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

167427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Geoff Mendal
411e14081f Merge "Import translations. DO NOT MERGE" 2014-10-14 01:28:31 +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
Amit Mahajan
38e48c2f47 am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '3547c13e0d9188b87c64082cf9756419186fd06e':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:35:40 +00:00
Evan Charlton
4f89e3b215 am 1354a1ff: am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev 
* commit '1354a1fffec1ece56011f4259fbcecafbf758c74':
  Update the SDK AIDL list
 2014-10-13 22:32:55 +00:00
Evan Charlton
1354a1fffe am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev 
* commit 'f715da3d6b2c2d5037de69262eba513e863a98d8':
  Update the SDK AIDL list
 2014-10-13 22:28:29 +00:00