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
bec9744f77
am 6a0d4fbd: am 00aeefd2: Add hidden API for removing cross-profile package filters
...
* commit '6a0d4fbd583284d8540e5cf36fada4a51ecdb040':
Add hidden API for removing cross-profile package filters
2014-08-06 15:26:09 +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
a043228824
am 1af49917: am 9e4e75a4: Merge "Implement face unlock running indicator on Keyguard." into lmp-dev
...
* commit '1af49917a767fd0ecabd47df1be5471310bc3a96':
Implement face unlock running indicator on Keyguard.
2014-08-06 15:00:44 +00:00
Chet Haase
7397856723
am 83e20b0d: am 51a8880d: Actually set the internal modal value in ListPopupWindow.setModal()
...
* commit '83e20b0d107770f8dad1fb919046d646a32c37e1':
Actually set the internal modal value in ListPopupWindow.setModal()
2014-08-06 14:56:26 +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
John Spurlock
edabcb9357
am 9cb61176: am 2b49eae5: Merge "Zen: Show subhead for Indefinitely." into lmp-dev
...
* commit '9cb6117652b63442a68e8c2783df5e5000349a35':
Zen: Show subhead for Indefinitely.
2014-08-06 14:46:23 +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
a8974aa3a0
am 74ea000c: am ceb386e1: Merge "PowerUI: Remove notification action icons." into lmp-dev
...
* commit '74ea000cd51f9ec176f2929061ae03a13b2544f2':
PowerUI: Remove notification action icons.
2014-08-06 14:28:57 +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
931dfed418
am 91558a66: am 5690c0eb: Merge "Fix resetAllModes call to act only on the calling user" into lmp-dev
...
* commit '91558a66f19769d9ac50b718fb7c5fa4a7651a5b':
Fix resetAllModes call to act only on the calling user
2014-08-06 13:53:42 +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
aa6cf24fcc
am 3a4ffb14: am bde77f4c: Debugging bad notification sorts.
...
* commit '3a4ffb14892d5391ce7ca97cb0a0d99fac879793':
Debugging bad notification sorts.
2014-08-06 13:42:22 +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
7797373219
am c774a900: am 3272a9d6: Turn off/on wifi to correspond with hotspot
...
* commit 'c774a900391b5296c70ab0a0f5860451c51f4c64':
Turn off/on wifi to correspond with hotspot
2014-08-06 13:11:01 +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
Sungsoo Lim
739e31eeca
am 0e33cbb0: am cf9c8d95: Merge "TIF: Add a content rating system for Brazil" into lmp-dev
...
* commit '0e33cbb0db66d9d61fe6a0b7890892aaa61dc749':
TIF: Add a content rating system for Brazil
2014-08-06 13:05:08 +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
Santos Cordon
7fdc21f2dc
am 73c3e8da: am b064ed4f: Add setConferenceable() API from ConnectionService to incall. (1/4)
...
* commit '73c3e8da958a6c5575545cdc80ec1b894da01bd7':
Add setConferenceable() API from ConnectionService to incall. (1/4)
2014-08-06 12:58:26 +00:00
Sungsoo Lim
a892805765
am a982555a: am 1b014966: Merge "TIF: Add content ratings for Australia" into lmp-dev
...
* commit 'a982555aa83e85ecbdbe0441cc538105b7e9a357':
TIF: Add content ratings for Australia
2014-08-06 12:58:21 +00:00
Youngsang Cho
ce7980bc1a
am 4edca544: am 58d7cb1a: Merge "Remove a Handler constructor parameter Looper in TIS" into lmp-dev
...
* commit '4edca5440e24dcc297c214ea3ad5fd2dec570431':
Remove a Handler constructor parameter Looper in TIS
2014-08-06 12:58:16 +00:00
Youngsang Cho
430a5994e6
am 9cb3f48f: am 89dbdccc: Merge "Add a method in TIS to relayout SurfaceView" into lmp-dev
...
* commit '9cb3f48fed1285a24bf3d978b01d3b2c5f889a36':
Add a method in TIS to relayout SurfaceView
2014-08-06 12:58:12 +00:00
Jae Seo
cd68158196
am c585b1e9: am e5b4e2f8: TIF: Add explanation for TvView
...
* commit 'c585b1e9e29fe89708aef6a247addb7e5b763adc':
TIF: Add explanation for TvView
2014-08-06 12:58:08 +00:00
Jungshik Jang
83f249e951
am efca8d3c: am 924057dc: Merge "More tweaks for recording" into lmp-dev
...
* commit 'efca8d3c9fb9c8c2c5db1b62c9321932dfe68091':
More tweaks for recording
2014-08-06 12:58:01 +00:00
Brian Carlstrom
48a5894e04
am 87e08756: am 0ecd18e2: Remove java.lang.reflect.ArtMethod accidentally added in ad601d76e820ba680b14b7016d2e79763b7f4663
...
* commit '87e087560896f5d8dce770fc57d2f6a640dfd072':
Remove java.lang.reflect.ArtMethod accidentally added in ad601d76e820ba680b14b7016d2e79763b7f4663
2014-08-06 12:57:57 +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
c594819143
am a3deeed2: am b0ee5931: Merge "TIF: Add content rating system for Spain" into lmp-dev
...
* commit 'a3deeed299f4939c693875cab538a875a6f3d0c6':
TIF: Add content rating system for Spain
2014-08-06 03:02:07 +00: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
7cabc4dbc7
am 711216a3: am 99592521: Sensor related changes for NDK.
...
* commit '711216a3c04dd5ec781e7aedc6e51c09040657cc':
Sensor related changes for NDK.
2014-08-06 02:43:48 +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
1ac77618a4
am 06d5a413: am 098c4716: TIF: make TvInputService.Session class static
...
* commit '06d5a413fc1cd760a73e796ee911d2e5884c9d12':
TIF: make TvInputService.Session class static
2014-08-06 02:39:49 +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