Automerger Merge Worker
ddc90f776a
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: d86df5d487 am: 1d2fee6c5a
...
Change-Id: Iacf81df3640c54cdd774309b0d1c3d6f25bc3c06
2020-03-13 05:57:04 +00:00
Automerger Merge Worker
a0587e8278
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: 9d37d5df00 am: 526f23e533
...
Change-Id: I0ece09d2b21d44cea1f71e6bde51d9f2a5fbcf48
2020-03-13 05:57:03 +00:00
Automerger Merge Worker
3ad4eb1014
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: c0035cfc86 am: 7415aa1ffe
...
Change-Id: I29c6cea9576dd03ff5b7f87b1ac9e282f09d617b
2020-03-13 05:39:37 +00:00
Automerger Merge Worker
526f23e533
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: 9d37d5df00
...
Change-Id: Iea562ed63fd657a55640cf3085935988d8ad7e04
2020-03-13 05:39:24 +00:00
Automerger Merge Worker
1d2fee6c5a
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: d86df5d487
...
Change-Id: Ie0d756b795c9f7721f7ca20b03fd7eee5a748d48
2020-03-13 05:39:17 +00:00
Automerger Merge Worker
7415aa1ffe
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: c0035cfc86
...
Change-Id: I9eb7176fce6069dd48caa92fb43b61af1faa40fb
2020-03-13 05:15:14 +00:00
Automerger Merge Worker
d86df5d487
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff
...
Change-Id: I53566a529f76c804004941076c4549ab873b470c
2020-03-13 05:15:10 +00:00
Automerger Merge Worker
9d37d5df00
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff
...
Change-Id: I772373e7815dceac04431d16cb1de055a6d1634e
2020-03-13 05:14:59 +00:00
Automerger Merge Worker
c0035cfc86
Merge "Remove ignore test case" into rvc-dev am: ad30345078
...
Change-Id: I06bae8e189cfb47a95beedbe732822d21975ddc3
2020-03-13 05:01:47 +00:00
Automerger Merge Worker
e94cbd98ff
Merge "Remove ignore test case" into rvc-dev am: ad30345078
...
Change-Id: I6f1e2d5f3429c6fccee5d80403e27b445cd40012
2020-03-13 05:01:38 +00:00
Edgar Wang
3b47408016
Refine remove locale warning dialog string
...
- If the first language is not selected, just remove the body copy
else warning user the locale will change to another language.
Fixes: 140723349
Test: manual & robotest
Change-Id: I9fec17ae85889f2864c3f3cae744f7181e6f9b2c
2020-03-13 12:49:21 +08:00
Edgar Wang
ad30345078
Merge "Remove ignore test case" into rvc-dev
2020-03-13 04:45:59 +00:00
Automerger Merge Worker
9340a90e49
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 897eea3bc4 am: e6502b753a am: 9ffb6e386f
...
Change-Id: Iba61ac407e1c634ff0bf5ac93fa93d255168e492
2020-03-13 04:16:16 +00:00
Automerger Merge Worker
c0979bb150
Merge "Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 0bfda151bf" into rvc-d1-dev-plus-aosp am: 857f09a45d am: b4169939a1
...
Change-Id: I2562d85c0a96376458f45885e77134663b39ba17
2020-03-13 04:15:54 +00:00
Automerger Merge Worker
9ffb6e386f
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 897eea3bc4 am: e6502b753a
...
Change-Id: I2692585d9a4c78c6522d470ada18b8b36533a376
2020-03-13 04:15:25 +00:00
Automerger Merge Worker
5616591d2b
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 2c3ee203bf am: f2755520a1
...
Change-Id: Ia42aae3bf00ba46dfac23c2172d4d5abbee3ef7d
2020-03-13 04:14:44 +00:00
Automerger Merge Worker
b4169939a1
Merge "Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 0bfda151bf" into rvc-d1-dev-plus-aosp am: 857f09a45d
...
Change-Id: I6581c7ac9073fdd31e9cfcda14fa1992be2e0e9f
2020-03-13 04:01:32 +00:00
Automerger Merge Worker
f2755520a1
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 2c3ee203bf
...
Change-Id: I494bd6614828d3fa8cba87f1bc77ced05d06c89b
2020-03-13 04:00:33 +00:00
Automerger Merge Worker
e6502b753a
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 897eea3bc4
...
Change-Id: Ic01687809ab05464a514ffeb4bbfac0c78429829
2020-03-13 04:00:23 +00:00
Automerger Merge Worker
857f09a45d
Merge "Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 0bfda151bf" into rvc-d1-dev-plus-aosp
2020-03-13 03:40:12 +00:00
Automerger Merge Worker
897eea3bc4
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044
...
Change-Id: Ic1db6caf15ef6aed31e27bf1aedf19c0dc9a93cc
2020-03-13 03:40:08 +00:00
Automerger Merge Worker
cceef6428c
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 0bfda151bf
...
Change-Id: I54b0bf1335d21c3b2b45ddb69b175ee4734205f0
2020-03-13 03:40:03 +00:00
Automerger Merge Worker
2c3ee203bf
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044
...
Change-Id: I5a80461f141c2c96234e05f65b7feb09d20101f3
2020-03-13 03:39:54 +00:00
Automerger Merge Worker
3f6c723044
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
...
Change-Id: Iee7a93a3c65d7bdb432937bcc5b81d2f3dd7fa45
2020-03-13 03:27:02 +00:00
Automerger Merge Worker
0bfda151bf
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
...
Change-Id: I6ecd56f6855cfd160e491472e1c5276deccde92d
2020-03-13 03:27:00 +00:00
TreeHugger Robot
89a6fafa33
Merge "Use values-night to control the dark mode background color" into rvc-dev
2020-03-13 03:13:27 +00:00
Stanley Wang
8694c34e09
Update Settings strings for R.
...
Bugs: 143267842
Test: Rebuilt rom and saw different screens.
Change-Id: Id2d89287fe36240d71de2092daac44a5da9be282
2020-03-13 10:37:07 +08:00
Brad Ebinger
95aeac6790
Set the CHAR_LIMIT to 110 in order to support more translations.
...
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.
Fixes: 150941009
Test: manual
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
2020-03-12 18:15:54 -07:00
Automerger Merge Worker
12cebe28c4
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 424982b66a am: 00ef0309cf am: 45406e4045
...
Change-Id: If2dec9ab8590d97f6e8b0dc29ab4c8e0088b879b
2020-03-13 00:51:26 +00:00
Automerger Merge Worker
fd5f419d60
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: 370fd8650d am: 9418cfeb11 am: 77ca303911
...
Change-Id: Ib99634a2f9b84f300a92ebab9dc16d0ffddbdef7
2020-03-13 00:51:03 +00:00
Automerger Merge Worker
02a18bce16
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 411f8fc4f9 am: 6c090cbd38
...
Change-Id: I1b269fba73b19b54b4f3d1f2296664b119a50aff
2020-03-13 00:50:37 +00:00
Automerger Merge Worker
f9c83c78d8
Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: af05a79dd1 am: 920f07228f am: 460299b90d
...
Change-Id: Ida704a99c308e000057b989b170a353aa5c8991d
2020-03-13 00:49:52 +00:00
Automerger Merge Worker
546b30d8ba
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: f63c3aca11 am: 496773632f am: af7cd6f85b
...
Change-Id: Ifb8cdc046433db6a2502677c1856356bd8482566
2020-03-13 00:41:10 +00:00
Automerger Merge Worker
22d69f8588
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: c477088b78 am: a379802366 am: 158de66300
...
Change-Id: Icefb1762becf0d7815a491beeb2659e11b3e821f
2020-03-13 00:38:36 +00:00
Automerger Merge Worker
82b9a7aa65
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 am: 5f99e79af4 am: 2febd6e59f am: b24e351a84 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3ef7dc31d6e837402792ab036c6c730e36a32429
2020-03-13 00:37:56 +00:00
Automerger Merge Worker
88a427f9d7
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 am: 8fdc20fd87 am: aa1a8dc3a5 am: bc062e6ead
...
Change-Id: Idb4542c82e33e196cf6c0ce25191ebaab11a89fa
2020-03-13 00:37:24 +00:00
Automerger Merge Worker
e0dd9eaf5c
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: 999977ff27 -s ours am: 135d77ae70 -s ours am: 56a95edb34 -s ours am: 49a1aebd2e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7f70c1be276a716e2cb7f345221177d7c3a8c4f0
2020-03-13 00:36:36 +00:00
Automerger Merge Worker
4c654b6e35
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 1b2cdfc1e0 -s ours am: 5d170c119a -s ours am: 443230b2bf -s ours am: 0595d63ad1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7fa980d74db5e99f744deb3e303129bb2f65dd53
2020-03-13 00:36:06 +00:00
Automerger Merge Worker
548ad0eede
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: bde8ce85e0 am: 74ae03d4a8 am: ca4f008287 am: 2bf6e60e2c -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia45acc1ef4945395c891672ac809f0dd6ba90592
2020-03-13 00:35:30 +00:00
Automerger Merge Worker
89160260e7
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c am: d37f5b5a7a am: 193d8cf727 am: da81d54de3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8ad5c6c4cca03cec08176d366b53f7a0f24d9932
2020-03-13 00:35:28 +00:00
Automerger Merge Worker
6c911aacd5
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours am: 4302d438b0 -s ours am: b167885376 -s ours am: ee1accc141 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I05585f1da36042e0a285af68843134fceb45141f
2020-03-13 00:34:30 +00:00
Automerger Merge Worker
387f5f8acc
Merge "Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: 58f8eded5d" into rvc-d1-dev-plus-aosp am: d34664915a am: c3e996f204
...
Change-Id: I6b5ebbc2764d470f536612ea9e5cba5bdf85da3e
2020-03-12 23:39:49 +00:00
Automerger Merge Worker
8eb45c004d
Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: 841b980a88 am: a9027be3b0
...
Change-Id: I3db1900bc659a06796695ebc7f2c1a8460d06c94
2020-03-12 23:32:35 +00:00
Automerger Merge Worker
45406e4045
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 424982b66a am: 00ef0309cf
...
Change-Id: Idad7f08ff83965a5425cc579f6668023cdb0b647
2020-03-12 23:20:41 +00:00
Automerger Merge Worker
77ca303911
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: 370fd8650d am: 9418cfeb11
...
Change-Id: Ie2362eb7aff02d6dcebe889b77e738c9a5ccc9cd
2020-03-12 23:09:17 +00:00
Automerger Merge Worker
6c090cbd38
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 411f8fc4f9
...
Change-Id: Idd8f37349077d7b4ea3f7e45f8e54bfc5342c796
2020-03-12 23:08:59 +00:00
Automerger Merge Worker
00ef0309cf
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 424982b66a
...
Change-Id: Ideabb4637cd2ad3e51f3680418f59b0279daa117
2020-03-12 23:08:56 +00:00
Automerger Merge Worker
460299b90d
Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: af05a79dd1 am: 920f07228f
...
Change-Id: I0f572dbda8348430f08b46dc62f74c64b9caf28a
2020-03-12 23:01:06 +00:00
Automerger Merge Worker
af7cd6f85b
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: f63c3aca11 am: 496773632f
...
Change-Id: I3259e2a3968a3706268c5695bea44cef42faa86b
2020-03-12 22:30:20 +00:00
Automerger Merge Worker
158de66300
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: c477088b78 am: a379802366
...
Change-Id: Ic6a370374bf6e21c74dc12019316c9fb248f1b1c
2020-03-12 22:28:56 +00:00
