Viesturs Zarins
c4272f8d7b
Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4f3
am: e6a708e0a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238
Change-Id: I73e641eb833ce94de481e897da06caa75729e570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 20:35:12 +00:00
Yuxin Hu
fe2ed9c453
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
am: 75b784fcd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: Ib0b2225ea16febddde345c2edc0fef1fd18e4e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:49:13 +00:00
Yuxin Hu
d8fbd089d8
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
am: f783947615
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I7d2cfa1bb297eab9ff0b06ed10d628153ae1c40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:48:28 +00:00
Viesturs Zarins
cd6409b84c
Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238
Change-Id: I2829a6386bc5e9b710e2e4dc62636aa9493a6f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:47:56 +00:00
Yuxin Hu
1af33f713b
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
am: f783947615
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: Ifdca402cee4f367a73952887663685478bcffabb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:46:15 +00:00
Yuxin Hu
e7c3c0fa70
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
am: b67e1d5371
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I6f25d8783e9c94335bd8f58c969b8e14c82f9147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:45:48 +00:00
Viesturs Zarins
e6a708e0a6
Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238
Change-Id: I6801b2b87bad63dad61a739025e99dd3425180c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:44:48 +00:00
Yuxin Hu
b67e1d5371
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I7e0b919a71dd1d5c97ab6645a62e69a3f97ec03d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:03:27 +00:00
Yuxin Hu
75b784fcd0
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I9f456a0b676c188c61e0ae4002d57a0d7f6c3dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:03:06 +00:00
Yuxin Hu
f783947615
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I55082fed74d343f8c1daab93e7fb73d093853d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 19:02:31 +00:00
Viesturs Zarins
8e9955a4f3
Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev
2023-05-25 18:49:59 +00:00
Chun-Ku Lin
750cf98095
Merge "Use ResourcesUtils to get the resource from the target application."
2023-05-25 18:32:45 +00:00
Yuxin Hu
67c72c01cb
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev
2023-05-25 18:08:10 +00:00
tom hsu
06c3ae5e82
[Settings] Avoid settings crash from NPE of TelephonyManager.
...
Bug: 233783567
Test: atest passed
Change-Id: Ie0ed8fa3b87b8e130396cf4d918295403ae43501
2023-05-25 14:37:51 +00:00
Chaohui Wang
a4b57ce163
Merge "Improve the loading time of DataSaverSummary" into udc-qpr-dev am: b04b977cac
am: aac2015cc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405371
Change-Id: Iaf28e0eb54c235b69ef6830d5e7fc86b713a982b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 10:54:47 +00:00
Chaohui Wang
aac2015cc7
Merge "Improve the loading time of DataSaverSummary" into udc-qpr-dev am: b04b977cac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405371
Change-Id: I1ffdee026aa86e7b31b963d8d7ef62613df4fb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 10:10:40 +00:00
Chaohui Wang
b04b977cac
Merge "Improve the loading time of DataSaverSummary" into udc-qpr-dev
2023-05-25 09:38:35 +00:00
danielwbhuang
2fe3307511
Display gesture education button in touchpad settings
...
1. We hid this button before.
2. Display the button in the latest release.
Bug: 276001904
Test: manual
Change-Id: I20bfc76162eeb99e85afede30e9fe6145251d65d
2023-05-25 17:24:52 +08:00
Treehugger Robot
3b187b80aa
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 0d065f7913
am: 506b8af1b1
am: 1a777429d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: Iccdcd1ab5cfa0a1789465adda6af2e378891895e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 09:01:06 +00:00
Chaohui Wang
1c08b16475
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: a9a229665b
am: 516503df0a
am: ad92fd238c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: I30c028db559aefcb4bfa675581289ec3911edfce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 09:00:58 +00:00
Treehugger Robot
db3ec7b2b8
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 48355b8b24
am: e2aea57de4
am: e6095db454
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: I37ca187c9b8f4aaac5b167fc913fa13e3cd5f09e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 09:00:50 +00:00
Chaohui Wang
cf120fed65
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: f976ff3f06
am: 6d2caf2e52
am: b02cf9562a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: I00531d270d900207077c01a6de3a9c7dd26152c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 09:00:43 +00:00
Treehugger Robot
76ce8c8c99
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 0d065f7913
am: 2299f35385
am: 22acfebdb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: I9a893fc01caac12d45ccff12fbe39c2ef9dfe20e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 08:59:58 +00:00
Chaohui Wang
148c86ad8e
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: a9a229665b
am: 85365bf381
am: 3ca754c35c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: I77ad8e96432e6b693253559bf958b739e28a3e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 08:59:16 +00:00
Viesturs Zarins
ac347eddd9
Fix missing Activity embedding allowlisting for Assistant.
...
The normal settings fragments are already allowlisted via SubSettingActivity.
ManageApplications fragment based activities are not compatible with that however.
The ManageApplications fragment has several modes that are selected by the activity name, hence cannot use the SpringboardSettings activity to launch just the fragment.
For more context, see
go/conversational-care-activity-embedding-allowlisting
BUG: 282921726
Change-Id: I65872b574ce6272fbd33ab7bd100504a6536f340
2023-05-25 08:43:07 +00:00
Treehugger Robot
1a777429d6
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 0d065f7913
am: 506b8af1b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: Iaa2952f655065661890b47723594ba8730eb76b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 08:17:17 +00:00
Chaohui Wang
ad92fd238c
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: a9a229665b
am: 516503df0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: I4832b1dc0837c6d71157e172e69ec452bc16b65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 08:16:55 +00:00
Treehugger Robot
e6095db454
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 48355b8b24
am: e2aea57de4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: Id5549b198f9a5d9cb6925af97ac9f45302122da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 08:12:07 +00:00
Chaohui Wang
b02cf9562a
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: f976ff3f06
am: 6d2caf2e52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: Iee83ddb0f09f5f05f922e7949782a7c838538d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 08:12:00 +00:00
Treehugger Robot
22acfebdb9
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 0d065f7913
am: 2299f35385
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: Ifb5a172d9977287ab725510a0b2faa4fae33c7a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 08:11:53 +00:00
Chaohui Wang
3ca754c35c
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: a9a229665b
am: 85365bf381
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: I33a4bfa4535cfe87156b77b7f58fb54ad5e34ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 08:11:18 +00:00
Treehugger Robot
506b8af1b1
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 0d065f7913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: I0ba5cc6eb2112440a4b2063f1347fed9406f5ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:33:25 +00:00
Treehugger Robot
e2aea57de4
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 48355b8b24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: I3b4ef57a77546a6078e62eb696fae80363b90d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:32:19 +00:00
Chaohui Wang
6d2caf2e52
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: f976ff3f06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: Ia7b7be32a800e70aa117f43717e04cddbadb3370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:32:05 +00:00
Chaohui Wang
516503df0a
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: a9a229665b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: Ia5aaf1c116abef625c43a63619636b18cfe6515f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:31:52 +00:00
Treehugger Robot
d243b12da5
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 1d2e2d318b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: Ia1e552464e510c823c59c3ad11d8bf7994634551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:27:55 +00:00
Treehugger Robot
2299f35385
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
am: 0d065f7913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: Ied812c9a81d5945d7a1c3157ef345e359b8c0c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:27:45 +00:00
Chaohui Wang
85365bf381
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: a9a229665b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: Ic4f862141920da6b3d392c48158fd94eadf1758e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:27:38 +00:00
Chaohui Wang
2a9188e67e
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
am: 2c4c75ebc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: Ida03b8db306928177905957266b147166e43c55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:27:17 +00:00
TreeHugger Robot
adcdbf2c7d
Merge "Add a footer message for battery cycle count" into udc-qpr-dev am: 810659f82d
am: 8163f3d93b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23419678
Change-Id: Ia54dd14fa776b2bd2102c6926288068e69321c96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 07:11:39 +00:00
Treehugger Robot
0d065f7913
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: I46331c040344bcf47c7ce59f37a8ce5378eee961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:45:29 +00:00
Treehugger Robot
1d2e2d318b
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: Ifb53243a7e5d22b5b6a362c88c786465c8266a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:45:27 +00:00
Chaohui Wang
a9a229665b
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: Ieb36ee51360a0406d62fa500e518be0b4e6dddd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:45:21 +00:00
Chaohui Wang
2c4c75ebc6
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: I3566c2602c7f5808f1be7fd0687db0984157b481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:45:18 +00:00
Treehugger Robot
48355b8b24
Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373
Change-Id: I68dd6ae9bd91519b126cbacb8cba1fb4909524a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:41:09 +00:00
Chaohui Wang
f976ff3f06
Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018
Change-Id: I271981812af20ac9d666465edea064fba0a2642e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:40:44 +00:00
Milton Wu
bc2dbee762
[BiometricsV2] Refine fingerprint activities
...
Seperate FingerprintEnrollmentActivity to another InternalActivity and
SetupActivity. InternalActivity is used for FingerprintSettings.
SetupActivity is used for setupwizard flow.
Bug: 284248001
Test: atest FingerprintEnrollmentActivityTest
Test: atest for biometrics/biometrics2 in unit tests
Test: settingRoboTest for biometrics
Change-Id: I9fb5dc34300060b9ccf857a3335b81a5d4bf5c7b
2023-05-25 06:25:58 +00:00
Treehugger Robot
1fd77775cb
Merge "[Settings] Use background thread to get VoNr state." into udc-dev
2023-05-25 06:25:55 +00:00
TreeHugger Robot
8163f3d93b
Merge "Add a footer message for battery cycle count" into udc-qpr-dev am: 810659f82d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23419678
Change-Id: I906471b83c8554e65de2ba3d4e34468cdb6a5c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:23:46 +00:00
Chaohui Wang
5b042e2feb
Merge "Fix crash of PictureInPicture" into udc-dev
2023-05-25 06:02:59 +00:00