Commit Graph

81115 Commits

Author SHA1 Message Date
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
Ahaan Ugale
a2475f6843 Merge "Update summary for Passwords and Accounts." into sc-dev am: 2e46cdb287
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13978938

Change-Id: I190d862d7ab2d2cb3ba2d4aec31f27cd6c2a174c
2021-03-25 16:44:18 +00:00
Ahaan Ugale
2e46cdb287 Merge "Update summary for Passwords and Accounts." into sc-dev 2021-03-25 16:22:46 +00:00
Betty Chang
7a42295926 Merge "Display WiFi Version number" into sc-dev am: 62ba6db719
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989774

Change-Id: I28452abd34f2f083111ee0b03b32a158ea5db5ca
2021-03-25 15:44:34 +00:00
Betty Chang
62ba6db719 Merge "Display WiFi Version number" into sc-dev 2021-03-25 15:04:58 +00:00
Arc Wang
8c5ad0d0a4 Merge "Storage category UX changes in Storage Settings" into sc-dev am: 8774295309
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960257

Change-Id: Iec08cd70720b6aa80c25abaf7b54c00069309280
2021-03-25 14:22:03 +00:00
Arc Wang
8774295309 Merge "Storage category UX changes in Storage Settings" into sc-dev 2021-03-25 14:03:33 +00:00
Marie Matheson
e327ce6482 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: I443a2da67e595c5de66937b1b30bc8e17d8d65d8
2021-03-25 14:01:03 +00:00
Arc Wang
2b00ecdda9 Storage category UX changes in Storage Settings
- Change category types.
- Use Intent.ACTION_VIEW to show content of each category.
- Sort order of each category by storage size.

Bug: 170918505
Test: make RunSettingsRoboTests ROBOTEST_FILTER=StorageItemPreferenceTest
      make RunSettingsRoboTests ROBOTEST_FILTER=StorageItemPreferenceControllerTest
      manual
      Click each category in Storage Settings.
Change-Id: Ib7beb1779a0fcbfd7b8ec52446707b105fcebff5
2021-03-25 20:27:50 +08:00
Wesley.CW Wang
2ce80cdb6b Update Battery settings main page string (1/2)
- Update Battery usage preference summary string
 - Update Battery saver preference summary string
 - Update Adaptive preference column string
 Screenshot: https://screenshot.googleplex.com/6FVaoeHjTSFs2o6.png

Bug: 183689347
Test: make RunSettingsRoboTests -j40
Change-Id: I72c5ebb5d3fd189db7c40c645b8dab4367d154ba
2021-03-25 20:16:22 +08: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
Sunny Shao
7573545b7f Merge "Implement new "Open by default" page" into sc-dev am: 1c2216e543
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849841

Change-Id: Idd29340bb22e1b0835cfb8c9b331ffe12ccfc685
2021-03-25 11:11:40 +00:00
Sunny Shao
1c2216e543 Merge "Implement new "Open by default" page" into sc-dev 2021-03-25 10:58:22 +00:00
Tsung-Mao Fang
53bded37f2 Add collapsing toolbar to Device Admin Add page
Test: Built the apk and see new collapsing tool bar on this page
Fix: 183689071
Change-Id: I42457fc75f2b725b39e1a1187ffa6d21f5bfe164
2021-03-25 10:18:24 +00:00
Wesley.CW Wang
27b451d8df Adjust battery tips action am: f1e41c0bd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981627

Change-Id: I185f4b451f9b959e7559d2f9ce6aec25d48ba28c
2021-03-25 10:02:58 +00:00
Wesley.CW Wang
f1e41c0bd9 Adjust battery tips action
- Change low battery tips action to launch battery saver page
 - Enable smart battery tip when battery level is lower than expected and battery saver is off

Bug: 183582881
Test: make RunSettingsRoboTests -j40
Change-Id: I38b0ff7109d5ea95703edeade26cdfeed50f1403
2021-03-25 09:46:31 +00:00
changbetty
8fcb1f5974 Display WiFi Version number
- Display these type and hide the item in other case
   WIFI_STANDARD_11AX(6) WiFi 6
   WIFI_STANDARD_11AC(5) WiFi 5
   WIFI_STANDARD_11N (4) WiFi 4

-Screenshot
 https://photos.app.goo.gl/BbyZEQFyganEPfuw8

Bug: 117216087
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: Ic360e501d2e3bd80ce3bcb3ddf529ec5d00c1bcc
2021-03-25 17:29:31 +08:00
Ahaan Ugale
2c80a7ca98 Update summary for Passwords and Accounts.
Bug: 169455298
Test: manual - disable silky home and check summary
Test: make RunSettingsRoboTests
Change-Id: Id4574f5865c57ec6a5cd010412a59411ab9af546
2021-03-25 09:25:30 +00:00
Arc Wang
6c26974b83 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: I8b01c0dc88ede87d0b2dc60d32ca037cdad06408
2021-03-25 09:25:11 +00:00
Jason Chiu
f2a38ebaf7 Merge "Fix missing accounts category for single profile case." into sc-dev am: 288fe41e69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989853

Change-Id: I86a2743e14db3a28ea8ff0e3de090b645614a579
2021-03-25 09:24:39 +00:00
Weng Su
2674a25a0b 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: I0522a2a3dee1d003b862ae13bffd3c6b62974f0c
2021-03-25 09:24:32 +00:00
Pasty Chang
e544ec2587 Merge "Set ConfirmDeviceCredentialActivity non-external in FRP" into sc-dev am: 5f3cb0b666
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13697945

Change-Id: I2525f4195d4c7bbf3a8bea142c986a1c075238b2
2021-03-25 09:22:31 +00:00
Arc Wang
89222adb7f Merge "Fix resource problem in PrivateVolumeForgetTest" into sc-dev 2021-03-25 09:17:58 +00:00
Jason Chiu
288fe41e69 Merge "Fix missing accounts category for single profile case." into sc-dev 2021-03-25 09:01:36 +00:00
Weng Su
4675222987 Merge "Correct the defined value of Maximize compatibility" into sc-dev 2021-03-25 08:30:02 +00:00
Pasty Chang
5f3cb0b666 Merge "Set ConfirmDeviceCredentialActivity non-external in FRP" into sc-dev 2021-03-25 08:22:25 +00:00
Sunny Shao
81fa20a4f1 Implement new "Open by default" page
- Use the new MainSwitch and TopIntro widgets.
- Create VerifiedLinksPreference and LeftSideCheckBoxPreference.
- Create ProgressDialogFragment and SupportedLinksDialogFragment.
- Retrieve the links info from DomainVerificationManager.
- Allow user to change the supported links into selected links.
- Refactor the ClearDefaultsPreference.
- Move AppLaunchSettings into intentpicker directory.

Bug: 177923646
Bug: 182530528
Test: manual test
Change-Id: I935a2fdd0f62cdb8b8d3210fb2f800f682249cb7
2021-03-25 16:01:28 +08:00
Almaz Mingaleev
197b3fd092 Merge "Show pop-up banner when Location is off and user tries to enable GeoTZ." into sc-dev am: 206f12fd0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13930308

Change-Id: I1d5f25b8bb5922464c422528d5ce86f81dae83df
2021-03-25 07:28:49 +00:00
Almaz Mingaleev
206f12fd0a Merge "Show pop-up banner when Location is off and user tries to enable GeoTZ." into sc-dev 2021-03-25 07:09:43 +00:00
Ahaan Ugale
bd009abc36 Merge "Use a Quantity String for the autofill password count." into sc-dev am: 404e45d03a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13992105

Change-Id: I4c55c1fd29da2e118996e000657652215b2b50ff
2021-03-25 07:06:43 +00:00
Arc Wang
fadbe5b070 Launch StorageDashboardFragment instead of StorageSettings
Since users can use StorageDashboardFragment to choose storages,
it's not necessary to choose storages in StorageSettings.

Bug: 174964885
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LowStorageSliceTest
      manual
      Launch Storage Settings.
Change-Id: Ida61052c4294899099914d62da24ca2937a894a0
2021-03-25 14:43:39 +08: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
Ahaan Ugale
404e45d03a Merge "Use a Quantity String for the autofill password count." into sc-dev 2021-03-25 06:30:37 +00:00
Ahaan Ugale
507d987aa3 Fix missing accounts category for single profile case.
Bug: 169455298
Test: manual - with no accounts, with an account, with work profile.
 Clicking all preferences work as expected.
Test: make RunSettingsRoboTests
Change-Id: Ie206c52b259d2b6610aa2c6ea52cb276d49266a3
2021-03-24 22:57:29 -07:00
Peter Wang
5f5c56c0a1 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: Ie03b31ba0887726aedae81bbeb5cb0f6327177a3
2021-03-25 05:47:37 +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
Curtis Belmonte
b0ef5e3311 Merge "Add new strings for face auth/enrollment" into sc-dev am: 59cf802ee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13987721

Change-Id: I72895b6edf859ab75d436e4d8595aa2c8c6f6b4c
2021-03-25 04:46:36 +00:00
Sunny Shao
2754550cc4 Merge "Remove android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS enforcement" into sc-dev am: 5a342bcb0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13986128

Change-Id: I105b4df0b650e5dfc07ff580ccb11ea2fb5dbf46
2021-03-25 04:46:06 +00:00
Curtis Belmonte
59cf802ee4 Merge "Add new strings for face auth/enrollment" into sc-dev 2021-03-25 04:31:11 +00:00
Peter Wang
204f35dc58 Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: I9764d7070c44f8b8db654e9f6520d4f5c6d00cb3
2021-03-25 04:25:54 +00:00
Sunny Shao
5a342bcb0b Merge "Remove android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS enforcement" into sc-dev 2021-03-25 04:18:19 +00:00
Jeremy Goldman
280e53f139 Merge "Update strings in main VpnPreference." into sc-dev am: 417d5bdc7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975120

Change-Id: I6ea22825b8e79f1ccec29f56d5992e7062dd2f62
2021-03-25 04:08:24 +00:00
Jeremy Goldman
a4056286d9 Merge "VpnPreferenceControllerTest converted to JUnit" into sc-dev am: c3723e22d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975115

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

Change-Id: Ib2f683ebd6e5bb71d9702c698b6a112ba7b523b7
2021-03-25 03:46:25 +00:00
Ahaan Ugale
a768fb8065 Use a Quantity String for the autofill password count.
Bug: 169455298
Test: manual - check display with sample app and different numbers of
 passwords
Test: make RunSettingsRoboTests
Test: atest SettingsUnitTests:com.android.settings.applications.autofill.PasswordsPreferenceControllerTest
Change-Id: I12f2a415499c210df429088fe11c64e7431babb3
2021-03-24 20:37:54 -07:00
Jeremy Goldman
417d5bdc7c Merge "Update strings in main VpnPreference." into sc-dev 2021-03-25 03:36:26 +00:00
Jeremy Goldman
c3723e22d5 Merge "VpnPreferenceControllerTest converted to JUnit" into sc-dev 2021-03-25 03:24:40 +00:00
Winson
32fc88088d Remove android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS enforcement
With app links v2 changes, 3P apps will need access to this screen to
prompt users to approve their domains, so remove the permission
enforcement to allow them to do so.

Bug: 178648367

Test: presubmit

Change-Id: I8819d7c82f2dc771bb0001182bb16a08401732c7
2021-03-25 03:24:04 +00:00
Jeremy Goldman
de9d641349 Update strings in main VpnPreference.
If there is an insecure VPN, don't display the name of the vpn in the
summary. Instead, display "Not secure" if there is only 1 total vpn
available, and display the number of insecure VPNs + " not secure."

Screenshot: https://screenshot.googleplex.com/9Bxn7frDm7aVHtG
Test: manual test (because the junit test for the controller has not yet
been cherrypicked into sc-dev)
Bug: 176821216
Change-Id: Ie454d9605effd5208457e8c91b08cc382d4992af
2021-03-25 03:23:36 +00:00
Peter Wang
3fbb8612f5 Merge "Removed unused import" 2021-03-25 03:12:57 +00:00