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

162722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
7238e84c16 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-14 01:27:58 +00:00
Alan Viverette
d9a2b99de2 am 42e96769: Merge "Add support for tint and tintMode to GradientDrawable" into lmp-mr1-dev 
* commit '42e96769ae9acd830e919ebc17a9294b6367538d':
  Add support for tint and tintMode to GradientDrawable
 2014-10-14 01:13:34 +00:00
Alan Viverette
42e96769ae Merge "Add support for tint and tintMode to GradientDrawable" into lmp-mr1-dev 2014-10-14 01:00:36 +00:00
Alan Viverette
db8ecf8005 am 788e30bd: Merge "Revert "Always project ripples"" into lmp-mr1-dev 
* commit '788e30bd34b575e029d6b55d74e9c81ce28b21df':
  Revert "Always project ripples"
 2014-10-14 00:41:49 +00:00
Alan Viverette
788e30bd34 Merge "Revert "Always project ripples"" into lmp-mr1-dev 2014-10-14 00:37:03 +00:00
Fabrice Di Meglio
a99cad8dc1 am 5dac2a22: Merge "Fix bug #17900580 Top bar drop shadow no longer transparent" into lmp-mr1-dev 
* commit '5dac2a225e54e0fc4cbddb81e7e11c6296c579b3':
  Fix bug #17900580 Top bar drop shadow no longer transparent
 2014-10-14 00:24:07 +00:00
Geoff Mendal
cd38106a63 am d112c2a3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd112c2a3659cdb253d7ed651db85417a8f72300e':
  Import translations. DO NOT MERGE
 2014-10-14 00:24:03 +00:00
Fabrice Di Meglio
5dac2a225e Merge "Fix bug #17900580 Top bar drop shadow no longer transparent" into lmp-mr1-dev 2014-10-14 00:14:37 +00:00
Geoff Mendal
d112c2a365 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-14 00:13:31 +00:00
Alan Viverette
43027b7bca Add support for tint and tintMode to GradientDrawable 
BUG: 17975498
Change-Id: I8aeec48b8499abaf055e75018759f99801efdecc
 2014-10-13 16:55:59 -07:00
Alan Viverette
2627206e1b Revert "Always project ripples" 
Projecting ripples places them under shadows, which is not
ideal. Punting this workaround and waiting until we have
proper support for rounded corner clipping on windows.

This reverts commit f90b6bd54f60960a790b5bd507a0d75d961a981a.

Change-Id: I61946649bbb1bf74a969d74e5353608afc8e4463
 2014-10-13 23:18:04 +00:00
Wei Wang
1602b0f8d0 am 3f0aa505: am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 
* commit '3f0aa505f4bf6ecb111dc5b39f30189afbac3cff':
  Add support of advertising through standard instance.(1/4)
 2014-10-13 23:12:01 +00:00
Wei Wang
3f0aa505f4 am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 
* commit '34020eb6ebc619c90b9107003331a91e4d5a350e':
  Add support of advertising through standard instance.(1/4)
 2014-10-13 23:05:37 +00:00
Wei Wang
34020eb6eb Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 2014-10-13 23:02:30 +00:00
Evan Charlton
9a79debc5b am 4f89e3b2: am 1354a1ff: am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev 
* commit '4f89e3b215c731a34b3ab8c300539f96e3f22459':
  Update the SDK AIDL list
 2014-10-13 22:41:19 +00:00
Aravind Akella
b78c16793b am 1f9b32f0: Sensor documentation fixes. 
* commit '1f9b32f006f7c506d9df5bf73294710665746397':
  Sensor documentation fixes.
 2014-10-13 22:41:15 +00:00
Sarah Maddox
7666f90409 am 60c5fbc3: am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '60c5fbc3a9cb13963d9095d699f2745c9cdb343c':
  Fixed a typo in Perf Tips.
 2014-10-13 22:36:00 +00:00
Alan Viverette
a8bcf1fb8f am 5bcc5b28: am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit '5bcc5b287b58cb69c3542c52998c6354341d8394':
  Increase contrast for money permission
 2014-10-13 22:35:57 +00:00
Elliott Hughes
81fcede86d 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 'b8175ad3bf91dfd8b519e39d8f327e87e3e5aeca':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:35:53 +00:00
Jeff Sharkey
86195bd9a3 am 1229d266: am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '1229d266f60b9e40e92a5fcee8baeaedd7e8c367':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:35:49 +00:00
Jesse Hall
05bbbebb47 am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '8d3cf106aa53ccf03c9f57c4e3b4af5799e2b530':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:35:45 +00:00