YK Hung
af0eed4bd4
Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev am: b7cfe00235
am: aed98fc75e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123004
Change-Id: I9d62f957d5fcaeaeae4b851bf655b1fa7b37b090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:09:31 +00:00
YK Hung
aed98fc75e
Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev am: b7cfe00235
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123004
Change-Id: Ib94ebfd423cf3cf200f8af4bef1c1247bc3a7015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 11:28:22 +00:00
YK Hung
b7cfe00235
Merge "Move duplicate operations in the BackupHelper to OptimizeUtils" into udc-dev
2023-05-10 10:42:35 +00:00
Marcello Galhardo
d478fe535e
Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300
am: d608996d1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850
Change-Id: I040810ab3d4dea8e7b4784d9dadb160cb1811681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:45:18 +00:00
Marcello Galhardo
d608996d1f
Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850
Change-Id: I1bccba1b2642e39155543448f4d2feba3139f736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:44:40 +00:00
Daniel Huang
ad9525bd97
Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb
am: d7bec8275e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896
Change-Id: If77bcec6ce2013a26a886be6cf3bb066da0e9ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:43:42 +00:00
Marcello Galhardo
f5a3485300
Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev
2023-05-10 09:23:52 +00:00
Daniel Huang
d7bec8275e
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: I608e726a2ac9c92b9a565c938688430508276a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:00:16 +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
Daniel Huang
28aa2964fb
Merge "[Fixed] UI issues after rotation" into udc-dev
2023-05-10 07:59:20 +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
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
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
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
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
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
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
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
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
Bill Lin
4d5063ffdc
Merge "Refine SkipDialog title and desc by device configs" into udc-dev
2023-05-09 23:09:38 +00:00
Becca Hughes
48d406cecc
If you tap outside dialog then re-enable
...
Test: ondevice
Bug: 281696686
Change-Id: I7aee51952b8a905010710a574e0dd39616b2e5d9
2023-05-09 22:48:53 +00:00
Himanshu Gupta
0b19e92158
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242
Change-Id: If6633fb997d54a37ad07b26c097d98ce19de3602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:43:28 +00:00
Becca Hughes
ce1c823116
Merge "Fix provider update bug" into udc-dev am: 5031d67f21
am: 01b75c9719
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934
Change-Id: I3edb704fe21ee0391b23cd3ac17244e737651c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:43:15 +00:00
Becca Hughes
8df9b69c10
Hide enable dialog and prefix pref wrongly enabled am: e513c71189
am: 847e29faf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516
Change-Id: I4bca53d2ab71d1d88242483a5a2f9c3344098c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:42:50 +00:00
Himanshu Gupta
81180f985e
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242
Change-Id: Ie0b3e0bb0255d3b540267192123a21546358e7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:02:35 +00:00
Becca Hughes
01b75c9719
Merge "Fix provider update bug" into udc-dev am: 5031d67f21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934
Change-Id: Ibef3433141e67938efd2f3c07978870525e14a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:02:14 +00:00
Himanshu Gupta
53bf6b1dc8
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
2023-05-09 22:00:36 +00:00
Becca Hughes
847e29faf7
Hide enable dialog and prefix pref wrongly enabled am: e513c71189
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516
Change-Id: I1dd252d3452d0591313e3544a421d29def096cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:00:18 +00:00
Becca Hughes
5031d67f21
Merge "Fix provider update bug" into udc-dev
2023-05-09 21:48:13 +00:00
Becca Hughes
e513c71189
Hide enable dialog and prefix pref wrongly enabled
...
Test: ondevice
Bug: 281329396
Bug: 280905737
Change-Id: I82652a2520a2f9ca9bc7f8f78cf020bef7af0b15
2023-05-09 21:16:01 +00:00
Becca Hughes
49d11e4995
Fix provider update bug
...
Test: make
Bug: 280905737
Change-Id: Ia7f33f4c5e1168cadd66119c42bd52e0a80eda10
2023-05-09 20:41:51 +00:00
Derek Jedral
6b96b8fc4f
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: fff41e6aa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: I31a9c9a6a2b2fb1578f57f8b701dd1abcd6e0deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:45:48 +00:00
Derek Jedral
fff41e6aa3
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: I7aaeed6ad5967a88b04583b19f8b35e2551a3b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:04:09 +00:00
Treehugger Robot
870face978
Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda
am: 6dd01a2ef9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180
Change-Id: Ie03385ba50efc467c69fa51f63facaff559bf3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:21:10 +00:00
Derek Jedral
9c67ee1eb1
Merge "Remove feature flag for active unlock" into udc-dev
2023-05-09 17:17:11 +00:00
Treehugger Robot
6dd01a2ef9
Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180
Change-Id: I71ec2340aaa88c8f6b2404a967b9876735af6121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:41:55 +00:00
Treehugger Robot
f4939a4bda
Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev
2023-05-09 15:59:32 +00:00
Nan Wu
3407bb7611
Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4
am: cd6d1d53ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497
Change-Id: If263ed1327fb7bc170ecc7409983fb6c2098ce21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:13:39 +00:00
Nan Wu
cd6d1d53ca
Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497
Change-Id: I3d52133a999da5163b9d14d09afa9e8561292c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:29:30 +00:00
Nan Wu
38b99012f4
Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev
2023-05-09 13:49:06 +00:00
danielwbhuang
c92bd9789d
[Fixed] UI issues after rotation
...
1. Use onSaveInstanceState to store the data.
2. Do not repeat to automatically select the keyboard layout.
Bug: 281481973
Bug: 281461013
Test: manual
Change-Id: Ieaa8fa3d2e6c22c39b34313d255e4f7869777a8b
2023-05-09 20:03:17 +08:00
Vincent Wang
2e8cba3e95
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: 1e8948fbcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: I3cfeb0c4e8117e4aca83e3a0da18050210d29236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:33:29 +00:00
Chaohui Wang
39c6a23f92
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
am: b52b6f6d46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: I133e238da705871a308265ba66ea39e28b7e559f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:33:08 +00:00
TreeHugger Robot
cbe5c8f504
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
am: e6998973d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: I739c4c8bfe467ab16c293ddd9c738e669ea15d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:48 +00:00
Chaohui Wang
e2869f34fa
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
am: 9a96e14cc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: I0084db67d3524ae8d7a3309b6c015b8ddd286bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:26 +00:00
Treehugger Robot
fe33d447f9
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
am: 0cbdd648f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: I21debfcb2a88abb3c53f5af84627cfe8694fb37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:31:59 +00:00