Automerger Merge Worker
18d9d24ee3
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours
...
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-11 20:29:24 +00:00
Automerger Merge Worker
89f85ccbf6
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa
...
Change-Id: Id9ac2f6a2b074e8a07a31c401051b135b9b8b34d
2020-03-11 20:24:00 +00:00
Automerger Merge Worker
9b9f4ec1b7
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa
...
Change-Id: I91060da017fe98d629e06d9f817a88d71b33b2a6
2020-03-11 20:23:32 +00:00
Automerger Merge Worker
bfa63c5fbd
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7
...
Change-Id: Id7db52b4409d8d12d5207f7298b58b7e20f745b5
2020-03-11 20:23:25 +00:00
Automerger Merge Worker
31933bea45
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic0716de563c854768010f78b01ee4cbd546e99a0
2020-03-11 20:17:25 +00:00
Automerger Merge Worker
7152f018fa
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
...
Change-Id: I54762e5a403b6879fb3aaf4f93ac8621a1d6dfed
2020-03-11 20:10:36 +00:00
Automerger Merge Worker
07fb084ce7
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
...
Change-Id: I457fe332b417e991fe7e2625fef8f8f3c176daac
2020-03-11 20:09:21 +00:00
Automerger Merge Worker
61167e098e
Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b
...
Change-Id: I749ba8ae504f37a7a3e9f2c7aa09ebcca8245964
2020-03-11 20:07:54 +00:00
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
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
bcabf612e6
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f am: bafe942da7 am: fad5089a5f am: f0f896c5e8
...
Change-Id: If45a415de308e9e4957b7035c8d35e5ffdfe2a1c
2020-03-11 14:41:19 +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
732ee72abf
Merge "Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584" into rvc-dev-plus-aosp am: 164dce85e4 am: aa826d85b1 am: 38801f0232
...
Change-Id: Ic089ce52471ba87ed80b040c21adf1987bd20bb9
2020-03-11 14:11:23 +00:00
Automerger Merge Worker
a875ac154a
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496 am: dcc0fa5f6e am: 9aa950e0d9 am: 607ecefc8c
...
Change-Id: I6a50de7a97cbc78fb0c313dbde9c7c78f9a765da
2020-03-11 14:11:00 +00:00
Automerger Merge Worker
2c830ace03
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f am: c02b876009 am: cf13163981
...
Change-Id: I82f275ced9d8c11d74486596d54a3471cb294acf
2020-03-11 14:10:29 +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
1ae3363f96
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9 am: 4f2ad111cc am: ae5b2ddd68 am: 449f1a533e
...
Change-Id: Ia777f93d81282eced6fdf9f1e3d3546a92dfb391
2020-03-11 13:54:37 +00: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
aa1d2b8b25
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: fd3293d1db am: ed4856ed64 am: 53712ea1d5
...
Change-Id: I771bbe1858b48e95c31551a9e46bebab3846075d
2020-03-11 13:54:24 +00:00
Automerger Merge Worker
2a12dc8e4b
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9 am: 3b61fd3975 am: 6649dfb85e
...
Change-Id: Iaa7aef6ecbdea77643bc29ae9493ac530a93ff0a
2020-03-11 13:54:06 +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
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
f2639347e3
Merge "Fix and Ignore broken test cases"
2020-03-11 12:39:44 +00:00
TreeHugger Robot
16a7ba81f4
Merge "Tweak strings for assist app" into rvc-dev
2020-03-11 12:38:44 +00:00
