PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,558 Commits 1 Branch 0 Tags
7afa4dd1bea4ec99a779b63e670f273a1be65b51
Commit Graph

62558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tim peng
c118a89a68 Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 
Change-Id: Ie53b603df317bbc96d64d0796551745f3754bce9
 2020-04-21 06:10:05 +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
d4580c856b Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: ab1a5a5fa0 
Change-Id: I465c07baa584a29f27b37f2a028197187811a07b
 2020-04-21 02:55:39 +00:00
tim peng
a50534ad62 Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e 
Change-Id: I3fb1da1317942be19571153d35c133fc69110fd8
 2020-04-21 02:54:43 +00:00
tim peng
ab1a5a5fa0 Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a 
Change-Id: Ia7455d79077b2cc0ec08916bdc66cb30e6ea4616
 2020-04-21 02:34:26 +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
Brad Ebinger
61a44018eb [automerger skipped] Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046 am: f82153c3ec -s ours am: aa1ca9c180 -s ours 
am skip reason: Change-Id Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12 with SHA-1 de2ffe1f16 is in history

Change-Id: Id430487cb27c64b037f8c73182e670b51735dc19
 2020-04-20 21:54:44 +00:00
Brad Ebinger
8c2de745c6 [automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours am: 52cb98cac1 -s ours 
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790 is in history

Change-Id: Ib0fe0c5400d3c4209bbbbedb013d3d918c2259cb
 2020-04-20 21:52:44 +00:00
Brad Ebinger
aa1ca9c180 [automerger skipped] Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046 am: f82153c3ec -s ours 
am skip reason: Change-Id Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12 with SHA-1 de2ffe1f16 is in history

Change-Id: Ia23bb55900200ca47b093aead2430e06fc9126a0
 2020-04-20 21:29:31 +00:00
Brad Ebinger
52cb98cac1 [automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours 
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790 is in history

Change-Id: Iade0e884c0b5e98704e6892b1cbbd66b0d3d9c36
 2020-04-20 21:29:23 +00:00
Brad Ebinger
f82153c3ec Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046 
Change-Id: I765918f1712bb80006a3d0751a84477a94c2d432
 2020-04-20 21:06:10 +00:00
Brad Ebinger
2c60eb8851 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 
Change-Id: I1d6e0324ee8db02a75e3f14ebfe24fad369b0bd2
 2020-04-20 21:04:14 +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
Brad Ebinger
a7bf6a3046 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" 2020-04-20 20:40:50 +00:00
Brad Ebinger
a9295ea648 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." 2020-04-20 20:40:02 +00:00
Xiangyu/Malcolm Chen
0ab56379e4 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: f181589b71 
Change-Id: I1b08ab7479a81efef8b5adb72a78385cff83a4c6
 2020-04-20 19:49:33 +00:00
Xiangyu/Malcolm Chen
d781fe860c Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 
Change-Id: Iadec916a916cfc93147c68fa243a5f21f346dabe
 2020-04-20 19:47:57 +00:00
Xiangyu/Malcolm Chen
f181589b71 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 
Change-Id: I2e35616ac335cfb257d2de74ac83582f3b6019fb
 2020-04-20 19:28:16 +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
Brad Ebinger
6b87fa6705 Set the CHAR_LIMIT to 110 in order to support more translations. 
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 153376000
Fixes: 150941009
Test: manual
Merged-In: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
 2020-04-20 12:08:58 -07:00
Brad Ebinger
f6a1184c0f Change to Contact Discovery Dialog Language based on Privacy Feedback 
Fixes: 153376820
Bug: 141950843
Test: verify text
Merged-In: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
 2020-04-20 19:08:07 +00:00
Julia Reynolds
c525f2793d Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 44aed00a26 
Change-Id: Ib7fd90c499aff7ecdfb8a6382cc8ae216ae1160c
 2020-04-20 18:13:35 +00:00
Julia Reynolds
d81714214b Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e 
Change-Id: I8e5a6417cf5ac57faa0e8378d41d0e65ea1b95b4
 2020-04-20 18:11:50 +00:00
Julia Reynolds
44aed00a26 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed 
Change-Id: Ic0b76edf0c67693ac0563ce1b8bdc0f69ffcf17e
 2020-04-20 17:54:44 +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
9af05c5c23 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: 615a2398fe 
Change-Id: I9a65264827c4261c29f59ea2e0fd039ba6bcf999
 2020-04-20 17:03:52 +00:00
jasonwshsu
b25cd33e39 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 
Change-Id: I833a26326c9c30269ee07eab6fe9ba58ffceaa00
 2020-04-20 17:02:56 +00:00
jasonwshsu
615a2398fe Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 
Change-Id: Ia03258348afbbdf9549c1fadd4038be75ced45c0
 2020-04-20 16:44: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
5fdf4bbfd8 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: 7f486ec9d7 
Change-Id: I4437b6ac60c141a1f9573598ea8db9ca850c6242
 2020-04-20 14:03:47 +00:00
Julia Reynolds
075f8a5256 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c 
Change-Id: I9d18ecc39606a2690b781790ae4e93a4221de02c
 2020-04-20 14:02:35 +00:00
Julia Reynolds
7f486ec9d7 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 
Change-Id: I722abcb6f7b6be50ddbb8997e48bf6bf4f218e47
 2020-04-20 13:39:23 +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
5ecf04426c Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: e0311ea5bc 
Change-Id: I56a7bdce18c955106351c5c9d53925194bb97678
 2020-04-20 07:03:02 +00:00
Bonian Chen
8af001fdc5 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 9f4efa0ea2 
Change-Id: I02313f4fe2c36ffcb30664c3f134ee24ca3292d7
 2020-04-20 07:02:48 +00:00
TreeHugger Robot
ea9c5d94d7 Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: 0199de663e 
Change-Id: I12bf950958d6853eff67990a795b355d6e9c0d65
 2020-04-20 07:01:38 +00:00
Bonian Chen
662a1173fb Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 6457a087c3 
Change-Id: If686c48d92366de603a9a7527a7a257be073faac
 2020-04-20 07:01:33 +00:00