Bill Yi
63067fce6e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59cfc8ae14 -s ours am: e68afc2727 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556174
Change-Id: I3fefad6e2b7a6b38e4fda12ab345bf17823a0a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:03:08 +00:00
Automerger Merge Worker
df0a3a6534
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours" into udc-dev-plus-aosp
2023-06-05 20:59:18 +00:00
Bill Yi
9789ce21f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: Ie3ac1bef85aecede1be8673730dfc5c4ea51538e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:58:58 +00:00
Bill Yi
9ef2618eca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: f108c63394 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: I653c865636253df6b60d89b18965dbd4ac54fc52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:58:53 +00:00
Bill Yi
a9bc102471
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: I9a0d68e98124579ee8f4ae7fea209960abc73282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:58:43 +00:00
Bill Yi
e68afc2727
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59cfc8ae14 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556174
Change-Id: Ib4c87cb28adc652f306b2101984d13301242b1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:29:21 +00:00
Bill Yi
aeacaaee64
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: Ie42f1d09d6218ba3350b6971370fd554ea10f719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:18:41 +00:00
Bill Yi
f108c63394
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: I2e93a216a570bf7cd685e691e593ba8163089f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:13:06 +00:00
Bill Yi
0a31322199
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: Iaf4243052f0b3cf46d02ca11aa64f9e48e8c9a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:11:33 +00:00
Justin Gross
5e2768327a
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I17069f20447108b5346fc7246288e8ba93b35f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 18:37:33 +00:00
Justin Gross
89e829e3dc
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev
2023-06-05 18:00:15 +00:00
Bill Yi
1b5824f6c9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia19dd8b4893160c436ed2a4b548b1c0a18ac5642
2023-06-04 18:44:23 -07:00
Bill Yi
fe27600237
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I00c2c563b2687f49c85e0774c1a8b279e8781ede
2023-06-04 18:36:19 -07:00
Bill Yi
59cfc8ae14
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib2c29e2e9c358a14b63738fba13a296d7d49f9ed
2023-06-04 12:24:22 -07:00
TreeHugger Robot
a7b0933819
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Ic495c899a15cfbfaca7edb76f4be6cb79c8f8c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 21:37:08 +00:00
TreeHugger Robot
25d24e0cf0
Merge "Restrict SimDialogActivity" into udc-dev
2023-06-02 20:41:47 +00:00
Jason Chiu
ac614d26f0
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247
Change-Id: Ia77c8a4f15ff6983bc56b86372e50332cf50f4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 11:01:06 +00:00
Jason Chiu
b2ed35b2ae
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev
2023-06-02 10:27:14 +00:00
Jason Chiu
d103243e8b
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b am: 2b8067e797
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473
Change-Id: Ie6f50f7e915be5990ba5f33c5e375f3508491b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 10:21:49 +00:00
Jason Chiu
2b8067e797
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473
Change-Id: I2e223f815b9d96f0766a139cdee53884f47d849b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 09:34:10 +00:00
Jason Chiu
390c348d4b
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473
Change-Id: I3d1b66a4288434d52075538af737c2d1ac33f4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 08:49:21 +00:00
Jason Chiu
428e97cdfa
Merge "Do not init dashboard categories when SetupWizard isn't finished yet"
2023-06-02 08:05:32 +00:00
Chaohui Wang
2f3132c132
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: I6007c4a5a009d72bca37f7521bb82e934d547be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 07:01:13 +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
64d1cc6a13
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: I4a029988fb74df2cf270dbe09b67f747e5cb8223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 06:38: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
Jason Chiu
2225729ce2
Do not init dashboard categories when SetupWizard isn't finished yet
...
The generated category cache during SetupWizard flow is invalid.
Bug: 261885832
Test: manual
Change-Id: Id2108b2cc4ab557b086c4dbbd5dc7722c73e74d3
2023-06-02 04:55:20 +00:00
Treehugger Robot
3b13b37028
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: Id0a855210c55cc92571aef6cd3522116403d1aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 04:25:39 +00:00
Yanli Wan
4764e9a4da
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: Ie341ac02032d0ff93e81fb7f63474f23517ad3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 04:25:22 +00:00
Treehugger Robot
47d3cfe635
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev
2023-06-02 04:19:22 +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
07366fc787
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: I73529848e6c47197c0219a94ef75e1a6a80f2f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 01:24:44 +00:00
YK Hung
2bfdf17d69
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: If657a49c9a84ef7d88eec14453aae016a3e0c005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 01:23:02 +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
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
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
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
662ba59a47
Merge "Fix resource leakage caused by cursor"
2023-06-01 22:10:34 +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
Justin Gross
d96911734c
Enable vendors to add preference controllers in mobile network settings
...
Implement AbstractSubscriptionPreferenceController so that vendor code
can add preference controllers to MobileNetworkSettings.
Bug: 280323952
Test: manual
Change-Id: I6b1916d8956ebd4163958155a448e7fb27942951
2023-06-01 20:33:23 +00:00
Pavel Grafov
4aef4043aa
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: I9eaafcb4e1ce813e8775cbce0c6eda5137e922fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 15:57:28 +00:00
Pavel Grafov
8e13abebc0
Merge "Avoid double quiet mode requests" into udc-dev
2023-06-01 15:31:13 +00:00
Cao Peng
38f1b45d50
Fix resource leakage caused by cursor
...
Change-Id: I9507658cc82a2b9760507530920a37044f7de2fd
Signed-off-by: Jia Jia <jia.jia@zte.com.cn >
2023-06-01 18:16:26 +08:00
Chaohui Wang
9ab4ef224e
Hide Show System on SPA version App languages
...
To align with non-SPA version.
Fix: 285264906
Test: Visual check on App languages
Change-Id: I7f8b0aec0e33fcb46939075458a8b0a710fac640
2023-06-01 09:20:42 +00:00
Jason Chiu
2560c0df9b
Do not init dashboard categories when SetupWizard isn't finished yet
...
The generated category cache during SetupWizard flow is invalid.
Bug: 261885832
Test: manual
Change-Id: Id2108b2cc4ab557b086c4dbbd5dc7722c73e74d3
2023-06-01 16:07:53 +08:00