Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,284 Commits 1 Branch 0 Tags
e4cd381d3ca4e8405baee38db0ddaffdfd0da596
Commit Graph

36491 Commits

Author SHA1 Message Date
calvinpan
8c6218013d Clear the entries in updateState 
When user select the prefer network type that will also invoke
updateState(), so need to clear the entries to prevent adding duplicate
item.

Bug: 152031192
Test: By manual.
Change-Id: I05c5eae658cf72bdf05f5007b4aeba575ab14d61
 2020-03-23 14:09:54 +08:00
Treehugger Robot
cbe5bbdcd5 Merge "Fixed NullPointerException" am: 5fb16be925 
Change-Id: Ie99fc2139875e0f8dfbfbe0bd31f55f135607996
 2020-03-23 06:00:05 +00:00
TreeHugger Robot
c24801b26b Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: d582019b63 am: 742539e288 am: 22c2b61ee2 
Change-Id: Iefc7917e2fcc485fe5cdc784795b5be31f8d44aa
 2020-03-23 03:34:47 +00:00
tim peng
3e6ef24d82 Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 am: 7b1b527b13 am: a1185b6c2c 
Change-Id: Ie16d2387ab802a185233a5122e2d9ead133e6c37
 2020-03-23 03:02:58 +00:00
TreeHugger Robot
8e19b032b2 Merge "Updates main page for Do Not Disturb" 2020-03-23 02:52:46 +00:00
TreeHugger Robot
d582019b63 Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b 
Change-Id: I2573e4a5f478a60bc07424dec42b828ccb6e642e
 2020-03-23 02:42:30 +00:00
tim peng
7b1b527b13 Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 
Change-Id: I81fae7c73c5bd96aabcae7156e0fef98a49ed633
 2020-03-23 02:13:40 +00:00
TreeHugger Robot
dea87bd85b Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev 2020-03-23 02:07:56 +00:00
tim peng
f51bd0decb Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 
Change-Id: I2406caf1ecdb217658c310f4db948c627adcf790
 2020-03-23 01:59:00 +00:00
tim peng
f8f1b271b1 Merge "Update header information in output switcher" into rvc-dev 2020-03-23 01:47:25 +00:00
Arc Wang
263930d8b4 [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I 
Some tests are removed because WifiTracerLib listens to most intents
and callbacks to Settings APP, most of the receiving intent tests are
removed.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Id88a5c9276457e329840e72711bd06e51a03dd1f
 2020-03-23 09:42:35 +08:00
Beverly
5cfb5aa52d 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
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
 2020-03-23 01:41:45 +00:00
TreeHugger Robot
5d418f3082 Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3e87cf919d am: 1e734997b0 
Change-Id: I565e9b04d0f1f1b6429513847f10065e8fd44d97
 2020-03-21 04:08:52 +00:00
TreeHugger Robot
3e87cf919d Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 
Change-Id: I7b84db149a1410e1fb495b493690c7ae98d73dbb
 2020-03-21 03:38:12 +00:00
TreeHugger Robot
981d9e37cb Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b 
Change-Id: Idd8c529261fd853b5aba28f88139008ea489aa40
 2020-03-21 03:14:28 +00:00
TreeHugger Robot
a4e3d5ef8b Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev 2020-03-21 02:58:15 +00:00
Julia Reynolds
94b04df4b4 Redesign individual conversation page 
Test: atest
Fixes: 151765526
Change-Id: I98d45222104eb03449e469bcd80fd5f23c2935ca
 2020-03-20 18:34:24 -04: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
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
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
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
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
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
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
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
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
b61e67fc0c Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5 am: 4758893d86 am: bab104e792 am: 3e63e060a5 
Change-Id: I26ccf6d734195d059ec69b9af432bb5346f4562c
 2020-03-20 16:06:07 +00:00
TreeHugger Robot
bab104e792 Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5 am: 4758893d86 
Change-Id: Ia276b3d9dc6080c7fb9e7626124091e29d13d351
 2020-03-20 15:57:36 +00:00
TreeHugger Robot
ab09a70636 Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5 
Change-Id: I6af9222e1a643d9f7cb669ea01fc3918ed4da407
 2020-03-20 15:44:24 +00:00
Bonian Chen
b90fe0b04c [Settings] Apply ImsQueryController#isServiceStateReady to VoLte 
Apply ImsQueryController#isServiceStateReady() to VoLte part

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: I1535df837f2e015cd1afb0891fd69a98c7d6991a
 2020-03-20 23:33:47 +08:00
TreeHugger Robot
cdaf5d38b5 Merge "Disable the sync now menu while no any synced item" into rvc-dev 2020-03-20 15:25:04 +00:00
Joshua Duong
56ad92c3b9 Add visibility control to ADB QR code preference. 
The preference should be hidden if isAdbWifiQrSupported() is false.

Bug: 150163684
Bug: 149843499

Test: make RunSettingsRoboTests ROBOTEST_FILTER=AdbQrCodePreferenceControllerTest
Change-Id: I3e833440fb1a6f369ac97cec8db04f2b99dd4640
(cherry picked from commit 6178918653)
Exempt-From-Owner-Approval: cherry-pick
 2020-03-20 15:09:53 +00:00
Joshua Duong
75ae058627 Add toast error message for no WiFi on wireless debugging. 
Show a toast to connect to a WiFi network when the user tries to
enable wireless debugging while not connected to any Wi-Fi network.

Bug: 150139061
Bug: 149843499

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingEnablerTest

Change-Id: I389f5fddc874f60e8156ecf6ef2f1c6eddc1d7a5
Exempt-From-Owner-Approval: LGTM
(cherry picked from commit 564f6ba770)
 2020-03-20 15:08:30 +00:00
Joshua Duong
04bc02223e Merge changes from topic "adbwifi-bugs" 
* changes:
  Add toast error message for no WiFi on wireless debugging.
  Add visibility control to ADB QR code preference.
 2020-03-20 15:07:14 +00:00
Joshua Duong
564f6ba770 Add toast error message for no WiFi on wireless debugging. 
Show a toast to connect to a WiFi network when the user tries to
enable wireless debugging while not connected to any Wi-Fi network.

Bug: 150139061
Bug: 149843499

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingEnablerTest

Change-Id: I389f5fddc874f60e8156ecf6ef2f1c6eddc1d7a5
Exempt-From-Owner-Approval: LGTM
 2020-03-20 15:05:28 +00:00
Arc Wang
31f04d1585 [Wi-Fi] Fix Wi-Fi broken tests 
Bug: 150910070
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
Merged-In: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
 2020-03-20 14:07:13 +00:00
Automerger Merge Worker
6fad8f62f6 Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp am: 81299ce74d am: 106cf460f0 
Change-Id: I9518bc4eb9dc23aa34eae082e5426cae6a6ca4e3
 2020-03-20 11:49:39 +00:00
Bonian Chen
e2e597c538 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: 78b5db508b am: 5ec5ac505a 
Change-Id: I95b460761888220716bd2000976a01bc3ef92524
 2020-03-20 11:49:11 +00:00
Bonian Chen
d874f73d40 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: e3d992094a am: 2f5b6f5350 
Change-Id: I73692312ef9e266cddac3e6581798bfaeb23793c
 2020-03-20 11:48:42 +00:00
Junyu Lai
b5b6a47ebc Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0 
Change-Id: I55d1f78c8a0c90a1feef840865fdc9bb686da2cf
 2020-03-20 11:15:34 +00:00
Bonian Chen
78b5db508b Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e 
Change-Id: Id6591b6f9b6cb773cef09704440df379053f520a
 2020-03-20 11:15:25 +00:00
Bonian Chen
e3d992094a Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf 
Change-Id: Id182022f476a09a71f819f8ef0176fd99ef3545c
 2020-03-20 11:15:19 +00:00
Junyu Lai
2f60c6dddd Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 
Change-Id: I68335aa9d56608b1ca2d0180d25cdbf077737697
 2020-03-20 11:08:52 +00:00
Junyu Lai
040bfe3721 Merge "Adjust code for API council feedback" into rvc-dev 2020-03-20 11:03:47 +00:00