Ioana Alexandru
c1c20274c6
Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539
Change-Id: Ia4348c7ab9369a0bb40dd30c2db39e6824e1bc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 17:32:30 +00:00
Ioana Alexandru
e0a4a343c4
Fix AmbientDisplayAlwaysOn isSliceable.
...
I changed this method to return true in ag/22761786 thinking that it was
necessary (as per the example at
https://g3doc.corp.google.com/company/teams/apps-android-settings/howto/settings_slices.md#preference-controller ),
but this breaks a test, so I'm rolling back that part of the change.
Fix: 279881487
Test: presubmit
Change-Id: I87716a0daf5face9a79f98353b49ea2166226279
2023-05-02 16:52:26 +00:00
Treehugger Robot
d5921d0bcf
Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943
Change-Id: I18fe27407d8f6003b597a4a9e98ed3b30cefe626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:58:21 +00:00
Treehugger Robot
d624141732
Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev
2023-05-02 14:47:48 +00:00
Lucas Silva
bece3e4b9f
Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741
Change-Id: If83df1299e3c8c48850ed9a924485e45d2bc85cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:35:09 +00:00
Lucas Silva
9bd47de298
Merge "Fix colors for dreams settings according to new spec" into udc-dev
2023-05-02 14:00:22 +00:00
Ankita Vyas
b32d02c293
Add tests for config check in ClonedAppsPreferenceController
...
Bug: 280071827
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=ClonedAppsPreferenceControllerTest
Change-Id: Id7c2e73bdb0c2af3e700b3620bde2fe77c47f3e6
2023-05-02 12:03:42 +00:00
Chaohui Wang
ef748cfc36
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: I8e058b75c12a4bf2bf3462b83a23804e42db2acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:35:15 +00:00
Treehugger Robot
01d7ed6a61
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: Ie0c10646accf9a9e9fdc219a76b84cf3cfd76872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:24:59 +00:00
Chaohui Wang
bf9ba71cba
Merge "Fix Data Saver page crashed when rotate" into udc-dev
2023-05-02 09:50:17 +00:00
Treehugger Robot
3b60e2a9c3
Merge "Fix battery percentage is inconsistent in settings" into udc-dev
2023-05-02 05:08:39 +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
Edgar Wang
cd321d15a4
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: I17f261e3f7b5db0cf09b2ce5cd055109c0674ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:36:34 +00:00
Edgar Wang
11a93074f0
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: Ib8d8a7d9f5e8a26d327a9ed0f22f23aac2194400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:36:26 +00:00
Treehugger Robot
1352c72005
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: Ia8813239148539ba7da86305209102262f40d9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:36:16 +00:00
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
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