PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,739 Commits 1 Branch 0 Tags
5ccb69bcd0b107215e393674e936701b595dce31
Commit Graph

62739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
e0311ea5bc Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 
Change-Id: Ib0a2f2c1dd9ea3f08133e5989372db04d2c0fb17
 2020-04-20 06:41:38 +00:00
Bonian Chen
9f4efa0ea2 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 
Change-Id: I613fbf2dc6e744958065f05f9fb392ddc9e1af36
 2020-04-20 06:41:27 +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
ebc7f0c01f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: 0d54da879e -s ours 
am skip reason: subject contains skip directive

Change-Id: Ifafea4dfeb351c9c18a92fbacedddf3767b92b42
 2020-04-19 16:54:01 +00:00
TreeHugger Robot
4535d27c66 [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: I94133a33fc2a8e1a04290bc8d80a948903977b1a
 2020-04-19 16:52:39 +00:00
TreeHugger Robot
0d54da879e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours 
am skip reason: subject contains skip directive

Change-Id: I02b63a18f678d09f504f5c89266e3b99d48b5d42
 2020-04-19 16:30:06 +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
5d321540e2 [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours am: 12980747a1 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iaafdf0f1a8f05fa1f68e143827488de985c740ab
 2020-04-19 08:48:31 +00:00
Bill Yi
51ec4060ec [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: Icf6114966d7521d24dfcf7b50069d40a82cdd000
 2020-04-19 08:47:08 +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
12980747a1 [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours 
am skip reason: subject contains skip directive

Change-Id: Idb464788b9d8897e3263967235b85b809a3b333f
 2020-04-19 08:24:02 +00: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