Justin Gross
73dcd293c3
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: b9d09dddda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I2753b78613de8d49c3dad49b4b5cd5ce058d0e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 19:49:39 +00:00
Justin Gross
b9d09dddda
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I4bed3fa8bf3800894c159b2e6c11361ee1cf0cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 19:25:12 +00:00
Justin Gross
0e3ea95a58
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: Id08742370d36beeacedcad6538c8482c465b0324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 18:36:49 +00:00
Treehugger Robot
065885622b
Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343
Change-Id: Iee500ce4346a8554a37a4ff98ae5f3775b3ad411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 18:03:19 +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
Treehugger Robot
dbec7ba7fb
Merge "Use custom action key icon" into udc-qpr-dev
2023-06-05 16:56:35 +00:00
ykhung
7dec603727
Make the estimator cache logic is the same as SysUI flow am: 53f48c4a97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557957
Change-Id: I42405b0eef20370cc6a838d1040149f9a635d391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 07:02:11 +00:00
ykhung
53f48c4a97
Make the estimator cache logic is the same as SysUI flow
...
Ensure the remaining time estimator cache logic is the same as SysUI
https://source.corp.google.com/android/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java;l=375-386
Test: presubmit
Fix: 285747156
Change-Id: If7218dc70792aafaec45c71018897bed80df7f3d
2023-06-05 01:39:41 +00:00
TreeHugger Robot
f6f0c966a9
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 565f4b5730
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I045be75427f44db3ca778391bb64cbfe81822c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 23:10:47 +00:00
TreeHugger Robot
4834abe241
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I763e30e24d32f456b30bf174eeacc899149b0ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 22:23:17 +00:00
TreeHugger Robot
565f4b5730
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I2bc382165446ca91d4662b151174463781ae5c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 22:21:34 +00:00
TreeHugger Robot
f0503e2a51
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Ifdc153ead7f9c45046bf5df96b1d44cd576f561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 21:36:40 +00:00
TreeHugger Robot
25d24e0cf0
Merge "Restrict SimDialogActivity" into udc-dev
2023-06-02 20:41:47 +00:00
Jason Chiu
3812b37db7
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: d48ba61155
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247
Change-Id: I068fb33918911b727b529dd80db9f7f138c17b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 16:40:13 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Chaohui Wang
28300d5340
Merge "Unify the strings for Erase eSIM / eUICC" into udc-qpr-dev
2023-06-02 04:17:23 +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
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
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
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
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
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
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
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