Commit Graph

47999 Commits

Author SHA1 Message Date
Treehugger Robot
aa354d5666 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I0f8ba89b5d6d2968b4770591218a786bdac00e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 13:58:28 +00:00
ykhung
0288b6d4af Fix battery percentage is inconsistent in settings
Fix: 275217364
Test: make test RunSettingsRoboTests
Change-Id: I16dd772aacaea3f8ddb6da579adb033124e3dbb7
2023-05-02 11:58:08 +08:00
Treehugger Robot
fdf3c2135c Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e am: 1352c72005
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539

Change-Id: I11951d054ee660042517daa16bcee868e241ee2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 03:14:05 +00:00
Treehugger Robot
65efc1f45e Merge "Support incompatible charger state in the Settings main page" into udc-dev 2023-05-02 01:51:10 +00:00
Grace Cheng
7771d0eab0 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: Ia74f13072f0779f8c3a4a08a254dd6857200fcd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 23:32:03 +00:00
Grace Cheng
8b36777419 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev 2023-05-01 22:40:59 +00:00
Kweku Adams
97252eed2d Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I89c3e6121bbb4083d1f6c49ce4819bf495ce1ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 16:14:31 +00:00
ykhung
09c1a4a850 Support incompatible charger state in the Settings main page
https://screenshot.googleplex.com/9af4YCnCCjKHCFY

Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I6562e1b48a85ceceb20389ed87e55e0093040be2
2023-05-02 00:04:01 +08:00
Kweku Adams
83c04b32d1 Merge "Use string notifications_disabled instead of off" into udc-dev 2023-05-01 15:37:22 +00:00
Florian Mayer
3be6f32c42 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ia7cef08103ad0faaedbcb26051757d3ef93b4e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 10:58:56 +00:00
Florian Mayer
d7bbff0041 Merge "Fix typo in MemtagHelper" into udc-dev 2023-05-01 10:26:47 +00:00
Florian Mayer
411d78c06c Fix typo in MemtagHelper
Bug: 280034968
Change-Id: I5977925399342cd79f0bed2dd4af0e21c0c20102
2023-05-01 10:25:04 +00:00
Chaohui Wang
ca615997ea Use string notifications_disabled instead of off
notifications_disabled was changed to off in
Change: I5f84d09f223efd478461ded93aeac82bf7b128d8

And reverted from off to notifications_disabled in
Change: Iaad301c5513478fb95e40987ea3ccb4f923d71fa

This usage is branched from AppNotificationPreferenceController.java,
and missed in revert.

Bug: 272603842
Test: Visual
Test: Unit test
Change-Id: I5b8466134c1342e10de7a2ead8c52931e0c19377
2023-04-29 15:42:09 +08:00
Grace Cheng
ec1bd37db0 Prevent NPE on deleting fingerprint in Settings
Gate all Settings FingerprintUnlockCategory logic on isSfps() check to prevent NPE

Fixes: 279866500
Test: Enroll 2+ fingerprints on a non-sfps device, delete fingerprint,
observe no crash

Change-Id: I040d498426e0f8efb789875eedeb7bcf44436149
2023-04-29 05:19:41 +00:00
Treehugger Robot
4671972bea Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: Ica664646426196d5a88072594eb1a6d04b37ed97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 03:52:58 +00:00
Treehugger Robot
24666c9737 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev 2023-04-29 03:21:56 +00:00
Julia Tuttle
e0adef90bb Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I618fd16ea06ed6cbe5a9556d16d56af5baefd4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:47:03 +00:00
Julia Tuttle
7b3df1c080 Merge "Fix a couple compiler warnings in Settings" into udc-dev 2023-04-28 18:42:23 +00:00
Yuxin Hu
25b270c0f8 Add developer option switch to set ANGLE as the default system driver
This change adds a new developer option switch called
"Enable ANGLE". It defaults to off. User can choose
to toggle it on and off, and the value of the system
property "persist.graphics.egl" is changed accordingly:

switch off: persist.graphics.egl=""
switch on: persist.graphics.egl="angle"

When user toggles the switch, a reboot window is
popped up asking user to reboot now to make the change
takes effect. If user chooses to cancel the reboot,
the switch is toggled back. This enforces that a reboot
is required whenever the "persis.graphics.egl" value
changes.

Upon reboot, we will load either ANGLE or native
GLES driver as the system driver, based on the value of
"persist.graphics.egl".

The switch is disabled if ANGLE is not installed
in /vendor partition. We use the system property
"ro.gfx.angle.supported" as an indicator. We set the
two conditions together in angle.mk file. Any device
mk file that inherits angle.mk file will result in
ANGLE libs installed in /vendor and "ro.gfx.angle.supported"
set to true.

Bug: b/270994705
Test: m; flash and check Pixel 7 boots fine
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest

Change-Id: I565eff614472bb6ba50742e7dfa49b50dca2809f
2023-04-28 18:42:10 +00:00
Julia Tuttle
7e3355382b Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I0cd1f87310eaec55cf42347660080568b403ef71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:38:24 +00:00
Austin Delgado
ff7ae4123b Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: Ib0a993f8869f22535148be59767deb209acbdf5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:36:50 +00:00
Julia Tuttle
75f566bce9 Fix a couple compiler warnings in Settings
Bug: 277938609
Test: builds
Change-Id: Ib5e236220dfcfddec60c9277d06ffbde9645bb73
2023-04-28 18:19:30 +00:00
Julia Tuttle
ec12caadda Merge "Optimize imports in AppNotificationSettings" into udc-dev 2023-04-28 18:18:40 +00:00
Austin Delgado
9b94905c63 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev 2023-04-28 17:42:46 +00:00
Chaohui Wang
b60bb6a22f Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675

Change-Id: I62662e92f9b302be44eaebe34dc1415924a900ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 12:26:45 +00:00
Chaohui Wang
fec25d4bad Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev 2023-04-28 11:52:50 +00:00
Treehugger Robot
7c369b3dbc Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948

Change-Id: Ic79aff153dc19207fb52fc73ec8f563cf79ff26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 10:11:26 +00:00
Treehugger Robot
060a56468d Merge "Revert "Back up the smooth display setting"" into udc-dev 2023-04-28 09:58:16 +00:00
Chaohui Wang
8470122ad1 Fix ImeiInfoPreferenceControllerTest
For test case updatePreference_simSlotWithoutSim_notSetEnabled,
mSecondSimPreference is a mock, instead of check the default value of
isEnabled(), verify it's setEnabled() not called.

Fix: 279880808
Test: RobolectricTest
Change-Id: I72064820754e053def46bdbf10317189c7ac608f
2023-04-28 15:53:44 +08:00
Tom Hsu
574483e474 Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: I3e1823e82cc1d0a2cdc57652b8de7cbddd3bb2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:17:19 +00:00
Tom Hsu
bd9263b391 Merge "[Settings] UI part: Add metrics for language" into udc-dev 2023-04-28 02:49:59 +00:00
Julia Tuttle
3a68e5bf28 Optimize imports in AppNotificationSettings
Bug: 277938609
Test: builds
Change-Id: Id44390f6fc8b6294c951a7f4ec9bd37e0a364dfd
2023-04-27 17:24:14 -04:00
TreeHugger Robot
d4ceb73fe5 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I2a13de79198afd67cb8e910aead7275b460df8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 19:27:17 +00:00
TreeHugger Robot
32602794ed Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev 2023-04-27 18:55:20 +00:00
Treehugger Robot
0469be62f0 Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687 am: a6f0662924
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: I63b80b09c29c9d41f7b950c7a63955088e17824e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 18:02:40 +00:00
Becca Hughes
c6a74847e4 DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I79a8f47acb16ac995333c7c40a0309c83e67404c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:09:06 +00:00
Becca Hughes
a620612b9f DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: I0e113f37760847067042e41dd1a3e48d398c0270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:06:41 +00:00
Becca Hughes
c74ccee659 Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev 2023-04-27 16:35:18 +00:00
Becca Hughes
4fc5b0e7b3 Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev 2023-04-27 16:35:07 +00:00
Piotr Wilczyński
eef23f441c Revert "Back up the smooth display setting"
Revert submission 22741921-cherrypick-bug-211737588-lp9s6r5vn3

Reason for revert: b/279215664

Reverted changes: /q/submissionid:22741921-cherrypick-bug-211737588-lp9s6r5vn3

Change-Id: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
Merged-In: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
2023-04-27 16:13:03 +00:00
Zoey Chen
cfaa13442c [Settings] UI part: Add metrics for language
Bug: 279915462
Test: atest
Change-Id: Ie13c57b2b398beb48dfe0ac289ec336483575445
2023-04-27 15:55:45 +00:00
TreeHugger Robot
d3897afda6 Merge "Change drop down strings to "View by ..."" into udc-dev 2023-04-27 11:12:45 +00:00
Treehugger Robot
a6f0662924 Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: I5390a0b64018dbeb74a79f81b94ff7a47712106a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:21:35 +00:00
Treehugger Robot
c40b06b687 Merge "[Settings] Update code owner" am: 709b27384b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: Ib0806c0bf18797da3e44dbe4800283430120b49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:42:22 +00:00
Zoey Chen
bee241bd5a Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev 2023-04-27 09:35:24 +00:00
Zaiyue Xue
8888e5eea7 Change drop down strings to "View by ..."
https://screenshot.googleplex.com/8J4KQW9FKB9yjsL.png

Bug: 279654750
Fix: 279654750
Test: manual
Change-Id: Ia66db0910b318b1e819960d08294a4303497b3e7
2023-04-27 17:33:04 +08:00
Treehugger Robot
709b27384b Merge "[Settings] Update code owner" 2023-04-27 09:12:59 +00:00
Edgar Wang
e0049f0ae8 Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev 2023-04-27 08:27:42 +00:00
Weng Su
8c50edd1e7 Fixed speed selection lost when changing password in Wi-Fi hotspot settings
- Use current SoftApConfiguration to build new SoftApConfiguration to keep unchanged properties

Bug: 279717060
Test: manual test
atest -c WifiTetherSettingsTest

Change-Id: I3ee7960b13b339445cc79c3d440f5c56c78c015f
2023-04-27 14:55:52 +08:00
Treehugger Robot
97c42d8736 Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b am: 83f2d27e35
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510

Change-Id: I21f648353029042ec50608218415eb2dd95c41e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 05:04:41 +00:00