Automerger Merge Worker
fe302e4867
Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
...
Change-Id: I0b9346370cf28648659d38a6a2bdeb0f893195f5
2020-03-11 20:05:37 +00:00
Automerger Merge Worker
487e3be342
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
2020-03-11 20:05:36 +00:00
Automerger Merge Worker
19ff9101ee
RESTRICT AUTOMERGE am: 077dd9b07f
...
Change-Id: I73f9a68326f6e6c477fc43eeb84b3349f519b658
2020-03-11 20:05:35 +00:00
Automerger Merge Worker
a3ddb0c4fb
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5ec3ba82e851a69ab1d7aff75603ad6a674661fd
2020-03-11 20:05:00 +00:00
Julia Reynolds
44b5b7c575
Update empty state for apps bypassing dnd
...
Test: atest
Fixes: 150346679
Change-Id: Iccc5f1fb3dd7ee2c114f8757a020833b3b41e91d
2020-03-11 18:09:47 +00:00
TreeHugger Robot
5e788604c2
Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev
2020-03-11 17:51:30 +00:00
Jason Hsu
91e5ece7ab
Merge "Align help resource usage in caption preferences." into rvc-dev
2020-03-11 17:47:16 +00:00
Chen Chen
291ff22d7b
Merge "MetricId: Avoid byte[] and string ambiguity"
2020-03-11 17:26:37 +00:00
Automerger Merge Worker
f0f896c5e8
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f am: bafe942da7 am: fad5089a5f
...
Change-Id: I45b9da57cb2d4999f5c39056d64c0f1c66a2f0fa
2020-03-11 14:16:50 +00:00
Automerger Merge Worker
38801f0232
Merge "Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584" into rvc-dev-plus-aosp am: 164dce85e4 am: aa826d85b1
...
Change-Id: I125357eef5dc23cb6b1d74e02649aa18bdf89b31
2020-03-11 14:04:15 +00:00
Automerger Merge Worker
607ecefc8c
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496 am: dcc0fa5f6e am: 9aa950e0d9
...
Change-Id: Ie13d45d59660e9e46ad168eefc2ae938cfc1f7c4
2020-03-11 14:03:58 +00:00
Automerger Merge Worker
fad5089a5f
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f am: bafe942da7
...
Change-Id: If5c2ad317c6671dd897800c45869b9e6812b4353
2020-03-11 14:03:46 +00:00
Automerger Merge Worker
cf13163981
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f am: c02b876009
...
Change-Id: Iab2b6461dfc26c32e6c10e017eeef395fc32a21c
2020-03-11 14:03:46 +00:00
jasonwshsu
27d06ff502
Remove search result for hidden magnification.
...
* Use searchable = "false" to suppress search indexes.
Bug: 146019459
Test: manual test
Change-Id: I1188f201ddc9ec8d59faf2bcb549839c054f73bd
2020-03-11 21:58:25 +08:00
Automerger Merge Worker
449f1a533e
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9 am: 4f2ad111cc am: ae5b2ddd68
...
Change-Id: I79a605ec6651700106087e2b314eef45489a18c9
2020-03-11 13:54:30 +00:00
Automerger Merge Worker
aa826d85b1
Merge "Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584" into rvc-dev-plus-aosp am: 164dce85e4
...
Change-Id: I7601df3bd65c82ae0728d5cfb1858cc786f634be
2020-03-11 13:48:23 +00:00
Automerger Merge Worker
9aa950e0d9
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496 am: dcc0fa5f6e
...
Change-Id: I0798c47d6a331ecfb5da24dc36638c9f90d1b14c
2020-03-11 13:48:17 +00:00
Automerger Merge Worker
bafe942da7
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f
...
Change-Id: I0ca06dd373492de0ca127fbe940fd1e29ae0e770
2020-03-11 13:48:13 +00:00
Automerger Merge Worker
c02b876009
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f
...
Change-Id: I7cffc5bf1f1e31da43aff446d1f7cc554d8130dc
2020-03-11 13:48:04 +00:00
Automerger Merge Worker
53712ea1d5
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: fd3293d1db am: ed4856ed64
...
Change-Id: Id5375e55181928714608d25123215f06bf2b2461
2020-03-11 13:39:59 +00:00
Automerger Merge Worker
6649dfb85e
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9 am: 3b61fd3975
...
Change-Id: If393c446096bf4d1d40e674e8eb2e2398d66b33c
2020-03-11 13:39:41 +00:00
Automerger Merge Worker
ae5b2ddd68
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9 am: 4f2ad111cc
...
Change-Id: Ic7bbe962bffa2197c885167cfc099f99efb0f770
2020-03-11 13:39:40 +00:00
Automerger Merge Worker
164dce85e4
Merge "Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584" into rvc-dev-plus-aosp
2020-03-11 13:29:35 +00:00
Automerger Merge Worker
539815566f
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584
...
Change-Id: Ibb8f5b1b1e72d75a77c023d2a6bb957954d3b8b9
2020-03-11 13:29:31 +00:00
Automerger Merge Worker
d6c0f379c5
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584
...
Change-Id: I8d0ebe9a4b6c2acb19b8e1fc9003d85cf4818faf
2020-03-11 13:29:29 +00:00
Automerger Merge Worker
84da18bf54
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496
...
Change-Id: I6dd10164057b625f1378e2937c1f1319c8d18ced
2020-03-11 13:29:27 +00:00
Automerger Merge Worker
dcc0fa5f6e
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496
...
Change-Id: I6f2b643c9c8a1aa799c6006943ed63ea68aeaf6a
2020-03-11 13:29:27 +00:00
Automerger Merge Worker
ed4856ed64
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: fd3293d1db
...
Change-Id: Ia308fd30fcbcbb845b9901634031e384a427833a
2020-03-11 13:19:56 +00:00
Automerger Merge Worker
4f2ad111cc
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9
...
Change-Id: I5949b8852d48a200cce8921ac0130a9b075dfb2e
2020-03-11 13:19:49 +00:00
Automerger Merge Worker
3b61fd3975
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9
...
Change-Id: I50a8dd13d25900c11fc28160a8abe2ca40e682c3
2020-03-11 13:19:38 +00:00
TreeHugger Robot
11dbe14584
Merge "Fix TetherSettingsTest" into rvc-dev
2020-03-11 13:12:56 +00:00
Automerger Merge Worker
ec71e52496
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45
...
Change-Id: I3f9d4e48bce108de162bb11daa91338951a71b46
2020-03-11 13:09:00 +00:00
Automerger Merge Worker
fd3293d1db
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4
...
Change-Id: I2193e15b508b9c2c5186afb2afa186d8d3f690fd
2020-03-11 12:57:15 +00:00
Automerger Merge Worker
aeb13d1dd9
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4
...
Change-Id: I2fbe22e43e922b97f23ebd08f7927730e035c1fa
2020-03-11 12:57:05 +00:00
Zoey Chen
23c382aa45
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin"
2020-03-11 12:54:05 +00:00
TreeHugger Robot
16a7ba81f4
Merge "Tweak strings for assist app" into rvc-dev
2020-03-11 12:38:44 +00:00
Automerger Merge Worker
dbbaabc17b
Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: e7e184fdc8 am: 285ef8c7de
...
Change-Id: I3b20f0dd0c73c933a73a38f2a0f87695f7942a6d
2020-03-11 12:15:23 +00:00
Automerger Merge Worker
a1a249d973
Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e am: 59da6a7c05 am: cd54f01f7d
...
Change-Id: I2f57cdce8e079aab3a93685f01f647f6f357eb3d
2020-03-11 12:15:17 +00:00
Automerger Merge Worker
445b52265d
Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: fde1a52ad1 am: ed5f5b195e
...
Change-Id: Ia24e30937f00907b226d54eddd264f77190253ad
2020-03-11 12:15:04 +00:00
Automerger Merge Worker
4489bb6334
Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: 01a0945e36 am: 132f9f38d8
...
Change-Id: I9abf6e005e89764414cf9ff2c1bf91c86e8a5c28
2020-03-11 12:01:57 +00:00
Automerger Merge Worker
76051d2c6d
Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: a3b983560b am: 90b0b7d10f
...
Change-Id: Iad1760b7c2981bc4612b985a4a2fc032243f7183
2020-03-11 12:01:52 +00:00
Automerger Merge Worker
e8d01bfdac
Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: 25325e9e20
...
Change-Id: Ifadfe25da56db629873b2b49e38d0723f6919632
2020-03-11 12:01:46 +00:00
Automerger Merge Worker
2328c28f80
Merge "Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e" into rvc-d1-dev-plus-aosp am: 998ab43fc2
...
Change-Id: I8cab6044283d05cf84443cc2c780c3184c89cefb
2020-03-11 12:01:41 +00:00
Automerger Merge Worker
d40d267867
Merge "Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d" into rvc-d1-dev-plus-aosp am: c14719b4cb
...
Change-Id: I76ff226ebdbbf49c484c96048ed8d5971538a06f
2020-03-11 12:01:26 +00:00
Automerger Merge Worker
285ef8c7de
Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: e7e184fdc8
...
Change-Id: I6c827c786db5241c4585a842c16a05fa0970e45d
2020-03-11 12:01:16 +00:00
Automerger Merge Worker
cd54f01f7d
Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e am: 59da6a7c05
...
Change-Id: I7a8a0627b8b3fe8cb57c2010202a2877cd8b081a
2020-03-11 12:01:11 +00:00
Automerger Merge Worker
ed5f5b195e
Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: fde1a52ad1
...
Change-Id: I7e1969815d5b0b6d8b107ca5200e8626fa01435b
2020-03-11 12:00:56 +00:00
Automerger Merge Worker
4ca5489d70
Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: dc192bf8ed
...
Change-Id: I07b636295295bc7696bc2517cf3810b4308371e7
2020-03-11 12:00:56 +00:00
Automerger Merge Worker
132f9f38d8
Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: 01a0945e36
...
Change-Id: Ib58a689a6d7dfbee62663729ddefa29eb9423f9e
2020-03-11 11:51:31 +00:00
Automerger Merge Worker
90b0b7d10f
Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: a3b983560b
...
Change-Id: I65cf2ba52e0e2a1ac3aac10b3abb0c34976d8867
2020-03-11 11:51:26 +00:00
