Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,503 Commits 1 Branch 0 Tags
6cb994b13b67284db66786e6177044fdb2b20bf3
Commit Graph

30842 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Bonian Chen
be71dbdda7 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 
Change-Id: I218e2a34c62eaef6307475d1c5add31d3ff9ded4
 2020-03-20 11:01:52 +00:00
Bonian Chen
e495a049c4 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e 
Change-Id: Ia9cef50655182a53cae97115708490848974b78e
 2020-03-20 11:01:48 +00:00
Bonian Chen
26fb6c29c1 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev 2020-03-20 10:52:38 +00:00
Bonian Chen
06899ffb8e Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev 2020-03-20 10:48:03 +00:00
Bonian Chen
594c267e99 [Settings] mSubId should not be overridden in 
TelephonyBasePreferenceController

mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.

Bug: 150535296
Test: manual
Change-Id: I391b034c9badd43094ab52b8b6488bca07ef3c86
 2020-03-20 10:46:52 +00:00
Arc Wang
04854f8234 [Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings 
When WifiTracker2 callbacks to Wi-Fi Settings, should check if the
activity is finishing at first.

Bug: 151677440
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I95737eae3f67e6471c75ba845b57af2d721d5d37
 2020-03-20 18:02:02 +08:00
Yi-Ling Chuang
6950877b7a Fix ContextualAdaptiveSleepSliceTest 
ADAPTIVE_SLEEP has been moved from Settings.System to Settings.Secure
but the main logic hasn't synced with the change which leads to the
failure.

Fixes: 139319542
Test: robotests
Change-Id: I56f58cc3da5a4034e2bf2ed5a63ae3bc2fec2a21
 2020-03-20 17:29:03 +08:00
TreeHugger Robot
c2e24ebb2b Merge "[Wi-Fi] Fix Wi-Fi broken tests" 2020-03-20 08:53:54 +00:00
Arc Wang
4fafe6716c [Wi-Fi] Fix Wi-Fi broken tests 
Bug: 150910070
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
 2020-03-20 15:41:29 +08:00
Bonian Chen
4a49f426fb [Settings] Avoid from accessing IMS with invalid subscription id 
Check subscription ID before accessing to IMS APIs

Bug: 149190278
Test: make and manual test
Change-Id: I0561529ccaf23c84d7d6dd3e268386ab82f17418
 2020-03-20 13:31:35 +08:00
Sooraj Sasindran
50021cec85 Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d am: cb5953d272 am: 46a5ddb514 
Change-Id: Ia9e327ab1eedd47004a2d15c4e7fe9703d8dfdc1
 2020-03-20 05:30:49 +00:00