TreeHugger Robot
8697de6be3
Merge "DO NOT MERGE" into qt-qpr1-dev
2020-03-12 10:36:01 +00:00
Automerger Merge Worker
5fe624a009
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b
...
Change-Id: Ib4a750e64f0e012e94898c15e1f369561231299a
2020-03-12 09:55:28 +00:00
Automerger Merge Worker
999977ff27
[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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: Iae2b16273c94c1cfefc3ba1cc377f796c45c4136
2020-03-12 09:55:22 +00:00
Automerger Merge Worker
1b2cdfc1e0
[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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: Ic938d11f692384c04b04aac9ddbd643a0983529f
2020-03-12 09:55:01 +00:00
Automerger Merge Worker
bde8ce85e0
[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
...
Change-Id: I6a6e037cc80eb9f2cc505158e5f937b287c05254
2020-03-12 09:54:13 +00:00
Automerger Merge Worker
4cc152835c
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f
am: 19ff9101ee
-s ours am: 7dc37f978c
...
Change-Id: I7ece5a97e683dec786ba8c95a7950bc4b4b0d693
2020-03-12 09:54:12 +00:00
Automerger Merge Worker
c90737a257
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours am: f816e89f7a
-s ours
...
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
is in history
Change-Id: I572fec74b56a8e2e4e7f3ca9ecdc536a09a376bc
2020-03-12 09:53:24 +00:00
shafik
143ec3ec2b
Update ManageExternalStorageDetailsTest setUidMode
...
We previously changed ManageExternalStorageDetails to use
AppOpsManager#setUidMode instead of AppOpsManager#setMode, but forgot to
update the relevant unittest. This CL changes that unittest.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ManageExternalStorageDetailsTest
Fix: 150914062
Change-Id: I2cfe7e7a19f2422474d11fb946089a6847b36b12
2020-03-12 09:43:55 +00:00
Automerger Merge Worker
b2a718f62f
[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 skip reason: subject contains skip directive
Change-Id: Icbe574512461d49be73aaca3a3d94779a2017bf4
2020-03-12 09:23:29 +00:00
Automerger Merge Worker
0922e7fdcb
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1
-s ours am: a3ddb0c4fb
-s ours am: 31933bea45
-s ours am: 18d9d24ee3
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibbf2edb55ba4f72cbb1d8c96ab266f841bf31f27
2020-03-12 09:23:22 +00:00
Automerger Merge Worker
6708ebae6d
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
am: fe302e4867
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I94cea1b92275f86a666fcba6c950bf4b4659531f
2020-03-12 09:23:01 +00:00
Automerger Merge Worker
7dc37f978c
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f
am: 19ff9101ee
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I70c3e6daa2e2bbe6e2cef1fcbd1e78cd475fbc20
2020-03-12 09:22:57 +00:00
Automerger Merge Worker
f816e89f7a
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia4397258a0b87af025c6d8a866c03a060555b462
2020-03-12 09:21:48 +00:00
Tim Peng
dd39f44344
Handle ransferring state in output switcher
...
-Add subtitle on Slice item for transferring and failed case
-Add test cases
Bug: 150903460
Test: make -j50 RunSettingsRoboTests
Change-Id: I45fee20194dc6c9ec86ca88158393dfda455d0c0
2020-03-12 16:29:30 +08:00
Zhen Zhang
63c7c202d7
Log some actions for changing wifi hotspot config
...
Log following actions:
- wifi hotspot name changed
- wifi hotspot password changed
Added tests for logging actions in each controller's test.
Bug: 151113705
Test: WifiTetherSSIDPrefereceControllerTest;
WifiTetherPasswordPreferenceControllerTest;
CodeInspectionTest
Change-Id: I84b1cd8449e575a6ee1ad8868e7791dc601e726f
2020-03-12 01:06:46 -07:00
Automerger Merge Worker
cae2447a56
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
...
Change-Id: Ic3ec86390758853a91341650e1382215d04ea6d5
2020-03-12 06:42:35 +00:00
Zoey Chen
e34dc697d2
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev
2020-03-12 06:40:04 +00:00
Automerger Merge Worker
c1059b0f25
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
...
Change-Id: Ibb0d255c96279db485f4190c98b5fc854826f8a7
2020-03-12 06:39:18 +00:00
Calvin Pan
59f5eb638e
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev
2020-03-12 06:25:11 +00:00
Automerger Merge Worker
4c69bcab70
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
...
Change-Id: I80f8b6a996ec4006a225f63d5471ae7f70a2bcb4
2020-03-12 06:03:46 +00:00
Automerger Merge Worker
9e15dc3582
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb
...
Change-Id: Ib6deaaca23af6c8636e2861a011ff02d982c507b
2020-03-12 06:03:40 +00:00
Menghan Li
873b50a46a
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev
2020-03-12 05:37:32 +00:00
Menghan Li
3fd654becb
Merge "Update R acessibility assets and strings (1/n)" into rvc-dev
2020-03-12 05:37:19 +00:00
Tim Peng
e7bc985a35
Remove unnecessary permission for output switcher panel
...
-Make this as a generic panel
-Add CTS to make sure this panel works on all Android devices
Bug: 151272095
Test: make -j50 RunSettingsRoboTests
Change-Id: Ie4fe277144a586eaf902dc5b700027153b1c86ab
2020-03-12 05:13:26 +00:00
Automerger Merge Worker
70f287362c
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
...
Change-Id: I5f7a480c4dd5b035ad8e61e430d235dcd23c76e6
2020-03-12 04:48:55 +00:00
TreeHugger Robot
40613ef30c
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev
2020-03-12 04:35:32 +00:00
zoey chen
cf33e51a55
Fix Card 2's pin shows ON when only turn on card 1's pin
...
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
Merged-In: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
2020-03-12 03:56:46 +00:00
Automerger Merge Worker
93fedb0e3f
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814
...
Change-Id: If84bded0c61524cda613f57ff0b7839817655eae
2020-03-12 03:04:00 +00:00
TreeHugger Robot
a7bd169814
Merge "Fix WifiTetherSettingsTest" into rvc-dev
2020-03-12 02:54:35 +00:00
Automerger Merge Worker
5f2520f685
[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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
is in history
Change-Id: I19964afedd126b92b35977cc0a97abe1b8fb9ffc
2020-03-12 02:09:20 +00:00
Automerger Merge Worker
10caf51f27
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I26c2fcfc1c38818d168667d1121a0cde3018c566
2020-03-12 01:51:17 +00:00
TreeHugger Robot
f2754332a0
Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev
2020-03-12 01:35:21 +00:00
Lucas Dupin
249d80ec7b
Blur developer setting
...
New dev-option for enabling and disabling blurs, on devices that support
it.
Bug: 149792636
Test: manual
Test: atest EnableBlursPreferenceControllerTest
Change-Id: I26b4739a7b811c461557316a9247f6a9c397048a
2020-03-11 18:17:46 -07:00
Automerger Merge Worker
61eb0791a3
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
...
Change-Id: I4094a00c4bf9b04300243a8ff11984e95ac793c1
2020-03-12 00:40:12 +00:00
TreeHugger Robot
cbd5ec24d7
Merge "Remove search result for hidden magnification." into rvc-dev
2020-03-12 00:25:03 +00:00
menghanli
a248e0e6d5
Update R acessibility assets and strings (1/n)
...
- Color correction
- Color inversion
- Magnification
- Dwell
- Caption preferences
- Allow shortcut from lockscreen
Bug: 148837311
Test: Manual test
Change-Id: I1f5ff3bcbf53dab508311bcea3712ad2b30898eb
2020-03-12 07:18:58 +08: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
Kevin Chyn
8ee5045d68
Merge "Partial revert of ag/10482633" into rvc-dev
2020-03-11 20:56:42 +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
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
is in history
Change-Id: I0f6d8eeec8469cfe05b36bfbf27687be2973108a
2020-03-11 20:29:24 +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
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
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