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

167454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Hao
3a3848f15a am 838018b2: am b5c5354f: am 63360780: Merge "Stop boot dexopt when low on memory." into lmp-mr1-dev 
* commit '838018b2536d66455edf65ec263c5b99e7744a46':
  Stop boot dexopt when low on memory.
 2014-10-14 19:04:43 +00:00
John Spurlock
c23059bedf am 9766d5b2: am 23e47ce6: am bec0c53a: Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev 
* commit '9766d5b236394dbc988619a4e0236621add3c6b6':
  Make SeekBarVolumizer restartable.
 2014-10-14 19:04:38 +00:00
John Reck
cc1b97965d am 1467c54d: am f3259620: am 94c40fe9: CARD LAND! 
* commit '1467c54d857fbfc03fb52b9ba95db72c6acbae32':
  CARD LAND!
 2014-10-14 19:04:29 +00:00
Nicolas Prevot
684bbd8668 am e5a75d13: am 20ec9b79: am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 
* commit 'e5a75d1333b92c23cf243af80e62de06a0f9c892':
  Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.
 2014-10-14 19:04:25 +00:00
Jinsuk Kim
f152525db9 am 584b564d: am 20bc8c19: am 93eed0c0: CEC: Use hotplug event for MHL device registry 
* commit '584b564df00475966127801a8c8d6560428ac97f':
  CEC: Use hotplug event for MHL device registry
 2014-10-14 19:04:18 +00:00
Geoff Mendal
a4bbf72648 am 97ddc849: (-s ours) am 7238e84c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '97ddc849248e2df7b0b592aa170450158d818b7f':
  Import translations. DO NOT MERGE
 2014-10-14 19:04:14 +00:00
Alan Viverette
a0d48e1cd7 am 882d5cd0: am d9a2b99d: am 42e96769: Merge "Add support for tint and tintMode to GradientDrawable" into lmp-mr1-dev 
* commit '882d5cd051b2081e27f97dcf35a695737e00b434':
  Add support for tint and tintMode to GradientDrawable
 2014-10-14 19:04:10 +00:00
Alan Viverette
42d7f6c17e am b50d1586: am db8ecf80: am 788e30bd: Merge "Revert "Always project ripples"" into lmp-mr1-dev 
* commit 'b50d1586053d16f31faa989a0643e809353a04ee':
  Revert "Always project ripples"
 2014-10-14 19:04:00 +00:00
Fabrice Di Meglio
374b30f214 am 11dd7cab: am a99cad8d: am 5dac2a22: Merge "Fix bug #17900580 Top bar drop shadow no longer transparent" into lmp-mr1-dev 
* commit '11dd7cab3b1d6bb3d869732653fcb350b05e063e':
  Fix bug #17900580 Top bar drop shadow no longer transparent
 2014-10-14 19:03:53 +00:00
Geoff Mendal
d74f1db748 am f233cce9: (-s ours) am cd38106a: (-s ours) am d112c2a3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'f233cce91dd9494df424f8e3caf22e709117b9dc':
  Import translations. DO NOT MERGE
 2014-10-14 19:03:49 +00:00
Wei Wang
4460079faa am ce285c8a: am 1602b0f8: am 3f0aa505: am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 
* commit 'ce285c8afbc3c26cf15632e442f658a5d2fb76ff':
  Add support of advertising through standard instance.(1/4)
 2014-10-14 19:03:45 +00:00
Evan Charlton
5db046bda4 resolved conflicts for merge of 9963fc12 to master 
Change-Id: I2339dcafc38693bf6c89d4e3643627270791442e
 2014-10-14 11:06:32 -07:00
Aravind Akella
36d94c6ba0 am 2a8be3c9: am b78c1679: am 1f9b32f0: Sensor documentation fixes. 
* commit '2a8be3c9b5c7f5c5b44232e27a9d6417b72dc2b0':
  Sensor documentation fixes.
 2014-10-14 17:56:51 +00:00
Jeff Hao
838018b253 am b5c5354f: am 63360780: Merge "Stop boot dexopt when low on memory." into lmp-mr1-dev 
* commit 'b5c5354fdab213c28d0817169d4ed100cc3e0215':
  Stop boot dexopt when low on memory.
 2014-10-14 17:51:21 +00:00
John Spurlock
9766d5b236 am 23e47ce6: am bec0c53a: Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev 
* commit '23e47ce65273607d36474422ab02e1ae6fbd41c9':
  Make SeekBarVolumizer restartable.
 2014-10-14 17:51:17 +00:00
John Reck
1467c54d85 am f3259620: am 94c40fe9: CARD LAND! 
* commit 'f325962096663a5264f2ec613293818f7f3ea2f9':
  CARD LAND!
 2014-10-14 17:51:07 +00:00
Nicolas Prevot
e5a75d1333 am 20ec9b79: am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 
* commit '20ec9b79f1d98ccbe5b8d4486feaf37a4f80a945':
  Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.
 2014-10-14 17:51:02 +00:00
Jinsuk Kim
584b564df0 am 20bc8c19: am 93eed0c0: CEC: Use hotplug event for MHL device registry 
* commit '20bc8c19b655a9b1416f7aa698ebd3d5e6c21dd9':
  CEC: Use hotplug event for MHL device registry
 2014-10-14 17:50:52 +00:00
Geoff Mendal
97ddc84924 am 7238e84c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '7238e84c166ba033b76eeeecf180434337e574b9':
  Import translations. DO NOT MERGE
 2014-10-14 17:50:40 +00:00
Alan Viverette
882d5cd051 am d9a2b99d: am 42e96769: Merge "Add support for tint and tintMode to GradientDrawable" into lmp-mr1-dev 
* commit 'd9a2b99de201c89b1b6c58eae213bb15bef58168':
  Add support for tint and tintMode to GradientDrawable
 2014-10-14 17:50:34 +00:00
Alan Viverette
b50d158605 am db8ecf80: am 788e30bd: Merge "Revert "Always project ripples"" into lmp-mr1-dev 
* commit 'db8ecf8005294833a9fe758e5e4a4d6fd100bd66':
  Revert "Always project ripples"
 2014-10-14 17:50:27 +00:00
Fabrice Di Meglio
11dd7cab3b am a99cad8d: am 5dac2a22: Merge "Fix bug #17900580 Top bar drop shadow no longer transparent" into lmp-mr1-dev 
* commit 'a99cad8dc1fe1a2f4e9ba51ac41fe02b626bc2fd':
  Fix bug #17900580 Top bar drop shadow no longer transparent
 2014-10-14 17:49:48 +00:00
Geoff Mendal
f233cce91d am cd38106a: (-s ours) am d112c2a3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'cd38106a634960f42c282bcc1aab79270cecee78':
  Import translations. DO NOT MERGE
 2014-10-14 17:49:43 +00:00
Wei Wang
ce285c8afb am 1602b0f8: am 3f0aa505: am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 
* commit '1602b0f8d0ccbdedb5406a5d427c777c5d8b39b5':
  Add support of advertising through standard instance.(1/4)
 2014-10-14 17:49:24 +00:00
Evan Charlton
9963fc120a am 9a79debc: am 4f89e3b2: am 1354a1ff: am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev 
* commit '9a79debc5b065fa2d9c63e01903a376fb9e2227c':
  Update the SDK AIDL list
 2014-10-14 17:48:38 +00:00
Aravind Akella
2a8be3c9b5 am b78c1679: am 1f9b32f0: Sensor documentation fixes. 
* commit 'b78c16793b1542ff786bc6ae58cafa876b4bce45':
  Sensor documentation fixes.
 2014-10-14 17:48:29 +00:00
Sarah Maddox
e02cf9934c am 3505460f: am 7666f904: am 60c5fbc3: am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '3505460f73a25a32fef1215ff86354591eef6fb9':
  Fixed a typo in Perf Tips.
 2014-10-14 17:30:39 +00:00
Alan Viverette
0a80835e4f am 3a6366f2: am a8bcf1fb: am 5bcc5b28: am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit '3a6366f25c760e79d2eae3d4bfe3e25f2e045397':
  Increase contrast for money permission
 2014-10-14 17:30:35 +00:00
Elliott Hughes
e89bfcd14d am 07b68d8a: am 81fcede8: am b8175ad3: am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit '07b68d8ad4a6f7d4fff2806819050657238e04ab':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-14 17:30:30 +00:00
Jeff Sharkey
755799c707 am 7d5e9455: am 86195bd9: am 1229d266: am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '7d5e9455f479d3a2685c84388ef752d08c49e7fc':
  DocumentsUI: Add content description for nav.
 2014-10-14 17:30:27 +00:00
Jesse Hall
3f2c8122f0 am 3e173290: am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '3e1732907b41e69fbd6ddb13de6f47c845cb85c0':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-14 17:30:23 +00:00
Amit Mahajan
fa72516ac9 am ed454542: am 38e48c2f: am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit 'ed4545423b0166f2436adee077d11b85b62ed07a':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-14 17:30:18 +00:00
Sarah Maddox
3505460f73 am 7666f904: am 60c5fbc3: am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '7666f9040957d1e85815a3cce59ec4606c83d86d':
  Fixed a typo in Perf Tips.
 2014-10-14 17:22:54 +00:00
Alan Viverette
3a6366f25c am a8bcf1fb: am 5bcc5b28: am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit 'a8bcf1fb8f81515d876205a4d416a178eb53c511':
  Increase contrast for money permission
 2014-10-14 17:22:49 +00:00
Elliott Hughes
07b68d8ad4 am 81fcede8: am b8175ad3: am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit '81fcede86d89287a5add53b256d384f9a370d77d':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-14 17:22:44 +00:00
Jeff Sharkey
7d5e9455f4 am 86195bd9: am 1229d266: am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '86195bd9a39436a9dc39de782e20892f51cf7397':
  DocumentsUI: Add content description for nav.
 2014-10-14 17:22:40 +00:00
Jesse Hall
3e1732907b am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '05bbbebb475a2816d60c4a8ec140cccddc16b269':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-14 17:22:33 +00:00
Amit Mahajan
ed4545423b am 38e48c2f: am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '38e48c2f477d6908d7d29503749cbe4290b013a7':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-14 17:22:28 +00:00
Jeff Hao
b5c5354fda am 63360780: Merge "Stop boot dexopt when low on memory." into lmp-mr1-dev 
* commit '63360780f2bf21f55ba6f58c3624f19c7d52626b':
  Stop boot dexopt when low on memory.
 2014-10-14 16:59:59 +00:00
Jeff Hao
63360780f2 Merge "Stop boot dexopt when low on memory." into lmp-mr1-dev 2014-10-14 16:55:40 +00:00
John Spurlock
23e47ce652 am bec0c53a: Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev 
* commit 'bec0c53a402224cf4807efd4077047c870f5b58f':
  Make SeekBarVolumizer restartable.
 2014-10-14 16:45:48 +00:00
John Spurlock
bec0c53a40 Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev 2014-10-14 16:40:31 +00:00
John Reck
f325962096 am 94c40fe9: CARD LAND! 
* commit '94c40fe92117f301c7758de2861ab0c1d6cfded0':
  CARD LAND!
 2014-10-14 16:09:27 +00:00
John Reck
94c40fe921 CARD LAND! 
Bug: 16712006

Initial work towards benchmarking HWUI systems
Currently this will just create a screen full of
"cards" to simulate a high load scenario for
shadows and clipping

Change-Id: Ie9f9a9570844e136db8053e8fc62fe06cb922a5f
 2014-10-14 09:02:04 -07:00
Nicolas Prevot
20ec9b79f1 am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 
* commit 'd8a21bbedbaeb752b7f458823ed709b9a01c14c1':
  Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.
 2014-10-14 09:19:49 +00:00
Nicolas Prevot
d8a21bbedb Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 2014-10-14 09:07:43 +00:00
Jinsuk Kim
20bc8c19b6 am 93eed0c0: CEC: Use hotplug event for MHL device registry 
* commit '93eed0c03a1f9cd66946760045122516483ba3f0':
  CEC: Use hotplug event for MHL device registry
 2014-10-14 06:52:05 +00:00
Jinsuk Kim
93eed0c03a CEC: Use hotplug event for MHL device registry 
Substitute hotplug on event for registering MHL device as TV input.
Initializes a corresponding MHL DeviceInfo as well as MHL local device
instance.

Bug: 17349017

Change-Id: I7e55afda9390aa5fa8b7687cfa6fac132f342fe6
 2014-10-14 11:53:10 +09:00
Geoff Mendal
411e14081f Merge "Import translations. DO NOT MERGE" 2014-10-14 01:28:31 +00:00
Geoff Mendal
7238e84c16 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-14 01:27:58 +00:00