Automerger Merge Worker
c4ad2628e1
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7
...
Change-Id: I448cbe85cafb3edf91d17b201d924ec2d79d888d
2020-03-11 21:23:21 +00:00
Automerger Merge Worker
c678022a13
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7
...
Change-Id: Id210117c4d064bcd05adbc749a181271b5bd8413
2020-03-11 21:23:05 +00:00
Automerger Merge Worker
ce81c0baef
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: 038905a840 am: 6211d885d5
...
Change-Id: I317a27a3122e4a404833159d97257e92b28e0415
2020-03-11 21:22:47 +00:00
Automerger Merge Worker
a8b0106e27
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: f0034eb4ed am: bbe24da6a1
...
Change-Id: I86cb18b1a8b18fb0270807cdbf8a9884547853e6
2020-03-11 21:22:05 +00:00
Automerger Merge Worker
a20e11e02e
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 706c05eaf4 am: ee78d6a0d5
...
Change-Id: I5da04bed3a5abc722d8deb58dc2d3626fc6eb0cb
2020-03-11 21:14:31 +00:00
Automerger Merge Worker
bbe24da6a1
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: f0034eb4ed
...
Change-Id: Ic1440ee5840cbf9e59193c39b9a717e5d88c327e
2020-03-11 21:10:24 +00:00
Automerger Merge Worker
6211d885d5
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: 038905a840
...
Change-Id: I492181f4a01fdf01b1ff655354f9af3dc909a2e3
2020-03-11 21:06:50 +00:00
Automerger Merge Worker
69a31c2484
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68
...
Change-Id: I0c30d3f4fb38b5ab066e62935d8ce9a7cf3e4e9b
2020-03-11 21:00:17 +00:00
Automerger Merge Worker
0cb70101c7
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68
...
Change-Id: I3dc14a3085153ff5bdfd9b94c80750f9c6595b64
2020-03-11 20:59:46 +00:00
Automerger Merge Worker
ee78d6a0d5
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 706c05eaf4
...
Change-Id: I23cabacc7df3ef3e0a1238f24c10987a70f97fd1
2020-03-11 20:59:21 +00:00
Automerger Merge Worker
f0034eb4ed
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983
...
Change-Id: I5b4d9c0ab3d2e087b0717728d6896209980986e1
2020-03-11 20:59:10 +00:00
Automerger Merge Worker
038905a840
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983
...
Change-Id: Ibe007653565dc79c492a9fe6664b5ce40d9f8774
2020-03-11 20:58:56 +00:00
Kevin Chyn
8ee5045d68
Merge "Partial revert of ag/10482633" into rvc-dev
2020-03-11 20:56:42 +00:00
Automerger Merge Worker
ffe9bf2d8c
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 9b9f4ec1b7 am: 9028365bca am: 8d34f80b42
...
Change-Id: Ia6802bcededc49bebd3a9f5419350c8656aa8420
2020-03-11 20:52:44 +00:00
Automerger Merge Worker
aac545ff2e
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 89f85ccbf6 am: 0a33bcfdf4
...
Change-Id: I98e82f2c2b5dbc9d486920be23ceb2dbcc67a3fb
2020-03-11 20:51:06 +00:00
Automerger Merge Worker
5df2b2f142
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7 am: bfa63c5fbd am: 87b44ea9da
...
Change-Id: I887ce0220886c085531c0e484373e2976865518a
2020-03-11 20:49:45 +00:00
Automerger Merge Worker
8d34f80b42
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 9b9f4ec1b7 am: 9028365bca
...
Change-Id: Ic5925df8d18b92880dfc7eb67b775f492b7b6e28
2020-03-11 20:48:00 +00:00
Automerger Merge Worker
279d4d9983
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df
...
Change-Id: I0f8e5ce1eb3dd6358222c81eefeb622cc5bb3ca4
2020-03-11 20:47:43 +00:00
Automerger Merge Worker
706c05eaf4
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df
...
Change-Id: I366b32e4d47fb10f0ff9b00cfa99d7cc53779ebe
2020-03-11 20:47:37 +00:00
Automerger Merge Worker
0a33bcfdf4
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 89f85ccbf6
...
Change-Id: I822f2873c64505568478375bf5b9c68658028d1d
2020-03-11 20:35:42 +00:00
Automerger Merge Worker
9028365bca
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 9b9f4ec1b7
...
Change-Id: I7691bf710c0e7310fdf960868d30cd13eac11051
2020-03-11 20:35:04 +00:00
Automerger Merge Worker
87b44ea9da
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7 am: bfa63c5fbd
...
Change-Id: Ib20d10a128151a3e22e53f7f7a923e5942cadaef
2020-03-11 20:35:04 +00:00
TreeHugger Robot
79336396df
Merge "Update empty state for apps bypassing dnd" into rvc-dev
2020-03-11 20:33:15 +00:00
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
