drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,662 Commits 1 Branch 0 Tags
Commit Graph

124662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
47e352cf04 am 6250c59e: Merge "Refactoring of fitSystemWindows to applyWindowInsets for views" 
* commit '6250c59e0d917fb3641ac499ca69b011aa50a4bd':
  Refactoring of fitSystemWindows to applyWindowInsets for views
 2014-02-06 14:43:27 -08:00
Adam Powell
6250c59e0d Merge "Refactoring of fitSystemWindows to applyWindowInsets for views" 2014-02-06 22:41:14 +00:00
Ricardo Cervera
86b99ae94c am 1d2b0c00: am adb94013: am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '1d2b0c008bfedfa4d6ef231c393f848cda662e03':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 14:17:33 -08:00
Ricardo Cervera
921407e137 am 6232c3ca: am a5e35cb0: am 6ed26862: am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit '6232c3caf580d805ef26648c645181ac37ab00ff':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 14:17:30 -08:00
Craig Mautner
ec8ac30614 am c667f054: am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing. 
* commit 'c667f054d5b5a87247cd84d78d483dc1c97af41a':
  DO NOT MERGE. Test for Configuration differences before changing.
 2014-02-06 14:17:28 -08:00
John Reck
ef129d8442 am 393fdbec: Merge "Remove overdraw counter" 
* commit '393fdbec9f3f11d277e1631c2e36362e408cbbdc':
  Remove overdraw counter
 2014-02-06 14:17:25 -08:00
Adam Lesinski
95e17980c5 am 9f97de13: am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev 
* commit '9f97de13359662c2709eed227b3fab2ce7d5dabc':
  Check feature bits before loading optional services
 2014-02-06 14:17:22 -08:00
Jeff Sharkey
be781e26aa am 2b1252dd: Merge "Update DrmOutputStream to use raw FileDescriptor." 
* commit '2b1252ddd2650cb38918cb85d2a3711b2cfa8db5':
  Update DrmOutputStream to use raw FileDescriptor.
 2014-02-06 14:17:18 -08:00
Craig Mautner
a9080e9b01 am d1c2c542: Test for Configuration differences before changing. 
* commit 'd1c2c5421181b988f09fd12d9633e2a7c2a8ab60':
  Test for Configuration differences before changing.
 2014-02-06 14:17:15 -08:00
Ricardo Cervera
1d2b0c008b am adb94013: am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit 'adb940131adf137023006fcd86663fd048fa6a54':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:29:59 +00:00
Ricardo Cervera
6232c3caf5 am a5e35cb0: am 6ed26862: am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit 'a5e35cb002936291b79ff422c94eb2caabedfb3a':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:26:03 +00:00
Ricardo Cervera
adb940131a am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8ff1f285c93a1a44a7419ab216bee2f92518387a':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:23:40 +00:00
Ricardo Cervera
8ff1f285c9 am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit 'b7d456d4a410d1a17933ed0256fecd2144160615':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:20:28 +00:00
Ricardo Cervera
a5e35cb002 am 6ed26862: am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit '6ed268623b9e4a10a080e15d64340c16d2dd8a28':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:19:50 +00:00
Ricardo Cervera
b7d456d4a4 am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:17:12 +00:00
Ricardo Cervera
6ed268623b am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit '74d290fd62dfec09708664f354805c548b3dc5eb':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:16:28 +00:00
Ricardo Cervera
8d65fc2c69 am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8756b0c3cea50d47ba7191d8a493f774b23a1631':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:13:29 +00:00
Ricardo Cervera
74d290fd62 am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit 'd057fa6d40198e07844f702608b7959bad3bd48b':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:13:21 +00:00
Ricardo Cervera
d057fa6d40 am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit '531939d151167e56b3106205f4c3d859a9f509ce':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:09:36 +00:00
Ricardo Cervera
8756b0c3ce Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 2014-02-06 21:09:12 +00:00
Ricardo Cervera
531939d151 Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 2014-02-06 21:07:09 +00:00
Craig Mautner
c667f054d5 am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing. 
* commit '43ef013cbd769533737135af5a338898cc619602':
  DO NOT MERGE. Test for Configuration differences before changing.
 2014-02-06 20:36:56 +00:00
Craig Mautner
43ef013cbd am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing. 
* commit '38f7dcd7dcb5d98d86f19f3c4725aea89f9792ff':
  DO NOT MERGE. Test for Configuration differences before changing.
 2014-02-06 20:29:49 +00:00
Craig Mautner
38f7dcd7dc DO NOT MERGE. Test for Configuration differences before changing. 
Changing Configuration first and then testing for changes yields a
result indicating no change.

Fixes bug 12904769.

Change-Id: If7e39e843f15b1143d9877497d595511afabd020
 2014-02-06 12:27:20 -08:00
John Reck
393fdbec9f Merge "Remove overdraw counter" 2014-02-06 20:26:37 +00:00
Adam Lesinski
9f97de1335 am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev 
* commit 'a5a93f559d337ad5b79716b05ea43707eb779dc8':
  Check feature bits before loading optional services
 2014-02-06 20:25:51 +00:00
Adam Lesinski
a5a93f559d am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev 
* commit '7f416631413e75a1756bd316a2e1906725d72f24':
  Check feature bits before loading optional services
 2014-02-06 20:16:30 +00:00
Adam Lesinski
7f41663141 Merge "Check feature bits before loading optional services" into klp-modular-dev 2014-02-06 20:13:21 +00:00
John Reck
593b19a49e Remove overdraw counter 
Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd
 2014-02-06 11:26:23 -08:00
Ricardo Cervera
893ee42c72 docs: Updated the retaining an object during conf change. Bug: 10303533 
Replaced use of deprecated methods with retained fragments.

Change-Id: I0f0a045da88f9817077070729ef0af283bea93e4
Review: http://quixote.mtv.corp.google.com:8007/guide/topics/resources/runtime-changes.html
 2014-02-06 10:57:36 -08:00
Jeff Sharkey
2b1252ddd2 Merge "Update DrmOutputStream to use raw FileDescriptor." 2014-02-06 18:50:05 +00:00
Craig Mautner
d1c2c54211 Test for Configuration differences before changing. 
Changing Configuration first and then testing for changes yields a
result indicating no change.

Fixes bug 12904769.

Change-Id: If7e39e843f15b1143d9877497d595511afabd020
 2014-02-06 10:31:41 -08:00
Ricardo Cervera
56d37fb8cd docs: Fixed links to Proguard manual. Bug: 12713887 
The SourceForge manual cannot be linked to sections directly because
of JavaScript and HTML frames. I used the MIT links from the bug
report instead.

Review: http://quixote.mtv.corp.google.com:8001/tools/help/proguard.html

Change-Id: I1be210d392d78a7560a89f421074ba6d99499da0
 2014-02-06 09:49:04 -08:00
Jeff Sharkey
ebf8ad5d91 Update DrmOutputStream to use raw FileDescriptor. 
This allows DownloadManager to use FDs, paving the way for downloading
directly to content:// Uris.

Also return flag indicating if deleteOlderFiles() actually deleted
anything.  Update tests to verify.

Bug: 5287571
Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
 2014-02-06 09:47:38 -08:00
Andreas Huber
0bf51fc094 am b341a24b: Merge "Remove no longer needed http proxy handling code, it\'s obsolete now" 
* commit 'b341a24b2adbb67cdc34ade0a19570ee37f0cb82':
  Remove no longer needed http proxy handling code, it's obsolete now
 2014-02-06 09:13:10 -08:00
Andreas Huber
b341a24b2a Merge "Remove no longer needed http proxy handling code, it's obsolete now" 2014-02-06 17:10:31 +00:00
Jessica Hummel
3c3e16e041 am e33e2ca3: Merge "Extend DeviceOwner concept to accommodate ProfileOwners" 
* commit 'e33e2ca3460c0e5a898e5b0406d86b16b96f735a':
  Extend DeviceOwner concept to accommodate ProfileOwners
 2014-02-06 02:25:23 -08:00
Jessica Hummel
e33e2ca346 Merge "Extend DeviceOwner concept to accommodate ProfileOwners" 2014-02-06 10:23:00 +00:00
Adam Connors
776c555d95 Extend DeviceOwner concept to accommodate ProfileOwners 
ProfileOwners, like DeviceOwners, are Device Admins that have
additional priviledges. ProfileOwners however are scoped per
user.

Change-Id: I1e22c85878e0672121e6ebbe97fca38591f992b2
 2014-02-06 10:07:19 +00:00
Deepanshu Gupta
30164eee82 am 6886e3ac: am 7bd287b7: am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev 
* commit '6886e3ac185b4ee2d5e2cf054b4beb0d9c55b18f':
  Add methods for Time_Delegate
 2014-02-05 19:18:30 -08:00
Deepanshu Gupta
bd40c264cf am f7994e89: am 6a9cbd5a: am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev 
* commit 'f7994e89e94d55998e63e9ebe74a8f10c05ccb3a':
  Optimize layout rendering in layoutlib
 2014-02-05 19:18:27 -08:00
Deepanshu Gupta
748ca8dbc5 am a859670d: am f9021e48: am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev 
* commit 'a859670d0a135d9a33b57fcc450fafa09d9c5a7f':
  Add missing files to fix libphonenumber for layoutlib.
 2014-02-05 19:18:24 -08:00
Deepanshu Gupta
abbe45e81e am 3a9d89e2: am 1bcc286d: am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev 
* commit '3a9d89e28885d5d92423b9d28a1a2430b65e1559':
  Fix the measurement of text bounds.
 2014-02-05 19:18:21 -08:00
Deepanshu Gupta
dacbd2ac7c am 1c064691: am 1bceb982: am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library. 
* commit '1c06469101464c147058c01bc25c9e4b3c1aa16b':
  Fix a bug in Nine Patch library.
 2014-02-05 19:18:18 -08:00
Deepanshu Gupta
6886e3ac18 am 7bd287b7: am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev 
* commit '7bd287b70a1c95c96663a6028e9809fd3844f55a':
  Add methods for Time_Delegate
 2014-02-06 03:15:37 +00:00
Deepanshu Gupta
f7994e89e9 am 6a9cbd5a: am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev 
* commit '6a9cbd5a2d56782e94b870735df51d32314684d8':
  Optimize layout rendering in layoutlib
 2014-02-06 03:15:33 +00:00
Deepanshu Gupta
a859670d0a am f9021e48: am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev 
* commit 'f9021e48bedc9fda9bff4e33244e689fb06e8ecb':
  Add missing files to fix libphonenumber for layoutlib.
 2014-02-06 03:15:30 +00:00
Deepanshu Gupta
3a9d89e288 am 1bcc286d: am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev 
* commit '1bcc286def646f98747bce2c4dedb0737d5fcf9d':
  Fix the measurement of text bounds.
 2014-02-06 03:15:26 +00:00
Deepanshu Gupta
1c06469101 am 1bceb982: am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library. 
* commit '1bceb9823f7af258489c91fa201214805744fa4a':
  Fix a bug in Nine Patch library.
 2014-02-06 03:15:22 +00:00
Deepanshu Gupta
7bd287b70a am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev 
* commit 'ea2ec77f9538de2ea795d3e257f19e8cff659665':
  Add methods for Time_Delegate
 2014-02-06 03:06:38 +00:00