Commit Graph

1451 Commits

Author SHA1 Message Date
Julia Reynolds
148d6ec9ff Merge "Only show enhanced options for migrated apps" into sc-dev am: 6ca32df6b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051178

Change-Id: I57afd181897fb288dea0734888d50cedd11ebd55
2021-04-05 18:47:58 +00:00
Julia Reynolds
6ca32df6b6 Merge "Only show enhanced options for migrated apps" into sc-dev 2021-04-05 13:30:57 +00:00
Julia Reynolds
cc907eadaf Only show enhanced options for migrated apps
Apps that are using the API or target > S.

Test: settings unit tests
Bug: 184027330
Change-Id: Ifae94e6392a19a215ea9beb1e816c221381bf057
2021-04-02 10:39:29 -04:00
Beth Thibodeau
f0f14c4f25 Merge "Update style of main media setting toggle" into sc-dev am: 6812256031
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13998846

Change-Id: I45c37b9cccdc462d3ea94486a09f24e7255102d1
2021-04-01 16:05:09 +00:00
Beth Thibodeau
6812256031 Merge "Update style of main media setting toggle" into sc-dev 2021-04-01 15:47:07 +00:00
Jeremy Goldman
5ef363aadd Merge "Revert "Unit tests for the VpnInfoPreference."" 2021-04-01 08:26:25 +00:00
Jeremy Goldman
761b0f0b77 Revert "Unit tests for the VpnInfoPreference."
This reverts commit 1e461619ab.

Bug: 183926662
Reason for revert: Quick fix to resolve broken test in production

Change-Id: Iadd655ed522c3c3c39109655183859e8b4875acd
2021-04-01 04:53:01 +00:00
Bill Lin
e43497ff54 Merge "2/ Make One handed mode support multiple user switch" into sc-dev am: e3e3fc915a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849836

Change-Id: I446caec4128640628d205babf4b5306c99a2eb90
2021-04-01 02:37:25 +00:00
Bill Lin
e3e3fc915a Merge "2/ Make One handed mode support multiple user switch" into sc-dev 2021-04-01 02:02:39 +00:00
Beth Thibodeau
643eb42323 Update style of main media setting toggle
Bug: 183347608
Test: visual
Test: atest MediaControlsPreferenceControllerTest
Change-Id: I0a882b769af93914ff01e428f9c07d3ab22cc36a
2021-03-31 12:12:27 -04:00
Bonian Chen
194af56330 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU"
* changes:
  Revert "[Settings] Support getSystemService(Class<T>)"
  Revert "[Settings] Convert to getSystemService(Class<T>)"
2021-03-31 14:30:40 +00:00
Arc Wang
9d5b4688e2 Merge "Fix com.android.settings.deviceinfo.storage.StorageEntryTest" into sc-dev am: aed1bba60a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029456

Change-Id: I3a382089a60bc5c036d7e5d2fee85ddff03de68f
2021-03-31 12:53:38 +00:00
Bill Lin
49ba85dc8a 2/ Make One handed mode support multiple user switch
Previously OHM did not support for multile user switch.
We get current user id in settings and get/put settings value
with currentUserId.

Test: manual switch user and check Settings > System > Gesture > One-Handed
Test: make RunSettingsRoboTests -j40

Bug: 182278800
Change-Id: I12dcc7b634ae19375358733357dc95197e81067c
2021-03-31 17:48:23 +08:00
Bonian Chen
d6f54ed90b Revert "[Settings] Convert to getSystemService(Class<T>)"
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
2021-03-31 09:37:03 +00:00
Arc Wang
a1fb47beb8 Fix com.android.settings.deviceinfo.storage.StorageEntryTest
StorageEntry#isStub() is unused and not built in apk.
Remove the method to fix test fail.

Bug: 184045592
Test: atest com.android.settings.deviceinfo.storage
Change-Id: I89d73c45111918c2ff01174d6fbb47f8c59f6968
2021-03-31 10:05:09 +08:00
Weng Su
045b3eba93 Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev am: 4e341b780a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13990616

Change-Id: I5845d9691397f86ade3e69279d8e9c33a6f53b99
2021-03-30 11:57:01 +00:00
Weng Su
4e341b780a Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev 2021-03-30 11:32:57 +00:00
Arc Wang
71ec654fcc Merge "Show "Files" category for public storage in Storage Settings" into sc-dev am: dd2f2f51e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975110

Change-Id: Iea8ea56dfa32eca83adeb75b5fc98668af017b80
2021-03-30 11:18:15 +00:00
Arc Wang
dd2f2f51e0 Merge "Show "Files" category for public storage in Storage Settings" into sc-dev 2021-03-30 09:48:04 +00:00
Arc Wang
c626380689 Show "Files" category for public storage in Storage Settings
Users can click this preference to see public storage files
in external file browsers.

Bug: 170918505
Test: make RunSettingsRoboTests ROBOTEST_FILTER=StorageItemPreferenceControllerTest
      manual
      Select private storage and public storage and observe UI
Change-Id: If3f0d59b2ebf941d70e81e60c4c2015b80e7cf33
2021-03-30 15:51:49 +08:00
Bonian Chen
e12af7c44d Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev am: fecfb7f5e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14022667

Change-Id: If7b7aed4d406cea84e118a9b8f9c29ae6206287d
2021-03-30 05:37:24 +00:00
Bonian Chen
fecfb7f5e4 Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev 2021-03-30 05:31:52 +00:00
Bonian Chen
234b698fb2 Revert "[Settings] Support getSystemService(Class<T>)"
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
2021-03-30 00:51:15 +00:00
Almaz Mingaleev
dd2a685756 Allow alternative time zone ID to be set device's zone.
If America/Godthab is set as device time zone, display it as if
America/Nuuk is chosen.
If time zone is known, but is not an alternative and not shown
in time zone picker, region will de derived from user's locale.

Bug: 155738410
Test: atest com.android.settings.datetime.timezone.model
Test: set persist.sys.timezone via adb and checked
Date & Time screen

Change-Id: I168fb4319e144dbe9e2496d06a681d4c09b411c0
2021-03-29 11:18:57 +01:00
Weng Su
439cc64b1c [Provider Model] Move the Internet unavailable Wi-Fi down
- Check the Wifi network have both INTERNET and VALIDATED capabilities
to achieve effective network access

- Move the Internet unavailable Wi-Fi down to the top of Wi-Fi list

- Don't paint color for the Internet unavailable Wi-Fi

- Screenshot:
  https://screenshot.googleplex.com/w82kbALssdTZmg4

Bug: 178457619
Bug: 178926547
Bug: 178978070
Test: manual test on device
atest -c InternetUpdaterTest \
         NetworkProviderWorkerTest \
         ProviderModelSliceTest

Change-Id: Idf04e556ab5a87abc5bc96d1934f5e8fd91fbfaa
2021-03-26 23:24:14 +08:00
Peter Wang
5babfac3d1 Fix coding styles for erase euicc only options
Bug: 159650638
Test: Build
Change-Id: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
Merged-In: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
2021-03-25 11:13:29 -07:00
Marie Matheson
24ef404cc4 Adds SecuritySetting feature for providing an alternative SecuritySettings fragment am: 4b302a166e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13959948

Change-Id: Ic64333aafe28c21b8d1657f3d264604c1ea1a2e3
2021-03-25 14:00:21 +00:00
Marie Matheson
4b302a166e Adds SecuritySetting feature for providing an alternative SecuritySettings fragment
Bug: 181764224
Test: New tests added to SettingsUnitTests.
Test: Tested manually with and without feature-provided fragment.
Test: No new failures in SettingsUnitTests, or robolectric. No failures in security directory of robolectric tests.
Change-Id: I21038baf3098c18e1713a332085a5efc376f73da
2021-03-25 11:50:27 +00:00
Arc Wang
14db8ee16e Merge "Fix resource problem in PrivateVolumeForgetTest" into sc-dev am: 89222adb7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989775

Change-Id: I6c77ad950d3744784ed365afd8de05c8807f60df
2021-03-25 09:24:58 +00:00
Weng Su
c3b036845e Merge "Correct the defined value of Maximize compatibility" into sc-dev am: 4675222987
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981642

Change-Id: I09f264fb071f7af47c461bc19f246cc394c519a4
2021-03-25 09:22:27 +00:00
Arc Wang
89222adb7f Merge "Fix resource problem in PrivateVolumeForgetTest" into sc-dev 2021-03-25 09:17:58 +00:00
Weng Su
4675222987 Merge "Correct the defined value of Maximize compatibility" into sc-dev 2021-03-25 08:30:02 +00:00
Arc Wang
e22d1493af Fix resource problem in PrivateVolumeForgetTest
Somehow Resource IDs are inconsistent between SettingsLib and
SettingsUnitTests. Import SettingsLibMainSwitchPreference to fix.

Bug: 183342958
Test: atest com.android.settings.deviceinfo.PrivateVolumeForgetTest
Change-Id: Id8dfccd520577fc1a8e5177e20e99b52bb57a66a
2021-03-25 06:31:57 +00:00
Peter Wang
4b8a6cd4b8 Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712 am: 204f35dc58 am: fe042ac08e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: I3daef123a7aee6810f4512f099c18c7fa22eb533
2021-03-25 05:47:51 +00:00
Peter Wang
fe042ac08e Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712 am: 204f35dc58
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: Ib9676c28c112cc712f91f9e8c40b1e1e9aa61fa4
2021-03-25 05:09:59 +00:00
Jeremy Goldman
c3723e22d5 Merge "VpnPreferenceControllerTest converted to JUnit" into sc-dev 2021-03-25 03:24:40 +00:00
Kevin Han
d2d32a8dc0 Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev am: bad7c091d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13986126

Change-Id: If6b6de316c761e30ffca47a8174bd4a93b563e38
2021-03-24 20:55:30 +00:00
Kevin Han
bad7c091d6 Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev 2021-03-24 20:37:03 +00:00
Ahaan Ugale
861a58ab89 Merge "Autofill Settings: Display the number of saved passwords." into sc-dev am: a8df0386ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13803855

Change-Id: I7e0be679fd52df2f3c5fd17779166521801b5a14
2021-03-24 18:55:51 +00:00
Ahaan Ugale
a8df0386ae Merge "Autofill Settings: Display the number of saved passwords." into sc-dev 2021-03-24 18:42:50 +00:00
Peter Wang
f8f7876c01 Removed unused import
Test: Build
Bug: N/A
Change-Id: Idd87913a67486deaf125b5b5aed89600bfac1982
2021-03-24 11:26:16 -07:00
Peter Wang
0b5532f67c Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" 2021-03-24 18:12:14 +00:00
Zhen Zhang
c86abd9b99 Fix HibernationSwitchPreferenceControllerTest
Fix the HibernationSwitchPreferenceControllerTest

Test: this is the test
Bug: 183585589
Change-Id: If97f664596e2724b3435b88ed7f3ea8c3fa4df94
2021-03-24 10:56:30 -07:00
Weng Su
f50e9c24c1 Correct the defined value of Maximize compatibility
- The return value defined by the Wi-Fi framework API is opposite to the
UI
  Compatibility on:  isBridgedModeOpportunisticShutdownEnabled() = false
  Compatibility off: isBridgedModeOpportunisticShutdownEnabled() = true

- Need to use the reverse value from Settings UI to the Wi-Fi framework API.

Bug: 183576049
Test: manual test
atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest

Change-Id: I731156806661bfbca14e7eaaa648a205a3d77b74
2021-03-24 21:56:57 +08:00
Arc Wang
fd8f6c9159 Merge "Fix resource problem in SettingsSliderPreferenceControllerTest" into sc-dev am: 7ed6ce93da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981625

Change-Id: I138a8d5dd0479b6d89987c49822f0023b6e67580
2021-03-24 11:32:25 +00:00
Arc Wang
7ed6ce93da Merge "Fix resource problem in SettingsSliderPreferenceControllerTest" into sc-dev 2021-03-24 11:17:53 +00:00
Arc Wang
2383c6c806 Fix resource problem in SettingsSliderPreferenceControllerTest
Somehow Resource IDs are inconsistent between Settings and
SettingsUnitTests. Import SettingsLibTwoTargetPreference to fix.

Bug: 183340630
Test: atest SettingsSliderPreferenceControllerTest
Change-Id: Icc404d8ebefe1399806775272a37c56845406bc7
2021-03-24 16:39:05 +08:00
Zhen Zhang
d64dff2c98 Merge "Update summary based on hibernated apps number" into sc-dev am: 59aa4f9cb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13955152

Change-Id: I2eaf37a821808a3797d0cf620ad9eeb852c01651
2021-03-24 06:48:01 +00:00
Zhen Zhang
59aa4f9cb1 Merge "Update summary based on hibernated apps number" into sc-dev 2021-03-24 06:42:56 +00:00
Jeremy Goldman
dcbde1138b VpnPreferenceControllerTest converted to JUnit
global settings string set to guarantee pre-test environment.
PreferenceManager and PreferenceScreen instantiated instead of mocks,
and mock preference inserted with getKey function overridden.

Bug: 176821216
Test: atest -c VpnPreferenceControllerTest
Change-Id: I94a881df13d1b35126de10f561d657136e4fed7f
Merged-In: I94a881df13d1b35126de10f561d657136e4fed7f
(cherry picked from commit 7361f8557c)
2021-03-24 05:33:13 +00:00