Commit Graph

62371 Commits

Author SHA1 Message Date
TreeHugger Robot
032228ccf1 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18 -s ours am: 21058df4b3 am: 509af6cb81
Change-Id: Ia49accc60215091b0e2b61f33915eb610202c887
2020-03-20 22:33:39 +00:00
Stanley Wang
58f9ae3096 Update Settings strings for R.
Bug:143267842
Test: Rebuilt rom and saw different screens.
Change-Id: Id2d89287fe36240d71de2092daac44a5da9be282
(cherry picked from commit 8694c34e09)
Merged-In: Id2d89287fe36240d71de2092daac44a5da9be282
2020-03-20 22:31:44 +00:00
Jack Yu
922e1d23d8 Added slot index in area info broadcast
Added slot index information in the broadcast
so the receiver knows which slot to get information.

Test: Manual
Merged-In: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Change-Id: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Fix: 150126754
(cherry picked from commit 5a4dabcba2)
2020-03-20 13:18:09 -07:00
Zhen Zhang
7f2d6ce058 Refactor new tether settings to remove SharedPreferences
Bluetooth, USB and Wifi Disable tether preferences will turn on/off that
type of tethering interface instantly without storing it into
SharedPreferences. They are listening to TetherEnabler to update their
state.
Refactored to remove dependancy on SharedPreferences.

Bug: 151367756
Test: TetherEnablerTest; BluetoothTetherPreferenceControllerTest;
UsbTetherPreferenceControllerTest;
WifiTetherDisablePreferenceControllerTest; AllInOneSettingsTest;
AllInOneTetherPreferenceControllerTest

Change-Id: Ia6cc60bc4de8f08413beb6d41552a18f6fa6a55b
2020-03-20 13:15:10 -07:00
Joshua Duong
9d46c71fba Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a am: c6e68b5830 am: d910baf535
Change-Id: I31f7039ee76111dbcaf56b026c18fcf55c99f118
2020-03-20 20:07:28 +00:00
Joshua Duong
6c7880d673 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306 am: 8017331f64 am: 6e2635d11e
Change-Id: Idb4461d1006ad48ccbf6af204b90df117bd99a0e
2020-03-20 20:07:26 +00:00
Joshua Duong
d910baf535 Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a am: c6e68b5830
Change-Id: Ia4874ceb7cd3ea04595bda9dc30eca71b325764c
2020-03-20 19:44:35 +00:00
Joshua Duong
6e2635d11e Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306 am: 8017331f64
Change-Id: I0de8b2ce35b1b6a9526b89051fc9b404b4a9cd05
2020-03-20 19:44:32 +00:00
Beverly
e65db314f1 Update DND people Settings pages
Settings > Sound > Do Not Disturb > People
- Redesign of messages + calls settings pages
- Redesign of conversations page
- Added strings for Apps page

Test: make RunSettingsRoboTests7
Bug: 151845457
Change-Id: I58d22a31c398418c053e06a4c6bf5ed8c482ee35
2020-03-20 19:37:59 +00:00
Joshua Duong
975956b33b Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 2a3d93f2cc
Change-Id: Ief352c39bbb008db936122ce790cce57f60defce
2020-03-20 19:29:52 +00:00
Joshua Duong
dfe5331cd2 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 33659c99dc
Change-Id: I8ec55cedf8a6e0f1e9a6924aa5ff72b2fef8dc99
2020-03-20 19:29:51 +00:00
Joshua Duong
2a3d93f2cc Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958
Change-Id: Iaa687cccc1c6c7667350e8de751d7010cd872cf5
2020-03-20 19:16:42 +00:00
Joshua Duong
33659c99dc Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782
Change-Id: I502e79749c5df0b77a9024383545a1d273a5e10d
2020-03-20 19:16:40 +00:00
Joshua Duong
c6e68b5830 Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a
Change-Id: I869608c3ed88f6dfe3d3a3b8eb08ea03a278861b
2020-03-20 19:15:46 +00:00
Joshua Duong
8017331f64 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306
Change-Id: I9293a4340a3e73db11c79c8874340d507d745b87
2020-03-20 19:15:45 +00:00
Joshua Duong
74f5edce8c Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a
Change-Id: I67a48698ac2aeca3c31027d6f9d6b8658298e9c1
2020-03-20 19:15:42 +00:00
Joshua Duong
244ac12928 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306
Change-Id: If65e56f5a3fda563b742ac0ad15b3f962eca22c2
2020-03-20 19:15:41 +00:00
Joshua Duong
6fcb6b356a Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958
Change-Id: I90616c087e665c1d6980b9b6ac76f5f3d37be506
2020-03-20 19:04:50 +00:00
Joshua Duong
6efa33e306 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782
Change-Id: I3d3ab0f1b54cef538b8bbc75c48c187a631f9742
2020-03-20 19:04:48 +00:00
Joshua Duong
f5ff928958 Merge "Add visibility control to ADB QR code preference." into rvc-dev 2020-03-20 19:02:49 +00:00
Joshua Duong
2f7a77b782 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev 2020-03-20 19:02:49 +00:00
TreeHugger Robot
3b43a14172 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours am: 8a3c90359e -s ours am: c892944075 -s ours
am skip reason: subject contains skip directive

Change-Id: I567deed7570bf3cbfeb511058d1c40ba62fad094
2020-03-20 19:02:20 +00:00
TreeHugger Robot
509af6cb81 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18 -s ours am: 21058df4b3
Change-Id: I5221e3cdea75869dab3afbcb6f8ca8780c678adc
2020-03-20 18:45:21 +00:00
TreeHugger Robot
c892944075 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours am: 8a3c90359e -s ours
am skip reason: subject contains skip directive

Change-Id: I2ac3e3e7d32d788896970716c161262aaf6f7808
2020-03-20 18:38:44 +00:00
TreeHugger Robot
21058df4b3 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18 -s ours
am skip reason: subject contains skip directive

Change-Id: I6078067348010390012aa1ca5789ada3ab833b81
2020-03-20 18:31:56 +00:00
TreeHugger Robot
d661d78c52 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: f261041e88 -s ours am: 8b96070457 -s ours
am skip reason: subject contains skip directive

Change-Id: Id034b169f697468c4350f81da55ab9eae0a00df3
2020-03-20 18:27:22 +00:00
TreeHugger Robot
f786866134 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours am: 053d2baff2 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d7fdedc1dbc6d8a9d1478b46f17e7d292c0f833
2020-03-20 18:26:02 +00:00
TreeHugger Robot
c6e000ff18 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:00 +00:00
TreeHugger Robot
8a3c90359e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours
am skip reason: subject contains skip directive

Change-Id: I2ae49f68605be4f91a35202a0f18ae70101139bd
2020-03-20 18:12:49 +00:00
TreeHugger Robot
8b96070457 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: f261041e88 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia9d63da6c1d774e15de443e7d1bdf76d626a2aae
2020-03-20 18:12:43 +00:00
TreeHugger Robot
053d2baff2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours
am skip reason: subject contains skip directive

Change-Id: Iabc0a63cc8c59c6f0883b5f8e6c4e1ef0384cdfb
2020-03-20 18:12:04 +00:00
TreeHugger Robot
feaa91837a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours
am skip reason: subject contains skip directive

Change-Id: I56114e77ffad0fe5b9ab7683624332406138bdf5
2020-03-20 17:45:32 +00:00
TreeHugger Robot
f261041e88 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours
am skip reason: subject contains skip directive

Change-Id: Id431f37dea177c4b4ad6a65744d7582f460b67a5
2020-03-20 17:45:16 +00:00
TreeHugger Robot
65fb5c31c2 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-20 17:24:57 +00:00
TreeHugger Robot
0fea1bb772 [automerger skipped] Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: 8e0807a069 am: 7868ba726f am: 72cc464ad8 -s ours
am skip reason: Change-Id Ie9b9384610857e2999fe4642a93c2d31ce3315f3 with SHA-1 31f04d1585 is in history

Change-Id: I28a3aea60c1d439259ba0b7b538677348eb70b35
2020-03-20 17:23:14 +00:00
Beverly
509273cc03 Updates main page for Do Not Disturb
Settings > Sound > Do Not Disturb
- Update strings, more descriptive summary for DND Apps summary
- Move top-level ordering of preferences
- Remove old unused DND strings

Test: make RunSettingsRoboTests7
Test: make ROBOTEST_FILTER=ZenModeBypassingAppsPreferenceControllerTest RunSettingsRoboTests
Test: manual
Bug: 151845457
Merged-In: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
2020-03-20 17:12:55 +00:00
TreeHugger Robot
e84d70f8ee [automerger skipped] Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: d83b13f1c8 -s ours am: bf2eccc2d4 -s ours
am skip reason: Change-Id Ie9b9384610857e2999fe4642a93c2d31ce3315f3 with SHA-1 31f04d1585 is in history

Change-Id: I21e96c14e49f626831a949e52cce3544e7b60008
2020-03-20 17:07:53 +00:00
TreeHugger Robot
40976939b3 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: 8e0807a069 am: be2d41ffc6
Change-Id: I3ff53d6a54a7de51d3f121951a9a8e056fbaac91
2020-03-20 17:07:19 +00:00
TreeHugger Robot
72cc464ad8 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: 8e0807a069 am: 7868ba726f
Change-Id: I1e3dfa272a8762701aafd9b9afc920b17900a8de
2020-03-20 17:07:03 +00:00
TreeHugger Robot
7868ba726f Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: 8e0807a069
Change-Id: Ida2e8813fbb8b714f4d402cd2db5a18a341f657e
2020-03-20 16:50:45 +00:00
TreeHugger Robot
bf2eccc2d4 [automerger skipped] Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: d83b13f1c8 -s ours
am skip reason: Change-Id Ie9b9384610857e2999fe4642a93c2d31ce3315f3 with SHA-1 31f04d1585 is in history

Change-Id: If84c07cf361a394984a15d4594e0cfa0a16bb978
2020-03-20 16:50:44 +00:00
TreeHugger Robot
be2d41ffc6 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: 8e0807a069
Change-Id: I211b9944b0230131400551aa14b31c3a066db43c
2020-03-20 16:50:34 +00:00
TreeHugger Robot
d83b13f1c8 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6
Change-Id: I45bddca51ffc42668643f3b350294ebf1c1e4622
2020-03-20 16:32:40 +00:00
TreeHugger Robot
8e0807a069 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6
Change-Id: I808a81e954fab8d93583300fedd006d3cb8bebe3
2020-03-20 16:32:19 +00:00
TreeHugger Robot
9419711e08 Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5 am: 4758893d86 am: 72d61919a9 am: 1c4b201314
Change-Id: I07a0ab81afd41690094a2eb110f46a4b482d7251
2020-03-20 16:26:19 +00:00
TreeHugger Robot
534bb50ec6 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev 2020-03-20 16:21:05 +00:00
Rubin Xu
56d5cc244d Show in UI if admin has disabled face auth
Bug: 135747161
Test: manual
Change-Id: I13bf681be36a2ea5192f841ffcf423390189474c
2020-03-20 16:14:05 +00:00
TreeHugger Robot
1c4b201314 Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5 am: 4758893d86 am: 72d61919a9
Change-Id: I7262b4d1c12d12572709198032d921471ad25386
2020-03-20 16:08:39 +00:00
TreeHugger Robot
8a96ca9424 Merge "Update summary of low battery tip in tests." into rvc-dev am: 781ca5864d am: 41bb03252b am: d0eacd10ef am: 8c85b68534
Change-Id: Ic1679c43f0c5f2079126965b2125908ef1308109
2020-03-20 16:05:13 +00:00
TreeHugger Robot
75cdbf394a [automerger skipped] Merge "Ignore broken tests" into rvc-dev am: 3eddda5985 am: 8957104180 am: 1cdaf85548 am: 6109f52346 -s ours
am skip reason: Change-Id I59abca488d8cff2eb043ebe66aff9563cf3a01d4 with SHA-1 86ddac58a9 is in history

Change-Id: I092780b144eaaad5dc2fe2f750ad1d96fd877b18
2020-03-20 16:04:58 +00:00