Commit Graph

126393 Commits

Author SHA1 Message Date
Marcello Galhardo
76c05274ee Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: 8f2ebb1510 am: af59a41da5 am: d63e9096e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I31e99bb9e86df2202240e33955e01d5ebd1df497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:38:27 +00:00
Daniel Huang
96e1795351 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: 52567d5ce9 am: 0be8644109 am: 7bd95dd6f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I93813a5828ae13fda9dfa1007c976797b8a0dcdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:37:17 +00:00
Daniel Huang
296da292b3 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: d7bec8275e am: 67e1c060dc am: 5c131ca160
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: Ic6977ce2c1e6d8f449a767da05fbff42c8290af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:36:51 +00:00
Daniel Huang
a7b410e2f8 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: 2c30f604b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

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

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

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

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

Change-Id: I217c55534d755b1001c666c1690c8eb22c64a47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:13:27 +00:00
Marcello Galhardo
6255d37ad9 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e am: af658f1ab4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: Iab8c01d073f10dbbb55ebead9b8a883f5a93065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 18:57:21 +00:00
Daniel Huang
615b76a79d Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: d7bec8275e am: ad9525bd97 am: 87d9d70efc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I61fed7e932c8dc476b689ca61bbf8ee919924bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 16:29:52 +00:00
Himanshu Gupta
c75b8d6bd9 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 am: 56eb5c896d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: I4f26776fd228238bfca70d85a4364b8ab2c0dae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:03:05 +00:00
Himanshu Gupta
99ecc49ade 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 am: a4a9af2cd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

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

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

Change-Id: I048d8dfe5b7c31c59d5b17f8ea96855b5fca727d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:02:38 +00:00
Becca Hughes
0f88c15b00 Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 75d3f20983 am: cc9463004f am: 592f2fa78a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

Change-Id: Iaca714f73270d0f282d77116b0878b2d22849beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:02:30 +00:00
Becca Hughes
cd36d82c9f Hide enable dialog and prefix pref wrongly enabled am: e513c71189 am: 914cd963d6 am: 431b724199 am: ac2be1741f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516

Change-Id: I59793eb2b71def9230f1c7a8bd9d75e820e06bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:02:20 +00:00
Himanshu Gupta
eeb39ed143 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: 5145d15830 am: eaad3636a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: Iac63af62db47d84c690b4fae688d996e68209335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:02:11 +00:00
Becca Hughes
7e1cac8de6 Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 01b75c9719 am: 40af741095 am: 4f42526031
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

Change-Id: If0b00ad4fff0aa8ae698301afc2244f08706bdc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:02:00 +00:00
Becca Hughes
1275445dd7 Hide enable dialog and prefix pref wrongly enabled am: e513c71189 am: 847e29faf7 am: 015d352ccf am: 471977164c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516

Change-Id: I4866417ca160fb38959c26ed2582ab2faa7b5f4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:01:48 +00:00
Derek Jedral
c0b72b84c6 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: fff41e6aa3 am: 0863849a36 am: abbf9c2894
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I8eb1965b294550035d209d355c383a53d8a31b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 13:06:08 +00:00
Marcello Galhardo
d63e9096e7 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: 8f2ebb1510 am: af59a41da5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I57575354e1abd70c79083fd850f2db6a8c6ffb01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 10:21:11 +00:00
Daniel Huang
7bd95dd6f4 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: 52567d5ce9 am: 0be8644109
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I0fbc55653e50e9cd0e0d573592c5bbd325361da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 10:20:57 +00:00
Daniel Huang
5c131ca160 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: d7bec8275e am: 67e1c060dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I2cc078b95b002555b3e94b49d48c93fbae0f080e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 10:20:45 +00:00
Marcello Galhardo
af658f1ab4 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I400e5f91996be0e02d488d0fee5e2b59e3b1b7ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:48:00 +00:00
Daniel Huang
87d9d70efc Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: d7bec8275e am: ad9525bd97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I4ad5c255c7bf5045762486d2126ffb9f1553c12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:47:48 +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
af59a41da5 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: 8f2ebb1510
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I0ecf5c9c5af83b4d9e4d8ebf50d0866e4665cfe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:45:07 +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
Daniel Huang
0be8644109 Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb am: 52567d5ce9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I1d2dd9d4ea85542a19ab600bdbdd8ebb6f27fed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:43:06 +00:00
Marcello Galhardo
8f2ebb1510 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: I9bf03c4fec44e7fe97f3d1023115d823607d20c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:40:30 +00:00
Daniel Huang
67e1c060dc 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: Ic9de27ea9701df5ca3bbe7cec284f003065ebdda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:39:30 +00:00
Marcello Galhardo
f5a3485300 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev 2023-05-10 09:23:52 +00:00
Derek Jedral
9340c6f9b7 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: fff41e6aa3 am: 6b96b8fc4f am: 27b5b2d1ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I045d924f9af06aa7ec3ab18f421b72ce7a42cdd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:00:26 +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
Daniel Huang
2c30f604b4 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: Icbc09be2306b0a5a6bcc2d55aa7777acd1d8cfb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:00:09 +00:00
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