Dan Sandler
52e5701eea
Move LOCK_SCREEN_SHOW_NOTIFICATIONS to per-user Settings.Secure.
...
Bug: 15331132
Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
2014-08-06 18:00:53 +00:00
John Reck
7aede5afe4
am 73118c87: Merge "clamp & round alpha" into lmp-dev
...
* commit '73118c87a2a4c1f174a507de0d66eddabb51e471':
clamp & round alpha
2014-08-06 17:33:37 +00:00
Fabrice Di Meglio
b31086e869
am 46ccd1f7: Make SwitchPreference switch more Material
...
* commit '46ccd1f738e973cea73a33134b5bd37f0712ceba':
Make SwitchPreference switch more Material
2014-08-06 17:28:44 +00:00
Fabrice Di Meglio
52ab18bc6c
Make SwitchPreference switch more Material
...
- remove the padding so that we behave the same way as the CheckBoxPreference
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: Ie22f389820c4a48bcf4b018d7009a07140cb493b
2014-08-06 17:21:16 +00:00
Alan Viverette
b1de5a59be
Merge "Separate tint and tintMode properties" into lmp-dev
2014-08-06 17:19:40 +00:00
Alan Viverette
a426445dfd
Separate tint and tintMode properties
...
BUG: 16054922
Change-Id: I820fb857b671faf9eb27612e470e820c5c4cd6b5
2014-08-06 15:42:10 -07:00
ztenghui
33559c96ad
Merge "MiterLimit represent a ratio itself, no need to scale" into lmp-dev
2014-08-06 17:19:40 +00:00
ztenghui
c4d651ec8a
MiterLimit represent a ratio itself, no need to scale
...
Change-Id: I474d8c29fc28786c6b3ff88848c1c802ab76d77c
2014-08-06 20:07:04 +00:00
Yao Chen
dc33b6170b
Merge "Adds getServiceComponent() to MediaBrowser, getQueueTitle() and getExtras() to MediaController" into lmp-dev
2014-08-06 17:19:40 +00:00
Yao Chen
51fdfa273e
Adds getServiceComponent() to MediaBrowser, getQueueTitle() and
...
getExtras() to MediaController
Change-Id: I6092ac1ae05ba55c14a042698bb88bd16e9b1fa7
2014-08-06 14:10:41 -07:00
Igor Murashkin
5bd43d7145
Merge "camera2: (legacy) Support awb mode, test mode metadata keys" into lmp-dev
2014-08-06 17:19:40 +00:00
Igor Murashkin
733341bf0d
camera2: (legacy) Support awb mode, test mode metadata keys
...
Change-Id: Ic013aa820bbea02a662d546eb9f70baa20c0136e
2014-08-06 14:35:40 -07:00
Eric Laurent
b287c9388e
Merge "AudioSystem: add API to query audio HW sync source" into lmp-dev
2014-08-06 17:14:55 +00:00
Chris Craik
2e294a9798
am 439a63b3: Fix nine patch crash
...
* commit '439a63b3a9d958e1b53db64686a4dd3199786323':
Fix nine patch crash
2014-08-06 16:48:24 +00:00
Chris Craik
01af516a87
Fix nine patch crash
...
bug:15598400
Prevent destroying a NULL chunk
Change-Id: Iea0ac5311ca8061f60c02669cd9b87eededf1b1d
2014-08-06 16:44:47 +00:00
Jeff Sharkey
ad0a752382
am 4b5aa98a: Merge "CleanSpec!" into lmp-dev
...
* commit '4b5aa98a64bbd404a18c3e3e68b4a8eb4d0ae8db':
CleanSpec!
2014-08-06 16:43:00 +00:00
Brian Colonna
ef7672bb9f
am 92376c7b: Merge "Bug 16147163: Secure camera can now be launched with FUL running" into lmp-dev
...
* commit '92376c7bff044e65c93af483effb2bae1ce9160a':
Bug 16147163: Secure camera can now be launched with FUL running
2014-08-06 16:11:55 +00:00
Adrian Roos
ccdff62159
Update User switcher to new spec, implement adding users
...
Also enforces restrictions on when guests can be added.
Bug: 15545213
Change-Id: Ia03747fbcc39f2b1b20876463c85afbac5057878
2014-08-06 18:00:32 +02:00
Geoff Mendal
a67e473cf4
am 409e3a25: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '409e3a25a2565b0f88e8fa8dfbaaa579c7dc0d81':
Import translations. DO NOT MERGE
2014-08-06 15:49:49 +00:00
Alexandra Gherghina
1ab405c057
am 00aeefd2: Add hidden API for removing cross-profile package filters
...
* commit '00aeefd2a1849af94844f03410a3648183878e47':
Add hidden API for removing cross-profile package filters
2014-08-06 15:22:10 +00:00
Jorim Jaggi
de701435ce
am 9e4e75a4: Merge "Implement face unlock running indicator on Keyguard." into lmp-dev
...
* commit '9e4e75a4d05ce60b423c52889d6f6f19119a0847':
Implement face unlock running indicator on Keyguard.
2014-08-06 14:55:09 +00:00
Alexandra Gherghina
e41ce995a0
Add hidden API for removing cross-profile package filters
...
Bug: 16646591
Change-Id: Iaf6837fe4390ac1018c49df366ea434776ed7244
2014-08-06 14:52:50 +00:00
Chet Haase
7acfba8772
am 51a8880d: Actually set the internal modal value in ListPopupWindow.setModal()
...
* commit '51a8880dbcf6f662714e4c289d7ef5a9832bf48d':
Actually set the internal modal value in ListPopupWindow.setModal()
2014-08-06 14:51:06 +00:00
Chet Haase
e04499ad93
Actually set the internal modal value in ListPopupWindow.setModal()
...
The current code ignores the parameter and sets the internal modal
value to true. This has probably gone unnoticed because all framework
usage of this method calls it with 'true', except for one case where
it sets it to 'false' temporarily, and then to 'true'.
Issue #16815832 ListPopupWindow setModal broken
Change-Id: I4ac7ab31b4ab91c9959efd4ccf2264a8e381708f
2014-08-06 14:45:30 +00:00
John Spurlock
8c42c9d042
am 2b49eae5: Merge "Zen: Show subhead for Indefinitely." into lmp-dev
...
* commit '2b49eae54ae1901b965b994174d3999206985533':
Zen: Show subhead for Indefinitely.
2014-08-06 14:41:54 +00:00
John Spurlock
03d705be27
am ceb386e1: Merge "PowerUI: Remove notification action icons." into lmp-dev
...
* commit 'ceb386e19a7fe638f9f7dd8faca81dc034f646ab':
PowerUI: Remove notification action icons.
2014-08-06 14:24:41 +00:00
Alexandra Gherghina
64b15309f4
am 5690c0eb: Merge "Fix resetAllModes call to act only on the calling user" into lmp-dev
...
* commit '5690c0eb26085a665885f95d29c34185c52cc988':
Fix resetAllModes call to act only on the calling user
2014-08-06 13:49:35 +00:00
Daniel Sandler
2e9469de35
am bde77f4c: Debugging bad notification sorts.
...
* commit 'bde77f4c163a2e7898fe0bbdc9c463b95e382c51':
Debugging bad notification sorts.
2014-08-06 13:37:38 +00:00
Daniel Sandler
41da5ff98f
Debugging bad notification sorts.
...
Bug: 16626175
Change-Id: I6cc7ee5f853c846e3aed6f9750e8fb6bc5aed699
2014-08-06 13:26:04 +00:00
Jason Monk
bdae529e77
am 3272a9d6: Turn off/on wifi to correspond with hotspot
...
* commit '3272a9d615782532468d582669351b024f4bf868':
Turn off/on wifi to correspond with hotspot
2014-08-06 13:07:16 +00:00
Jason Monk
256a22663d
Turn off/on wifi to correspond with hotspot
...
Add logic to act the same way Settings does. Without this sometimes
wifi is in the wrong state (on) and the hotspot wont turn on.
Bug: 16818232
Change-Id: Iaa7950a1c2097cfd798eddb604b49b3a152f1260
2014-08-06 13:04:06 +00:00
Sungsoo Lim
ce9d13757b
am cf9c8d95: Merge "TIF: Add a content rating system for Brazil" into lmp-dev
...
* commit 'cf9c8d95525991e3f4239e24609cf020bf083495':
TIF: Add a content rating system for Brazil
2014-08-06 12:51:02 +00:00
Santos Cordon
4c2c87f8ff
am b064ed4f: Add setConferenceable() API from ConnectionService to incall. (1/4)
...
* commit 'b064ed4f9e58302f93545b63d081103c3d0dadfe':
Add setConferenceable() API from ConnectionService to incall. (1/4)
2014-08-06 12:44:16 +00:00
Sungsoo Lim
bf2df3f46e
am 1b014966: Merge "TIF: Add content ratings for Australia" into lmp-dev
...
* commit '1b01496607e8ea4858cc0b3f36eb0e83d3d097dc':
TIF: Add content ratings for Australia
2014-08-06 12:44:00 +00:00
Youngsang Cho
f12ac48174
am 58d7cb1a: Merge "Remove a Handler constructor parameter Looper in TIS" into lmp-dev
...
* commit '58d7cb1a7d2561531ca96b52185fe5f97f6d5db7':
Remove a Handler constructor parameter Looper in TIS
2014-08-06 12:43:52 +00:00
Youngsang Cho
c1575b16b6
am 89dbdccc: Merge "Add a method in TIS to relayout SurfaceView" into lmp-dev
...
* commit '89dbdcccb8b116cdb77a86329bc5fe2cae6b397c':
Add a method in TIS to relayout SurfaceView
2014-08-06 12:43:41 +00:00
Jae Seo
77cd34da7e
am e5b4e2f8: TIF: Add explanation for TvView
...
* commit 'e5b4e2f82434b68045a90086ae951f1a1d9a32b5':
TIF: Add explanation for TvView
2014-08-06 12:43:32 +00:00
Jungshik Jang
465e97ebb3
am 924057dc: Merge "More tweaks for recording" into lmp-dev
...
* commit '924057dc66c2396622b99a69c4913b931b13c4eb':
More tweaks for recording
2014-08-06 12:43:08 +00:00
Brian Carlstrom
6c65c6b96b
am 0ecd18e2: Remove java.lang.reflect.ArtMethod accidentally added in ad601d76e820ba680b14b7016d2e79763b7f4663
...
* commit '0ecd18e2fd12f93cd7af951c01eaadc3b9059eb5':
Remove java.lang.reflect.ArtMethod accidentally added in ad601d76e820ba680b14b7016d2e79763b7f4663
2014-08-06 12:43:01 +00:00
Santos Cordon
7c7bc7f691
Add setConferenceable() API from ConnectionService to incall. (1/4)
...
Change-Id: I64fdca08d35f893d755e3b154543a261b1418343
2014-08-06 03:36:09 -07:00
Jae Seo
9551e92507
TIF: Add explanation for TvView
...
Bug: 16801733
Change-Id: I8fa81a850d1e29f32fdb6caa4bd3dc4b2668e18a
2014-08-05 23:09:13 -07:00
Brian Carlstrom
40c89a087b
Remove java.lang.reflect.ArtMethod accidentally added in ad601d76e820ba680b14b7016d2e79763b7f4663
...
Change-Id: Ib01118d950e7cfe91c87a34489c51777262125bf
2014-08-05 21:09:29 -07:00
Dongwon Kang
3babc1d15e
am b0ee5931: Merge "TIF: Add content rating system for Spain" into lmp-dev
...
* commit 'b0ee59317533e2cac0efe24a85499fbfe56bee25':
TIF: Add content rating system for Spain
2014-08-06 02:58:02 +00:00
Aravind Akella
2a9c88bf37
am 99592521: Sensor related changes for NDK.
...
* commit '995925214edbe522248e351e14e46f140501ccfd':
Sensor related changes for NDK.
2014-08-06 02:40:37 +00:00
Dongwon Kang
89d93bb7d2
am 098c4716: TIF: make TvInputService.Session class static
...
* commit '098c47168d3bcebb89ddb74d0f3e1e18315659cb':
TIF: make TvInputService.Session class static
2014-08-06 02:36:28 +00:00
Aravind Akella
99fe165082
Sensor related changes for NDK.
...
i) Add ASensor_isWakeUpSensor and ASensorManager_getDefaultSensorEx
methods.
Bug: 16399898
Change-Id: Icc252aad068fa337bef8b22f20584f98cd5a155d
2014-08-05 19:34:04 -07:00
Dongwon Kang
66b9e91801
TIF: make TvInputService.Session class static
...
This change would make the developers freely extend the Session class
out of the TvInputService class.
Change-Id: I7dc9501c771a6e4dcfcceeb1b294b95e612596eb
2014-08-06 11:15:30 +09:00
Matthew Xie
4565ded1a2
Merge "Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access" into lmp-dev
2014-08-06 02:12:24 +00:00
Matthew Xie
6b93229a21
Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access
...
The permission is hidden. It's for Bluetooth app only. We may unhide it in the future.
Change-Id: Ibc6f7b71f0c79dc282a8e5fdc786e1c16be7a892
2014-08-06 00:11:05 -07:00
Michael Wright
5425dbb1a6
am 104bc43d: Add supported refresh rate to displays
...
* commit '104bc43d148704cc6ecefa295cb8320ede34a4bd':
Add supported refresh rate to displays
2014-08-06 02:08:15 +00:00