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
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
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
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
YK Hung
bfc4637d09
Merge "Update incompatible charger checking rule" into udc-dev
2023-06-02 00:50:17 +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
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
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
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
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
4c5394afb3
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: I6a82013b578378facf575a6daa9070ff337d0fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 16:38:28 +00:00
Viesturs Zarins
8e33f2e52b
One more fix for 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.
ManageApplications internally launches Spa activity, so that needs to be allowlisted as well.
For more context, see
go/conversational-care-activity-embedding-allowlisting
BUG: 282921726
Change-Id: I4765bd6ba8006a56bc8b7016f57dac2188a14592
2023-06-01 16:30:51 +00:00
Pavel Grafov
8e13abebc0
Merge "Avoid double quiet mode requests" into udc-dev
2023-06-01 15:31:13 +00:00
Patty Huang
3e980c7c8f
Default show LE audio toggle in Device Detail
...
Bug: 284790607
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Test: Checks the LE Audio toggle is shown in Device Detail by default
Change-Id: Id301815513e8066941d3e4c44ab2e7b4d5ed011b
2023-06-01 20:36:34 +08:00
Angela Wang
d91da4f4ca
Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev
2023-06-01 11:04:31 +00:00
Angela Wang
1bc59caf13
Shouldn't show pair another ear dialog if hearing aid supports CSIP
...
Some devices may supports both ASHA and CSIP. If the device supports
CSIP, it'll automatically pair the other ear and thus no need to pop up
the pair another ear dialog which is specially for ASHA device.
Bug: 283269736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest
Change-Id: I9a8e3876e2905b18b1c63e74f47c6877504ebdc8
2023-06-01 09:54:35 +00:00
Chaohui Wang
0937c24f8f
Unify the strings for Erase eSIM / eUICC
...
erase_sim_confirm_button & erase_euicc_data_button are the same string
and with same meanings, but since the description of
erase_euicc_data_button is wrong and causes translate issue, clean up
erase_euicc_data_button then.
Fix: 279600315
Test: Visual check on Erase eSIMs dialog
Change-Id: I5dec3dd5c1e851f84dd401dddd5416a27cb1a428
2023-06-01 15:28:47 +08:00
TreeHugger Robot
c57d3de706
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
am: 9f831a600b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I15e5a054a77aafd21dcedea9b6a96a5b05b21e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:46:26 +00:00
TreeHugger Robot
9f831a600b
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: Ia75886edc6211a05645e047bc627a95f923cd6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:02:59 +00:00
ykhung
e2f19b7de9
Update incompatible charger checking rule
...
Bug: 278316711
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I8f720bcdf7c0efabc8278913ccf1c0427c857fac
2023-06-01 12:50:47 +08:00
Chaohui Wang
c27682642f
Merge "Update comment for Settings_srcs build target" into udc-qpr-dev
2023-06-01 03:31:45 +00:00
TreeHugger Robot
f65da39f37
Merge "Fix TetherSettings crash issue" into udc-dev
2023-06-01 03:11:20 +00:00
Angela Wang
7df08d69be
Merge "Make Hearing devices preference always visible" into udc-qpr-dev
2023-06-01 02:04:50 +00:00
TreeHugger Robot
48381cbd0a
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
am: becebd3a55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I097932611469fa2b7db783946c6e189a8aced28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 23:17:37 +00:00
TreeHugger Robot
becebd3a55
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I023988aa8e4e84af116b44a9c5fac1982b6183c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 22:34:47 +00:00
TreeHugger Robot
2484fa72d6
Merge "Add more search terms for WPP" into udc-dev
2023-05-31 22:02:49 +00:00
TreeHugger Robot
4d94d4e932
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070
-s ours am: d26db6ce5a
-s ours am: 34a8ceab26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I98132954e2a6ac54afc876bc6aee42957101d72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:49:37 +00:00
Bill Yi
92615faf3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c
-s ours am: 16f5f3cf3d
-s ours am: 10cb85a272
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ib6f9152c11c622cd84da15542d466e90408740fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:49:32 +00:00
Bill Yi
dd3aa0a710
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce
-s ours am: 58162acd2e
-s ours am: b32544a324
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: I71316fddc1dce53edac50e712c474cc5c879c539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:41:11 +00:00
TreeHugger Robot
b234c9d476
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours am: 53a315463c
-s ours am: 352a55249d
-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: I7b3281b3880345bf1e8f0f725fa40db6e57be5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:21:02 +00:00
Bill Yi
93430154f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours am: 5b8058c497
-s ours am: 5ef725d59a
-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: I7df4aa1b6aad3d2ef55fde8d080ec53d64a49ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:21:00 +00:00
Bill Yi
6ffaa03d9d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours am: 3365a09592
-s ours am: c4f7b4c792
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: I6f7e5282f6ae266296255e033b54b8c6077d9b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:20:32 +00:00
TreeHugger Robot
40d10d5a57
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4
-s ours am: f8b09e115a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: Ia2193600045ace9513c391550fd5ab54a7a68a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:20:02 +00:00
Bill Yi
a7de1c1abc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57ebe9c3b
-s ours am: 27cdb764dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: Ic7830cc73e05fdbfd7da1132be91f0a68a74d6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:19:54 +00:00
TreeHugger Robot
bffbb20d5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e
-s ours am: 647555b203
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: Ia324fdf5e9567b116d5bcc18da92d274050f9c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:19:49 +00:00
Bill Yi
5948267b82
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bcb8c25fd
-s ours am: 415c6816c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: I390f43e0cb8f6c111df09b8f3f7f724e28d34ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:19:37 +00:00
TreeHugger Robot
e27d26e27e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018
-s ours am: fc7894b9cd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: I55a09b63eeacb0dd49c080497114a964babe9a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:19:17 +00:00
Bill Yi
f1c2dac769
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4
-s ours am: 9fdc25a0f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467796
Change-Id: If63f37fb520c7a5093f555fa6431b6eb73c56f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:18:59 +00:00
TreeHugger Robot
34a8ceab26
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070
-s ours am: d26db6ce5a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Iaaa0fbfdb5af2fd52a0487efe0fc97d8fa6a128e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:38:06 +00:00
Bill Yi
10cb85a272
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c
-s ours am: 16f5f3cf3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I520d6e87532c6ded333dc07f49c83abe15af47ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:38:00 +00:00