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
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
Julia Tuttle
dd9bc876dc
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: I17b2390a8119feb22ed5290708720d41898bcad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:18:14 +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
a8e8345a8c
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: Ia92f1d9a2c35eb03c06d787b153bbb93774e57d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:14:29 +00:00
Austin Delgado
b8fc7e5bc2
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: I34e2f839ec6505bccc11f03db6c69988de8674ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:14:09 +00:00
TreeHugger Robot
59074a8194
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244
am: b73a414dc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: If7b615285655c95a49cad3e06d4f0d23d2dd2179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:11:23 +00:00
TreeHugger Robot
99a75b24ee
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: If64d6ee2186bb42b775159ddd3dd29bf03b5cf42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:11:19 +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
1b4f6059dc
[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: I48fb227343cfa9ba42b3c774a8db61a3a9fe646a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:07:43 +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
Bill Yi
c910c70bed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797
-s ours am: 4174b548cf
-s ours am: 8a77dd90a3
-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: If6f69d6f5a70fd798ce21c69deedf86115a4b330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:06:35 +00:00
Julia Tuttle
775d61dc4e
Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080
am: e0adef90bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913
Change-Id: Id1cd6525e13254f4c738bfb1e6cec6f2cea6cc53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:49:16 +00:00
Julia Tuttle
472a2024ad
Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda
am: 7e3355382b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912
Change-Id: I372d19fcd0ef394904a04e0514299139f7aa8c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:47:59 +00:00
Austin Delgado
ce3118d414
Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63
am: ff7ae4123b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172
Change-Id: I07b2d29814748641ed512b3cefddd3f4b914d959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:47:51 +00:00
Julia Tuttle
e35f0679e3
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: I7ff16243bf2d4dfa93062615bd41360090113d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:47:05 +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
TreeHugger Robot
e8defdd89f
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244
am: 041d659ab7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: Id58a8350cf29a620c498b05472999769b8025fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:46:17 +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
Julia Tuttle
c8d12d6b34
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: I64797ad4d4d0ab8fedf35466254cadf95df83fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:36:54 +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
Austin Delgado
01570d3bfc
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: If3a258888b10881b28d8452f79d8cc1490a69c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:36:41 +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
TreeHugger Robot
041d659ab7
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: I2d0c37c829c0862084a08ce7ff0b9041e4a3f945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:34:52 +00:00
TreeHugger Robot
b73a414dc4
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: Ie1f348768d304da3b1a1e69a93c68c0a846f57ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:32:36 +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
Bill Yi
7531a1ec03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797
-s ours am: 4174b548cf
-s ours am: 74ee200fa2
-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: Icce1e4f50355cc64a2c4ead580c8c7d5213e5587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:32:12 +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
74ee200fa2
[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: I8f782eb9707ea8aa7834609ccfe2c89ebb1e672b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:29:27 +00:00
Bill Yi
8a77dd90a3
[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: I85283550466989ce53f44f3750ef885ea896e44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:27:27 +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
Bill Yi
72f8242715
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797
am: faf6409455
-s ours am: 4e09eb096c
-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: Ia90a434a59872b13640ca6e5932f23b0b264ad26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:24:45 +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
4e09eb096c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797
am: faf6409455
-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: I14a9ed4d975325a7cfb4f618ff67ad46865b9c90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 16:50:19 +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
Chaohui Wang
c3dbe979b0
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
am: 6be82a5ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I04be472891e4f66541c4bd15eb920402e619e9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 14:24:52 +00:00
Chaohui Wang
dc86933298
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
am: b60bb6a22f
am: 165777a935
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I5eee6f33c87278763b892167fa10edc6ce4f5945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 14:10:24 +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
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
165777a935
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
am: b60bb6a22f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I9ab9b70f9992ee4911d3e129def2e3e09a75ee4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 13:19:09 +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