PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,702 Commits 1 Branch 0 Tags
fbb7b19880cdd98dcb2625c8dfbe7da24410b2cb
Commit Graph

61702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
0987923594 Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961 
Change-Id: Ibed580769fc846df8d3f6c6d58df8668bff34378
 2020-04-21 08:25:04 +00:00
Bonian Chen
5bc8aa7961 Merge "[Settings] Code refactor" into rvc-dev 2020-04-21 08:21:28 +00:00
Bonian Chen
05a2603d55 Merge "[Settings] Support of DSDS API" into rvc-dev am: 57c2df4c7c 
Change-Id: I09ceb36bc6c8e73737bdb72c7bcc65080181b7ed
 2020-04-21 08:18:04 +00:00
Arc Wang
205b585cf3 [Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks 
When users click a Wi-Fi network and it's
WifiConfiguration.getNetworkSelectionStatus().hasEverConnected()
is false, WifiSettings2 will launch the Wi-Fi edit UI for users
to edit password again.
It's not necessary to show the Wi-Fi edit UI if the Wi-Fi network
is a open network.

Bug: 154548505
Test: manual
      Click a never connected secure Wi-Fi and edit UI shows.
      Click a never connected open Wi-Fi and edit UI does not show.
Change-Id: Ie8489aff001942f92fbfaafd772f84b1b4a09cf4
 2020-04-21 16:04:03 +08:00
Bonian Chen
57c2df4c7c Merge "[Settings] Support of DSDS API" into rvc-dev 2020-04-21 07:55:07 +00:00
Xiangyu/Malcolm Chen
2c71b962e1 Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a am: 9df4b0ce58 am: 75a67ffdd4 
Change-Id: I3754195354bf1b49cc634d902c14611f27d07e75
 2020-04-21 07:39:46 +00:00
Bonian Chen
6718cc0eeb Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev am: 7606dfd931 am: 7fdf4b50b1 am: 818ff09fc3 
Change-Id: Icaf8fe826dadc20652110f4115d16430af3b5c2e
 2020-04-21 07:39:39 +00:00
Xiangyu/Malcolm Chen
75a67ffdd4 Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a am: 9df4b0ce58 
Change-Id: I264f2579d7e5a5c93e1bf9e7a34bbb200349fa02
 2020-04-21 07:16:33 +00:00
Bonian Chen
818ff09fc3 Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev am: 7606dfd931 am: 7fdf4b50b1 
Change-Id: I862819927107eb6547487ed639fdc0c82a4cda24
 2020-04-21 07:16:26 +00:00
Bonian Chen
dcef423720 [Settings] Refactor test case DataUsageSummaryPreferenceControllerTest 
Refactor test case of DataUsageSummaryPreferenceControllerTest

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Ieb551a32d87c53cbd0765e19e710f1f0469da9d5
 2020-04-21 15:08:27 +08:00
Bonian Chen
0f47147543 [Settings] To avoid from crash when callback 
Callback from SubscriptionManager and PhoneStateListner may comes in
under the case of Preference not available.

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Change-Id: I50b83b4488d272f6482bde5f09b57d59e6fc27a3
 2020-04-21 15:02:14 +08:00
Xiangyu/Malcolm Chen
9df4b0ce58 Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a 
Change-Id: I1a56d11a7c96f970fe1b0fe929e47f165ac1df29
 2020-04-21 07:00:43 +00:00
Bonian Chen
7fdf4b50b1 Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev am: 7606dfd931 
Change-Id: Ia7987b7418b430b0ae85b3340f29c2b52689f7eb
 2020-04-21 07:00:34 +00:00
Sunny Shao
5094248487 Ignore a lot of failed roboletric test cases 
Bug: 154568213
Bug: 154568594
Bug: 154567856
Bug: 154566065
Bug: 154566012
Bug: 154566007
Bug: 154564960
Bug: 154564366
Bug: 154564361
Bug: 154564994
Bug: 154563784
Bug: 154564243
Bug: 154563562
Bug: 154564136
Bug: 154564211
Bug: 154563778
Bug: 154563910
Bug: 154562715
Bug: 154563116
Bug: 154562264
Bug: 154562785
Bug: 154563290
Bug: 154561690
Bug: 154562361
Bug: 154560878
Bug: 154560145
Test: make RunSettingsRoboTests
Change-Id: I220540d519b222ad7d3b69070a9262bb25f22d23
 2020-04-21 15:00:30 +08:00
Xiangyu/Malcolm Chen
eb27c7d94a Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev 2020-04-21 06:47:18 +00:00
Bonian Chen
9bc2f7f8bc [Settings] Code refactor 
Minor code refactor

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Change-Id: I060e7c880d91a0e5059610c5ceae319d47c19c7a
 2020-04-21 14:43:48 +08:00
Bonian Chen
7606dfd931 Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev 2020-04-21 06:40:40 +00:00
tim peng
7e3d1754eb Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: 434ec84186 am: 4c66989e41 
Change-Id: I610be3bc9488ddd197cf923544057dddef88038a
 2020-04-21 06:34:14 +00:00
tim peng
4c66989e41 Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: 434ec84186 
Change-Id: I79b2a3bfedd7ede394d2f36b07fe897cdd98de04
 2020-04-21 06:23:16 +00:00
tim peng
434ec84186 Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 
Change-Id: I7e9d43442830167d5764739ff64a1833de6accb0
 2020-04-21 06:09:15 +00:00
tim peng
58f9d0c7b9 Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev 2020-04-21 05:51:25 +00:00
tim peng
108c131b67 Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e am: 7fdd5143df 
Change-Id: I6193c62bf5be2800f6f78ca040a2dd88c7f67951
 2020-04-21 03:15:04 +00:00
tim peng
7fdd5143df Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e 
Change-Id: Iefa9abd901b78d8adffebc27701394f678c09a03
 2020-04-21 02:55:39 +00:00
tim peng
f864bed27e Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a 
Change-Id: I7390f6a18144c796e5fb9a297c4678d469a1808a
 2020-04-21 02:33:40 +00:00
Tim Peng
4fe1de57a5 Change the wording from "Stop casting" to "Stop" 
-The string is freezed. Reuse current "Stop" string

Bug: 153705889
Test: make -j42 RunSettingsRoboTests
Change-Id: I39184dcbfda5937677ab171a66ad5dcbbb8e6b68
 2020-04-21 10:22:15 +08:00
tim peng
db86b2ef2a Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev 2020-04-21 02:17:30 +00:00
jasonwshsu
f74c0a72b6 Show default description only if description and html description are empty 
* AccessibilitySettings only get the description to pass to the
ToggleFeaturePreferenceFragment
* ToggleFeaturePreferenceFragment handle the default description logic

Bug: 154092127
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.accessibility.AccessibilitySettingsTest"
Change-Id: I516a393aeef1472ca5d185d477a2b0b108fc5342
 2020-04-21 01:34:22 +00:00
Zhen Zhang
c10ec56e0f Add ethernet tether option into AllInOneTetherSettings 
Create controller for ethernet tether preference in
AllInOneTetherSettings and corresponding test.

Test: AllInOneTetherSettingsTest; UsbTetherPreferenceControllerTest;
BluetoothTetherPreferenceControllerTest;
EthernetTetherPreferenceControllerTest;
WifiTetherDisablePreferenceControllerTest; TetherEnablerTest
Bug: 153690620

Change-Id: I8918d5c8a82c521b00eb3c712af80c2041778595
 2020-04-20 13:53:58 -07:00
Xiangyu/Malcolm Chen
791b99a6fe Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: db0a05c926 
Change-Id: Icaaf82055dae2b1ba4f37253e61b721b76d5cfec
 2020-04-20 20:12:35 +00:00
Xiangyu/Malcolm Chen
db0a05c926 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 
Change-Id: I62475cd44c69f04227a3e5e56de343fef675242c
 2020-04-20 19:49:05 +00:00
Xiangyu/Malcolm Chen
8ca377ffd4 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 
Change-Id: Ia9defd6ddcc917f333568fef33f093eb024e6eb2
 2020-04-20 19:27:12 +00:00
Malcolm Chen
80be9de6d0 Define a helper link for 5G limitation in DSDS footer. 
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
 2020-04-20 19:12:16 +00:00
Xiangyu/Malcolm Chen
9674276bb5 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev 2020-04-20 19:10:15 +00:00
Julia Reynolds
2ae4ad8242 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d1cd33c72b 
Change-Id: If0058e1c3c25bb1da0b41cd5fd2b8531dc444495
 2020-04-20 18:27:57 +00:00
Julia Reynolds
d1cd33c72b Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e 
Change-Id: Iaf430693d977ba185c5241558d444bb581227196
 2020-04-20 18:13:07 +00:00
Julia Reynolds
4fa251613e Merge "Set explicit back target for history" into rvc-dev am: bb979153ed 
Change-Id: I2c81ca3114f44cab401b7f698cde7ae5481b8ebb
 2020-04-20 17:53:22 +00:00
Julia Reynolds
bb979153ed Merge "Set explicit back target for history" into rvc-dev 2020-04-20 17:40:18 +00:00
jasonwshsu
cfda3179a6 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: 67dea59aeb 
Change-Id: I1436f461c510965b401b8e221af6fb0a22e08cda
 2020-04-20 17:28:46 +00:00
jasonwshsu
67dea59aeb Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 
Change-Id: Ie414f5b0ea32101371327845853c330eb297e12c
 2020-04-20 17:03:31 +00:00
jasonwshsu
e7766cc455 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 
Change-Id: I711b86a69ef33f24fa8dc1e175e3cb8c6741532b
 2020-04-20 16:43:22 +00:00
Julia Reynolds
6c8451a89f Set explicit back target for history 
Test: manual
Fixes: 153554906
Change-Id: Ic3198afae878e3cfbfbfa7e72b1c71a6f4e74a2e
 2020-04-20 11:31:43 -04:00
jasonwshsu
1be2666d11 Remove unused attribute 'EXTRA_SUMMARY_RES' 
* Magnification already use EXTRA_HTML_DESCRIPTION to replace it.

Bug: 154092127
Test: manual test
Change-Id: I5385907eb0911894159a80444493bf233bb43e1a
 2020-04-20 23:09:59 +08:00
Julia Reynolds
59c64fefc0 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c am: 181a657080 
Change-Id: I43558ed8a9ca4c2a21112bdc762807c9b992e64f
 2020-04-20 14:26:58 +00:00
Julia Reynolds
181a657080 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c 
Change-Id: I507228b6d30c8dfb5052a1190f7e803cc9301d72
 2020-04-20 14:03:59 +00:00
Julia Reynolds
a8bb57287c Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 
Change-Id: Id6c256f18943631a727b212d39b102c93f1a0f63
 2020-04-20 13:37:30 +00:00
Julia Reynolds
608bd69328 Merge "Update conversation bubble settings" into rvc-dev 2020-04-20 13:16:57 +00:00
Alex Johnston
d1a31ab6b3 Update Wi-Fi configs restrictions 
* Update isNetworkLockedDown in WifiUtils
  to check the profile owner if the device
  is an organization-owned managed profile
  device.
* Update the logic to check if a Wi-Fi
  network can be forgotten (for both the
  device owner and profile owner of an
  organization-owned device).

Bug: 150197944
Bug: 153605361
Test: manual testing
      make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiDetailPreferenceController2Test
      make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiUtilsTest

Manual Testing Steps
A. Provision TestDPC in 'Device Owner' mode.
   - Create a Wi-Fi config in TestDPC.
   - Enable 'DO created Wi-Fi configs are
     modifiable only by DO'.
   - Go to Settings and verify that the network
     created cannot be modified and the 'Forget'
     button is not displayed.
B. Provision TestDPC in 'Profile Owner of an
   organization-owned managed profile' mode.
   - Create a Wi-Fi config in the work profile
     instance of TestDPC.
   - Enable 'DO created Wi-Fi configs are
     modifiable only by DO'.
   - Go to Settings and verify that the network
     created cannot be modified and the 'Forget'
     button is not displayed.
C. Provision CtsVerifier in 'Device Owner' mode.
   - Go to 'Device owner tests' > 'Wifi
     configuration lockdown'.
   - Create a Wi-Fi config then follow the
     instructions.

Change-Id: Ie3c71113441a3aca62563310ad0e53d89fa04226
 2020-04-20 12:25:47 +01:00
Tim Peng
71dd32ded0 Hide volume slider in Output Switcher when volume adjustment is restricted 
-Check UserManager.DISALLOW_ADJUST_VOLUME
-Hide slider when unsupported

Bug: 153922342
Test: 1.Open CTS-V app > Device Owner Tests
2.install CtsEmptyDeviceOwner.apk -"adb install -r -t CtsEmptyDeviceOwner.apk"
3.enter the command "adb shell dpm set-device-owner com.android.cts.emptydeviceowner/.EmptyDeviceAdmin"
4.push Check device owner button
5.open Policy transparency test and go to Disallow adjust volume > Enable the switch > Open settings.

Change-Id: Iac2793ead6d93d4eaada19c4eec33885d4b97138
 2020-04-20 09:09:07 +00:00
Peter_Liang
a277adc7c7 Uniform the settings enum proto for accessibility tutorial. 
Replace 'DIALOG_TOGGLE_SCREEN_ACCESSIBILITY_BUTTON' and 'DIALOG_TOGGLE_SCREEN_GESTURE_NAVIGATION' with DIALOG_ACCESSIBILITY_TUTORIAL.

Bug: 148989018
Test: manual test
Change-Id: I991cc8fac532982ebdb4995b42ea01a3dc0e52e3
 2020-04-20 16:00:39 +08:00
TreeHugger Robot
fa5fc6e7c8 Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: 0199de663e am: 2729e0fa4f 
Change-Id: Idec81561fed2bd0c9e5540e2e5ffcaf89def1887
 2020-04-20 07:20:28 +00:00