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
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
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
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
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
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
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
TreeHugger Robot
810659f82d
Merge "Add a footer message for battery cycle count" into udc-qpr-dev
2023-05-25 05:53:19 +00:00
Chun-Ku Lin
fbadd2889f
Use ResourcesUtils to get the resource from the target application.
...
Bug: 284220081
Test: atest OneHandedPreferenceControllerTest
Change-Id: I25558af0c797dfc0a5fdd3cff6f1724ff18dac27
2023-05-25 04:37:50 +00:00
Yi-Ling Chuang
20c5966bf4
Add a footer message for battery cycle count
...
Bug: 276399056
Test: rebuild
Change-Id: I3aea252ace55edbde117698c17f1b4e0ab601b89
2023-05-25 12:24:24 +08:00
tom hsu
97a1fc643e
[Settings] Use background thread to get VoNr state.
...
- TelephonyManager#isVoNrEnabled may not send back the result in time,
so use different thread and timer to prevent ANR.
Bug: 282876876
Test: atest passed
Change-Id: Ie6cc0f8a459f5ebed930e457dacb9b742df70fad
2023-05-25 10:56:03 +08:00
Diya Bera
ddd8bd0ed7
Fingerprint Error Dialog am: 71dd391e4d
am: 565ce9eaae
am: 573a59f8d0
am: d740dc9d66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: Ib84cd36b1d64c939e91b4b5be711f0605dcc5f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 22:50:57 +00:00
Diya Bera
34ca84a805
Fingerprint Error Dialog am: 71dd391e4d
am: 87cba95c68
am: e204664790
am: 0e03a069f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: Ia56773e1aea8337a647ec22d4d704ffb3755afda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 22:36:07 +00:00
Diya Bera
0abed0cd08
Fingerprint Error Dialog am: 71dd391e4d
am: 565ce9eaae
am: f868f3fdda
am: e196e903b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: If75f48c1a672ad1eb127a574f320b4a95e13be81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 22:30:25 +00:00
Chun-Ku Lin
9849bce398
Merge "Unified service and shortcut state summary on a11y settings page."
2023-05-24 22:21:26 +00:00
Diya Bera
d740dc9d66
Fingerprint Error Dialog am: 71dd391e4d
am: 565ce9eaae
am: 573a59f8d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: I90dae0854c194b8cfbbf4dc1754c87cc602a86a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 21:46:58 +00:00
Diya Bera
0e03a069f7
Fingerprint Error Dialog am: 71dd391e4d
am: 87cba95c68
am: e204664790
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: Ie323538a81480049def27d3317a92ec130fe81ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 21:23:47 +00:00
Diya Bera
e196e903b3
Fingerprint Error Dialog am: 71dd391e4d
am: 565ce9eaae
am: f868f3fdda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: Ic2e7cbf81d6893d3a6f921c808374e4327718ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 21:22:03 +00:00
Diya Bera
e204664790
Fingerprint Error Dialog am: 71dd391e4d
am: 87cba95c68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: I9a0be0d0788e3bba3329074d5f97334c4aa0ba1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 20:59:26 +00:00
Diya Bera
573a59f8d0
Fingerprint Error Dialog am: 71dd391e4d
am: 565ce9eaae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: Ia96b5aa1a9cd700b15ddf9aa986856ff4aee5f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 20:59:04 +00:00