Commit Graph

125900 Commits

Author SHA1 Message Date
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
Jason Chiu
d48ba61155 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: I0b0a3ae052e682bef38eb55c72fce82c3072a209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:58:22 +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
Jason Chiu
8d939360ec Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: I18022745ce3b47bdc4afabbe7ece958d1ab8c41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 11:46:06 +00:00
Jason Chiu
52df3a5f64 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: ac614d26f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: Ie6d2c23fd067a9144414f9324c8908eca594c1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 11:09:25 +00:00
Jason Chiu
933d3279a1 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b am: 2b8067e797 am: d103243e8b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473

Change-Id: I9fbae9cd746b9adfa710618868db7fd2a50224d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 11:06:15 +00:00
Jason Chiu
a8142278e9 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: I8a7966fd9f3ee88683c35fd4f2bd7b60b475cbcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 11:05:34 +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
27000f18aa Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 2f3132c132
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250

Change-Id: I47b63b54475dc74cf2fb6c0b83dc827432edd4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 07:23:06 +00:00
Chaohui Wang
5ba8511fc7 Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 64d1cc6a13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426

Change-Id: I96a88c6ad033aef04e8c47a9f491167f9f88480d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 07:22:58 +00:00
Chaohui Wang
6a8c87c194 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: I800b807485952a0bc8cababa4b7664787acee356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 07:20:41 +00:00
Chaohui Wang
623f93a963 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: I24ef6e92b15ca3087752db52ed9244446a680aaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 07:20:25 +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
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
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
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
0339f763b9 Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 3b13b37028
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077

Change-Id: I354374cd867d8b93f6aaafab07d8516f9e5d052b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 05:09:25 +00:00
Yanli Wan
41b7cb56c7 Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: 4764e9a4da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457

Change-Id: I9ed3fe3c37da5d36c291129bb0a76903128f9c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 05:09:09 +00:00
Treehugger Robot
da647c56cf 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: Ie80f779283a48571a5169b7c408bc5a300640866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 05:07:08 +00:00
Yanli Wan
c7ba6daae6 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: I892da352fea5f362892c14b61e61a3b90a7ff4dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 05:06:45 +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
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
f2e08c31a5 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: Ib0523add5d3a5b2961d0e5c42d7dfdad13e38459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 02:31:02 +00:00
TreeHugger Robot
e523ee97f3 [automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 07366fc787 -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: I2cf0be2335825ecb4f448b0b1db7aa1b92346fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 02:11:41 +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
YK Hung
439c0b0057 Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 2bfdf17d69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351

Change-Id: I5b72555272e415807732c18e636ff1f49c061178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 02:10:10 +00:00
TreeHugger Robot
4d22ed26ff 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: Ia17423d04dd300569d950a309b9a6928f4f5cfa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 02:07:15 +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