Commit Graph

80762 Commits

Author SHA1 Message Date
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
Fan Zhang
770f8efe02 Merge "Button for opening app from Safety settings page" into sc-dev am: d2e71827cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13984250

Change-Id: I54843f489932058cea2e7ee3d23067d37e581cdc
2021-03-25 03:04:19 +00:00
Fan Zhang
d2e71827cf Merge "Button for opening app from Safety settings page" into sc-dev 2021-03-25 02:38:12 +00:00
Minche Li
3ddf67bdd8 Merge "Corrects the string for magnification dialog" into sc-dev am: ff6c9e231f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13984246

Change-Id: I6855d2139a4b464354369a86167714ea15ffd3ab
2021-03-25 02:36:44 +00:00
Minche Li
ff6c9e231f Merge "Corrects the string for magnification dialog" into sc-dev 2021-03-25 01:52:24 +00:00
Robin Lee
afcab7fe85 Merge "Move alarms_and_reminders strings to SettingsLib" into sc-dev am: d7b51a7b05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13974286

Change-Id: Ic3c1da7db4e8754599bc038d03a38d1d74208d3d
2021-03-25 01:13:53 +00:00
Curtis Belmonte
6aaee7f89f Add new strings for face auth/enrollment
Test: Build and install

Bug: 182806496
Bug: 183649070
Change-Id: I17efa5fee0babcece9c5fb2eb83e8cab4a575f2a
2021-03-24 17:48:01 -07:00
Robin Lee
d7b51a7b05 Merge "Move alarms_and_reminders strings to SettingsLib" into sc-dev 2021-03-25 00:44:37 +00:00
Fan Zhang
a288358343 Button for opening app from Safety settings page
Bug: 179063896
Test: Manual

Change-Id: I4cf627d630de277ebea3fe551d6799e5589e1af3
2021-03-24 23:46:49 +00:00
Michael Wachenschwanz
ae599280bf Merge "Add MobileRadio/Gnss MeasuredBatteryConsumpter methods to FakeUid" into sc-dev am: 448dac80de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13959658

Change-Id: I600e07d8eb4b94f002e027dd017185cb2b4b22ff
2021-03-24 20:55:46 +00:00
Kevin Han
4820b8c2e2 Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev am: bad7c091d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13986126

Change-Id: Id7d386997c7cd74471d86883ee4f49fb2275f10c
2021-03-24 20:55:20 +00:00
Fan Zhang
79ce82b680 Merge "Add strings for Safety & Emergency section Bug: 179063896 Test: make Settings" into sc-dev am: c5242cbea9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975105

Change-Id: I16a8ce919c51f294367fdbbfb52b8a081add7ce6
2021-03-24 20:54:49 +00:00
Michael Wachenschwanz
448dac80de Merge "Add MobileRadio/Gnss MeasuredBatteryConsumpter methods to FakeUid" into sc-dev 2021-03-24 20:46:34 +00:00
Kevin Han
bad7c091d6 Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev 2021-03-24 20:37:03 +00:00
Fan Zhang
c5242cbea9 Merge "Add strings for Safety & Emergency section Bug: 179063896 Test: make Settings" into sc-dev 2021-03-24 20:36:41 +00:00
Shireesha Bongarala
af15313b34 Add strings for Safety & Emergency section
Bug: 179063896
Test: make Settings

Change-Id: Ife43a597fa7262978e705fef96c783f109ff3f16
2021-03-24 20:29:27 +00:00
Peter Wang
b2b4de78e3 [automerger skipped] Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8 am: 447fc31966 -s ours am: 67f7068065 -s ours
am skip reason: skip tag Change-Id Ia260b47a4dd0ddf0363740891b5e1d818c8631b7 with SHA-1 ecd856eeeb is already in history

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

Change-Id: Ib7d9567a6bb648c3b39cdf57ff8451ea762eaac9
2021-03-24 20:11:05 +00:00
Peter Wang
67f7068065 [automerger skipped] Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8 am: 447fc31966 -s ours
am skip reason: skip tag Change-Id Ia260b47a4dd0ddf0363740891b5e1d818c8631b7 with SHA-1 ecd856eeeb is already in history

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

Change-Id: I125327931f43e3312cf5fb7173ba0f2929521044
2021-03-24 19:56:23 +00:00
Sally Yuen
e194ce60ed Merge "Update Reduce Bright Colors preference string" into sc-dev am: 286247a9b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960429

Change-Id: I040000a15af7b17ef98cde8f61e1a57dab0a171e
2021-03-24 19:51:46 +00:00
Soonil Nagarkar
2491d63996 Remove dynamic location settings footer
Replace with static location settings footer.

Bug: 182210346
Test: manual
Change-Id: If3ab492418e5f3461f7b0123fc771ecdd56db6c9
2021-03-24 12:43:03 -07:00
Peter Wang
447fc31966 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: I7a0a8993fbadd72cfe1dfb16879fb235b67ff007
2021-03-24 19:32:58 +00:00
Sally Yuen
286247a9b6 Merge "Update Reduce Bright Colors preference string" into sc-dev 2021-03-24 19:11:31 +00:00
Peter Wang
e74a04b3a8 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: Ia2dccf44b762bc5cf805f4c2aa3fea7f937c921c
2021-03-24 18:56:56 +00:00
Ahaan Ugale
6f4f57c9e4 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: I170523a39971a20209dcee06c9df78ff2c887b9d
2021-03-24 18:55:28 +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
sallyyuen
cd09b3a571 Update Reduce Bright Colors preference string
Test: manual, atest ReduceBrightColorsPreferenceControllerTest
Bug: 182116724
Change-Id: Ifde343aad7c6931efd083a1c728a2504b74f089f
2021-03-24 09:54:57 -07:00
Yanting Yang
fd82d8277b Merge "Add new summaries for homepage preferences" into sc-dev am: 1b82a33048
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981634

Change-Id: I5d25e366c2ac3bb9d06d11fe99874ea11519cf3f
2021-03-24 15:24:22 +00:00
Jason Chang
c82076169f Merge "Fix refresh in Gestures, not reflecting the changes after toggling on/off one-handed mode" into sc-dev am: aafe9ac0a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849832

Change-Id: I0c1b404c4f26ce235ccb584ab4ae3aba0b072cee
2021-03-24 15:24:10 +00:00
Ahaan Ugale
373d2272ce Merge "Merge Autofill settings into Account settings." into sc-dev am: 7f3534925f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13958194

Change-Id: I1a06e10a8fa25ec1a9a8c6c6134f66a51772183e
2021-03-24 15:23:35 +00:00
Yanting Yang
1b82a33048 Merge "Add new summaries for homepage preferences" into sc-dev 2021-03-24 15:21:39 +00:00
Jason Chang
aafe9ac0a0 Merge "Fix refresh in Gestures, not reflecting the changes after toggling on/off one-handed mode" into sc-dev 2021-03-24 15:15:52 +00:00
mincheli
78d9b85041 Corrects the string for magnification dialog
Corrects one word

Bug: 183368007
Test: none
Change-Id: Ic1babf57ca32617509c5b52463281a00b12c6d75
2021-03-24 22:51:04 +08:00
Ahaan Ugale
7f3534925f Merge "Merge Autofill settings into Account settings." into sc-dev 2021-03-24 14:48:58 +00:00
Edgar Wang
667162f986 Merge "Update Preference style" into sc-dev am: 7cd16ae07d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892865

Change-Id: I4e106ee324a126d4e47dfd9884193c88903c9f97
2021-03-24 14:27:15 +00:00
SongFerng Wang
381850e149 Merge "Set setNetworkSelectionModeManual with AccessNetworkType into RIL/Modem" into sc-dev am: 419d5438f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981638

Change-Id: I17d58ecb5ced552c348b3e9d1cec8548dafbe42b
2021-03-24 14:26:58 +00:00
Edgar Wang
7cd16ae07d Merge "Update Preference style" into sc-dev 2021-03-24 14:14:37 +00: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
SongFerng Wang
419d5438f1 Merge "Set setNetworkSelectionModeManual with AccessNetworkType into RIL/Modem" into sc-dev 2021-03-24 13:53:52 +00:00
Jason Chang
858bda81f1 Fix refresh in Gestures, not reflecting the changes after
toggling on/off one-handed mode

1) Remove disabling on swipe down notification.
2) Update to align asset with One-Handed mode temporarily.
3) Change some states when toggle on/off and align with
One-Handed mode.
4) Set temporary asset style to "centerInside" to avoid image
corrupted problem when device rotate.
5) Add new string on Swipe down notification toggle switch.

Bug: 177679988
Bug: 181970213

Test: manual verified on Settings > System > Gesture page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures.OneHandedSettingsTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedAppTapsExitPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedTimeoutPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures.OneHandedSettingsUtilsTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures.SwipeBottomToNotificationPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures.SwipeBottomToNotificationSettingsTest"

Change-Id: Ifd2346a7694323d21eb424891987c8317847e7c5
2021-03-24 21:40:08 +08:00
Yanting Yang
4745f871a7 Add new summaries for homepage preferences
Bug: 183586663
Test: rebuilt
Change-Id: Iaff186924cce5a9e5bac4fb648ea1931ec13468a
2021-03-24 21:17:32 +08:00
Jason Chiu
3e54bd45f0 Merge "Settings homepage redesign" into sc-dev am: 923cd0de6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13946305

Change-Id: Ie3a2db6399e52d7c4e8542c2f219c2f206adcef8
2021-03-24 13:10:49 +00:00
Jason Chiu
923cd0de6c Merge "Settings homepage redesign" into sc-dev 2021-03-24 13:05:34 +00:00
SongFerngWang
b471e2c38c Set setNetworkSelectionModeManual with AccessNetworkType into RIL/Modem
To new the OperatorInfo with the AccessNetworkType parameter.

Bug: 179636444
Bug: 182336960
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=NetworkSelectSettingsTest
Change-Id: If78fde9a22e91ee8b77e2063762166b2137ebbc1
2021-03-24 20:46:04 +08:00
Yanting Yang
0a3c066a89 Merge "Rename the screen title of all apps" into sc-dev am: 11ad3be029
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13981626

Change-Id: I494a54a6f7f4e4af5c596f84692bb867d625c5f4
2021-03-24 12:30:51 +00:00