PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,628 Commits 1 Branch 0 Tags
4c20cbfbe7055eaf39d6518d7f77c4e025cd4a66
Commit Graph

64628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
f4dabba6e3 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d81714214b 
Change-Id: Icadd6c0b4ded5e1605e5df0978569eeaa1523de9
 2020-04-20 18:28:12 +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
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
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
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
jasonwshsu
5effcb5598 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: 67dea59aeb am: cfda3179a6 
Change-Id: I72a8aa23c024e1a39853a9418f21eb19e1d66cdd
 2020-04-20 17:54:35 +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
e37e426cc0 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: 615a2398fe am: 9af05c5c23 
Change-Id: I56ac674b4c036263e36c8d3aa1d515f6aba1b4c4
 2020-04-20 17:28:18 +00:00
jasonwshsu
86125faa38 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: b25cd33e39 
Change-Id: I8e53f67acc53c97a7b5a7d006b104f28f595410c
 2020-04-20 17:27:05 +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
67dea59aeb Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 
Change-Id: Ie414f5b0ea32101371327845853c330eb297e12c
 2020-04-20 17:03:31 +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
f941055c1d Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c am: 181a657080 am: 59c64fefc0 
Change-Id: I41387d9552a4d2c74473abedb8f323934e568cb1
 2020-04-20 14:47:11 +00:00
Julia Reynolds
ce9b6157d7 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: 7f486ec9d7 am: 5fdf4bbfd8 
Change-Id: Icbd514c47a1ae6b876325fd12a364ccbdd233efe
 2020-04-20 14:27:46 +00:00
Julia Reynolds
f889af8b16 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c am: 075f8a5256 
Change-Id: Iaecc368637dc9451605df30236ea6359d168d1c2
 2020-04-20 14:27:32 +00: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
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
TreeHugger Robot
c4eb91c78a Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: 0199de663e am: 2729e0fa4f am: fa5fc6e7c8 
Change-Id: I901b9d676fa20c8c333255e39c5394e2da6e9952
 2020-04-20 07:41:55 +00:00
Bonian Chen
8579f254e2 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 6457a087c3 am: 2600816357 am: da9861f7ab 
Change-Id: I2f0a2e6ca217fe16af898aebf87d206bc6ec4a1d
 2020-04-20 07:41:19 +00:00
TreeHugger Robot
df134f0384 Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: e0311ea5bc am: 5ecf04426c 
Change-Id: I41c441c002e77c15b1777ba3474ee02dcb30bdfc
 2020-04-20 07:21:05 +00:00
Bonian Chen
1650d85069 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 9f4efa0ea2 am: 8af001fdc5 
Change-Id: I0affa9e26002246e8a23bbe3d9114024846d0de2
 2020-04-20 07:20:58 +00:00
TreeHugger Robot
6333db75d1 Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: 0199de663e am: ea9c5d94d7 
Change-Id: Idacfb815503a7129f13022c3aa5c778293376896
 2020-04-20 07:20:38 +00: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
Bonian Chen
da9861f7ab Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 6457a087c3 am: 2600816357 
Change-Id: Ibf26d84a2d97a3178d65075639db3c0a80f90783
 2020-04-20 07:20:16 +00:00
Bonian Chen
cd907c5b1b Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 6457a087c3 am: 662a1173fb 
Change-Id: I7be38921cddcb6c0e8c912b0267d29d1ee0f5bf9
 2020-04-20 07:20:16 +00: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
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
8af001fdc5 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 9f4efa0ea2 
Change-Id: I02313f4fe2c36ffcb30664c3f134ee24ca3292d7
 2020-04-20 07:02:48 +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
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