Commit Graph

126499 Commits

Author SHA1 Message Date
Daniel Huang
52567d5ce9 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I2c554ed2dbe696f2d8c10b5860b6796eba2dccf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 08:56:36 +00:00
Guangjie (Jerry) Shi
c6c4a3a2da Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 54a6dd7217 am: 7045faeae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: Ic49765df91b4b932251c9e44b41696dd494d8e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 08:55:21 +00:00
ykhung
981726c0e7 Move duplicate operations in the BackupHelper to OptimizeUtils
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
adb shell bmgr restore 34bbf79f36c8ed43 com.android.settings

Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I2bc8842849998841aa38af3564f51bb81606c8cf
2023-05-10 08:41:58 +00:00
Evan Laird
328e1cb636 Merge "Set default value of battery percent preference" am: 145caf7d4e am: b4d2e7da30 am: ff6f9337c8 am: 930bee6167 am: 2785a8410d am: 4c0fb53033
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: I29d607cfe8128df313d7059b4043d4a1c75ebd0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 08:28:01 +00:00
Daniel Huang
28aa2964fb Merge "[Fixed] UI issues after rotation" into udc-dev 2023-05-10 07:59:20 +00:00
Guangjie (Jerry) Shi
27b27f8143 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 8e70a25893 am: d8bfff3134
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: Iaebddf667cded193f7d571bd5696217f801c216e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:58:02 +00:00
Guangjie (Jerry) Shi
7045faeae1 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 54a6dd7217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: I3763ee97b9bfb17e1aa2f654abb4e059532d1ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:57:59 +00:00
Chaohui Wang
e598d5a065 Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: e98635c9fd am: b03ee1ad90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: Id8c9e51796dad8774392df0afa5a1f8f8234ec9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:57:52 +00:00
Guangjie (Jerry) Shi
15eb2fd250 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 8e70a25893 am: 02f56a627a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: If2b67e526591a8468b098626299dc990d238d78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:37:14 +00:00
Chaohui Wang
16edb9b32e Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: e98635c9fd am: 9ea3fb9e53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: Iefd82fa6ea75e2b998e8478f03182fe921be6d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:36:32 +00:00
Chaohui Wang
6a8a4127c0 Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: 8178129fca am: 7b7ff6e1db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: I586069702c45a8df6a7713fa3032fd55323bd784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:31:37 +00:00
Guangjie (Jerry) Shi
02f56a627a Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 8e70a25893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: Ibc4efb04f0c68aa79883cb4d7fe37777c38ffc41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:31:33 +00:00
Guangjie (Jerry) Shi
d8bfff3134 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 8e70a25893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: I312a5f5d30b89205938d43567a1a6946a46bc6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:15:30 +00:00
Chaohui Wang
b03ee1ad90 Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: e98635c9fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: I96513932ba3e689f6d69400f134082d22d64019a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:15:09 +00:00
Guangjie (Jerry) Shi
c93df29409 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: Ica8ac64f4e85934d11e556ff214db60afa75b8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:14:54 +00:00
Guangjie (Jerry) Shi
8e70a25893 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: I79921f8f98396e741852d68f81b1d537ba0e87f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:14:52 +00:00
Chaohui Wang
9ea3fb9e53 Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: e98635c9fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: I8a8e870d4a36effc36110e3bde00b4b7fa0fca89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:11:51 +00:00
Guangjie (Jerry) Shi
54a6dd7217 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: I6063d2795be8883e3d46b7a3290a32cb1addc3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:10:32 +00:00
Chaohui Wang
7b7ff6e1db Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 am: 8178129fca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: I425facb683b1af1816c7ae81faf3e91a2fa73c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:56:54 +00:00
Guangjie (Jerry) Shi
ba44f13498 Merge "Add null check for settings default preference controller" into udc-dev 2023-05-10 06:30:37 +00:00
Chaohui Wang
e98635c9fd Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: Ib24e2c605b64bc20abf7b1cdf2a1af3dee2e0346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:15:55 +00:00
Chaohui Wang
2bf036e61c Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: Ia36b1bc8d0263d26f0550a0dbda3a5189c2e49a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:14:43 +00:00
Chaohui Wang
8178129fca Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: Idd096dfa879208010ce24ae96432d42ceae572d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:06:48 +00:00
Chaohui Wang
6619994919 Merge "Fix button not clickable in sim confirm dialog" into udc-dev 2023-05-10 05:26:02 +00:00
Chaohui Wang
9beb5605b8 Fix button not clickable in sim confirm dialog
Bug: 261994361
Fix: 280787593
Test: Manually with Talkback on
Test: Manually with Talkback off
Change-Id: I23d4ea816eb534dcde48cc2ebc6bb4a9770d107e
2023-05-10 04:15:37 +00:00
Jerry Shi
21df117d52 Add null check for settings default preference controller
Test: local built and tested
Bug: 281771729
Change-Id: Ib3467c22262125ac7dac00eb9ea68516ddf53b5a
2023-05-09 21:00:32 -07:00
Becca Hughes
8eee400a71 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: cb0643a885 am: fffa183326
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: Ia22fd2b7172a0e82c43c874d6ebb76228f9456d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:57:08 +00:00
Bill Lin
9ae72a84e7 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1 am: 55335bc164
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I4ceb1d92afbf18fb5d8ff2f97e8042648a478b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:56:01 +00:00
Becca Hughes
f23c05db51 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: 654313a55b am: c20caa3150
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I4ead74bde3a45931a46cf72aa29609cb6eefce9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:55:52 +00:00
Bill Lin
d19a1c4a0d Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: 496ad744db am: feeaade45d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: If60c03b305fef3e1d8e085f494611b409c390e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:55:30 +00:00
Becca Hughes
af5ce05bf9 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: cb0643a885 am: fce08f688d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: Icfb04efc047f26c51465336dd62c9e1cda49b62e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:54:59 +00:00
Bill Lin
547f6d63a2 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1 am: e5dfcc0270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: Ic223c0fd928b5c50d29a4198379586da3fce077c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:53:39 +00:00
Becca Hughes
c20caa3150 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: 654313a55b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: Ib3471e50a659bae87fcc590f9e1e8d5bc16f9263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:14:32 +00:00
Becca Hughes
fffa183326 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: cb0643a885
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I596356a0051c76953f5ba59918be35b1e9009488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:13:59 +00:00
Bill Lin
feeaade45d Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: 496ad744db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: Ie2abbf89ba36673725f642de3f8e9032dbb653b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:13:16 +00:00
Bill Lin
55335bc164 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I050c45b75779a313d6153ff22f84c09c8272fc7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:12:58 +00:00
Becca Hughes
fce08f688d Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 am: cb0643a885
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: Ic8bb677b710a89f1cde4b6c77ea14dce9c2ad9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:10:01 +00:00
Bill Lin
e5dfcc0270 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I409d9db2155b71005aeec519dadac701f5e5d550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 01:09:37 +00:00
Becca Hughes
6a52165bd2 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I225d72a2eb1442cfb6594b147c71e860fd8ab981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:51:56 +00:00
Becca Hughes
cb0643a885 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I0e83c6d3fe56b9dc06709e8942e51e052e89aa0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:51:07 +00:00
Hao Dong
bb03fc355e Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." 2023-05-10 00:48:15 +00:00
Becca Hughes
654313a55b Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I2a2227ff6f5eb821b2ccc61d430b5a12bbbc3ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:46:49 +00:00
Becca Hughes
90b344e760 Merge "If you tap outside dialog then re-enable" into udc-dev 2023-05-10 00:33:11 +00:00
Bill Lin
9eb1ba4169 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: Ia55e7d1a1abadd54644e8ec60c61930cf7255abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:29:49 +00:00
Bill Lin
496ad744db Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I5c1e7bca3eda4ce7bbf056107dd7e7631fd82fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:28:40 +00:00
Bill Lin
f6d23468b1 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I4606997e91b4e23c76480362c6736efb464d7652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 00:28:30 +00:00
Himanshu Gupta
56eb5c896d Merge "Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default." into udc-dev am: 53bf6b1dc8 am: 1e77d0d6c9 am: e8fee72eeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: Iec71adbb6636ca6725eb896a3b4d6140f2cbff6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 23:51:24 +00:00
Himanshu Gupta
a4a9af2cd3 Merge "Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default." into udc-dev am: 53bf6b1dc8 am: 81180f985e am: 0b19e92158
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: I7aa656a97b62a4a5277491a977b371d8f4ba7856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 23:34:35 +00:00
Becca Hughes
537b0d6ecc Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 01b75c9719 am: ce1c823116
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

Change-Id: I71e20d7699b9b7d998454fb00d9e4ee1631899b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 23:28:40 +00:00
Becca Hughes
e1e9ee90a3 Hide enable dialog and prefix pref wrongly enabled am: e513c71189 am: 847e29faf7 am: 8df9b69c10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516

Change-Id: Iaae75ac8673eedeffaa7d12e923525f77e8999a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 23:28:17 +00:00