OSDN Git Service
Lucas Dupin [Thu, 22 Jun 2017 18:01:12 +0000 (18:01 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c" into oc-dr1-dev
am:
99613f8253
Change-Id: I09f5a5351f9c71be3db9d85405a4244cf0e3ee5d
Jason Monk [Thu, 22 Jun 2017 17:54:16 +0000 (17:54 +0000)]
Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744" into oc-dr1-dev
am:
3072655374
Change-Id: I9be0689c6ad9e6c25a1f51c6368e539a841afa0c
Erik Kline [Thu, 22 Jun 2017 17:51:13 +0000 (17:51 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038" into oc-dr1-dev
am:
c4c5b6f806 -s ours
Change-Id: I3564c8dd49349802ede537f3c42c253376fba8b7
Narayan Kamath [Thu, 22 Jun 2017 17:48:32 +0000 (17:48 +0000)]
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e" into oc-dr1-dev
am:
04bd18fb30
Change-Id: I2cc9faee52a7daedbe13a499f80f4ef36e13d0e8
Jason Monk [Thu, 22 Jun 2017 17:45:32 +0000 (17:45 +0000)]
Merge "Add config to artificially inflate number of bars" into oc-dr1-dev
am:
cfca96d28a
Change-Id: Ib95407d2ea4c81e4b0e7284fe96a9dac0bc36897
Android Build Merger (Role) [Thu, 22 Jun 2017 17:40:42 +0000 (17:40 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c" into oc-dr1-dev
Lucas Dupin [Thu, 22 Jun 2017 17:39:24 +0000 (17:39 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
am:
d0550a9b6c
Change-Id: Ic82b4d1316d5232712a0e395b080262c314ecf68
Android Build Merger (Role) [Thu, 22 Jun 2017 17:38:53 +0000 (17:38 +0000)]
Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744" into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 17:37:55 +0000 (17:37 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
am:
6791bee744
Change-Id: I2bd4481438c382c718d51c65fe3941e88c63b2c7
Android Build Merger (Role) [Thu, 22 Jun 2017 17:37:22 +0000 (17:37 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038" into oc-dr1-dev
Erik Kline [Thu, 22 Jun 2017 17:36:51 +0000 (17:36 +0000)]
Merge "resolve merge conflicts of
c8b180116d42 to oc-dr1-dev" into oc-dr1-dev
am:
8839b4c7ba -s ours
Change-Id: Ife953e5775cbccacaeb3a325caa4b496f73f6458
Erik Kline [Thu, 22 Jun 2017 17:36:12 +0000 (17:36 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
am:
be7657b038
Change-Id: Ie34a3c7aa39c9b70602236f4d4a4d5548566dd51
Android Build Merger (Role) [Thu, 22 Jun 2017 17:35:25 +0000 (17:35 +0000)]
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 17:34:09 +0000 (17:34 +0000)]
Merge "Add config to artificially inflate number of bars" into oc-dr1-dev
Narayan Kamath [Thu, 22 Jun 2017 17:34:12 +0000 (17:34 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
am:
31cf02742e
Change-Id: Ie0d68df7a51c10bc82974680bdd16f1eab48e9fa
TreeHugger Robot [Thu, 22 Jun 2017 17:28:26 +0000 (17:28 +0000)]
Merge "resolve merge conflicts of
c8b180116d42 to oc-dr1-dev" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 17:25:10 +0000 (17:25 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
Lucas Dupin [Thu, 22 Jun 2017 16:59:45 +0000 (16:59 +0000)]
Merge "Darker extracted gradients." into oc-dr1-dev
am:
eaac5e2fe9
Change-Id: I31d11041f6a11558620c1a17bd5a6a8d637394bc
TreeHugger Robot [Thu, 22 Jun 2017 16:54:36 +0000 (16:54 +0000)]
Merge "Darker extracted gradients." into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 16:32:05 +0000 (16:32 +0000)]
Merge "Use id directly when extensions change fragments" into oc-dr1-dev
am:
9aa0a8e1f4
Change-Id: I9e05dead59d49213f058e8c0efe17f329f49e1a9
TreeHugger Robot [Thu, 22 Jun 2017 16:25:48 +0000 (16:25 +0000)]
Merge "Use id directly when extensions change fragments" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 15:39:22 +0000 (15:39 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
Jason Monk [Thu, 22 Jun 2017 15:20:04 +0000 (11:20 -0400)]
Add config to artificially inflate number of bars
Test: manual
Bug:
62664881
Change-Id: Id8797f4f6178af16051147d3021bb34074afbca9
Erik Kline [Thu, 22 Jun 2017 15:10:12 +0000 (00:10 +0900)]
resolve merge conflicts of
c8b180116d42 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
32163131
Bug:
62343300
Change-Id: I7f86e5f02c8b599aa71babbbb32bf4803cbd9a2f
Merged-In: I542e013aa19fefd3443588c9a81ee59cd669ab6f
Merged-In: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08
Merged-In: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Juan Lang [Thu, 22 Jun 2017 14:17:21 +0000 (14:17 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev
am:
f5d8628779
Change-Id: I7299706fbc31f17fb18a5225be0f6460dd04707e
Jason Monk [Thu, 22 Jun 2017 14:09:29 +0000 (10:09 -0400)]
Use id directly when extensions change fragments
This avoids a crash if the fragment hasn't been created yet.
Test: manual
Change-Id: I0799c50a3482c3c60fd0e27d486db5214e92f183
Fixes:
37855553
Erik Kline [Thu, 22 Jun 2017 14:06:59 +0000 (14:06 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev am:
c0af382a25 -s ours
am:
caafb1fbe3 -s ours
Change-Id: Ied5003b52d758618cdaa4900a9e36845cebf7e66
Juan Lang [Thu, 22 Jun 2017 14:05:53 +0000 (14:05 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev
Felipe Leme [Thu, 22 Jun 2017 14:04:27 +0000 (14:04 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev am:
6358cdcd28
am:
17911ae02b
Change-Id: I848c2f793706bb7223a05b989f55e4f77e31e343
Android Build Merger (Role) [Thu, 22 Jun 2017 13:59:17 +0000 (13:59 +0000)]
Merge "Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722 am:
ef863368b4" into oc-dr1-dev-plus-aosp
Amith Yamasani [Thu, 22 Jun 2017 13:57:54 +0000 (13:57 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722
am:
ef863368b4
Change-Id: I0663ad4be0ae6b29ea0b2f5942af518a830632b3
Android Build Merger (Role) [Thu, 22 Jun 2017 13:57:27 +0000 (13:57 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
fcc7a55558" into oc-dr1-dev-plus-aosp
Pavel Grafov [Thu, 22 Jun 2017 13:56:15 +0000 (13:56 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f
am:
fcc7a55558
Change-Id: Ica390ce4fe72b205c89b269f7f3d050d1c27511d
Android Build Merger (Role) [Thu, 22 Jun 2017 13:55:48 +0000 (13:55 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
e155b7ca8e" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 13:54:41 +0000 (13:54 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
f9a63d0457" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 22 Jun 2017 13:54:27 +0000 (13:54 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev
am:
c0af382a25 -s ours
Change-Id: I3b5e596034d8f5078dac107d754aec0f77d9ba89
Rob Carr [Thu, 22 Jun 2017 13:54:27 +0000 (13:54 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559
am:
e155b7ca8e
Change-Id: I917e8ef8d9aa83261bdbeb2200464549af9c7f70
Pavel Grafov [Thu, 22 Jun 2017 13:53:26 +0000 (13:53 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f
am:
f9a63d0457
Change-Id: Iae48fe9599a680a55024c4b377f7583e7606c870
Android Build Merger (Role) [Thu, 22 Jun 2017 13:53:00 +0000 (13:53 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
604c29006b" into oc-dr1-dev-plus-aosp
Rob Carr [Thu, 22 Jun 2017 13:51:45 +0000 (13:51 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559
am:
604c29006b
Change-Id: Ieea08ba5d0462bd28b185a59ab077a5f31e320cf
Felipe Leme [Thu, 22 Jun 2017 13:51:25 +0000 (13:51 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev
am:
6358cdcd28
Change-Id: Ic42bd782988bec610281b651346a5809e912c823
Android Build Merger (Role) [Thu, 22 Jun 2017 13:51:19 +0000 (13:51 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
1a588ec465 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 13:50:20 +0000 (13:50 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
131ccb00a8 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 22 Jun 2017 13:50:02 +0000 (13:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours
am:
1a588ec465 -s ours
Change-Id: Id6ea25f828e01b7e8aaf0b186718f830d111c797
Android Build Merger (Role) [Thu, 22 Jun 2017 13:49:33 +0000 (13:49 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
4b209f21b6 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 22 Jun 2017 13:49:27 +0000 (13:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours
am:
131ccb00a8 -s ours
Change-Id: I12baaccc938a1fcccdbc1ad97a18b802ffdee691
Android Build Merger (Role) [Thu, 22 Jun 2017 13:48:49 +0000 (13:48 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
70c2a7b0d9 -s ours" into oc-dr1-dev-plus-aosp
Amith Yamasani [Thu, 22 Jun 2017 13:48:51 +0000 (13:48 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev
am:
78f3a0f722
Change-Id: Ibc04014f224ecbc666c8296a2b25d939fbfc9921
Bill Yi [Thu, 22 Jun 2017 13:47:47 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours
am:
70c2a7b0d9 -s ours
Change-Id: I6559d4e1d46cd96e4c40a01c789b58cc41069b88
Bill Yi [Thu, 22 Jun 2017 13:47:15 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours
am:
4b209f21b6 -s ours
Change-Id: I438f9ea34f83513db4d43b7c6bc0f46c13d8d712
Pavel Grafov [Thu, 22 Jun 2017 13:45:52 +0000 (13:45 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
am:
f044e0b87f
Change-Id: I404ec7b0fa7fecb0e4945beca32c634358e0b33e
Evan Laird [Thu, 22 Jun 2017 13:44:31 +0000 (13:44 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev am:
6a651f81b5
am:
024ba89606
Change-Id: I330846d328be9e2e10631cd6ceb0296734308c23
Rob Carr [Thu, 22 Jun 2017 13:42:47 +0000 (13:42 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am:
8bc0aa2559
Change-Id: I45a7ed913929eeb8d1b6eda6855fe7976fa64a14
Bill Yi [Thu, 22 Jun 2017 13:39:36 +0000 (13:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c23c990f1 -s ours
Change-Id: Ib192e1569074bcd19d38d8e67a8378f63ca99164
Evan Laird [Thu, 22 Jun 2017 13:39:34 +0000 (13:39 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev
am:
ca35ed5cb9
Change-Id: I0d695cc7edaeddb7817a19ff6f7e33d55691d7e0
Bill Yi [Thu, 22 Jun 2017 13:35:55 +0000 (13:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
242c3c497c -s ours
Change-Id: Idbb294776a7400de5aebb99b9a45f7121c7415f6
Jason Monk [Thu, 22 Jun 2017 13:19:54 +0000 (09:19 -0400)]
Fix ConcurrentModificationException from LocationController
Test: runtest systemui
Change-Id: I0b7db7344217b3b7ad91f315100d1873e8167baf
Fixes:
62859544
TreeHugger Robot [Thu, 22 Jun 2017 13:31:40 +0000 (13:31 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 11:27:28 +0000 (11:27 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
Narayan Kamath [Thu, 22 Jun 2017 10:32:28 +0000 (10:32 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
Erik Kline [Thu, 22 Jun 2017 09:35:45 +0000 (09:35 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev
am:
e9b908c7a6 -s ours
Change-Id: Ie2f3c211b7e0807db4e5d5bfcd158356fca9a0dd
Erik Kline [Tue, 20 Jun 2017 12:18:31 +0000 (21:18 +0900)]
Create a TetherInterfaceStateMachine when told the interface name.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Merged-In: I542e013aa19fefd3443588c9a81ee59cd669ab6f
Merged-In: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08
Merged-In: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Change-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
(cherry picked from commit
b912c50b197cc0fc49bb7897130581dd02d2af01)
Erik Kline [Thu, 22 Jun 2017 09:31:03 +0000 (09:31 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev
Erik Kline [Fri, 9 Jun 2017 07:36:29 +0000 (16:36 +0900)]
Only disable Wi-Fi IP serving on specific interface, if available
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Merged-In: Id8d9c3f67f7a850af69069abee86adfc62841b28
Merged-In: Iac19359fd8712fa6a135f31bed9f0da97b3f2977
Merged-In: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
(cherry picked from commit
218c226b0882640a351deb0dd945a30b8bc32fff)
Erik Kline [Fri, 9 Jun 2017 07:36:29 +0000 (16:36 +0900)]
Only disable Wi-Fi IP serving on specific interface, if available
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Merged-In: Id8d9c3f67f7a850af69069abee86adfc62841b28
Merged-In: Iac19359fd8712fa6a135f31bed9f0da97b3f2977
Merged-In: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
(cherry picked from commit
218c226b0882640a351deb0dd945a30b8bc32fff)
(cherry picked from commit
798a93b0df76c4feb5ddd619b788f2cf9ea5bf77)
Brian Carlstrom [Thu, 22 Jun 2017 05:14:40 +0000 (22:14 -0700)]
_exit(0) on clean shutdown, not _exit(1)
Test: m -j32 checkbuild
Bug:
36066697
Change-Id: Iaed45a86f9603badf26041212dfc5e9399bc0a0c
TreeHugger Robot [Thu, 22 Jun 2017 04:52:32 +0000 (04:52 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev
Winson Chung [Thu, 22 Jun 2017 03:48:45 +0000 (03:48 +0000)]
Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev
am:
65a3b2ccc4
Change-Id: I576f611e4a1a6567e7cd2e80b4f5575ba99e2f4d
TreeHugger Robot [Thu, 22 Jun 2017 03:43:42 +0000 (03:43 +0000)]
Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev
Meng Wang [Thu, 22 Jun 2017 03:29:11 +0000 (03:29 +0000)]
Use "%s Wi-Fi" as WFC SPN for 302-{720,370}
am:
1b7ff89852
Change-Id: I3bf10404abc67b4f0284ee78cb4b63c1bd17cc5a
TreeHugger Robot [Thu, 22 Jun 2017 03:11:17 +0000 (03:11 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev
Erik Kline [Wed, 26 Apr 2017 02:11:07 +0000 (11:11 +0900)]
Refactor TISM add/remove code
This de-duplicates all the TISM adding and teardown code.
It does not yet change the locking or threading semantics.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- manual tethering of WiFi and USB start normally
Bug:
32163131
Bug:
36216864
Bug:
62343300
Merged-In: I8ed82272183022a0469011a1f993704ecf771e3f
Merged-In: Ic1bcb3ca011bdc886086f34be18409eb5b12f521
Merged-In: I44a57660d23e76a7c13368cb8f60eaeac5830a0a
Change-Id: I44a57660d23e76a7c13368cb8f60eaeac5830a0a
(cherry picked from commit
4dd9bb83e2779b309dcc7a7db389b16fa3cb05be)
TreeHugger Robot [Thu, 22 Jun 2017 01:14:12 +0000 (01:14 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev
Winson Chung [Tue, 20 Jun 2017 00:01:51 +0000 (17:01 -0700)]
Clean up dismiss target when last activity is unpinned.
Bug:
37309693
Test: Enter PIP, drag to show dismiss target, force kill application and
ensure target is hidden.
Change-Id: Ia41f8252e32a2ff3396796562874a6c47777030d
Felipe Leme [Thu, 22 Jun 2017 00:33:41 +0000 (17:33 -0700)]
Autofill fixes for secondary users:
- Display the SaveUI on all users.
- Dismiss the UI when switching users.
- Fix security check on disableOwnedAutofillServicesLocked()
Test: manual verification
Change-Id: I4e9167314f1feeda618db6c57735cc31d84486c1
Fixes:
62828906
Juan Lang [Thu, 11 May 2017 00:04:29 +0000 (17:04 -0700)]
Add CustomDialogPreference and CustomEditTextPreference to SettingsLib.
These classes provides extends features provided by the platform's
versions to users of the support library's versions.
Test: make RunSettingsLibRoboTests
Bug:
30046624
Merged-In: I995d5755113a8fb6d2ecc2df9322ff59c8662fe4
Change-Id: I385c92762f61c8836fffd37b24a26939cc5bc864
Evan Laird [Wed, 21 Jun 2017 22:24:36 +0000 (18:24 -0400)]
Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev
Picked up a fudge factor along a the way because of the way that the
rounded edges of oc-dr1 change the imaginary bounds of the triangle.
This should look good though.
Test: visual; runtest systemui
Change-Id: Ie79025c74bfeb136bb7f5ee7fe5604b2c12ab71e
Meng Wang [Wed, 21 Jun 2017 22:09:29 +0000 (15:09 -0700)]
Use "%s Wi-Fi" as WFC SPN for 302-{720,370}
Bug:
62647106
Test: make
Change-Id: I109f4b78446f96a5cb10e0fc84935ad180c9146c
Matthew Fritze [Wed, 21 Jun 2017 21:51:49 +0000 (21:51 +0000)]
Merge "Add enum to log psd bundle creation duration." into oc-dr1-dev
am:
736ba78a6e
Change-Id: I2b7421274bfd657575cc58ad6a0e35fd521e25d0
TreeHugger Robot [Wed, 21 Jun 2017 21:47:29 +0000 (21:47 +0000)]
Merge "Add enum to log psd bundle creation duration." into oc-dr1-dev
Pavel Grafov [Wed, 21 Jun 2017 21:24:47 +0000 (21:24 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
am:
f044e0b87f
Change-Id: Ib3df83d82eb2646a0f657606e05225250b5db2e5
Pavel Grafov [Wed, 21 Jun 2017 21:18:31 +0000 (21:18 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
Lucas Dupin [Sun, 18 Jun 2017 03:57:28 +0000 (20:57 -0700)]
Darker extracted gradients.
Bug:
62589787
Bug:
62572852
Test: visual
Change-Id: I88091af5f52227a2f79cd119a3ddcd1aa672a5e3
Rob Carr [Wed, 21 Jun 2017 21:08:31 +0000 (21:08 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am:
8bc0aa2559
Change-Id: I9ed40cbf0724627bcc89a2dd305ba61f206570e0
Amith Yamasani [Wed, 21 Jun 2017 21:06:44 +0000 (14:06 -0700)]
Clarify startScan API on how to get results
Make it clear in BluetoothLeScanner on how to get results
when starting a scan for a PendingIntent.
Bug:
38365430
Test: make offline-sdk-docs
Change-Id: I0bf88d751c89a8a478db985713357e153ac08595
Rob Carr [Wed, 21 Jun 2017 21:01:42 +0000 (21:01 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
Lucas Dupin [Wed, 21 Jun 2017 18:58:31 +0000 (11:58 -0700)]
Ensure icon contrast on the shelf
Change-Id: Ie9251ae4bdb4b590ce93c7f2f092476d5f895b5a
Fixes:
62591326
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
Bill Yi [Wed, 21 Jun 2017 20:25:08 +0000 (20:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c23c990f1 -s ours
Change-Id: I219b010519c5efae20ca065ca29257a1f876fd7e
Bill Yi [Wed, 21 Jun 2017 20:19:33 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
d5a305068a -s ours
Change-Id: Ieac3186dbb446b1d08ca96618a96b1c1493553c6
TreeHugger Robot [Wed, 21 Jun 2017 20:17:35 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 21 Jun 2017 20:11:32 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 21 Jun 2017 20:08:35 +0000 (20:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
52653734e3 -s ours
Change-Id: I7bb9c57df7c7723d48bd12432567ee97ba9295d8
Bill Yi [Wed, 21 Jun 2017 19:56:07 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
242c3c497c -s ours
Change-Id: Iaa7d2555bdcab5be052515f8f5d9c5c38360b4e9
TreeHugger Robot [Wed, 21 Jun 2017 19:51:45 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 21 Jun 2017 19:50:19 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Evan Laird [Wed, 21 Jun 2017 19:42:21 +0000 (19:42 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev
am:
6a651f81b5
Change-Id: Ie1fc63cf41efbe8006dad8ab80217f7d945b2de7
Evan Laird [Wed, 21 Jun 2017 19:31:22 +0000 (19:31 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev
Evan Laird [Tue, 20 Jun 2017 20:10:44 +0000 (16:10 -0400)]
Fix mobile signal icon when in airplane mode
1. Empty state was drawing a line too thing and not dark enough to be
seen.
2. Airplane mode should be the slashed, full signal, not the
empty one
Going into airplane mode now draws the full signal, lighter than normal,
with a slash. And the empty state now has a thicker line.
Test: runtest systemui
Fixes:
62794461
Change-Id: Ic5e40d2e0f6ebe0d270129f10883a1fcb146d717
Android Build Merger (Role) [Wed, 21 Jun 2017 19:17:50 +0000 (19:17 +0000)]
Merge "Merge "Fixed a bug where the panel could be stuck" into oc-dev am:
e8dceabd98 am:
3a18b28ab0" into oc-dr1-dev-plus-aosp
Selim Cinek [Wed, 21 Jun 2017 19:16:32 +0000 (19:16 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev am:
e8dceabd98
am:
3a18b28ab0
Change-Id: I129f1939631a38b2aa51659e9ff4207404416398
OSDN Git Service
