Xiangyu/Malcolm Chen
fdb2d434ff
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: d781fe860c am: 4d35849139
...
Change-Id: Ibefe3cd3e37ebe3ae3f1b5f5d7044d50fd9d7e53
2020-04-20 20:40:32 +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
Julia Reynolds
47f216d234
Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d81714214b am: f4dabba6e3
...
Change-Id: Id3e85b99c55e7de2990e66804b22616c93ad5161
2020-04-20 18:45:12 +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
jasonwshsu
b59175a5a3
Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: b25cd33e39 am: 86125faa38
...
Change-Id: I2b40e454750f7a6d62696b30a9e4fc96133882d4
2020-04-20 17:43:01 +00:00
Julia Reynolds
bb979153ed
Merge "Set explicit back target for history" into rvc-dev
2020-04-20 17:40:18 +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
4b34bd1c31
Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c am: 075f8a5256 am: f889af8b16
...
Change-Id: I962e75a1cea26798f692ce4afd09b5394829dbd9
2020-04-20 14:45:31 +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
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
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
Bonian Chen
9f4efa0ea2
Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511
...
Change-Id: I613fbf2dc6e744958065f05f9fb392ddc9e1af36
2020-04-20 06:41:27 +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
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
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
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
Julia Reynolds
37e316a427
Update configure notifications screen am: f43cf08634 am: b84e194474 am: fa8f3a84dd am: 245a2af879
...
Change-Id: I572c46d4847973262e28171256ee6529f5f5d8c6
2020-04-17 22:13:09 +00:00
Julia Reynolds
fa8f3a84dd
Update configure notifications screen am: f43cf08634 am: b84e194474
...
Change-Id: I8844a5951be6d1932d40bd00c872d96d8e15dc56
2020-04-17 21:17:24 +00:00
Julia Reynolds
9cbee26069
Update configure notifications screen am: f43cf08634
...
Change-Id: I1892d5d51bbf24ab2109e841c649a578de78500d
2020-04-17 20:59:37 +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
0570778831
Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634 am: e1e61d67b0 am: 3cab004e92 am: 6a29024181
...
Change-Id: I39ac4373d34d9f9f92f8ab6feca93d6e1cff693f
2020-04-17 11:16:59 +00:00
TreeHugger Robot
3cab004e92
Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634 am: e1e61d67b0
...
Change-Id: Icfe81f6b080d5305de4492467804bad83bc157ca
2020-04-17 10:39:57 +00:00
TreeHugger Robot
4deaf56720
Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634
...
Change-Id: I8e9c0ce77944b57245ca25e3fe00bf427e061cd4
2020-04-17 10:19:04 +00:00
Yanting Yang
8356672f57
Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33 am: aefa9ea849 am: 0bef3161a7
...
Change-Id: I0e5cda5fdad841388ee14138aef6bc0ddb999008
2020-04-17 10:18:57 +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
aefa9ea849
Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33
...
Change-Id: I0296e6afd75136175907f6dbf7ee80b30762d31f
2020-04-17 09:46:48 +00:00
Yanting Yang
47e38c8260
Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3
...
Change-Id: I08128e064ed1e31c162f990f018ce272bf528f48
2020-04-17 09:26:51 +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
Yanting Yang
b6c30a2c31
Do not generate copyable slices for Settings Search
...
Copyable slices is to provide user a quickly sub-text copying way on
Settings Search. Since we plan to remove all sub-text from Settings
Search, the copying feature is no longer available.
Therefore, we don't need to generate copyable slices in Settings
anymore.
Impact search result:
Build number, Phone number, Hardware version, Serial number and IMEI
Bug: 143118037
Test: visual and robotests
Change-Id: I81474aed994678c42d73cc59e169573880de1378
2020-04-17 13:25:22 +08:00