Automerger Merge Worker
63067d9e40
Merge "Blur developer setting" into rvc-dev am: 59b3974433
am: 148b737ef2
am: 386b605c61
am: a5fd9a5a44
...
Change-Id: If700d215220a17fb3c7d8617c680a080e485e732
2020-03-16 00:38:51 +00:00
Lucas Dupin
59b3974433
Merge "Blur developer setting" into rvc-dev
2020-03-15 23:28:13 +00:00
Automerger Merge Worker
29aa7d5408
Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96
am: 9f2fb9b595
am: 693cb5a2f2
am: 58dc174c23
...
Change-Id: I64b425f4dd30754586f4bbc472a6ea88b5cc3c2e
2020-03-13 17:30:43 +00:00
TreeHugger Robot
907905bb96
Merge "Refine remove locale warning dialog string" into rvc-dev
2020-03-13 16:43:45 +00:00
Automerger Merge Worker
74f957c212
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059
am: 62d9891328
am: 92b4f17fe2
am: b8743359a3
...
Change-Id: I03ff3d2c1bb45042cced1b8413af357187196d3b
2020-03-13 15:31:28 +00:00
Alex Johnston
37fa5bd059
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev
2020-03-13 14:28:15 +00:00
Automerger Merge Worker
7e427ab997
Merge "Fix tests" into rvc-dev am: 6d8e0fed61
am: f08d965b53
am: 648fe31181
am: 053b614f70
...
Change-Id: Ia20cbab27b29416dd55923bfb993e4d91dab8059
2020-03-13 10:19:57 +00:00
Tsung-Mao Fang
c7ecc98d5f
Merge "Ignore broken test case"
2020-03-13 10:04:29 +00:00
Tsung-Mao Fang
bac694f2a1
Ignore broken test case
...
Bug: 151279674
Test: Run robo test
Change-Id: I6777c126a084fc22a34c76d14f004e75a99dcd9f
2020-03-13 17:33:40 +08:00
TreeHugger Robot
6d8e0fed61
Merge "Fix tests" into rvc-dev
2020-03-13 09:27:16 +00:00
Automerger Merge Worker
a0587e8278
Merge "Remove ignore test case" into rvc-dev am: ad30345078
am: e94cbd98ff
am: 9d37d5df00
am: 526f23e533
...
Change-Id: I0ece09d2b21d44cea1f71e6bde51d9f2a5fbcf48
2020-03-13 05:57:03 +00:00
Edgar Wang
3b47408016
Refine remove locale warning dialog string
...
- If the first language is not selected, just remove the body copy
else warning user the locale will change to another language.
Fixes: 140723349
Test: manual & robotest
Change-Id: I9fec17ae85889f2864c3f3cae744f7181e6f9b2c
2020-03-13 12:49:21 +08:00
Edgar Wang
ad30345078
Merge "Remove ignore test case" into rvc-dev
2020-03-13 04:45:59 +00:00
Automerger Merge Worker
5616591d2b
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
am: 3f6c723044
am: 2c3ee203bf
am: f2755520a1
...
Change-Id: Ia42aae3bf00ba46dfac23c2172d4d5abbee3ef7d
2020-03-13 04:14:44 +00:00
TreeHugger Robot
89a6fafa33
Merge "Use values-night to control the dark mode background color" into rvc-dev
2020-03-13 03:13:27 +00:00
Automerger Merge Worker
8eb45c004d
Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538
am: ec6828f05e
am: 841b980a88
am: a9027be3b0
...
Change-Id: I3db1900bc659a06796695ebc7f2c1a8460d06c94
2020-03-12 23:32:35 +00:00
Julia Reynolds
49f40ee77b
Fix tests
...
Fixing one of them by removing an unneeded setting
Test: RunSettingsRoboTests2
Fixes: 151279674
Change-Id: If2b513ba7b4bf8ec5183e2a9457caab3d3e06dc4
2020-03-12 17:27:35 -04:00
Zhen Zhang
0ad0a50538
Merge "Log some actions for changing wifi hotspot config" into rvc-dev
2020-03-12 19:47:42 +00:00
Automerger Merge Worker
6bfc90ea6c
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b
am: 8dfa636433
am: f7e7def0a4
am: 0b883269c2
...
Change-Id: Ia6abe26b22ad4facd8de3cb258f7cba5fb1e7648
2020-03-12 18:00:38 +00:00
Alex Johnston
341f995971
DPC can be uninstalled in personal profile in New COPE
...
* For an organization-owned device, the DPC should be able to
be uninstalled in the personal profile. Previously, the
observed behaviour was that the uninstall button in the App
Info Screen was being greyed out.
* This was because the previous logic did not allow for
uninstalling any app which has a profile owner or device
owner on *any* user.
* This CL updates this logic, such that, for non-system apps
uninstalling is blocked only if the app has a profile owner
or device owner for the current calling user.
Bug: 149381804
Test: Manual testing
atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ifaf03daa41724dbbd869c7e1371a77cc39d15ac7
2020-03-12 13:38:19 +00:00
hughchen
728d63c014
Use values-night to control the dark mode background color
...
Bug: 149974597
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia10f7bab0ec7781db8b4b4dbdf359bb8a87672cc
2020-03-12 19:47:44 +08:00
Edgar Wang
651edc5c44
Remove ignore test case
...
Fixes: 147865441
Test: RunSettingsRoboTests ROBOTEST_FILTER=AssistFlashScreenPreferenceControllerTest
RunSettingsRoboTests ROBOTEST_FILTER=DefaultAssistPreferenceControllerTest
RunSettingsRoboTests ROBOTEST_FILTER=DefaultAutofillPickerTest
RunSettingsRoboTests ROBOTEST_FILTER=StyleSuggestionActivityTest
Change-Id: I46f2d4b1dc38047bea3b287f11dcc71b7aed6c87
2020-03-12 19:21:36 +08:00
shafik
143ec3ec2b
Update ManageExternalStorageDetailsTest setUidMode
...
We previously changed ManageExternalStorageDetails to use
AppOpsManager#setUidMode instead of AppOpsManager#setMode, but forgot to
update the relevant unittest. This CL changes that unittest.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ManageExternalStorageDetailsTest
Fix: 150914062
Change-Id: I2cfe7e7a19f2422474d11fb946089a6847b36b12
2020-03-12 09:43:55 +00:00
Zhen Zhang
63c7c202d7
Log some actions for changing wifi hotspot config
...
Log following actions:
- wifi hotspot name changed
- wifi hotspot password changed
Added tests for logging actions in each controller's test.
Bug: 151113705
Test: WifiTetherSSIDPrefereceControllerTest;
WifiTetherPasswordPreferenceControllerTest;
CodeInspectionTest
Change-Id: I84b1cd8449e575a6ee1ad8868e7791dc601e726f
2020-03-12 01:06:46 -07:00
Automerger Merge Worker
816f3b693c
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
am: c1059b0f25
am: 977a698823
am: ab91b6fc7d
...
Change-Id: I7ce1b6483994e8571d50c77e45ff0bc60e3fe4e4
2020-03-12 07:24:10 +00:00
Automerger Merge Worker
01233f2fc2
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a
am: 4c69bcab70
am: 5ed8894807
am: e5be54a8f4
...
Change-Id: I31126710d4b2085711992fcb3da0ffef6e804a23
2020-03-12 06:43:06 +00:00
Calvin Pan
59f5eb638e
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev
2020-03-12 06:25:11 +00:00
Automerger Merge Worker
e192eb634e
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
am: 70f287362c
am: 9701a87b2d
am: 37187c8141
...
Change-Id: I45dec95c06fe45e980bb4f62230058a20f059332
2020-03-12 05:40:59 +00:00
Menghan Li
873b50a46a
Merge "Update R acessibility assets and strings (2/n)" into rvc-dev
2020-03-12 05:37:32 +00:00
TreeHugger Robot
40613ef30c
Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev
2020-03-12 04:35:32 +00:00
Automerger Merge Worker
b73276489c
Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814
am: 93fedb0e3f
am: 9bd2280297
am: 1c9951fde6
...
Change-Id: Ie4c08847d5073c54b71827ed7f8cc19428628a3c
2020-03-12 03:49:06 +00:00
TreeHugger Robot
a7bd169814
Merge "Fix WifiTetherSettingsTest" into rvc-dev
2020-03-12 02:54:35 +00:00
Lucas Dupin
249d80ec7b
Blur developer setting
...
New dev-option for enabling and disabling blurs, on devices that support
it.
Bug: 149792636
Test: manual
Test: atest EnableBlursPreferenceControllerTest
Change-Id: I26b4739a7b811c461557316a9247f6a9c397048a
2020-03-11 18:17:46 -07:00
Automerger Merge Worker
2c830ace03
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584
am: 539815566f
am: c02b876009
am: cf13163981
...
Change-Id: I82f275ced9d8c11d74486596d54a3471cb294acf
2020-03-11 14:10:29 +00:00
TreeHugger Robot
f2639347e3
Merge "Fix and Ignore broken test cases"
2020-03-11 12:39:44 +00:00
Yi-Ling Chuang
b8eb466dd1
Fix WifiTetherSettingsTest
...
Bug: 151201888
Test: run WifiTetherSettingsTest successfully
Change-Id: I80df83f3dc720c80734ec083c33bab5c56c52796
2020-03-11 19:33:09 +08:00
Yi-Ling Chuang
f46fd991fa
Fix DevelopmentSettingsDashboardFragmentTest
...
Fixes: 151206654
Bug: 150907639
Test: robotests
Change-Id: I36a1dacc7fe2ccd3b724a9aa135447db97fa3d41
2020-03-11 19:16:35 +08:00
Tsung-Mao Fang
72b780aa89
Fix and Ignore broken test cases
...
Test: Run Test
Bug: 150914062
Bug: 151201888
Bug: 150907639
Change-Id: I7f467aebbbe35cb20d5c42b1db04e2838c12cfbb
2020-03-11 18:39:21 +08:00
Yi-Ling Chuang
542f76a51e
Fix TetherSettingsTest
...
Fixes: 151204777
Test: run TetherSettingsTest
Change-Id: Ic510aac7fc7f9af095e78473bc191a4e903dcaba
2020-03-11 18:18:36 +08:00
menghanli
19cf6ddff8
Update R acessibility assets and strings (2/n)
...
- Temporary-use template summary by shortcut state
Bug: 148837311
Test: Manual test
Change-Id: Ia720b8f3f317bb1874d6758ebc4fbf4145d0c217
2020-03-11 17:21:27 +08:00
Automerger Merge Worker
bb1deeca73
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
am: cb9cfc19c3
am: 570ec6a4a1
am: 99974b69db
...
Change-Id: I4a70e6fb297ea12873dc7b71f4bb1de3bafb703d
2020-03-11 05:08:29 +00:00
Automerger Merge Worker
5ed31a7e16
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
am: be6dd1a9c5
am: 81d2c6dad2
...
Change-Id: I979fa95da971363f2da11e46781e5076aa0517ec
2020-03-11 04:20:09 +00:00
Arc Wang
b8fb854e98
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev
2020-03-11 04:00:49 +00:00
TreeHugger Robot
6aa40f6ea7
Merge "Revert "Ignore some failed tests."" into rvc-dev
2020-03-11 03:16:49 +00:00
Yi-Ling Chuang
ef4550c504
Revert "Ignore some failed tests."
...
This reverts commit db4fd2b1c3
.
Reason for revert: Test failures are fixed.
Fixes: 150914017
Change-Id: I561816d51427f1141aae42128659b42cc25221dd
2020-03-11 03:16:33 +00:00
Automerger Merge Worker
e5a9590eb5
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340
am: 9bc76d1b50
am: 8cab6d80f9
am: 5c9b3e86ff
...
Change-Id: Idfcc1a72b9c9ddd3216694209226c4104238c26d
2020-03-10 13:26:54 +00:00
TreeHugger Robot
7c2979c340
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev
2020-03-10 12:12:46 +00:00
calvinpan
75867d8f63
Hide the 5G opiton when 5G has been disallowed
...
1. Create PreferenceEntriesBuilder for 5G entry. In the past, the
preferred network type entries was based on CarrierConfigManger value
but 5G option is based on allowed netowork type and device access
family, so include 4G and 5G logic in PreferenceEntriesBuilder.
2. If user selected item not in preferred network option, settings will
auto selected on the first item. For example, if user selected on 5G and
device disallowed 5G(5G option will be hide), so settings will selected
on first item(4G).
Bug: 149721842
Test: EnabledNetworkModePreferenceControllerTest
Change-Id: Ic447a137f9db4cf1a0048a8e58487c29b402bb48
2020-03-10 10:23:43 +00:00
Arc Wang
005fe6951c
[Wi-Fi] Add STA+AP information in Hotspot & tethering footer
...
Use WifiManager#isStaApConcurrencySupported() to check if a
device supports STA+AP and shows the footer information.
Bug: 121328949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest
Change-Id: I3446abb5cc9cdf76da8d17f5de31bd65715c165c
2020-03-10 18:15:13 +08:00
Automerger Merge Worker
07294f8c42
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4
am: 48d161b7b0
am: 0ed90e5f4c
am: b9289da489
...
Change-Id: I6f170f8240293e906ea3ed44c8f318fd87541f92
2020-03-10 09:12:52 +00:00