Commit Graph

126331 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Becca Hughes
592f2fa78a Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 75d3f20983 am: cc9463004f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

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

Change-Id: I85daea6b7b2a61de5f71becdc1207c1128a18a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 23:26:53 +00:00
Himanshu Gupta
eaad3636a6 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

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

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

Change-Id: I28c8acdf1270f6a076a13f75561ecd378121bfe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 23:25:24 +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
Himanshu Gupta
c183e11c11 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: 0eff752b20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: Ia6371130705d0866e90b3cc8ae1d62208c607847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 23:00:07 +00:00
Becca Hughes
56c3b1cddc Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 26cc21e52d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

Change-Id: Ic3b80900b91bbda365773387789f12f8c41079b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:59:57 +00:00
Becca Hughes
249713a244 Hide enable dialog and prefix pref wrongly enabled am: e513c71189 am: 335c87b924
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516

Change-Id: I19ab97192df79f83be2178117dae042260236c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:59:42 +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
e8fee72eeb 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: I27f1fd02f26ee1c364b0dce001173d142e99a9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:44:18 +00:00
Becca Hughes
cc9463004f Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 75d3f20983
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

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

Change-Id: I49c396704a085e2f124be905b1fd54fce17feb5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 22:43:51 +00:00