Commit Graph

129252 Commits

Author SHA1 Message Date
YK Hung
a23fdeef7a Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 466e7c56b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I10082d3d520ae0438f493dd6b4af6055eb4d2a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:29:09 +00:00
Chaohui Wang
a96e08ad5c Merge "Unify the strings for Erase eSIM / eUICC" into udc-qpr-dev am: 28300d5340 am: 4775a69214
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23510726

Change-Id: I73abb8dec94f34578ea087dd3d25e82fa751a9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 05:51:10 +00:00
Chaohui Wang
4775a69214 Merge "Unify the strings for Erase eSIM / eUICC" into udc-qpr-dev am: 28300d5340
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23510726

Change-Id: I4deb8fedde2535d8388b6a307f9cbbec8e1b394a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 05:12:55 +00:00
Chaohui Wang
28300d5340 Merge "Unify the strings for Erase eSIM / eUICC" into udc-qpr-dev 2023-06-02 04:17:23 +00:00
Treehugger Robot
dc707da616 Merge "Fix resource leakage caused by cursor" am: 662ba59a47 am: 381ac521bd am: 2ccf9d9560 am: 8bae3a88a3 am: 8ee04c3503 am: 5893274b08
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: Ib0f479bcc8765328594b4c5c45d8a7215b95e32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 02:36:10 +00:00
Treehugger Robot
8517a41908 Merge "Prevent non-system IME from becoming device admin" 2023-06-02 02:09:02 +00:00
Treehugger Robot
5893274b08 Merge "Fix resource leakage caused by cursor" am: 662ba59a47 am: 381ac521bd am: 2ccf9d9560 am: 8bae3a88a3 am: 8ee04c3503
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: I7f333ae1fecdc9561267e3dcbb4c1fd49af5a749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 01:48:19 +00:00
YK Hung
466e7c56b2 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I31562e4f787130bbb460030cc3cb7ad78604f21e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 01:22:04 +00:00
Treehugger Robot
8ee04c3503 Merge "Fix resource leakage caused by cursor" am: 662ba59a47 am: 381ac521bd am: 2ccf9d9560 am: 8bae3a88a3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: Ic40dcd37c21585e0b02c8fbc4af6596d1d0c57d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 00:59:14 +00:00
YK Hung
bfc4637d09 Merge "Update incompatible charger checking rule" into udc-dev 2023-06-02 00:50:17 +00:00
Treehugger Robot
8bae3a88a3 Merge "Fix resource leakage caused by cursor" am: 662ba59a47 am: 381ac521bd am: 2ccf9d9560
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: Ib8122df16de9af8f26cb9f2d6d666cad9a27c482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 00:12:28 +00:00
Hao Dong
af1b977c36 Fix the flicker of buttons in FaceSettings. am: 9b4e923986 am: 374e222198 am: 07300c01ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23520055

Change-Id: I5fc8ecac398215931104cf5b8e274d2180cfeb2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 23:48:48 +00:00
Hao Dong
07300c01ef Fix the flicker of buttons in FaceSettings. am: 9b4e923986 am: 374e222198
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23520055

Change-Id: I998f18029e83bb29cf2074de572ccf3006d9f581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 23:30:20 +00:00
Hao Dong
4e68c6b833 Fix the flicker of buttons in FaceSettings. am: 9b4e923986 am: 6fa8b76eee am: 3d57b69bed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23520055

Change-Id: I9ec54250197bfcbcf53668ad796dc3b9c4751d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 23:28:35 +00:00
TreeHugger Robot
ca59f0f610 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: a93397786a -s ours am: 4f3f92d3d6 -s ours am: fac048464f -s ours am: 8aa0b1d3eb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: Id7362bfdb31a4f7d2d15259da3b58756a315c301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 23:28:23 +00:00
Bill Yi
dffe6e19f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 13df8b2d97 -s ours am: fea0378937 -s ours am: 6cba52d79c -s ours am: 6b0cb8a5cd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: I9cf1b88c36a047ac86497ba0d0e2898882d7df16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 23:28:18 +00:00
Treehugger Robot
2ccf9d9560 Merge "Fix resource leakage caused by cursor" am: 662ba59a47 am: 381ac521bd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: I4196b9cff84c09c18f16010d5ea43d918b835459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 23:28:00 +00:00
Hao Dong
3d57b69bed Fix the flicker of buttons in FaceSettings. am: 9b4e923986 am: 6fa8b76eee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23520055

Change-Id: If5915ff3e188d58d86097286fc4214bd15253dc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:45:49 +00:00
Hao Dong
374e222198 Fix the flicker of buttons in FaceSettings. am: 9b4e923986
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23520055

Change-Id: I8f85fbe82fab09ce325a1d453f46e2a1ee976d6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:45:27 +00:00
Treehugger Robot
381ac521bd Merge "Fix resource leakage caused by cursor" am: 662ba59a47
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: Idebb2842aa83cabc6d85e9d277cdb29bbd45362d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:44:05 +00:00
TreeHugger Robot
8aa0b1d3eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: a93397786a -s ours am: 4f3f92d3d6 -s ours am: fac048464f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: I0841dfb44100edb6fa906e3a609fa4774f3e4c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:42:17 +00:00
Bill Yi
6b0cb8a5cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 13df8b2d97 -s ours am: fea0378937 -s ours am: 6cba52d79c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: I9be83a69d1fd9a438fc1f1db19326202282b9ec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:42:10 +00:00
Hao Dong
6fa8b76eee Fix the flicker of buttons in FaceSettings. am: 9b4e923986
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23520055

Change-Id: I46fee0f19fd9cc90450e3021a54c733bdcc16ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:39:10 +00:00
Treehugger Robot
662ba59a47 Merge "Fix resource leakage caused by cursor" 2023-06-01 22:10:34 +00:00
TreeHugger Robot
fac048464f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: a93397786a -s ours am: 4f3f92d3d6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: I78a9429d4809186916ee01801adb8d3d0149e9ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:03:45 +00:00
Bill Yi
6cba52d79c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 13df8b2d97 -s ours am: fea0378937 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: I464cfee47faab4cb62e904878b180fba23b0d4ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:03:40 +00:00
TreeHugger Robot
4f3f92d3d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: a93397786a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: If1f201c41de40ce7ee10d922d39c4f6cc7cff992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 21:45:23 +00:00
Bill Yi
fea0378937 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 13df8b2d97 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681

Change-Id: Ifbe80a52951f72788a6cd4b8c7f25251a0bb87f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 21:45:17 +00:00
Hao Dong
9b4e923986 Fix the flicker of buttons in FaceSettings.
Test: manual test - 1. enroll a face 2. open face settings 3. there is
no flicker
Bug: 273408521

Change-Id: I34d069cb1dbaa4bc38671dc37e3c8fe285f700aa
2023-06-01 20:47:07 +00:00
Viesturs Zarins
c3aff24230 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454 am: 1740b0fb94 am: 9525407d86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I744bad3f9dcc1b525b8817c265dbf1787b80655d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 20:07:49 +00:00
Viesturs Zarins
9525407d86 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454 am: 1740b0fb94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I84572e61a0c9d333d39581ff0caa58ea59a313bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 19:18:48 +00:00
Treehugger Robot
0a9fe7a3ab Merge "Adding ShadowBluetoothAdapter for the test" 2023-06-01 18:52:02 +00:00
Viesturs Zarins
1740b0fb94 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I4ce4bd8a014bfb3b73b64bc2f6eaa60dba1b20e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:35:05 +00:00
Viesturs Zarins
628618e837 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454 am: d16cabe8be am: b4445b54ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I66b8a63b074df2ee4bc18a064e0ab7361e73c41a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:24:20 +00:00
Prabir Pradhan
edbc95e817 Merge "Add "Show key presses" to input developer options" into udc-qpr-dev am: 8fca8a72dc am: 753647d584
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23356796

Change-Id: I9c43018307252742022d19443c3423fa4ee05550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:24:09 +00:00
Pavel Grafov
0febeaf10c Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3 am: 81e7bac047 am: ca5faa59bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ic2a59515cdc3534472b95f7ad0d5bf21b28b4cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:21:18 +00:00
Viesturs Zarins
b4445b54ee Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454 am: d16cabe8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I0a4bcac3a844f65bb5478ec598f3251bd883369c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:20:55 +00:00
Pavel Grafov
f706596ec3 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3 am: 9de781781a am: 8be7a132de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I0ac3a895005dd03edfc8e052b95c538edcd63b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:20:47 +00:00
Prabir Pradhan
753647d584 Merge "Add "Show key presses" to input developer options" into udc-qpr-dev am: 8fca8a72dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23356796

Change-Id: Icc77794741fcbeb32726dddc972d75819b77428a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:18:33 +00:00
Pavel Grafov
ca5faa59bb Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3 am: 81e7bac047
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I7326aadc1ac511fc9a43888c421c8965b26c15a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:16:29 +00:00
Pavel Grafov
1fe81d1683 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4aef4043aa am: fa0a6b46dc am: fe800cc8a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I33a2b2e37ec2ada97fea1e58fc9771e7565df4b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:16:05 +00:00
Pavel Grafov
8be7a132de Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3 am: 9de781781a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ic7219d38c78d16639f79a5f785cfa78d112cbb5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:52:07 +00:00
Viesturs Zarins
d16cabe8be Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev am: bd60552454
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517276

Change-Id: I097068654c6a38fd0d9ccdad0ee05e928d8691b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:50:48 +00:00
Chun-Ku Lin
b34dcecc58 Adding ShadowBluetoothAdapter for the test
Many robotests that touches BluetoothAdapter might need to use our own
ShadowBluetoothAdapter which implements a "fake" getSupportedProfiles
call, so that the test won't trying to execute the android framework's getSupportedProfiles method.

Bug: 285235777
Test: atest AccessibilitySettingsTest

Change-Id: I5b3b2f4528a2b32aff22928653c57576981c0ff9
2023-06-01 17:50:10 +00:00
Viesturs Zarins
bd60552454 Merge "One more fix for missing Activity embedding allowlisting for Assistant." into udc-d1-dev 2023-06-01 17:38:21 +00:00
Prabir Pradhan
8fca8a72dc Merge "Add "Show key presses" to input developer options" into udc-qpr-dev 2023-06-01 17:37:44 +00:00
Pavel Grafov
81e7bac047 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I8ce1a31df186ab0a396c8b0858286fd1cc53f740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:35:41 +00:00
Pavel Grafov
9de781781a Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4c5394afb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: I51adff067a14ebf25999da538501a373f0b2eca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:27:53 +00:00
Pavel Grafov
fe800cc8a1 Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4aef4043aa am: fa0a6b46dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ice3fb038905d559362ebcbcf66bdb9a047e93e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:26:37 +00:00
Pavel Grafov
fa0a6b46dc Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0 am: 4aef4043aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320

Change-Id: Ibec147373fadf2c5a8a7550b541b75961fb41a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 16:46:35 +00:00