Commit Graph

80762 Commits

Author SHA1 Message Date
Peter Wang
1b21e56ce3 [automerger skipped] Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a am: 5ef6e587c1 -s ours am: f7586147f8 -s ours
am skip reason: skip tag Change-Id I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2 with SHA-1 2404806afb is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: If6c5202bedcd8bc59cb178ef13bd51ab3a54b568
2021-03-25 22:59:06 +00:00
Peter Wang
f7586147f8 [automerger skipped] Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a am: 5ef6e587c1 -s ours
am skip reason: skip tag Change-Id I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2 with SHA-1 2404806afb is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: Ic75da4ead3956744f02d7f5d7036896bed2c7416
2021-03-25 22:18:21 +00:00
Peter Wang
5ef6e587c1 Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I82d7a91f9136998b8b438627ed68248a22c1dfa6
2021-03-25 21:36:39 +00:00
Soonil Nagarkar
ac9b143633 Merge "Remove dynamic location settings footer" into sc-dev am: 75703b3993
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13809765

Change-Id: I8fba4415161697eecbb6295b2e802654476dfe5a
2021-03-25 21:16:34 +00:00
Soonil Nagarkar
75703b3993 Merge "Remove dynamic location settings footer" into sc-dev 2021-03-25 21:08:32 +00:00
Peter Wang
2f30e9107a Merge "Fix coding styles for erase euicc only options" am: d3db03b520
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I0d7be5bf2e40af9a0c345be284a5bcc2058ebc8e
2021-03-25 20:50:10 +00:00
Peter Wang
d3db03b520 Merge "Fix coding styles for erase euicc only options" 2021-03-25 20:14:54 +00: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
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
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
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
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