TreeHugger Robot
b4409c9bf3
Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf
am: aac695129e
am: 374aefc2d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040
Change-Id: I5c6a6d3c6b3698c07585e06c00073e7c7c76e19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 18:10:46 +00:00
TreeHugger Robot
25b154d2ea
[automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e
am: 01360b3729
am: 800256a4c7
am: 0663defcd3
-s ours
...
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324
Change-Id: I9a96122b62491014b0af7962e84ea51cadba53c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 18:10:37 +00:00
Chaohui Wang
14f7f6c818
Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792
am: 3f05e59982
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250
Change-Id: I0837bd1fd686f4d77c148a2405fe5ae8a644ac99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 18:04:47 +00:00
Treehugger Robot
249107bc45
Merge "Fix AccessibilityHearingAidPreferenceControllerTest"
2023-06-02 17:48:23 +00:00
YK Hung
7e0dab25a9
Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
am: 4eabcdea6d
am: 6f892d206b
am: 748a9d228f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351
Change-Id: Ia69a096a12861d0fb97e293e46b6dfe823d9f6f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:51:12 +00:00
TreeHugger Robot
374aefc2d7
Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf
am: aac695129e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040
Change-Id: I559c2dc8f9ba35a434d58551c33f6b10eec1d4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:24:46 +00:00
TreeHugger Robot
0663defcd3
Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e
am: 01360b3729
am: 800256a4c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324
Change-Id: I28b4583ff719cd6d5064b405917f8c392e821ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:24:39 +00:00
YK Hung
748a9d228f
Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
am: 4eabcdea6d
am: 6f892d206b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351
Change-Id: I836fd07341a8817fd2d267f4aed049b345e2469e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:19:49 +00:00
TreeHugger Robot
aac695129e
Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040
Change-Id: I5202aa1f9202a906ef197a0f60209edf73df7ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:27 +00:00
TreeHugger Robot
800256a4c7
Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e
am: 01360b3729
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324
Change-Id: I7ade14ddd9840d45d97f587828edc4cbe0403a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:17 +00:00
YK Hung
6f892d206b
Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
am: 4eabcdea6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351
Change-Id: I924fe9631af514f947d278f32e808938a9c4c72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:50:24 +00:00
Chaohui Wang
2b3df243fc
Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2
am: d381b663ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426
Change-Id: I98903bf49d52011cf43258686e1f6cf8caca3058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:38:00 +00:00
Treehugger Robot
3ac151950a
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
am: 88a51ef8be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: Id13a9a99f652848a60d38813e5802b9d34b1bcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:37:32 +00:00
Yanli Wan
c3f578b815
Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678
am: 0ca7d94e3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457
Change-Id: I90932b3abaa492d5e381ef5a5c1043fdce3a8ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:35:43 +00:00
TreeHugger Robot
51cdda6a02
[automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e
am: 502e6d6e5b
-s ours
...
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 219d4e6ca1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324
Change-Id: I6b9fef9f2d661805488bba331f632f4868e930d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:34:41 +00:00
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
3f05e59982
Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250
Change-Id: I9edc0a5310147ad385df5e7fab30136fb01f94c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 07:00:16 +00:00
Chun-Ku Lin
0aea3ddb33
Fix AccessibilityHearingAidPreferenceControllerTest
...
**Root cause**
When adding a feature flag on showing different hearing aid page on
click, the tests were not executed because they were marked as @Ignore.
In order to execute the test, we need to turn the feature flag off, so that the test run in the same scenario where the feature flag was not introduced.
Bug: 279082331
Test: atest AccessibilityHearingAidPreferenceControllerTest
Change-Id: If11ac40a7ea3926578992f7c0577e7cbb1bb3273
2023-06-02 06:47:38 +00:00
Chaohui Wang
122ba16792
Merge "Hide Show System on SPA version App languages" into udc-dev
2023-06-02 06:41:54 +00:00
Chaohui Wang
d381b663ba
Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426
Change-Id: Ib51fa7a659803d4afa3c1193060f29295fca4255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 06:37:09 +00:00
Chaohui Wang
68995792c2
Merge "Fix padding issue on Scan QR code screen" into udc-dev
2023-06-02 05:52:16 +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
Treehugger Robot
88a51ef8be
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: If1842f2868204899a343487ac8469c0d4a283df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 04:24:55 +00:00
Yanli Wan
0ca7d94e3c
Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457
Change-Id: Ice9e893d2adbcf98f0728992e7696ebe807afae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 04:24:47 +00:00
Treehugger Robot
47d3cfe635
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev
2023-06-02 04:19:22 +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
Yanli Wan
7cc3625678
Merge "Update the string of Settings preference for device lock" into udc-dev
2023-06-02 03:52:00 +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
df23aab9bf
Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev
2023-06-02 02:11:08 +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
TreeHugger Robot
01360b3729
Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324
Change-Id: I214c99dc050c5c5cac5d080906e18d6d2b65f159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 01:24:02 +00:00
TreeHugger Robot
502e6d6e5b
Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324
Change-Id: I3432fc6d54519f74dad00feccfbd047cbbd18d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 01:23:24 +00:00
YK Hung
4eabcdea6d
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: I7a3133f83570a82bb5e87dd1096d5d47f85f3390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 01:22:21 +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
641d07244e
Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev
2023-06-02 01:15:00 +00:00
Chun-Ku Lin
7a8602dce9
Set textDirection=locale and layoutDirection=locale for alert dialog
...
It's strongly recommended by internationalization team to set
android:textDirection="locale" and android:layoutDirection="locale" to
tackle a text that consists of RTL and LTR characters.
Bug: 279491415
Bug: 283608580
Bug: 283608637
Test: manual
Merged-In: I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841
Change-Id: I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841
(cherry picked from commit 219d4e6ca1
)
2023-06-02 01:07:11 +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
Yanli Wan
23560717c4
Update the string of Settings preference for device lock
...
Bug: 282040794
Test: build & test locally
Change-Id: Ic9139c061b8cbea08bf74d0462420bf3157c4477
2023-06-01 22:57:48 +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