OSDN Git Service
Vladislav Kaznacheev [Thu, 13 Apr 2017 03:47:25 +0000 (03:47 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
am:
0964a2d9fc
Change-Id: I800980c3c887dd722410b427b7912b254012effc
TreeHugger Robot [Thu, 13 Apr 2017 03:36:23 +0000 (03:36 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
Jocelyn Dang [Thu, 13 Apr 2017 02:58:37 +0000 (02:58 +0000)]
Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev
am:
78b3b2308c
Change-Id: Ie7e78b33cc17ef29eba1ecf304ddbd4b40c17074
Jocelyn Dang [Thu, 13 Apr 2017 02:50:48 +0000 (02:50 +0000)]
Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev
Sudheer Shanka [Thu, 13 Apr 2017 01:59:13 +0000 (01:59 +0000)]
Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev
am:
67e802dd5e
Change-Id: I88cacca1d3a576b69dc0aaa6806b6c2901afa696
Sudheer Shanka [Thu, 13 Apr 2017 01:53:28 +0000 (01:53 +0000)]
Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev
Winson Chung [Thu, 13 Apr 2017 01:39:01 +0000 (01:39 +0000)]
Merge "Fix regression when removing task." into oc-dev
am:
efbcb0d2cc
Change-Id: I0f20de44ecbfab8a411e99623f407a4b7c6c6986
Dianne Hackborn [Thu, 13 Apr 2017 01:38:01 +0000 (01:38 +0000)]
Merge "Work on issue #
36427964: SecurityException: Unable to find app..." into oc-dev
am:
c62f0d7495
Change-Id: I87cbbdef2014cdc914b5165e68428aab2fa436c7
TreeHugger Robot [Thu, 13 Apr 2017 01:29:27 +0000 (01:29 +0000)]
Merge "Fix regression when removing task." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 01:27:50 +0000 (01:27 +0000)]
Merge "Work on issue #
36427964: SecurityException: Unable to find app..." into oc-dev
Salvador Martinez [Thu, 13 Apr 2017 01:01:35 +0000 (01:01 +0000)]
Merge "Added strings for thermal shutdown warning" into oc-dev
am:
dc52fd3168
Change-Id: I6395ad5cb79712e6cb00bcc4996fecda6018b919
TreeHugger Robot [Thu, 13 Apr 2017 00:51:22 +0000 (00:51 +0000)]
Merge "Added strings for thermal shutdown warning" into oc-dev
Wale Ogunwale [Thu, 13 Apr 2017 00:49:12 +0000 (00:49 +0000)]
Merge "Dump controller for AppWindowToken" into oc-dev
am:
b74567dd3b
Change-Id: I1c166eb1c7ad36396d7a463549d0ab1f9daebb61
Wale Ogunwale [Thu, 13 Apr 2017 00:48:06 +0000 (00:48 +0000)]
Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev
am:
343cf6e920
Change-Id: I05de9ee69443ebcae221736a1d4bcb94b89df00d
TreeHugger Robot [Thu, 13 Apr 2017 00:43:38 +0000 (00:43 +0000)]
Merge "Dump controller for AppWindowToken" into oc-dev
Wale Ogunwale [Thu, 13 Apr 2017 00:39:12 +0000 (00:39 +0000)]
Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev
Wale Ogunwale [Thu, 13 Apr 2017 00:36:34 +0000 (00:36 +0000)]
Revert "Ensure visible activities when device is unlocked."
Causes issues with window life-cycle...
Bug:
37119770
Bug:
37244415
Bug:
37281544
This reverts commit
7004a8801d0a60013681a86043bab74b4d42d680.
Change-Id: I0039db6e44488cd82ef745aa979bc8549fd8aeed
Chad Brubaker [Thu, 13 Apr 2017 00:11:16 +0000 (00:11 +0000)]
Merge "Expose more settings to Instant Apps" into oc-dev
am:
055b51af28
Change-Id: I1bddeffc290009c2ebf34168dc9ba8b69fe81e98
Evan Rosky [Thu, 13 Apr 2017 00:06:42 +0000 (00:06 +0000)]
Merge "Fix focus ordering with duplicate ids" into oc-dev
am:
a0ce440d60
Change-Id: I05050c7d2078a21f86a096ebc65bc2d6d8b4aa6a
Chad Brubaker [Wed, 12 Apr 2017 23:51:37 +0000 (23:51 +0000)]
Merge "Expose more settings to Instant Apps" into oc-dev
Evan Rosky [Wed, 12 Apr 2017 23:49:57 +0000 (23:49 +0000)]
Merge "Fix focus ordering with duplicate ids" into oc-dev
Roozbeh Pournader [Wed, 12 Apr 2017 23:37:03 +0000 (23:37 +0000)]
Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev
am:
d39388219f
Change-Id: Icae3c9b7166b4b83b31ad08bcd78db2205c916c1
Roozbeh Pournader [Wed, 12 Apr 2017 23:22:33 +0000 (23:22 +0000)]
Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev
Rob Carr [Wed, 12 Apr 2017 23:03:12 +0000 (23:03 +0000)]
Merge "Fix auto-pip visibility issues." into oc-dev
am:
7040f573f3
Change-Id: I1ac9baf15ac5efc2262f4bcf6ba650b25d326ff9
Android Build Merger (Role) [Wed, 12 Apr 2017 23:00:06 +0000 (23:00 +0000)]
Merge "Merge changes from topic 'network_specifier' am:
d0f476bdae am:
362bef45d1 am:
cfd729093f" into oc-dev-plus-aosp
Lorenzo Colitti [Wed, 12 Apr 2017 22:58:42 +0000 (22:58 +0000)]
Merge changes from topic 'network_specifier' am:
d0f476bdae am:
362bef45d1
am:
cfd729093f
Change-Id: I7535495681da8f168c46d6d95e13925cffecc99b
Jiaquan He [Wed, 12 Apr 2017 22:56:15 +0000 (22:56 +0000)]
Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev
am:
18d993bb72
Change-Id: Ic8d6df348c0c3908e32ae8dc288ee48b5a731163
Jiaquan He [Wed, 12 Apr 2017 22:54:17 +0000 (22:54 +0000)]
Draw a default focus highlight if needed.
am:
8062949ece
Change-Id: Ia06126f29168df05fe851746d86e15846ceca1b8
Jiaquan He [Wed, 12 Apr 2017 22:53:09 +0000 (22:53 +0000)]
Add a public API defaultFocusHighlightEnabled.
am:
b7daaf8b5f
Change-Id: I189aea9c495255fe68f5af98a6d33bd87dc79e3e
Jiaquan He [Wed, 12 Apr 2017 22:51:56 +0000 (22:51 +0000)]
Detect unhandled keyboard focused state.
am:
4a81674b45
Change-Id: I8c756acc96cab2d24c19f86c50266c2ef51b5494
Lorenzo Colitti [Wed, 12 Apr 2017 22:48:55 +0000 (22:48 +0000)]
Merge changes from topic 'network_specifier' am:
d0f476bdae
am:
362bef45d1
Change-Id: Iea17cb166f9c1bcec55cc8d404e00175aecb9918
Rob Carr [Wed, 12 Apr 2017 22:46:22 +0000 (22:46 +0000)]
Merge "Fix auto-pip visibility issues." into oc-dev
Lorenzo Colitti [Wed, 12 Apr 2017 22:43:03 +0000 (22:43 +0000)]
Merge changes from topic 'network_specifier'
am:
d0f476bdae
Change-Id: I783b2d06f3a5e8b9cd7940f1f1ef0dd951c734f1
TreeHugger Robot [Wed, 12 Apr 2017 22:40:06 +0000 (22:40 +0000)]
Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev
* changes:
Fix broken CTS tests.
Draw a default focus highlight if needed.
Add a public API defaultFocusHighlightEnabled.
Detect unhandled keyboard focused state.
Jocelyn Dang [Fri, 31 Mar 2017 21:03:37 +0000 (14:03 -0700)]
Add set-mode command to turn battery saver mode on and off.
Affected test will be modified in ag/
2101279
Test: adb shell cmd battery unplug && adb shell cmd power set-mode 0
Bug:
31944272
Change-Id: Ia88e7e164aa9b8b4d0ab51f607a64b35e2159273
Lorenzo Colitti [Wed, 12 Apr 2017 22:27:35 +0000 (22:27 +0000)]
Merge changes from topic 'network_specifier'
* changes:
[CM] Unhide the NetworkSpecifier as object API
Make the NetworkSpecifier a class instead of a string.
Tony Mak [Wed, 12 Apr 2017 22:18:56 +0000 (22:18 +0000)]
Merge "clear calling identity before calling settings provider" into oc-dev
am:
c240c9b134
Change-Id: I7b45453ad9dc57ac6c3a9b83f20731f9dcfbf114
Amit Mahajan [Wed, 12 Apr 2017 22:13:42 +0000 (22:13 +0000)]
Merge "Add p2 option in openLogicalChannel." into oc-dev
am:
682ce66309
Change-Id: I877f9e817beabcf9786796fd5accf06b1dcb3f36
TreeHugger Robot [Wed, 12 Apr 2017 22:09:19 +0000 (22:09 +0000)]
Merge "clear calling identity before calling settings provider" into oc-dev
Amit Mahajan [Wed, 12 Apr 2017 22:02:34 +0000 (22:02 +0000)]
Merge "Add p2 option in openLogicalChannel." into oc-dev
Jakub Pawlowski [Wed, 12 Apr 2017 21:56:26 +0000 (21:56 +0000)]
Merge "Bluetooth 5 PHY simplification" am:
a9acf9db97 am:
d43127865b
am:
ce8de6c3f7
Change-Id: I74da41983775b03ee2e642a07b5a8bdcf3be45cf
Dianne Hackborn [Wed, 12 Apr 2017 21:51:00 +0000 (21:51 +0000)]
Merge "Allow appops command to modify uid ops." into oc-dev
am:
81bfe1f62e
Change-Id: I843f40212346a3edaf219af5ec47ba16428914ad
Jakub Pawlowski [Wed, 12 Apr 2017 21:45:52 +0000 (21:45 +0000)]
Merge "Bluetooth 5 PHY simplification" am:
a9acf9db97
am:
d43127865b
Change-Id: I782c0ad038cd68c00b7dd5908c7975e79b672a04
Dianne Hackborn [Wed, 12 Apr 2017 21:37:47 +0000 (21:37 +0000)]
Merge "Allow appops command to modify uid ops." into oc-dev
Jakub Pawlowski [Wed, 12 Apr 2017 21:35:25 +0000 (21:35 +0000)]
Merge "Bluetooth 5 PHY simplification"
am:
a9acf9db97
Change-Id: Ibd712a7629d946c24640da0e07496c229c35f7ad
Sudheer Shanka [Wed, 12 Apr 2017 21:29:14 +0000 (14:29 -0700)]
Update NPMS internal state when app idle parole state is changed.
Fixes:
37250313
Test: 1. cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
2. runtest -c com.android.server.NetworkPolicyManagerServiceTest frameworks-services
Change-Id: I5fcac397116a07fe9015b7dabf5bca57b0b23176
Android Build Merger (Role) [Wed, 12 Apr 2017 21:34:58 +0000 (21:34 +0000)]
Merge "Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553 am:
f9197e0180 -s ours" into oc-dev-plus-aosp
Svet Ganov [Wed, 12 Apr 2017 21:34:02 +0000 (21:34 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553
am:
f9197e0180 -s ours
Change-Id: Ib3f118b07fbb994daa70ecbf37bc35dc4d16897b
Android Build Merger (Role) [Wed, 12 Apr 2017 21:33:41 +0000 (21:33 +0000)]
Merge "DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b am:
f72b1104f3 -s ours" into oc-dev-plus-aosp
Julius D'souza [Wed, 12 Apr 2017 21:32:43 +0000 (21:32 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b
am:
f72b1104f3 -s ours
Change-Id: I5d0b6cd4522507d6b8cffb88461a546de5b6f519
Svet Ganov [Wed, 12 Apr 2017 21:30:45 +0000 (21:30 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553 -s ours
am:
84ec9cbace
Change-Id: I44899ea4d5c7a48d7168cb008db31f0b62b093be
Julius D'souza [Wed, 12 Apr 2017 21:29:50 +0000 (21:29 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b -s ours
am:
3a967f92f2
Change-Id: I925d8a6b9bfb9e3020fd3a5a01794f4cc0243be4
Svet Ganov [Wed, 12 Apr 2017 21:28:45 +0000 (21:28 +0000)]
Merge "Add autofill feature API" into oc-dev
am:
a402d6dd2f
Change-Id: I5cfa36adbf31c49dffc519963545f388cae4b96d
Dianne Hackborn [Wed, 12 Apr 2017 21:27:27 +0000 (21:27 +0000)]
Merge "Add API to get a uid's current importance." into oc-dev
am:
ad6ab44e15
Change-Id: I845cb5fd01ccedd4a95093c56a320ee1f6497dac
Makoto Onuki [Wed, 12 Apr 2017 21:26:08 +0000 (21:26 +0000)]
Merge ""bmgr restore" really should wait until operation finishes." into oc-dev
am:
b4c2e6f468
Change-Id: Ic8779cbe121fcc2108bc742a6a9f2be866c76df3
Jakub Pawlowski [Wed, 12 Apr 2017 21:22:26 +0000 (21:22 +0000)]
Merge "Bluetooth 5 PHY simplification"
Svet Ganov [Wed, 12 Apr 2017 21:22:08 +0000 (21:22 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16
am:
91ed4d7553
Change-Id: I8c34b0ee542819bb254183a96845e925bce2b0a8
Svet Ganov [Wed, 12 Apr 2017 21:21:56 +0000 (21:21 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16
am:
91ed4d7553 -s ours
Change-Id: Ia744f56107b83b6a5d5e236d24641bd7db71ab02
Dianne Hackborn [Wed, 12 Apr 2017 21:21:52 +0000 (21:21 +0000)]
Merge "Fix issue #
37220301: Allow broadcasts with permissions to not be restricted" into oc-dev
am:
f74210c3a3
Change-Id: I1ed7f3e0cf3ee644bdbe5cb87b06f8b910d9ddec
Julius D'souza [Wed, 12 Apr 2017 21:20:50 +0000 (21:20 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886
am:
f72dd4142b
Change-Id: I9466a9f2a35ac3f81b2203347afc9f2f62587b20
Julius D'souza [Wed, 12 Apr 2017 21:20:47 +0000 (21:20 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886
am:
f72dd4142b -s ours
Change-Id: Ia99beb815b720219daecfdc9446c5ff2c4d1b16f
Selim Gurun [Wed, 12 Apr 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Deprecate findAddress() method" into oc-dev
am:
c68b1a8aef
Change-Id: I667ebcf6a9a18ae5a07a7e0f737abb6162568f83
TreeHugger Robot [Wed, 12 Apr 2017 21:17:29 +0000 (21:17 +0000)]
Merge "Add autofill feature API" into oc-dev
Shuo Qian [Wed, 12 Apr 2017 21:11:58 +0000 (21:11 +0000)]
Merge "ECBM SystemProperty cleanup" am:
4718606368 am:
40cde7b71f
am:
36611a0958
Change-Id: Ib68a4e3b34ad4d76e4b254350b523eaa424b30f9
Svet Ganov [Wed, 12 Apr 2017 21:11:57 +0000 (21:11 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
am:
39c3d2cf16
Change-Id: I3ddf7e0ceadd7c179f3c7de198658af190985f1b
Dianne Hackborn [Wed, 12 Apr 2017 21:11:40 +0000 (21:11 +0000)]
Merge "Add API to get a uid's current importance." into oc-dev
Julius D'souza [Wed, 12 Apr 2017 21:10:49 +0000 (21:10 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
am:
0a8ecc6886
Change-Id: I262e7497e9256f708847ba7c767f202c91aa1739
Makoto Onuki [Wed, 12 Apr 2017 21:10:32 +0000 (21:10 +0000)]
Merge ""bmgr restore" really should wait until operation finishes." into oc-dev
Dianne Hackborn [Wed, 12 Apr 2017 21:09:59 +0000 (21:09 +0000)]
Merge "Fix issue #
37220301: Allow broadcasts with permissions to not be restricted" into oc-dev
Shuo Qian [Wed, 12 Apr 2017 21:06:20 +0000 (21:06 +0000)]
Merge "ECBM SystemProperty cleanup" am:
4718606368
am:
40cde7b71f
Change-Id: I51ec750ff1833b1982d8fdc1995c1d8d29b36976
Selim Gurun [Wed, 12 Apr 2017 21:05:03 +0000 (21:05 +0000)]
Merge "Deprecate findAddress() method" into oc-dev
Shuo Qian [Wed, 12 Apr 2017 21:00:50 +0000 (21:00 +0000)]
Merge "ECBM SystemProperty cleanup"
am:
4718606368
Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721
TreeHugger Robot [Wed, 12 Apr 2017 21:00:21 +0000 (21:00 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
Android Build Merger (Role) [Wed, 12 Apr 2017 20:54:56 +0000 (20:54 +0000)]
Merge changes from topic 'am-
e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'ipsec-api-tweaks' am:
fddf677b8b am:
176bfb58c6 am:
a237a34085
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35 am:
9c2428ad4d am:
99c50add4f
nharold [Wed, 12 Apr 2017 20:53:17 +0000 (20:53 +0000)]
Merge changes from topic 'ipsec-api-tweaks' am:
fddf677b8b am:
176bfb58c6
am:
a237a34085
Change-Id: Ie868985d20535f35b869730a4ddaa00dc88a352d
Shuo Qian [Wed, 12 Apr 2017 20:52:18 +0000 (20:52 +0000)]
Merge "ECBM SystemProperty cleanup"
Nathan Harold [Wed, 12 Apr 2017 20:51:41 +0000 (20:51 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35 am:
9c2428ad4d
am:
99c50add4f
Change-Id: I49641308cd0f2ce3e8a7545c8b03108d69287c64
Jason Monk [Wed, 12 Apr 2017 20:50:32 +0000 (20:50 +0000)]
Merge "Make QS light" into oc-dev
am:
755138bb1c
Change-Id: I2a76725f4fb4edb0fa478619b28498c9bfc490ac
TreeHugger Robot [Wed, 12 Apr 2017 20:43:13 +0000 (20:43 +0000)]
Merge "Make QS light" into oc-dev
Wale Ogunwale [Wed, 12 Apr 2017 20:39:59 +0000 (13:39 -0700)]
Dump controller for AppWindowToken
To help with debugging.
Bug:
36097078
Test: N/A
Change-Id: I72108b918d839b67efe8b8eed65a33775bd94dbc
Bill Yi [Wed, 12 Apr 2017 20:27:30 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88ab6c1304 -s ours
Change-Id: I5f4ab216d538b793f1b9437a9e44320e2412b9cc
Bill Yi [Wed, 12 Apr 2017 20:19:34 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Todd Kennedy [Wed, 12 Apr 2017 20:00:09 +0000 (20:00 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev
am:
e7b806e9d2
Change-Id: Ic1dbc09e11aab6aacf66e0106274281534515b2d
Seigo Nonaka [Wed, 12 Apr 2017 19:55:52 +0000 (19:55 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
am:
1e924df63e
Change-Id: I484cd07fb67b40b54d7ad4b1ae7324a0d370ed6a
Jesse Evans [Wed, 12 Apr 2017 19:52:07 +0000 (19:52 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
am:
684b5381e9
Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642
TreeHugger Robot [Wed, 12 Apr 2017 19:45:50 +0000 (19:45 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev
Jaewan Kim [Wed, 12 Apr 2017 19:45:21 +0000 (19:45 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
am:
e7ce1d40e1
Change-Id: I4202bc13102f35b8d3cd4b328c5a1de49b7cb08e
Seigo Nonaka [Wed, 12 Apr 2017 19:39:41 +0000 (19:39 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:39:12 +0000 (19:39 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:37:22 +0000 (19:37 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
Julia Reynolds [Wed, 12 Apr 2017 19:24:55 +0000 (19:24 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev
am:
43dd3ba3c4
Change-Id: I05a728d069a06f4ec36dff79db022407f4d3504c
Casey Burkhardt [Wed, 12 Apr 2017 19:14:04 +0000 (19:14 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
am:
9aa64e6cfa
Change-Id: Ia7a56ce9ddc39d1e9e5d814d593dba96c95ae957
Julia Reynolds [Wed, 12 Apr 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev
Julius D'souza [Wed, 12 Apr 2017 06:41:27 +0000 (23:41 -0700)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
Bug:
36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit
8e9ea907448c49f573dd045707e37dd14efdf152)
Casey Burkhardt [Wed, 12 Apr 2017 19:04:12 +0000 (19:04 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
Svet Ganov [Wed, 12 Apr 2017 19:03:26 +0000 (19:03 +0000)]
Merge "Fill UI polish" into oc-dev
am:
c9a83326c2
Change-Id: Iafae2e819d836a1bda463898695f2fbf9334299b
TreeHugger Robot [Wed, 12 Apr 2017 18:54:28 +0000 (18:54 +0000)]
Merge "Fill UI polish" into oc-dev
Salvador Martinez [Mon, 10 Apr 2017 18:18:31 +0000 (11:18 -0700)]
Added strings for thermal shutdown warning
Strings for thermal shutdown warning were missing
so this CL adds them and a proto message value.
Test: SysUI tests still pass
Bug:
30994946
Change-Id: Ifd0b26248c2ebae5bcf32ecbea2566c14be7dc32
Kang Li [Wed, 12 Apr 2017 18:41:21 +0000 (18:41 +0000)]
Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
am:
1f477fb270
Change-Id: Ibab9026c9330218e459091f5d53505a64c039ce8
Mady Mellor [Wed, 12 Apr 2017 18:40:12 +0000 (18:40 +0000)]
Merge "Don't offer snooze for foreground service notifications" into oc-dev
am:
8f395a16fb
Change-Id: Ieb5ea626ed2fb83a4959f85be097d0f5563e1471
OSDN Git Service
