Commit Graph

66711 Commits

Author SHA1 Message Date
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
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
e35a4f8f9c Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: 0199de663e am: 2729e0fa4f am: fa5fc6e7c8 am: c4eb91c78a
Change-Id: I39c49e272df775864263eb9ba75fa16eb0d313da
2020-04-20 07:51:26 +00:00
Bonian Chen
4391b517ca Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 6457a087c3 am: 2600816357 am: da9861f7ab am: 8579f254e2
Change-Id: I3a96121896c5de9a0fa9bea363f50d48852f464c
2020-04-20 07:51:18 +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
8c6759a8ee Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: e0311ea5bc am: 5ecf04426c am: df134f0384
Change-Id: I110f524cc5821174e98f4dc8ce627c9da908ad6b
2020-04-20 07:39:45 +00:00
Bonian Chen
1ea5e97804 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 9f4efa0ea2 am: 8af001fdc5 am: 1650d85069
Change-Id: I3691132d260f35e58f5c8e3c2c5d4d58c59536cd
2020-04-20 07:39:37 +00:00
TreeHugger Robot
3f137df635 Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: 0199de663e am: ea9c5d94d7 am: 6333db75d1
Change-Id: I2b3b74ff09e59cc0802123bf1a11dcf44a3ea74f
2020-04-20 07:39:29 +00:00
Bonian Chen
5d7bbc04ab Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 6457a087c3 am: 662a1173fb am: cd907c5b1b
Change-Id: I9bc048d2f10e38421182af1daf3eaf9b5f06eee9
2020-04-20 07:39:07 +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
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
26684c0500 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours am: d37783a7ac -s ours am: 0af5bc2a6a -s ours am: cfed9b5cf2 -s ours
am skip reason: subject contains skip directive

Change-Id: I29aafa5039de1d2cc6fd579e4b44e6cc5d1e5b35
2020-04-19 17:28:12 +00:00
TreeHugger Robot
cfed9b5cf2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours am: d37783a7ac -s ours am: 0af5bc2a6a -s ours
am skip reason: subject contains skip directive

Change-Id: I37c61bde22a111e09fc90b8e8f99a248f1d61d79
2020-04-19 17:18:53 +00:00
TreeHugger Robot
656f6d5f17 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: 0d54da879e -s ours am: ebc7f0c01f -s ours am: 92c16ab0d4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia01fdfd8ff43a8422fa974e3459833b170402ed5
2020-04-19 17:17:39 +00:00
TreeHugger Robot
02ef450d48 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours am: 4535d27c66 -s ours am: 161cba0404 -s ours
am skip reason: subject contains skip directive

Change-Id: I663cb293f55e2b130312cae133825803b5ec2bef
2020-04-19 17:16:48 +00:00
TreeHugger Robot
92c16ab0d4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: 0d54da879e -s ours am: ebc7f0c01f -s ours
am skip reason: subject contains skip directive

Change-Id: I824d611d8f6beee29fc86ea459f813cdc862ed1a
2020-04-19 17:07:13 +00:00
TreeHugger Robot
0af5bc2a6a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours am: d37783a7ac -s ours
am skip reason: subject contains skip directive

Change-Id: I84e509f236d3ea7b26a6014ec3b911314810f438
2020-04-19 17:06:43 +00:00
TreeHugger Robot
161cba0404 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours am: 4535d27c66 -s ours
am skip reason: subject contains skip directive

Change-Id: I2078522ed57209c55d7515acc8c33c8600c6f568
2020-04-19 17:06:34 +00: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
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
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