Chaohui Wang
bfc811f384
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba
am: 49eebbcfe6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: Ie6a5ba59a28f40f7bfa0c9b9a33029634b011fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:28:00 +00:00
Treehugger Robot
1ff9d7cc34
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
am: f6ba37e583
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: Ifbc2f697f1c01683bab16227d5a02e9c3044575b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:24:35 +00:00
Chaohui Wang
bf9ba71cba
Merge "Fix Data Saver page crashed when rotate" into udc-dev
2023-05-02 09:50:17 +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
6ddc836713
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
am: 3bef26666f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: Id0f3d8dcf8c127f2209f3567d10149fa37556290
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
1fdc38fe4d
Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419
am: 9ae24317d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556
Change-Id: I3238e6d0e7681f121cabdba444be6ac0a4a10bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 00:29:42 +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
a8498b14f9
Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1
am: bdf3cb8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598
Change-Id: I1cbd994f1906de6e5e6eea57bb7adb89f0a925f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-01 16:57:21 +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
d8526d4c9c
Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041
am: b112a868a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417
Change-Id: Iaed6b8d9d579e2bb5f96bdb427ed3779933dd731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-01 11:41:54 +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
fa4f628318
Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
am: 7dfd217c1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821
Change-Id: I3b39848e791168df59d4f2203f59ae14728069df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 04:36:52 +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
Becca Hughes
7fdbfc7b0e
Revert "Rollback decision to merge by package name"
...
This reverts commit ca542c90cd
.
Reason for revert: product changed mind
Change-Id: Ic4b9275e8f19bf2b3e3e51f09162fb6d45e6a5bf
2023-04-28 21:06:00 +00:00
Julia Tuttle
a4877c4410
Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080
am: e35f0679e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913
Change-Id: I119564fb748f9fc4f8b0bf533a3fe988bdfb7165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:19:15 +00:00
Julia Tuttle
4693fb2f9d
Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda
am: c8d12d6b34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912
Change-Id: I13e3b9fedb2e0bed3156e22eab3f1ef982630973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:18:39 +00:00
Austin Delgado
4d53fc2add
Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63
am: 01570d3bfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172
Change-Id: I3130c2ec0a3aa653a11fd211ab4d7a3c411e7fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:15:41 +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
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
faf4b81386
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
am: 6d591f5b5c
am: a6d606f278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: Ie929c6eec8c4c612bee99fcc9b3face303baf08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 14:03:28 +00:00
Chaohui Wang
a6d606f278
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
am: 6d591f5b5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: Id9c80b73953e39623dbf9ee2bdc4a670c0eb5d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 13:13:31 +00:00
Chaohui Wang
fec25d4bad
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev
2023-04-28 11:52:50 +00:00
Treehugger Robot
060a56468d
Merge "Revert "Back up the smooth display setting"" into udc-dev
2023-04-28 09:58:16 +00:00
Treehugger Robot
186b9ef5b5
Merge "[BiometricsV2] Fix fingerprint 2nd enroll fail"
2023-04-28 08:05:45 +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
Treehugger Robot
9ed2ac48fb
Merge "[Settings] Update code owner" am: 709b27384b
am: c40b06b687
am: a6f0662924
am: 0469be62f0
am: 82296631cd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125
Change-Id: I81730fe484cd19aec2a97e43f2f4d7e57ec4672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 05:53:26 +00:00
Tom Hsu
c3f08dcf56
Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
am: 2bc75c0d5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844
Change-Id: Id8451b6b130cfccca0061f8aa9529c0783635641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:06:33 +00:00
Tom Hsu
1e2ecf3e2e
Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
am: 39b150171b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844
Change-Id: Id2f4e945fc893315f15f4f58e0f114187b5edb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:06:24 +00:00
Tom Hsu
39b150171b
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: I49425eb7c992008e5dc7f0d028c82e4bee41038e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:23:39 +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
Piotr Wilczyński
9797fc8d15
Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698
Change-Id: I3f3058996ac6418ce8df4e888b0959830276ac31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 20:53:05 +00:00
TreeHugger Robot
f48a328ac8
Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed
am: 9e2e3e9ae6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040
Change-Id: Ib258aa7845d1da749b43cce636a489a8d844322e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 20:22:17 +00:00
TreeHugger Robot
bb49ef02f9
Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed
am: d1ebd886db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040
Change-Id: I7007257549a53aabbede5faed635066bb8f82a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 20:22:15 +00:00
TreeHugger Robot
9e2e3e9ae6
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: I16732ae62948cd37f654d03739fc21973f9c754a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 19:25:08 +00:00
Treehugger Robot
82296631cd
Merge "[Settings] Update code owner" am: 709b27384b
am: c40b06b687
am: a6f0662924
am: 0469be62f0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125
Change-Id: Ib86e796a246d7112adce01f229771fbb40e4f70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 19:09:09 +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
3107fb0f96
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: Ifde2d297be711a957ce900ec5c7f1d30601bc6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:11:36 +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
7378d6c66c
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: I2c3cdf15907f2e6e2a40a2547b9b6b92cdcfd35c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:04:31 +00:00