OSDN Git Service
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
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: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
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
Julia Reynolds [Wed, 7 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
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
Jeff Sharkey [Wed, 7 Jun 2017 19:22:26 +0000 (19:22 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am:
6746aa8c4d
am:
dab10f2bb3
Change-Id: Icd84601fa67c3ae5d9e3a26709022760d1fe22c8
Jeff Sharkey [Wed, 7 Jun 2017 19:20:01 +0000 (19:20 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am:
6746aa8c4d
am:
3471981ddc
Change-Id: I1d308a6ef5ad479c152b8db1264842caefc36295
Jeff Sharkey [Wed, 7 Jun 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am:
6746aa8c4d
Change-Id: I32f223228c45a4949ebf53c1ab73d20fa9950ed6
Jeff Sharkey [Wed, 7 Jun 2017 19:12:59 +0000 (19:12 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am:
6746aa8c4d
Change-Id: I6b78fba341499617e279b38f2e1885cd58551b0d
Jeff Sharkey [Wed, 7 Jun 2017 19:03:54 +0000 (19:03 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
Todd Kennedy [Wed, 7 Jun 2017 19:00:23 +0000 (19:00 +0000)]
Merge "always adjust per-user application info" into oc-dev am:
91a9d65e42
am:
dcbfba2a45
Change-Id: I0da0ecb0ed9430e059bc13e73226d43275bef934
Todd Kennedy [Wed, 7 Jun 2017 18:55:19 +0000 (18:55 +0000)]
Merge "always adjust per-user application info" into oc-dev am:
91a9d65e42
am:
1581bb0b75
Change-Id: Ic1935a6051c78ffba6b1963373dc784d711c1c53
Todd Kennedy [Wed, 7 Jun 2017 18:52:27 +0000 (18:52 +0000)]
Merge "always adjust per-user application info" into oc-dev
am:
91a9d65e42
Change-Id: I1c7af6ce2ef12fd445389325e98b84b552efae88
Android Build Merger (Role) [Wed, 7 Jun 2017 18:50:59 +0000 (18:50 +0000)]
Merge "Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am:
28afa23a8f am:
4710a7ad03" into oc-dr1-dev-plus-aosp
Todd Kennedy [Wed, 7 Jun 2017 18:50:33 +0000 (18:50 +0000)]
Merge "always adjust per-user application info" into oc-dev
am:
91a9d65e42
Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
Makoto Onuki [Wed, 7 Jun 2017 18:49:58 +0000 (18:49 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am:
28afa23a8f
am:
4710a7ad03
Change-Id: I802eeffca56af708e47bcc1932708ac27f8e3262
Makoto Onuki [Wed, 7 Jun 2017 18:47:27 +0000 (18:47 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am:
28afa23a8f
am:
dd0f409b16
Change-Id: I9567a83070a1203e58615e1f87a3e217371dbc3e
Todd Kennedy [Wed, 7 Jun 2017 18:40:53 +0000 (18:40 +0000)]
Merge "always adjust per-user application info" into oc-dev
Makoto Onuki [Wed, 7 Jun 2017 18:40:46 +0000 (18:40 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am:
28afa23a8f
Change-Id: I3d1079365f13400d1f23f6e61122e00c67432dd1
Makoto Onuki [Wed, 7 Jun 2017 18:40:44 +0000 (18:40 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am:
28afa23a8f
Change-Id: I4c3561c8496a3892ca7a0ea425b979298b20acde
Android Build Merger (Role) [Wed, 7 Jun 2017 18:35:16 +0000 (18:35 +0000)]
Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am:
295dd7193e am:
3158673eeb" into oc-dr1-dev-plus-aosp
Selim Cinek [Wed, 7 Jun 2017 18:34:18 +0000 (18:34 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am:
295dd7193e
am:
3158673eeb
Change-Id: I2001475c549a1ecf1dec7e469bddc3a22ce86b57
Android Build Merger (Role) [Wed, 7 Jun 2017 18:33:57 +0000 (18:33 +0000)]
Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am:
295dd7193e am:
0151c6886f" into oc-dr1-dev-plus-aosp
Makoto Onuki [Wed, 7 Jun 2017 18:33:19 +0000 (18:33 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
Selim Cinek [Wed, 7 Jun 2017 18:33:05 +0000 (18:33 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am:
295dd7193e
am:
0151c6886f
Change-Id: I9bc738f6bad45e314e077c2250fe3e086571db7a
Albert Chaulk [Wed, 7 Jun 2017 18:29:53 +0000 (18:29 +0000)]
Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
am:
44bb9c7281
Change-Id: I6ed7f3aa0ceef0bac2ec44889bb19c757d07f10d
Selim Cinek [Wed, 7 Jun 2017 18:25:12 +0000 (18:25 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am:
295dd7193e
Change-Id: I1f41744ec2cc5d820e7381858d5974b17db8d893
TreeHugger Robot [Wed, 7 Jun 2017 18:23:11 +0000 (18:23 +0000)]
Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
Selim Cinek [Wed, 7 Jun 2017 18:22:09 +0000 (18:22 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am:
295dd7193e
Change-Id: I8b80da001d23932c48e9721ee1f23850cf4dcb31
Selim Cinek [Wed, 7 Jun 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
Android Build Merger (Role) [Wed, 7 Jun 2017 17:39:26 +0000 (17:39 +0000)]
Merge "Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am:
463985178c am:
df8c918129" into oc-dr1-dev-plus-aosp
Jason Monk [Wed, 7 Jun 2017 17:36:43 +0000 (17:36 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am:
463985178c
am:
df8c918129
Change-Id: I27f8a61c638ab63f6b0960884e60b8bed35df812
Jason Monk [Wed, 7 Jun 2017 17:36:36 +0000 (17:36 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am:
463985178c
am:
54d49157fd
Change-Id: I11fc1d70568497d264cdf76a9fe3687baa62a9ea
Jason Monk [Wed, 7 Jun 2017 17:28:24 +0000 (17:28 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
am:
463985178c
Change-Id: I4f1d959c130a008aad49c4aab0aa225bfb035ab3
Jason Monk [Wed, 7 Jun 2017 17:28:23 +0000 (17:28 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
am:
463985178c
Change-Id: Iefa8e2707df45004a5ac37094ee93f1fac4721e9
Jason Monk [Wed, 7 Jun 2017 17:17:43 +0000 (17:17 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
Android Build Merger (Role) [Wed, 7 Jun 2017 17:00:50 +0000 (17:00 +0000)]
Merge "Merge "Clear native shader when Paint shader changes" into oc-dev am:
d3e78478aa am:
e871596f15" into oc-dr1-dev-plus-aosp
John Reck [Wed, 7 Jun 2017 16:58:58 +0000 (16:58 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev am:
d3e78478aa
am:
e871596f15
Change-Id: I9813e607ebaec363fe6cd1c7b389b8c4ce2d5e74
John Reck [Wed, 7 Jun 2017 16:58:09 +0000 (16:58 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev am:
d3e78478aa
am:
4ee3fb4c54
Change-Id: I9fceeec5fd1db92c7f47f0bcde5278b0e84a6b55
John Reck [Wed, 7 Jun 2017 16:49:12 +0000 (16:49 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
am:
d3e78478aa
Change-Id: I7d96db34b1894e1064116b830a8fb159ad4c57b0
John Reck [Wed, 7 Jun 2017 16:49:08 +0000 (16:49 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
am:
d3e78478aa
Change-Id: I8d9c87e232ee1bbc77f3c5618f5856e891c78a74
John Reck [Wed, 7 Jun 2017 16:42:43 +0000 (16:42 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
Albert Chaulk [Mon, 5 Jun 2017 23:35:23 +0000 (19:35 -0400)]
Add a WM API to query the touch region for the input method window
This is needed by VR to handle keyboards that display a window larger
than the interactable region
Bug:
62194867
Test: Manually with prints
Change-Id: I7288956ed8da8d24e7c46ffa8f27461f7abbca5e
(cherry picked from commit
56162a0a51e2aa752a500d941869f1af652eabbf)
Android Build Merger (Role) [Wed, 7 Jun 2017 15:10:58 +0000 (15:10 +0000)]
Merge "Merge "Use correct timebase in fg service notifications." into oc-dev am:
630e7841e5 am:
107bfc46c6" into oc-dr1-dev-plus-aosp
Daniel Sandler [Wed, 7 Jun 2017 15:09:57 +0000 (15:09 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev am:
630e7841e5
am:
107bfc46c6
Change-Id: I407983d32ce8d2a6758f0125963d128db496d225
Daniel Sandler [Wed, 7 Jun 2017 15:07:25 +0000 (15:07 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev am:
630e7841e5
am:
2fe945c3a9
Change-Id: I5d851b00b92c88bf9b23bbdd021c207714abd6d9
Daniel Sandler [Wed, 7 Jun 2017 15:02:00 +0000 (15:02 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
am:
630e7841e5
Change-Id: Idde8d539f4f49bcf171e060d6c6483e375748346
Daniel Sandler [Wed, 7 Jun 2017 15:02:00 +0000 (15:02 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
am:
630e7841e5
Change-Id: I3493f13c16b24d343f61e80d70f37cf62d6b8ee2
Daniel Sandler [Wed, 7 Jun 2017 14:56:41 +0000 (14:56 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 14:12:09 +0000 (14:12 +0000)]
Revert "Change default for group alert behavior"
This reverts commit
8f7828ebe7fc6d87e0de112cfda2823fd5818cb2.
Mutes sound on legacy apps that use their summaries to make sound
Change-Id: I635b1428ee247c0b7753f58343637e64da1c981d
Fixes:
62387153
Android Build Merger (Role) [Wed, 7 Jun 2017 14:00:43 +0000 (14:00 +0000)]
Merge "Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am:
7925f817d0 am:
805e32d19d" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Wed, 7 Jun 2017 13:58:26 +0000 (13:58 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am:
7925f817d0
am:
ffbef55373
Change-Id: I77e47932a4a74ddcebf9138b009407f144d5f725
Wale Ogunwale [Wed, 7 Jun 2017 13:58:22 +0000 (13:58 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am:
7925f817d0
am:
805e32d19d
Change-Id: If05930440d7e095b46a0a65ebe1e03fa1741b02b
Wale Ogunwale [Wed, 7 Jun 2017 13:50:25 +0000 (13:50 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
am:
7925f817d0
Change-Id: I0b957a0a67a9e245d51dce610acef97d6b72fa04
Wale Ogunwale [Wed, 7 Jun 2017 13:50:25 +0000 (13:50 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
am:
7925f817d0
Change-Id: If142910eebf83a19e863004592335b38b94e1763
Wale Ogunwale [Wed, 7 Jun 2017 13:45:02 +0000 (13:45 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
Jason Monk [Wed, 7 Jun 2017 13:15:54 +0000 (09:15 -0400)]
Make DND tile primary toggle remember favorite zen
Test: manual
Change-Id: I2b589dbabf4bd7704d4df968ecbd986604e3b757
Fixes:
37794901
Erik Kline [Wed, 7 Jun 2017 09:59:43 +0000 (09:59 +0000)]
Merge "Add additional mocking for Context innards" am:
a65aa77c1c am:
35182218d3 am:
f22995eed5
am:
48c3c00ee1
Change-Id: I9a05f34035a15b233a44d517f2b2426481679974
Erik Kline [Wed, 7 Jun 2017 09:51:52 +0000 (09:51 +0000)]
Merge "Add additional mocking for Context innards" am:
a65aa77c1c am:
35182218d3
am:
f22995eed5
Change-Id: Ibde5e3e048236d32ea3c1ba2c2700bb6a75323e6
Erik Kline [Wed, 7 Jun 2017 09:46:11 +0000 (09:46 +0000)]
Merge "Add additional mocking for Context innards" am:
a65aa77c1c
am:
35182218d3
Change-Id: I7f08086badfddcf9d667a749cf035e36366f9a7c
Erik Kline [Wed, 7 Jun 2017 09:40:37 +0000 (09:40 +0000)]
Merge "Add additional mocking for Context innards"
am:
a65aa77c1c
Change-Id: I7f780c05c46b00457b194bfb13df5814735f0809
Treehugger Robot [Wed, 7 Jun 2017 09:32:02 +0000 (09:32 +0000)]
Merge "Add additional mocking for Context innards"
Hyunyoung Song [Wed, 7 Jun 2017 09:14:05 +0000 (09:14 +0000)]
Merge "Change Android default icon b/
35314247 Test: manual" into oc-dev am:
bb4aeb19be
am:
38568aff22
Change-Id: I913abeb2222f1fb4af814ea9741608671e30fa30
Michael Wright [Wed, 7 Jun 2017 09:11:06 +0000 (09:11 +0000)]
Merge "Actually wait until the display is ready." into oc-dev am:
496267f93b
am:
9468ded040
Change-Id: If985d418af3dae02bff7c40cdb30051c8eaaf7ab
Hyunyoung Song [Wed, 7 Jun 2017 09:04:17 +0000 (09:04 +0000)]
Merge "Change Android default icon b/
35314247 Test: manual" into oc-dev
am:
bb4aeb19be
Change-Id: I7a80c68f227d2596f3863b9f234d31a7143ca33c
Michael Wright [Wed, 7 Jun 2017 09:00:53 +0000 (09:00 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
am:
496267f93b
Change-Id: I40d9fb13190db81472cde320cccd9a868ea21516
Hugo Benichi [Wed, 7 Jun 2017 08:58:04 +0000 (08:58 +0000)]
Merge "Captive portal login shows specific network name" am:
01fb05cf62 am:
93fe99aca4 am:
75faf02f04
am:
f5b8d18798
Change-Id: I5f7e59c7bcd7df41e0e243612c93c16fb64038c4
Hugo Benichi [Wed, 7 Jun 2017 08:51:43 +0000 (08:51 +0000)]
Merge "Captive portal login shows specific network name" am:
01fb05cf62 am:
93fe99aca4
am:
75faf02f04
Change-Id: I1561ccd2676315f3110f20fcbfbd55453f92cbed
OSDN Git Service
