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
Filip Gruszczynski
5dcc3aca42
Log wallpaper crashes.
...
Change-Id: I40d9876dad2a8ec98135e3df127950dc3797040b
2014-10-13 15:51:39 -07: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
Aravind Akella
1f9b32f006
Sensor documentation fixes.
...
Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1
2014-10-13 22:25:46 +00:00
Evan Charlton
f715da3d6b
Merge "Update the SDK AIDL list" into lmp-dev
2014-10-13 22:19:41 +00:00
Evan Charlton
b298a5a594
Update the SDK AIDL list
...
Populate the framework.aidl list with .aidl files which are:
- In the android.* namespace
- Not marked @hide
- Do not have their corresponding .java files marked @hide
Bug: 17952409
Change-Id: I1f4abf7abbc298a51605571cd168362dcc5603b2
2014-10-13 15:12:57 -07:00
Sarah Maddox
60c5fbc3a9
am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev
...
* commit '64aec659b7b222c8663e36852f75f685c0ab8de4':
Fixed a typo in Perf Tips.
2014-10-13 22:08:47 +00:00
Alan Viverette
5bcc5b287b
am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev
...
* commit '21ad8732314872cc62ba2d311343c23b1e9078b8':
Increase contrast for money permission
2014-10-13 22:08:43 +00:00
Elliott Hughes
b8175ad3bf
am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev
...
* commit 'c02ddd6a0a4643ce49150231a104d77d90c13f27':
Ensure that the SIM language doesn't override the user language on the encryption UI.
2014-10-13 22:08:39 +00:00
Jeff Sharkey
1229d266f6
am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev
...
* commit 'c4d774d5d87439180eed0be45eb2242f8bf7cfaa':
DocumentsUI: Add content description for nav.
2014-10-13 22:08:35 +00:00
Jesse Hall
8d3cf106aa
am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
...
* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
2014-10-13 22:08:31 +00:00
Amit Mahajan
3547c13e0d
am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev
...
* commit '097c8d60115a9207ba4140ef99766741a2256361':
Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
2014-10-13 22:08:28 +00:00
Sarah Maddox
64aec659b7
am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev
...
* commit '8601b1b1ca75512177aa3539d33292250b5c9a2d':
Fixed a typo in Perf Tips.
2014-10-13 22:04:22 +00:00
Alan Viverette
21ad873231
am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev
...
* commit 'b927dfc774bd9d2c52cf6fbf50fe2eca16994c27':
Increase contrast for money permission
2014-10-13 22:04:15 +00:00
Elliott Hughes
c02ddd6a0a
am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev
...
* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
Ensure that the SIM language doesn't override the user language on the encryption UI.
2014-10-13 22:04:11 +00:00
Jeff Sharkey
c4d774d5d8
am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev
...
* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
DocumentsUI: Add content description for nav.
2014-10-13 22:04:06 +00:00
Jesse Hall
d4b38fe5c0
am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
...
* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
2014-10-13 22:03:59 +00:00
Amit Mahajan
097c8d6011
am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev
...
* commit '1901e175079e3b7242ace7d4b3ec38af3723f91b':
Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
2014-10-13 22:03:52 +00:00
Sarah Maddox
8601b1b1ca
Merge "Fixed a typo in Perf Tips." into lmp-dev
2014-10-13 21:50:30 +00:00
Alan Viverette
b927dfc774
Merge "Increase contrast for money permission" into lmp-dev
2014-10-13 21:31:40 +00:00
Alan Viverette
6f351bcc7c
am 2776b173: am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev
...
* commit '2776b17327e99338630db96d68170b0327084b3d':
Always project ripples
2014-10-13 21:12:43 +00:00
Alan Viverette
2776b17327
am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev
...
* commit '204e9f4cae2d49348c121c9738f8f33b5cb20b27':
Always project ripples
2014-10-13 21:07:55 +00:00
Alan Viverette
204e9f4cae
am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev
...
* commit '2f82e48abb71c92e41caa8057e3068dbfe96ed62':
Always project ripples
2014-10-13 21:03:21 +00:00
Alan Viverette
2f82e48abb
Merge "Always project ripples" into lmp-mr1-dev
2014-10-13 20:58:48 +00:00
Elliott Hughes
c130b428c5
Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev
2014-10-13 20:55:30 +00:00
John Spurlock
0e588ea8e1
Make SeekBarVolumizer restartable.
...
Decouple start from constructor, making it possible to restart
once stopped.
Bug:17898190
Change-Id: I2f860864161f818d5a62a28331ef1c47051fb39f
2014-10-13 20:46:36 +00:00
Jeff Sharkey
461b3896ba
Merge "DocumentsUI: Add content description for nav." into lmp-dev
2014-10-13 20:31:04 +00:00
Jesse Hall
647e0df0c7
Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
2014-10-13 20:23:15 +00:00
Alan Viverette
dc4e791b29
Increase contrast for money permission
...
BUG: 17923303
Change-Id: Ic35a9d37690ec5c4375285ca9b162cbff62db656
2014-10-13 13:12:49 -07:00
Jeff Sharkey
b7b30f691c
DocumentsUI: Add content description for nav.
...
Bug: 17922955
Change-Id: I44c0107d8dd03aab36da55deeb864e328b492124
2014-10-13 12:55:18 -07:00
Elliott Hughes
9c33f28d91
Ensure that the SIM language doesn't override the user language on the encryption UI.
...
Bug: 17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
2014-10-13 12:39:56 -07:00
Amit Mahajan
1901e17507
Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev
2014-10-13 19:32:36 +00:00
Yohei Yukawa
200ee78fe6
am d6d0c3f5: am 84928e72: am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev
...
* commit 'd6d0c3f54ae6c1ddd0b1ea086aeba28cd3ac2632':
Update config when "Show input method" is changed
2014-10-13 19:17:22 +00:00
Mike Lockwood
59a24d6ca9
am 4dd24730: am b3bab92e: am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev
...
* commit '4dd247305f4e4f3b3a7a9f52a8d1a9c6641391f3':
Change RECEIVE_BLUETOOTH_MAP permission to signature or system
2014-10-13 19:17:17 +00:00
Michael Wright
e067549804
am d61b3014: am 07dee169: am 48ca08a2: am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev
...
* commit 'd61b3014b3bcc9382e3bfba5ab50c62361783e20':
Clean-up ColorFade's shaders and buffers.
2014-10-13 19:17:12 +00:00