Edgar Wang
55d7c97022
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev
2023-05-02 02:31:02 +00:00
Edgar Wang
10129dc926
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev
2023-05-02 02:30:24 +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
fba051fff0
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: Ib8ab21f84ea24e97470854ed7c2ed5f12e262d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-01 23:50:17 +00:00
Grace Cheng
8b36777419
Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev
2023-05-01 22:40:59 +00:00
Wenhui Yang
3aae28c463
Fix overlap in udfps_enroll_enrolling
...
Fix the view overlap on R4 device when setting up fingerprint in
device registration or the font size set to largest. Please see
ag/21478828 for reference.
Test: Manual -
Set up fingerprint in device registration and observe the views
don't overlap.
Set up fingerprint in Settings with font size set to largest and observe the views don't overlap.
Bug: 275119187
Change-Id: I82d2a3941211801e2c4615ba9ba5a917f3cd9ea1
2023-05-01 22:18:47 +00:00
Lucas Silva
94b5a9e147
Fix colors for dreams settings according to new spec
...
Fixes: 279780657
Test: open settings > display > screen saver and verified colors are
correct in both light/dark modes
Change-Id: Ibb2ba40807c937161f4dfa565f10d0ca2fb35549
2023-05-01 15:21:11 -04:00
Kweku Adams
e6fe38f80c
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: I70720fd6a505dfed13296f32d3d8109053faef1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-01 16:18:44 +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
6dd4f9a4ec
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: I7d000eba56ef08dfbe53fb3417b00dc5d7bdd3dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-01 11:03:01 +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
ykhung
343284fe3f
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: I9a28921a13578106840c73fbd21bcff23855ac21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 08:18:06 +00:00
ykhung
a0f3f421dd
Fix legacy failed tests to avoid block presubmit
...
Root cause: the `Robolectric.setupActivity(Activity.class)` is removed from the system, which will always return the null `Context`
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: Ib52bc715508332bcb4bdcac56ecc414aa43f1419
2023-04-30 00:33:57 +00:00
Treehugger Robot
a1c21ec6d0
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-29 07:57:31 +00:00
Treehugger Robot
7d651cba2a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-29 07:57:31 +00:00
Treehugger Robot
987cc7259b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-29 07:57:31 +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
c1a32a5a7f
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: I553d2a4be15286ec59f6fb38b188f4878c0e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 03:57:09 +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
Treehugger Robot
e31a768cf5
Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576
Change-Id: Id3f95abd142fba8eecd361d8b13bd2bd4db1c28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 01:32:34 +00:00
Treehugger Robot
c72b766263
Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev
2023-04-29 01:03:35 +00:00
Treehugger Robot
550e33b9cd
Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419
Change-Id: I2b0bf456f6f494de4f626f93320a0bef8051b6ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 23:26:13 +00:00
Treehugger Robot
01c585ed27
Merge "Fixes broken Settings test." into udc-dev
2023-04-28 22:37:57 +00:00
Julia Tuttle
6fb097c08c
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: I26c3cc54bb1a899aae3f0e773368352573106d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:08:13 +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
b34c993a13
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: I515c52afec3451c1a138f04e0f45748b0197e040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:35:10 +00:00
Austin Delgado
f5d8437078
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: I3779705d1012d4d8b7df4b68f1e9ebea9f37451b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:32:30 +00:00
TreeHugger Robot
00259adc51
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: I3f9ed19a8a4f011ee47ca2afca23321d451d5f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:31:56 +00:00
Bill Yi
a4eb2b9a37
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797
-s ours am: 4174b548cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: I8b20c84b1db8f75bc08f08a053a495fb11249d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:24:57 +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
TreeHugger Robot
6e524f6244
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev
2023-04-28 17:01:39 +00:00
Bill Yi
4174b548cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: Iea6d3ccd75a787447cde716ca4b027d4d5e5f07f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 16:48:53 +00:00
Edgar Wang
089e76c429
Fix test case failed in SystemControlsFragmentTest
...
Fixes: 280071271
Test: local robotest
Change-Id: I96867e9718b4a30289fdcd3fcd9dc70ed8c227b0
2023-04-29 00:42:45 +08:00
Ale Nijamkin
12e05b8c59
Fixes broken Settings test.
...
In ag/22187500, we added the requirement for a wallpaper picker app to be installed in order to treat the lock screen shortcuts feature as enabled (in addition to the feature flag). That broke this test.
To fix, we're adding a mocked result to the PackageManager to pretend like the wallpaper picker application is installed.
Change-Id: I8654375e3fa33df0984c48fcf91dd8f6c18e984f
Fix: 280017187
Test: the test is back to passing.
2023-04-28 16:22:59 +00:00
Gil Cukierman
be1fb77da5
Enable null cipher toggle by default
...
Test: atest GsmCdmaPhoneTest NullAlgorithmsPreferenceController
Test: Manual test on multiple targets and cf
Bug: 262063621
Change-Id: Ic10dbe552eb48eb19efc53e2430a7a1eb081a50e
2023-04-28 15:43:28 +00:00
Christian Göllner
b613cc4a17
SettingsRoboTests: fix device state rotation related tests
...
Fixes: 280015539
Test: atest SettingsRoboTests
Change-Id: I0a3cc713f8df0477a172665a60551b456691b17c
2023-04-28 15:26:32 +02:00
Edgar Wang
f411b62425
Fix PrivateDnsPreferenceControllerTest test case failed
...
- getAvailibilityStatus_availableByDefault()
Fixes: 280048011
Test: locoal robotest
Change-Id: I490dc3348af241a76767885b52238d0b87880532
2023-04-28 21:04:59 +08:00
Chaohui Wang
6d591f5b5c
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I162a3dd40f6cda7ccbcef87703b1c5c76843f4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 12:30:19 +00:00
Chaohui Wang
fec25d4bad
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev
2023-04-28 11:52:50 +00:00
himanshuz
dd26189e2c
Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default.
...
Bug: 253449368
Test: Manual by building and flashing
Change-Id: I9099019f2bd982588f12ac1741fce27d24e5849e
2023-04-28 11:10:14 +00:00
Treehugger Robot
028c16242d
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d
-s ours
...
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: I00d026fd81ea149d062d0e2f363225b72669e6fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 10:11:33 +00:00
Piotr Wilczyński
2471b9f543
[automerger skipped] Revert "Back up the smooth display setting" am: eef23f441c
-s ours
...
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: Id89bf2cffbf4544399992568a1997df4e1ce5f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 10:10:39 +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