Chaohui Wang
7804e5a59c
Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792
am: 3916082b8a
am: d9efea9f79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250
Change-Id: Ia0eed492961c046e1e3a0c6e531d4ddd9af10880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:25:18 +00:00
Chaohui Wang
cbb127a4e5
Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2
am: 129e80c7d8
am: 317ca924a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426
Change-Id: Ic66add1ebadccd7d86a842f6dd42a2f1332fbf68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:25:09 +00:00
Treehugger Robot
5a718028b0
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
am: 91737c0b3b
am: d19f4f85fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: I748f8989347cc703c941e6bb41008f22e70d7627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:25:02 +00:00
Yanli Wan
859df29cf0
Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678
am: f120e3d563
am: d3516aa5d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457
Change-Id: Ibf748080f7c2f753e7156831b0d15c156367dcdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:24:55 +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
Chaohui Wang
d9efea9f79
Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792
am: 3916082b8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250
Change-Id: I51a7c6cf0387b9dbe8a470a8aa2afa5b5695745f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:53 +00:00
Chaohui Wang
317ca924a0
Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2
am: 129e80c7d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426
Change-Id: I11733e5f2be96e9ac6fc5278d45fa58b5f5e44c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:46 +00:00
Treehugger Robot
d19f4f85fd
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
am: 91737c0b3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: I9277de61513b892dee6517e2a6a393f77451e9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:40 +00:00
Yanli Wan
d3516aa5d0
Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678
am: f120e3d563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457
Change-Id: Iaf3158afffa27a9c8dac6862a1516019613852ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:33 +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
3916082b8a
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: I8febd929357a2f9c9b14ed74cca2d31337b8b086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 07:00:43 +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
129e80c7d8
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: Ie2e298e17a01dcb246c50610653855afa18d2018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 06:36:56 +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
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
91737c0b3b
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: I272844e63ff78dc9ef730c04b768ee2dc1634e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 04:24:57 +00:00
Yanli Wan
f120e3d563
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: Iea9a8510ca11d9f8ae4bea20479c3ae8144507d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 04:24:41 +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
df23aab9bf
Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev
2023-06-02 02:11:08 +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
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
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
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
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
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
Weng Su
ef81179538
Skip Wi-Fi hotspot in Settings Widgets
...
- Do not show Wi-Fi hotspots in Settings Widgets if the config is not set to show
Bug: 275268676
Test: Manual test
atest -c CreateShortcutPreferenceControllerTest
Change-Id: I5d86a78c9d48c9b63faff50d46f1254dbefd94cf
2023-06-02 04:54:59 +08: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
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