Commit Graph

80732 Commits

Author SHA1 Message Date
Lucas Lin
5ee7a7d07d Merge "Change the parameter type from ContentResolver to Context" 2021-03-17 06:35:21 +00:00
TreeHugger Robot
fdb6af2d20 Merge "Update string for Intent Picker" into sc-dev 2021-03-17 06:35:14 +00:00
TreeHugger Robot
c35e0bfa58 Merge "[Provider Model] Update airplane mode icon" into sc-dev 2021-03-17 06:16:20 +00:00
Bonian Chen
49cdb602ea [Settings] Support getSystemService(Class<T>)
Add getSystemService(Class<T>) to align the capability with framework
part.

Bug: 179640862
Test: local
Change-Id: I278951c2402aa8551cee37923f45626ab1830dd3
2021-03-17 13:32:32 +08:00
Edgar Wang
e92aa74878 Merge "Change packagename of TwoTargetPreference" into sc-dev am: 0c914077aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13566505

Change-Id: I8157b4547e76761c7868fae41c69cc4979d41166
2021-03-17 05:17:00 +00:00
Edgar Wang
0c914077aa Merge "Change packagename of TwoTargetPreference" into sc-dev 2021-03-17 05:08:21 +00:00
Lucas Lin
320d69cdf3 Merge "Change the parameter type from ContentResolver to Context" into sc-dev am: 78a02d76c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885645

Change-Id: Ie6d8d0758e09d62acbca31d1f3d9c491bf47466d
2021-03-17 03:46:07 +00:00
Lucas Lin
78a02d76c4 Merge "Change the parameter type from ContentResolver to Context" into sc-dev 2021-03-17 03:27:28 +00:00
Sunny Shao
5b541f082b Update string for Intent Picker
- Replace the "Supported links open in this app" with the
  "Allow web links to open in this app".

bug: 177923646
Test: compilation
Change-Id: I90c8a2f133bd35cf6e59ebe10dec40e06cb34cdf
2021-03-17 11:07:54 +08:00
jasonwshsu
c2057ae257 [Accessibility button settings] Remove half circle option in size selector
Half circle accessibility floating menu mode changed to be triggered from gesture.

Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: I123baaf3684d5cbb0a33fc2383da72aa022876c0
2021-03-17 02:44:48 +00:00
TreeHugger Robot
a371de6413 Merge "Allow SettingsMainSwitchBars to be disabled" into sc-dev am: 8105206432
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13887336

Change-Id: Id44284ef8988ebd80d3586fde4462aeab3754102
2021-03-17 02:25:20 +00:00
TreeHugger Robot
8105206432 Merge "Allow SettingsMainSwitchBars to be disabled" into sc-dev 2021-03-17 01:56:40 +00:00
Peter Wang
2404806afb Fix coding styles for erase euicc only options
Bug: 159650638
Test: Build
Change-Id: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
2021-03-16 18:09:49 -07:00
TreeHugger Robot
2bec77689e Merge "Only display single line for title" into rvc-qpr-dev am: a5ea519cc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849828

Change-Id: I8972ff3ca02d7ebd435f65a8eef5228b9a20fbc5
2021-03-16 23:54:35 +00:00
TreeHugger Robot
a5ea519cc6 Merge "Only display single line for title" into rvc-qpr-dev 2021-03-16 23:29:09 +00:00
Salud Lemus
ae41810b23 Update Device Admin Info admin message for a financed device
Bug: 182804474
Test: Used a test device that is registered via ZT

Change-Id: I7e2d3342ac0e71485a80823a8d565c95a00fee7a
2021-03-16 21:21:49 +00:00
Julia Reynolds
5166e3939d Allow SettingsMainSwitchBars to be disabled
Test: manual, looking at notification settings
Fixes: 182859292
Change-Id: I06db2a0984b0dcbf71a69fc8f58e54b4670652a8
2021-03-16 14:55:18 -04:00
Rajeev Kumar
334b01e941 Merge "Update Device Admin Info Settings text for a financed device" into sc-dev am: d2ca004392
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879788

Change-Id: I804462fc2a687a4e2cce249f676d8bdc07b975ae
2021-03-16 17:18:07 +00:00
Rajeev Kumar
378fcf6547 Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev am: 815558188f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879789

Change-Id: I6dd1b17fcaecc628fa93a87cafdafc77a5774a82
2021-03-16 17:17:47 +00:00
Rajeev Kumar
d2ca004392 Merge "Update Device Admin Info Settings text for a financed device" into sc-dev 2021-03-16 16:50:35 +00:00
Rajeev Kumar
815558188f Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev 2021-03-16 16:50:02 +00:00
Weng Su
a15019ce88 [Provider Model] Update airplane mode icon
- Screenshot:
  https://screenshot.googleplex.com/ULE5bL6sxXKzdN6

Bug: 182438540
Test: manual test
Change-Id: I2ef2cfa40d6fbc6bc164d57ca981bc216dacede4
2021-03-16 22:57:41 +08:00
Bonian Chen
d42d9a41f6 Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02 am: c27980c1a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941

Change-Id: I8efdc871c29a6c56aacf7a1b553a20c9cafc765d
2021-03-16 14:45:42 +00:00
Bonian Chen
c27980c1a9 Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941

Change-Id: I365757ae7bb17cabb39e377eb23aaf4ac97013b9
2021-03-16 14:09:39 +00:00
Tsung-Mao Fang
b77cf0afd1 Revert "Add javadoc about lifecycles for xml defined Controllers." am: 23562377b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885648

Change-Id: I241829cf9063e97d46a6f04ca54dc65cb0695297
2021-03-16 14:08:04 +00:00
Tsung-Mao Fang
3660bb97b4 Revert "Use androidx LifecycleObserver for wiring up controller ..." am: da9d5a1f92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885647

Change-Id: I0b4b55385d7640f55369434bebfcaa401ec65aed
2021-03-16 14:08:02 +00:00
Weng Su
68b0057f66 Smart Router settings UI changes
- Remove "AP band" preference

- Add "Maximize Compatibility" switch preference
  - Use bridged mode API for new devices (after P21)

- Screenshot:
  https://screenshot.googleplex.com/84X9Av8gVj3idjB

Bug: 168052744
Test: manual test
atest WifiTetherMaximizeCompatibilityPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Ib74156c0fa6eccdd13239854047b1fb4e49a293c
2021-03-16 21:50:55 +08:00
Bonian Chen
d248042a02 Merge "[Settings] Code refactor - remove unused import lines" 2021-03-16 13:47:28 +00:00
Shireesha Bongarala
e384fa00d9 Add strings for Safety & Emergency section
Change-Id: Ie3b0cf6fcd980e966c63aff5c87ad879b50588b5
2021-03-16 11:48:06 +00:00
Tsung-Mao Fang
23562377b0 Revert "Add javadoc about lifecycles for xml defined Controllers."
Revert submission 13804074-controller-lifecycle

Reason for revert: ag/182373167, see a crash related to this new cl.
Reverted Changes:
I39ac69f24:Use androidx LifecycleObserver for wiring up contr...
I086620e31:Add javadoc about lifecycles for xml defined Contr...

Change-Id: I6b539199de52432bb367303f5f78363886a05512
2021-03-16 10:34:46 +00:00
Bonian Chen
203f0fe89d [Settings] Code refactor - remove unused import lines
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style

Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
2021-03-16 10:24:24 +00:00
Tsung-Mao Fang
da9d5a1f92 Revert "Use androidx LifecycleObserver for wiring up controller ..."
Revert submission 13804074-controller-lifecycle

Reason for revert: ag/182373167, see a crash related to this new cl.
Reverted Changes:
I39ac69f24:Use androidx LifecycleObserver for wiring up contr...
I086620e31:Add javadoc about lifecycles for xml defined Contr...
Fix: 182373167

Change-Id: I7e6d2e9e6fd363a3afdd3dbab24e7c3b36e9ed29
2021-03-16 10:21:23 +00:00
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
Jeremy Goldman
ee3d56468b Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" 2021-03-16 08:15:56 +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
00128511e0 Merge "Update settings for app hibernation" into sc-dev am: a922c902f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13762606

Change-Id: I70d1671e6934821af56b2564e943c5812979af1b
2021-03-16 06:27:50 +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
e220ad779c Merge "Update subtext for require unlock for NFC" into sc-dev am: 2d3fbae37a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13871570

Change-Id: If242016275a30a3cf598365cc9ea94ea2adec30e
2021-03-16 03:29:17 +00: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
3f85039d97 Merge "Update auto-rotate UI to comply with guidelines" into sc-dev am: 833bf3eaf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13827308

Change-Id: Id8f1e7f47d808ebab7aea6c0b783cf17f582489c
2021-03-16 00:18:09 +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
ea7d718396 Merge "Fix auto-rotate summary not updating on devices without smart-auto-rotate" into sc-dev am: e12ad9777e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13842305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92f6be6e08d536316c124710cca445686deff007
2021-03-15 17:06:15 +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