OSDN Git Service
Todd Kennedy [Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978
am:
ddb322a000
Change-Id: Ic3ba662f2821aa617be0fa271e92e6cb805097c8
Android Build Merger (Role) [Thu, 8 Jun 2017 05:49:10 +0000 (05:49 +0000)]
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504 am:
b1a2cde4fd" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 8 Jun 2017 05:48:45 +0000 (05:48 +0000)]
Merge "Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev am:
be261948cb" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Thu, 8 Jun 2017 05:48:21 +0000 (05:48 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev am:
fdb3d31504
am:
b1a2cde4fd
Change-Id: I9164bc0eac776ff7e8a61c227e4ad9db45663542
Ian Pedowitz [Thu, 8 Jun 2017 05:46:25 +0000 (05:46 +0000)]
Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev
am:
be261948cb
Change-Id: I5f990815a7489828589303ee894ba3c94d6ef370
Sudheer Shanka [Thu, 8 Jun 2017 05:45:37 +0000 (05:45 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am:
f34713066e
am:
736cb0e33a
Change-Id: Ia4ae2f57539d652e9a898e4eb62d6b1bbc0de06a
Ian Pedowitz [Thu, 8 Jun 2017 05:42:17 +0000 (05:42 +0000)]
Merge "resolve merge conflicts of
7ea4f66f3557 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Ian Pedowitz [Thu, 8 Jun 2017 05:42:13 +0000 (05:42 +0000)]
Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev
Etan Cohen [Thu, 8 Jun 2017 05:32:09 +0000 (05:32 +0000)]
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
am:
89d6859dc4
Change-Id: Ib7dcbb63d9e41c8b9b3c702f883c84de06a23326
Etan Cohen [Thu, 8 Jun 2017 05:26:13 +0000 (05:26 +0000)]
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
Kevin Chyn [Thu, 8 Jun 2017 04:53:31 +0000 (04:53 +0000)]
Add setting and permission for assist gesture
am:
4fddc9fa4d
Change-Id: Ife2ee905017b3a7489b4a338f6ebe59301301bd0
Kevin Chyn [Mon, 5 Jun 2017 18:28:09 +0000 (11:28 -0700)]
Add setting and permission for assist gesture
Bug:
37427306
Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Ian Pedowitz [Thu, 8 Jun 2017 01:07:43 +0000 (18:07 -0700)]
resolve merge conflicts of
7ea4f66f3557 to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6f26542780c2b911e6aeea187c22e9d70823cd7a
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
Ian Pedowitz [Thu, 8 Jun 2017 00:47:38 +0000 (17:47 -0700)]
resolve merge conflicts of
695f21a66189 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
Todd Kennedy [Thu, 8 Jun 2017 01:05:25 +0000 (01:05 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
am:
dacdf2e978
Change-Id: I11bcd48eb91c1f877a27f1cb06d6269aef76d3d2
TreeHugger Robot [Thu, 8 Jun 2017 01:00:47 +0000 (01:00 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
Jeff Sharkey [Thu, 8 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
am:
fdb3d31504
Change-Id: I13684a6c952e978eed035e8c217605469c3b8665
Jeff Sharkey [Thu, 8 Jun 2017 00:32:30 +0000 (00:32 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
Sudheer Shanka [Thu, 8 Jun 2017 00:15:23 +0000 (00:15 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am:
f34713066e
Change-Id: I7ba4faeae53df155de0a25347efcc15974f2cc8c
Android Build Merger (Role) [Thu, 8 Jun 2017 00:10:59 +0000 (00:10 +0000)]
Merge "Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a am:
dacd9ed196" into oc-dr1-dev-plus-aosp
Ian Pedowitz [Thu, 8 Jun 2017 00:10:39 +0000 (00:10 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
am:
695f21a661
Change-Id: Id515004fae2e8ad90346ce82b334ae6f61b2c086
Sudheer Shanka [Thu, 8 Jun 2017 00:08:40 +0000 (00:08 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
Adrian Roos [Thu, 8 Jun 2017 00:08:30 +0000 (00:08 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a
am:
dacd9ed196
Change-Id: I72b507987f85e2b17f8a98de72a61e64f7b980bd
Adrian Roos [Thu, 8 Jun 2017 00:08:22 +0000 (00:08 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a
am:
b42e50a3a0
Change-Id: I1ca543cb1b23221adf96a7d09a152fea4461b8f5
Adrian Roos [Thu, 8 Jun 2017 00:00:25 +0000 (00:00 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am:
2ff366a39a
Change-Id: I0369da0041d3d8bf001340e7e8f88a60894c2c7d
Ian Pedowitz [Thu, 8 Jun 2017 00:00:16 +0000 (00:00 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
Adrian Roos [Wed, 7 Jun 2017 23:59:53 +0000 (23:59 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am:
2ff366a39a
Change-Id: I758d95a87400fe4643cd6cdb2c776de1975336b9
Adrian Roos [Wed, 7 Jun 2017 23:54:00 +0000 (23:54 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
Adrian Roos [Wed, 7 Jun 2017 23:48:03 +0000 (23:48 +0000)]
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
am:
4317e457ba
Change-Id: Ieef81f7433083085e8c4ad9e503ba2d333c90cd1
Android Build Merger (Role) [Wed, 7 Jun 2017 23:42:55 +0000 (23:42 +0000)]
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f am:
cf8cfc4412" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 7 Jun 2017 23:41:57 +0000 (23:41 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f
am:
cf8cfc4412
Change-Id: Iceb7d0a6b88b3bf011e585ead483e924e1cc1b98
Android Build Merger (Role) [Wed, 7 Jun 2017 23:41:51 +0000 (23:41 +0000)]
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f am:
50caf4af60" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Wed, 7 Jun 2017 23:40:32 +0000 (23:40 +0000)]
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
Bryce Lee [Wed, 7 Jun 2017 23:40:06 +0000 (23:40 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f
am:
50caf4af60
Change-Id: I46c77e2180b981e1d9e89b81d73e9f47a3519c55
Sundeep Ghuman [Wed, 7 Jun 2017 23:39:00 +0000 (23:39 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad
am:
8d4014995d
Change-Id: I26ab39fbc393a8fcf89c1daad50a8b02081c947a
Android Build Merger (Role) [Wed, 7 Jun 2017 23:36:20 +0000 (23:36 +0000)]
Merge "Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad am:
216f596cee" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Wed, 7 Jun 2017 23:35:32 +0000 (23:35 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad
am:
216f596cee
Change-Id: I99adff8d11f498a8f640689e6a472dc26a83ad04
Android Build Merger (Role) [Wed, 7 Jun 2017 23:35:08 +0000 (23:35 +0000)]
Merge "Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1 -s ours am:
788b2b9364 -s ours" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 7 Jun 2017 23:33:43 +0000 (23:33 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am:
f867733d4f
Change-Id: I7436b4e82365c2d83c1f38a856324e8e309920aa
Sundeep Ghuman [Wed, 7 Jun 2017 23:31:52 +0000 (23:31 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1
am:
8695bda38e -s ours
Change-Id: I5c9c69aab0789b8b741353936bd753ea491972c6
Sundeep Ghuman [Wed, 7 Jun 2017 23:31:49 +0000 (23:31 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1 -s ours
am:
788b2b9364 -s ours
Change-Id: Id8c23e19ad74c5bac9097f4c123d385ff2503b60
Bryce Lee [Wed, 7 Jun 2017 23:31:48 +0000 (23:31 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am:
f867733d4f
Change-Id: Icaff526ff266e449eefdc6f471c37d94290662b6
Sundeep Ghuman [Wed, 7 Jun 2017 23:28:29 +0000 (23:28 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am:
09d06437ad
Change-Id: I939b42d12919635ddac9bdf91a17323f154001a9
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:57 +0000 (23:25 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am:
584406f8e1
Change-Id: I42fad81d99eb8ed540ef24fae1b4e86402b33a82
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:50 +0000 (23:25 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am:
09d06437ad
Change-Id: Ie5150009258a7bccfdf222bf21329722e1e20589
Bryce Lee [Wed, 7 Jun 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
Sundeep Ghuman [Wed, 7 Jun 2017 23:23:20 +0000 (23:23 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am:
584406f8e1 -s ours
Change-Id: Ib9a20c7caf8a86a0611c9c91a4b0024686e3f5e9
TreeHugger Robot [Wed, 7 Jun 2017 23:19:04 +0000 (23:19 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:18:07 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
Selim Cinek [Wed, 7 Jun 2017 23:09:37 +0000 (23:09 +0000)]
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
am:
ab67c300f3
Change-Id: I593cd3dd18eaf6a11f3eb961c0185150131772e6
Bryce Lee [Wed, 7 Jun 2017 23:01:56 +0000 (23:01 +0000)]
Revert "Coordinate configuration changes and window frame size."
This reverts commit
afb45bba8379df530182dae882ec70329423dcfe.
Bug:
32839232
Fixes:
62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3
Selim Cinek [Wed, 7 Jun 2017 22:57:54 +0000 (22:57 +0000)]
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
Todd Kennedy [Tue, 6 Jun 2017 16:15:46 +0000 (09:15 -0700)]
Passing callingUid to internal methods
Sometimes callers want to clear the calling identity [to avoid permission
calls]. In this case, allow passing the original calling identity to
internal methods.
Test: Manual; create profile account and observe launcher still works cross profile
Test: bit FrameworksServicesTests:com.android.server.pm.ShortcutManagerTest{1..10}
Change-Id: I73f8ad4b2dc1895227c3fcb14f3f1f18f600562f
Fixes:
38349978
Selim Cinek [Wed, 7 Jun 2017 22:51:29 +0000 (15:51 -0700)]
Fixed an issue where the icons had the wrong color
The color of the icons was taken from the ambient view
and wasn't updated when dark changed.
Change-Id: I472e76ff9d4d92500faae5517f10bdeb2658936d
Fixes:
62423352
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Sanket Padawe [Wed, 7 Jun 2017 22:08:26 +0000 (22:08 +0000)]
Merge "Update strings for modem restricted state." into oc-dev am:
58977d1035
am:
6ef238a51c
Change-Id: I89e7d1ca10ec3e9519e3afc92a40b3e0dfc4ac98
Sanket Padawe [Wed, 7 Jun 2017 22:01:52 +0000 (22:01 +0000)]
Merge "Update strings for modem restricted state." into oc-dev am:
58977d1035
am:
6acd6102c9
Change-Id: I8429e585c54f1336ba70311a012c019e30680fb8
Android Build Merger (Role) [Wed, 7 Jun 2017 21:58:48 +0000 (21:58 +0000)]
Merge "Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495 am:
52e73d8ffb" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Wed, 7 Jun 2017 21:57:52 +0000 (21:57 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495
am:
52e73d8ffb
Change-Id: Ic7db17b6e523db3360d57a686abb802975240fef
Jorim Jaggi [Wed, 7 Jun 2017 21:56:25 +0000 (21:56 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495
am:
59fe02cf95
Change-Id: If712fd817a0179f6437dce5d234990a28743fedf
Sanket Padawe [Wed, 7 Jun 2017 21:53:44 +0000 (21:53 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am:
58977d1035
Change-Id: Id08df9dfdc858dfc4dfb31e7c6ad85fbe2b1869a
Sanket Padawe [Wed, 7 Jun 2017 21:50:30 +0000 (21:50 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am:
58977d1035
Change-Id: I44ee9421ee32c68dd880176f12a89c8ecb3ae03b
Jorim Jaggi [Wed, 7 Jun 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am:
fc1753d495
Change-Id: I5cd92b3e08e812f6634f7a8c793b8ac9ef3bcc00
Jorim Jaggi [Wed, 7 Jun 2017 21:46:41 +0000 (21:46 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am:
fc1753d495
Change-Id: I2024b1b5e967fc64a4b068fd47643f94478dcf5c
TreeHugger Robot [Wed, 7 Jun 2017 21:42:33 +0000 (21:42 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 21:40:00 +0000 (21:40 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
Android Build Merger (Role) [Wed, 7 Jun 2017 21:13:22 +0000 (21:13 +0000)]
Merge "Merge "Fixed a flicker of group notifications" into oc-dev am:
beba1bf936 am:
334964899f" into oc-dr1-dev-plus-aosp
Selim Cinek [Wed, 7 Jun 2017 21:11:32 +0000 (21:11 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev am:
beba1bf936
am:
334964899f
Change-Id: If6944735499ebd79b722cb1d9cefd4ee49e24234
Selim Cinek [Wed, 7 Jun 2017 21:11:20 +0000 (21:11 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev am:
beba1bf936
am:
80b417c731
Change-Id: I37a02992a66fb0b9c1cceba926340690db014f87
Android Build Merger (Role) [Wed, 7 Jun 2017 21:08:13 +0000 (21:08 +0000)]
Merge "Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am:
fd6b3c6da3 am:
550d5da702" into oc-dr1-dev-plus-aosp
Winson Chung [Wed, 7 Jun 2017 21:06:03 +0000 (21:06 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am:
fd6b3c6da3
am:
550d5da702
Change-Id: Ib31e7a0bf89db9fb347309fd14b44b0a3ca8cde2
Winson Chung [Wed, 7 Jun 2017 21:04:30 +0000 (21:04 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am:
fd6b3c6da3
am:
f676ac8ce5
Change-Id: I35612147fad06e390887931d57325ae82976e4bf
Selim Cinek [Wed, 7 Jun 2017 21:03:12 +0000 (21:03 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
am:
beba1bf936
Change-Id: I22d44dde99093cbcf10ca8cddb3beccfdc9bdafb
Selim Cinek [Wed, 7 Jun 2017 20:58:11 +0000 (20:58 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
am:
beba1bf936
Change-Id: Ia5a12355fd1ed7ec8c9e4cea68e5b17764479ebd
Winson Chung [Wed, 7 Jun 2017 20:57:41 +0000 (20:57 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am:
fd6b3c6da3
Change-Id: Ia156853dacf464f80ea46b35806c1f40d3107ecd
Winson Chung [Wed, 7 Jun 2017 20:53:42 +0000 (20:53 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am:
fd6b3c6da3
Change-Id: I262857f51aff127c3e1c4a223e22e7129060a9e7
Android Build Merger (Role) [Wed, 7 Jun 2017 20:49:41 +0000 (20:49 +0000)]
Merge "Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev am:
8d5b58a660 am:
a3da26e146" into oc-dr1-dev-plus-aosp
Selim Cinek [Wed, 7 Jun 2017 20:47:47 +0000 (20:47 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
Jian Sun [Wed, 7 Jun 2017 20:47:34 +0000 (20:47 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev am:
8d5b58a660
am:
a3da26e146
Change-Id: Idc1f787b542d116cdad62eb6a4406605d035f8ae
Jian Sun [Wed, 7 Jun 2017 20:47:30 +0000 (20:47 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev am:
8d5b58a660
am:
da93f30457
Change-Id: I2bd6be07162547385edf08d5fccc88a7cfe559ad
TreeHugger Robot [Wed, 7 Jun 2017 20:46:15 +0000 (20:46 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 20:38:41 +0000 (20:38 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev am:
6e96251d92
am:
f9f6424adb
Change-Id: I46ff1e1af158a8af1a27da04304a7bda4a60ebe9
Jian Sun [Wed, 7 Jun 2017 20:37:51 +0000 (20:37 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am:
8d5b58a660
Change-Id: I21f8e344b794a5e24f92a0895843b7875b764eba
Jian Sun [Wed, 7 Jun 2017 20:37:45 +0000 (20:37 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am:
8d5b58a660
Change-Id: Id381a515c44253dc2c3cfa7a74e855fda981580f
Jeff Sharkey [Wed, 7 Jun 2017 20:34:38 +0000 (14:34 -0600)]
Add timeout to StrictMode flash.
Consider an app that requests that a StrictMode border be shown, and
then immediately crashes. We'd end up showing the bars indefinitely,
which is a terrible UX.
This CL enqueues a second message to tear down the bars if nobody
asks for them to be taken down within 1 second.
Test: manual app that crashed after showing violation bars
Bug:
37787765
Change-Id: I45d2078d0dcaa94e8f24087d028f5f06d12c4349
Adrian Roos [Wed, 7 Jun 2017 19:18:05 +0000 (12:18 -0700)]
Keyguard: Increase clock size
Test: observe that keyguard clock looks slightly bigger now
Change-Id: Ic55582abb1cf82bf104afce7d1271e456c78aa1b
Fixes:
62105028
Jian Sun [Wed, 7 Jun 2017 20:31:00 +0000 (20:31 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 20:28:53 +0000 (20:28 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev am:
6e96251d92
am:
1732aae9e5
Change-Id: If434921580905cc668c9f4d4294124b9d534baa0
Julia Reynolds [Wed, 7 Jun 2017 20:21:38 +0000 (20:21 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
am:
6e96251d92
Change-Id: I167f941e2f09f240dd6109f849ccd87dee57f47c
Julia Reynolds [Wed, 7 Jun 2017 20:21:26 +0000 (20:21 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
am:
6e96251d92
Change-Id: Ie1d25ecf377a023833f29c01f093831f049166fd
Adrian Roos [Fri, 2 Jun 2017 00:55:05 +0000 (17:55 -0700)]
AmbientIndication: Add tap again hint
Adds a hint for tapping the ambient indication again to open.
Also fixes an issue where the indication bottom padding was not correctly
updated if the indication was shown while the panel is collapsed.
Bug:
38387500
Test: tap indication, verify it shows the tap-again-to-open hint. Also verify that if the indication gets set while the phone is unlocked that sufficient space is reserved after transitioning to the lockscreen.
Change-Id: Ie9a152b0bd86807958376fd278ef9502c03af6b2
Julia Reynolds [Wed, 7 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
Sundeep Ghuman [Tue, 6 Jun 2017 19:27:25 +0000 (12:27 -0700)]
DO NOT MERGE: Kill Wifi Badging in OC.
Speed labeling is turned on in O-DR hence this CL should not be merged
into master. Using the merged in tag below which implements speed
labeling (ag/
2346102) to prevent this CL from being merged into upstream
branches which need scoring ui.
Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed
Bug: b/
35628911
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I5740f68be25d5ec297f1f7dc3b3e59203cec2eb5
Android Build Merger (Role) [Wed, 7 Jun 2017 19:49:25 +0000 (19:49 +0000)]
Merge "Merge "Better error message for AVD" into oc-dev am:
cabf9cdc2e am:
7bbb50e21d" into oc-dr1-dev-plus-aosp
Doris Liu [Wed, 7 Jun 2017 19:46:59 +0000 (19:46 +0000)]
Merge "Better error message for AVD" into oc-dev am:
cabf9cdc2e
am:
7bbb50e21d
Change-Id: I118c4b4ba07f0774a59bfcf17b2246713e72b2dc
Doris Liu [Wed, 7 Jun 2017 19:45:52 +0000 (19:45 +0000)]
Merge "Better error message for AVD" into oc-dev am:
cabf9cdc2e
am:
cab35e9b0e
Change-Id: I48726108f88abbe3d08973259e1be1a1683df797
Doris Liu [Wed, 7 Jun 2017 19:40:53 +0000 (19:40 +0000)]
Merge "Better error message for AVD" into oc-dev
am:
cabf9cdc2e
Change-Id: I6e63b81fd2168780d23a88d7340812b55db98497
Jorim Jaggi [Wed, 7 Jun 2017 19:38:19 +0000 (12:38 -0700)]
Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND
To make sure we won't cause SystemUI to draw the black status bar
background while the starting window is visible.
Test: Warm open chrome
Test: go/wm-smoke
Bug:
38136531
Change-Id: I8dfc0926cafef9d41e78a637523316ac46ce05df
Doris Liu [Wed, 7 Jun 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Better error message for AVD" into oc-dev
am:
cabf9cdc2e
Change-Id: I96b7ac9525e4096da2662f1c1973e2ee52008cfc
Doris Liu [Wed, 7 Jun 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Better error message for AVD" into oc-dev
Android Build Merger (Role) [Wed, 7 Jun 2017 19:23:14 +0000 (19:23 +0000)]
Merge "Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am:
6746aa8c4d am:
dab10f2bb3" into oc-dr1-dev-plus-aosp
OSDN Git Service
