Kweku Adams
eafef5fe67
Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1
am: e6fe38f80c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598
Change-Id: Id6d5832f086b4ca773f90a1a53a2fbc3811888c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-01 17:01:18 +00: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
Kweku Adams
83c04b32d1
Merge "Use string notifications_disabled instead of off" into udc-dev
2023-05-01 15:37:22 +00:00
Florian Mayer
cfe9a7ce26
Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041
am: 6dd4f9a4ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417
Change-Id: Ibb342dd0c0da8b2a6381d89a6848cda76db482e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-01 11:45:55 +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
471bc178e5
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
am: 343284fe3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: I0f11401a21c9d9de656d46f298b86f2779b9115a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 09:04:18 +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
3740b67371
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22913945
Change-Id: I387cdba42cd4f17dd55709b3708092c6f2106637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 08:56:12 +00:00
Bill Yi
c02b50c037
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22913945
Change-Id: Ifb19ad9c9f63ea0916c95d6c6a9cb4d2610627c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 08:56:04 +00:00
Treehugger Robot
052b29430c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22913909
Change-Id: I931eb3cced5e3cefad8cd5fe7c94eed15999ec83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 08:56:01 +00:00
Bill Yi
243f587fd9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22913909
Change-Id: Iaae4ebe9ffc438c9ffb8252302d78ebed242d4f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 08:55:27 +00:00
Treehugger Robot
e00549cdd4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22913489
Change-Id: I3e453c16410385ed5f0b74d2c5581399f5b4dedb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 08:55:20 +00:00
Bill Yi
e08678a3fa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22913489
Change-Id: I693b38f4c4f289fe3d216b4e7d67b43fdc42ce0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 08:54:40 +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
Treehugger Robot
9dccc78050
Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
am: c1a32a5a7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821
Change-Id: I01654ba6548b73b357a39f4ed8cb015395fabf5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 04:40:54 +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
cef37fe214
Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263
am: e31a768cf5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576
Change-Id: Icd50c4d717bc92dcc77a41bde346d628ed5e3c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 02:14:22 +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
e25656bf3f
Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27
am: 550e33b9cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419
Change-Id: I4ff8b3f58901a52396cfae2fced59081f4aeb01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 00:07:38 +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
7edbed90aa
Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080
am: 6fb097c08c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913
Change-Id: I8c62657c6d8d09e81dd5b6cc09c99ead2a8cb238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:23:44 +00:00
Julia Tuttle
e3e8b4cd02
Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda
am: b34c993a13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912
Change-Id: I5561bad5f136fd8e91b8435bfb2bc93045805563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:21:39 +00:00
Austin Delgado
a386dddf72
Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63
am: f5d8437078
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172
Change-Id: I2427d052f8673090d39b084d2c4364edefe8359e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:20:30 +00:00
TreeHugger Robot
b24c3eae4c
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244
am: 00259adc51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: I08488767f3779fa57fcdfcfc4a48ed21ca92406a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:19:29 +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
Bill Yi
9f237dd9b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797
-s ours am: 4174b548cf
-s ours am: a4eb2b9a37
-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: Ia92d7f4befddb491341fffb797f77ea4883ddec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:07:42 +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
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
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
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