Alex Johnston
a47f5c1a1c
Allow enabled IMEs to be disabled in Settings
...
* If an IME is not in the permitted IME list and is enabled,
the user should be able to disable it.
* This prevents the IME from being stuck in a state where the
user cannot disable it and as a result the user's device
becomes uncompliant with their IT admin's policy.
Manual testing steps:
* Install TestDPC
* Set up work profile using TestDPC
* Install swiftkey in the work profile
* set permitted input methods (in TestDPC) to only system
* Use adb to enable Swiftkey
* Go to Settings and verify Swiftkey can be disabled
* Once disabled, verify Swiftkey cannot be re-enabled.
Bug: 180517539
Test: manual testing
Change-Id: I7bdd3a0c4fed4d16006445b7774fd1006cc2b569
2021-03-16 10:12:46 +00:00
lucaslin
8ffc3908ff
Change the parameter type from ContentResolver to Context
...
Context is more useful than ContentResolver, it can provide more
information if we want to change the behavior in the future.
Bug: 172183305
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
Change-Id: I6c06460b67f81112db311f0739457d5f1e2e4554
2021-03-16 17:41:37 +08:00
lucaslin
11e738c3a0
Change the parameter type from ContentResolver to Context
...
Context is more useful than ContentResolver, it can provide more
information if we want to change the behavior in the future.
Bug: 172183305
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
Change-Id: I6c06460b67f81112db311f0739457d5f1e2e4554
Merged-In: I6c06460b67f81112db311f0739457d5f1e2e4554
2021-03-16 09:36:12 +00:00
Lucas Lin
e30a49423b
Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889
am: 73c971a5af
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I6ae6e3f272c275ee3590328aa6039e2b995859c4
2021-03-16 08:46:30 +00:00
Lucas Lin
73c971a5af
Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I2ce646a34a7fc521b42c221faadfe6779f1c5ca4
2021-03-16 08:06:34 +00:00
Lucas Lin
159f261889
Merge "Use getPrivateDnsMode() to get the value of private DNS"
2021-03-16 07:39:35 +00:00
TreeHugger Robot
a922c902f6
Merge "Update settings for app hibernation" into sc-dev
2021-03-16 05:53:23 +00:00
Zhen Zhang
48bd52e091
Update settings for app hibernation
...
Created an preference in Apps & Notifcations page as the entry point for
apps that are hibernated. Also added a switch preference in AppInfo page
for users to exempt an app from hibernation.
Bug: 181172051
Test: HibernatedAppsPreferenceControllerTest;
HibernationSwitchPreferenceControllerTest;
AppInfoDashboardFragmentTest
Change-Id: I72a90ab391cd521150fc155a6d9c67c846b7360d
2021-03-15 21:34:46 -07:00
George Chang
2d3fbae37a
Merge "Update subtext for require unlock for NFC" into sc-dev
2021-03-16 02:43:33 +00:00
Salud Lemus
0e0247e5e4
Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device
...
Bug: 182839352
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest
Change-Id: I42bb9ce9a624fa20cd755af2d323b4c4f94048f7
2021-03-16 01:42:07 +00:00
Abel Tesfaye
833bf3eaf7
Merge "Update auto-rotate UI to comply with guidelines" into sc-dev
2021-03-15 23:52:26 +00:00
Salud Lemus
2ce6dc82b3
Update Device Admin Info Settings text for a financed device
...
Bug: 182804474
Test: Used a test device that is registered via ZT
Change-Id: Ia48e1767038f8dc3d8965ee30bc7aa9efaec59ef
2021-03-15 21:05:38 +00:00
Abel Tesfaye
e12ad9777e
Merge "Fix auto-rotate summary not updating on devices without smart-auto-rotate" into sc-dev
2021-03-15 16:27:16 +00:00
Alex Johnston
74be0de267
Merge "Cred mng app settings - close onRemove" into sc-dev
2021-03-15 13:33:47 +00:00
Treehugger Robot
e0c081b02e
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
am: c38b502c4a
am: f21b7ac120
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I422c40567fc90176cea5242494028d621c1656a5
2021-03-15 12:54:33 +00:00
Treehugger Robot
f21b7ac120
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
am: c38b502c4a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2ab0c8c81b6ba25a32bd41437c6a37cda9fc0e9
2021-03-15 12:12:13 +00:00
Chiachang Wang
1516f4e8bb
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
am: 201429b683
am: 4589965ebd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I966ca888ce14550ac0b76bbcf59e4e50015d44c3
2021-03-15 11:33:25 +00:00
Treehugger Robot
c38b502c4a
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d177c825df890a2d8947173e85ddd401e9f7361
2021-03-15 11:30:18 +00:00
Treehugger Robot
56834d2ce3
Merge "Add OWNER to network/datausage/wifi path"
2021-03-15 11:02:28 +00:00
Chiachang Wang
4589965ebd
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
am: 201429b683
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0118ce1ed80dd4b672e98f8a7a905d42462f24f
2021-03-15 10:51:50 +00:00
Chiachang Wang
201429b683
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d7e876c9fb8bf81a300b6b76154672e0d3b04c7
2021-03-15 10:14:46 +00:00
Alex Johnston
6469518bf3
Cred mng app settings - close onRemove
...
Remove credential management app and close
settings screen when remove button is selected
Manual testing steps:
* Set app as creg mng app
* Remove cred mng app via Settings
* Verify screen is closed on remove
Bug: 177909523
Test: manual testing
Change-Id: Ie38a5340a4985fb4997f353556f49e9589e8da5f
2021-03-15 10:11:39 +00:00
Chiachang Wang
d709b55250
Merge "Replace the hidden getActiveLinkProperties usage"
2021-03-15 09:42:16 +00:00
George Chang
4d396f9580
Update subtext for require unlock for NFC
...
update nfc_secure_toggle_summary
Bug: 182384599
Test: check subtext
Change-Id: I06f11587f14d262727fcc293a73df4504f68c4f0
2021-03-15 17:33:21 +08:00
Chiachang Wang
fd1fa9c0a8
Replace the hidden getActiveLinkProperties usage
...
It's a refactor work to remove the hidden connectivity method
usages outside the incoming connectivity module.
CM#getActiveLinkProperties is hidden and no longer supported
outside the module. Caller should replace it with
CM#getLinkProperties(Network), so replace the usage as it is.
Bug: 172183305
Test: m
Change-Id: I20bcc9da97113da352e43a87d029596c9729cad8
2021-03-15 09:07:48 +00:00
Bill Yi
4cd2f79deb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f062373bd
-s ours am: 62fd4e850b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I359662a106e00919d242612601d0fa19055c679a
2021-03-15 07:27:42 +00:00
TreeHugger Robot
1e90c63385
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3bb6f3afa1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad518d1e586e592527375f4a7ed7797515a8d7be
2021-03-15 07:07:16 +00:00
Bill Yi
1b13a3fc1a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c4a622b49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868208
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I82d562515bf9c26ecb4ebca5759acb2b7a05688d
2021-03-15 07:06:56 +00:00
Bill Yi
62fd4e850b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f062373bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f9a496b81acc2f2f31dab8546d6f2add2db1f75
2021-03-15 07:02:44 +00:00
Betty Chang
ebea5200cb
Add OWNER to network/datausage/wifi path
...
Change-Id: I30ca24ea0823378d18b39a2eae937378662f6c14
2021-03-15 06:39:14 +00:00
TreeHugger Robot
3bb6f3afa1
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-03-15 06:35:45 +00:00
TreeHugger Robot
d5ab407fce
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-15 06:26:57 +00:00
tim peng
28d9db3c86
Merge "Show advanced Bluetooth information in device detail page" into sc-dev
2021-03-15 05:26:45 +00:00
Jeremy Goldman
22b94fb3fd
Add goldmanj to the Settings' vpn2 directory Owners file
...
Change-Id: I91f560230a5dde1014a18c3d3bd03d1ed6f91dd6
2021-03-15 03:20:32 +00:00
Stanley Wang
9138b055d2
Merge "Remove the non-translatable tags from MainSwitch titles." into sc-dev
2021-03-15 02:53:56 +00:00
Tim Peng
90df1c9de1
Show advanced Bluetooth information in device detail page
...
-Apply new metadata on aosp/1596412
Bug: 182338346
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest
make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: Ic48ed9213111d0c6ec19b317d4c22e1400261706
2021-03-15 10:16:14 +08:00
TreeHugger Robot
70e508edd4
Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev
2021-03-15 01:53:00 +00:00
Lucas Lin
be164d0a55
Merge "Use getPrivateDnsMode() to get the value of private DNS" into sc-dev
2021-03-15 01:00:25 +00:00
Bill Yi
464f6aa64c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic6dd705e34982d51bdd2648bc4f20646d7bd6aba
2021-03-14 22:14:01 +00:00
Bill Yi
5f062373bd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9c6912b3ddd71aeecf639f628f15d04723ffea1d
2021-03-14 19:39:14 +00:00
Bill Yi
0c4a622b49
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iccfaa49e229aeb8c5365144394c6fd2635ee2a91
2021-03-14 18:08:33 +00:00
Bill Yi
97e669d333
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iba69fb0c0a9d7edb15865e4444f8d558465ce2f4
2021-03-14 17:36:32 +00:00
Minche Li
29ff0e0552
Merge "Updates magnification settings string" into sc-dev
2021-03-14 02:02:20 +00:00
Dmitri Plotnikov
656c67c01d
Encapsulate BatterySipper and BatteryConsumer in BatteryEntry
...
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryEntryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.AdvancedPowerUsageDetailTest
Change-Id: I67ab825c25b85012b5713736db62e0beb4d98a16
2021-03-13 12:51:47 -08:00
Yanting Yang
d604ca93dc
Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev
2021-03-13 16:56:29 +00:00
TreeHugger Robot
f575da48e5
Merge "Fix the issue of the repo upload hooking checker" into sc-dev
2021-03-13 16:40:53 +00:00
TreeHugger Robot
041966442f
Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev
2021-03-13 02:35:13 +00:00
Abel Tesfaye
e57c87528d
Fix auto-rotate summary not updating on devices without smart-auto-rotate
...
Test: locally with crosshatch
Bug: 181585193
Change-Id: I571b10556ff2f4f4d6ff960fcfdf7866405d5ee5
2021-03-13 02:14:57 +00:00
Yu-Han Yang
d8df0d97e2
Move WiFi/Bluetooth scanning toggles to new pages
...
Screenshots: http://shortn/_ZmO6y9Zi5S
Bug: 180533061
Test: on device
Change-Id: I1223c9f5641bcc24b3e16af45138643f62849b8b
2021-03-12 16:52:17 -08:00
TreeHugger Robot
38e0dae439
Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev
2021-03-12 23:52:00 +00:00