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

61081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
2729e0fa4f Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: 0199de663e 
Change-Id: Iadc581a630249b0a65d1bfc49c72cef29fec3b9b
 2020-04-20 07:03:00 +00:00
Bonian Chen
2600816357 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 6457a087c3 
Change-Id: I33ba45bcc56d5ca016d6138ef3c9ea5b399fd1b2
 2020-04-20 07:02:47 +00:00
TreeHugger Robot
0199de663e Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 
Change-Id: I0e5c668b2b7f3e59eaf1c0c9634c364a145bb0c6
 2020-04-20 06:40:07 +00:00
Bonian Chen
6457a087c3 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 
Change-Id: I4a89a7a2075d723a8e70ed298b900546397239d5
 2020-04-20 06:39:57 +00:00
TreeHugger Robot
12a838d1f6 Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev 2020-04-20 06:39:46 +00:00
Bonian Chen
23ed0b2c34 [Settings] Avoid from EUICC access blocking main thread 
Avoid from EUICC accessing form main thread and timeout if API takes too
much time.

Bug: 143996139
Test: manual
Change-Id: Ic1a2bd948b69d40632555d293df6ed56a6b7a712
 2020-04-20 14:38:23 +08:00
Bonian Chen
d9dadc0511 Merge "[DataUsage] UX enhancement" into rvc-dev 2020-04-20 06:24:12 +00:00
Bonian Chen
a66cf69f1f [DataUsage] UX enhancement 
Some of the field didn't take eu languages into consideration.
Enhance it through changing the:
1. Format of display
2. Parser after user input
3. IME support for comma in eu language

Bug: 141536928
Test: Manual input and check for results
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=BillingCycleSettingsTest
Change-Id: Ia7afc88c9043e924f205f966c4091248261b0aee
 2020-04-20 12:54:43 +08:00
TreeHugger Robot
d37783a7ac [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia9d2b6c706a79da6a2a2772137b50ca0ccd1a720
 2020-04-19 16:53:40 +00:00
TreeHugger Robot
a1dd01f5c3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4bdcdfb0126c7ca79e7726bd70db546537133763
 2020-04-19 16:28:45 +00:00
TreeHugger Robot
517dfeb385 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-19 15:48:36 +00:00
Bonian Chen
8f67701294 [Settings] Support of DSDS API 
Replacing getDataEnabled() by isDataEnabledForApn().

Bug: 143996139
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=BillingCycleSettingsTest
Change-Id: If36cfcd7c6b44fb89957ebf9f741936041761d9c
 2020-04-19 21:19:18 +08:00
Bill Yi
b0ee01b3ab [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours am: 935ff6a18a -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie466022993d60576aa4371dc96240cd2d44eac61
 2020-04-19 08:48:38 +00:00
Bill Yi
1b87a5528c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I01bde29a6ada6179c207cf2f0f6bde1a8dbffceb
 2020-04-19 01:38:42 -07:00
Bill Yi
935ff6a18a [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2ca017ad434243993b9ac12f0b3be09789374b69
 2020-04-19 08:22:40 +00:00
Bill Yi
90cce123e5 [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours 
am skip reason: subject contains skip directive

Change-Id: I3e5cce528fa6eccc7e7de29516b96e54cfddddb1
 2020-04-19 08:05:02 +00:00
Bill Yi
f6f96f8a85 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ia460d84145b5e6f1ff7a4fb93ad34510ed1a6800
 2020-04-18 22:28:22 -07:00
Julia Reynolds
c1235654ef Update configure notifications screen am: f43cf08634 am: b84e194474 
Change-Id: Iceef427af06d9faa17737801fb5ab0274716fcc4
 2020-04-17 21:19:13 +00:00
Julia Reynolds
b84e194474 Update configure notifications screen am: f43cf08634 
Change-Id: Idc63949ef2f2ecaaae7891a01d6eb48cbf830eaa
 2020-04-17 20:58:04 +00:00
Julia Reynolds
cecc69512d Update conversation bubble settings 
Test: atest
Fixes: 153471239
Change-Id: If53571b17236e5f49a1750acc9816287f5de2b1a
 2020-04-17 16:32:44 -04:00
Julia Reynolds
f43cf08634 Update configure notifications screen 
Test: atest
Bug: 153150072
Change-Id: I99ebe2cad5036a154c40bce54dbd6ddbd23c2323
 2020-04-17 12:47:06 -04:00
Pavel Grafov
25054ba36d Stop disabling wifi toggle when tethering is restricted 
When an admin disallows the user from configuring tethering, the
user should still be able to configure wifi.
When an admin disallows wifi configuration, the behavior is
unchanged: the toggle stays enabled and allows the user to turn
wifi on and off, but clicking on the text results in admin
transparency dialog, so the user won't be able to change wifi
config.

Bug: 149481093
Test: manual with TestDPC as the device owner
Change-Id: I6b33e43901454125c7f3f4dd3c70f050997e4e71
 2020-04-17 15:06:43 +01:00
TreeHugger Robot
9e72486b90 Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634 am: e1e61d67b0 
Change-Id: I21a71cd24ff61441392ab30a2253bf87a1e8a2ac
 2020-04-17 10:40:10 +00:00
TreeHugger Robot
e1e61d67b0 Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634 
Change-Id: Ie8fa7609ffaf252d012cdbf54d758ed20f5e06e9
 2020-04-17 10:18:53 +00:00
TreeHugger Robot
87883c7634 Merge "Fix incorrect app count displayed under special app access" into rvc-dev 2020-04-17 10:07:21 +00:00
Yanting Yang
7cfd82900c Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33 
Change-Id: Iec93b0c7624a143328f229bb88a95eea48af96ee
 2020-04-17 09:47:01 +00:00
Yanting Yang
e611ebfb33 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 
Change-Id: I23093ff82e7a4b5e51570653d1dfa015f09da675
 2020-04-17 09:26:42 +00:00
Yanting Yang
674e2c23a3 Merge "Do not generate copyable slices for Settings Search" into rvc-dev 2020-04-17 09:06:28 +00:00