Wenhui Yang
c4bc904c00
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 4e4941480f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: Ied6bcd205ea1d88a36428572b34e27f9dab21fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:43:48 +00:00
Wenhui Yang
bae452979c
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 2755f17587
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: I062a429e27310066b8e23e4c078b958ed07a7247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:31:47 +00:00
Charles Chen
a278f65bc4
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: f8d75358ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: Iadb0dddd01881e456ab3d627e13bc9befae49a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:30:44 +00:00
Wenhui Yang
66defa99d9
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 4e4941480f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: Ie44e01786c43a3989e8076b7bf19654407f067ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:29:44 +00:00
Charles Chen
497393ed85
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: 2258dd83cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: Ieb1404f5045c6a32d35e045381dedb217cc93097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:28:47 +00:00
Wenhui Yang
4e4941480f
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: I0a7131567f578e045d20bc92fa50b1e4fb3f85cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:28:24 +00:00
Charles Chen
fd34dac5ea
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: 2258dd83cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: I9380b30d997f7e313d86af542631a4e22f0cb104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:27:08 +00:00
Wenhui Yang
2755f17587
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471
Change-Id: I9c48161c5f1a85251daee07af18f8d1f128c468c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 06:24:02 +00:00
Wenhui Yang
25de3b2b9c
Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev
2023-05-03 06:11:23 +00:00
Charles Chen
f8d75358ea
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: If45c374a6db9f383dad8f0e169f083e6acef9a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 05:48:59 +00:00
Charles Chen
2258dd83cd
Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038
Change-Id: I38c795e9729694e7720387dde7e8c2d5ece5e3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 05:48:14 +00:00
Charles Chen
cb5a240361
Merge "Disable Settings large-screen optimization" into udc-dev
2023-05-03 05:44:08 +00:00
Edgar Wang
b663f17d31
Add new page enum for Account detail
...
Bug: 260054568
Test: rebuild
Change-Id: I332bebf4f4ce725759860f937f50c8a6f21d8648
2023-05-03 13:06:28 +08:00
SongFerngWang
0d36d37590
Shows main_battery information for not untethered device
...
The metadata have main_battery and device is not untethered device,
then UI show battery by metadata.
Bug: 273907230
Test: atest AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I73d8a69c81fe234a5c576ca3769c1b079ac0ceb4
2023-05-03 04:23:50 +00:00
Chaohui Wang
2aca9d40f8
Use correct App info screen's trash can icon
...
Fix: 280120259
Test: Visual
Change-Id: I954c344c3f5fdd256de7519f1534c982c084a521
2023-05-03 11:59:43 +08:00
Gil Cukierman
78d8fe7472
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de am: 38a1a3222c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: Iabc5461e62d7973514bf9ffc15c06f8256517a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 01:17:49 +00:00
Gil Cukierman
4526bcb348
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de am: 3ef10ba1e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: Ieb20df3875eab187a7f3bcacc0a73ab3b432d248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:54:18 +00:00
Gil Cukierman
38a1a3222c
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: I68cc91998ade8d4986d3852f091655e08cad0ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:32:05 +00:00
Gil Cukierman
3ef10ba1e0
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: Ib594b56fc30255732e2f1d1f64e151619919c678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:30:11 +00:00
Diya Bera
18d92855e8
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc am: ba1b53e93e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: I7ea6e5857876b7b196caa41c83b11ad64a31a2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:15:01 +00:00
Becca Hughes
87fc456d05
Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f am: 5215358c2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: I6f4ca5374d51bca78e269d27c80f1f8b0bd2694e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:14:43 +00:00
Gil Cukierman
f4755a4649
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: dd5fef516d am: 68251aefed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: I90f0961312c163e19851d5f6a962edccb9ffa4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:14:19 +00:00
Diya Bera
6198906dd9
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: d4066f5f7a am: 4c2a3ab3a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: I8b8e7b8ed1299ea00b577fcffd78ddbd9d6676be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:14:01 +00:00
Becca Hughes
6ae92bcf16
Fork autofill default app selection am: ddf359d0f8 am: 476e6769eb am: 54734fd6b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: If8376ee32e87d3abd920223731c72eda9634613d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:13:34 +00:00
Diya Bera
82b093054e
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc am: 2f9df85d1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: Ib10ed5f2b4e08bf6e09d4cdc94778f5ff857988f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:12:44 +00:00
Gil Cukierman
68251aefed
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: dd5fef516d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: Ib5f3072d43710611efad4bbf69cb3566911c50e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:11:22 +00:00
Becca Hughes
dbee9f7670
Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f am: b66c783024
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: Iffbc0657ff72e99eaf4d4b09f083e1acb7326e65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 00:11:21 +00:00
Gil Cukierman
dd5fef516d
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: I4d39e88aca6e31c3e897a0d16ec45124906d63cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:51:30 +00:00
Diya Bera
4c2a3ab3a0
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: d4066f5f7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: Id052be1ff606206053901911b6d62b13460f5c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:50:31 +00:00
Becca Hughes
b21df6c5fc
Align settings with new mocks
...
Test: ondevice
Bug: 278919696
Change-Id: I274126bce3616596c4a81dd3385f0844d8bdbf71
2023-05-02 23:50:22 +00:00
Gil Cukierman
6b5aa480de
Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756
Change-Id: I7a4655c5ac9ef9e7d66486591e1cfe566f385a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:50:13 +00:00
Becca Hughes
54734fd6b3
Fork autofill default app selection am: ddf359d0f8 am: 476e6769eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: Ia05a440e7c334020a829c355a32d3a250e2417ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:50:13 +00:00
Diya Bera
ba1b53e93e
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: Icd7ae4ce31f59c7a0e3d47d368d9904c743384eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:32:08 +00:00
Becca Hughes
5215358c2c
Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: Iffea8157079911c9a26de9cf8f03c3cea3f6d3fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:31:48 +00:00
Diya Bera
2f9df85d1a
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: I347b01c9dd6ef0fe73b4cd2052060480697266b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:28:04 +00:00
Becca Hughes
b66c783024
Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: I5c3133f66d3c0245b408946fdcbeffa9f4f91018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:27:42 +00:00
Gil Cukierman
6a2f6960ab
Merge "Enable null cipher toggle by default" into udc-dev
2023-05-02 23:11:40 +00:00
Diya Bera
d4066f5f7a
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: I9e5379823d02eed4848e033eb72bf163456a4f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:49:25 +00:00
Diya Bera
eb63f480cc
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757
Change-Id: I97f9fe6b4e4fc3abaeff42490b32008c760cb29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:48:27 +00:00
Becca Hughes
476e6769eb
Fork autofill default app selection am: ddf359d0f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: I52df2333cec85e89f24940c7a463a5ce57f50655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:47:57 +00:00
Becca Hughes
02e4e1d05f
Fork autofill default app selection am: ddf359d0f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: Ibf684e0c968d8dfa39f3fa5a74929c0acf0bbd8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:47:39 +00:00
Diya Bera
7dd5f5e156
Merge "Remove "Try again" from fingerprint error dialog" into udc-dev
2023-05-02 22:34:09 +00:00
Becca Hughes
d4cf2d1171
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c am: 09b2df4303
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I750dc699264f522512cf8ecf41b2be97bb12a4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:30:40 +00:00
Becca Hughes
3954cb8526
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: b31c4909db am: ce50f13168
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I78f2627f8a85c4e8711a31c73eb3f16af923b9d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:30:08 +00:00
Becca Hughes
58cc818200
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c am: 1ac2d51e73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: Iceef860c979f74c2b3ee2d9ae774202964262164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:29:28 +00:00
Becca Hughes
ce50f13168
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: b31c4909db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I8244d5f22d4d4733e39ca9f45ffc7be65407b4af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 21:47:15 +00:00
Becca Hughes
09b2df4303
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I490298203b8748898ae07ca00a9372241b2e6199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 21:46:55 +00:00
Becca Hughes
1ac2d51e73
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I1bbab46eacf48ee4ce8aa9f176017177eab80c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 21:42:54 +00:00
Becca Hughes
c5f2edcb4c
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I44dc0cd87c0be7df8b1506d203078ff57ff21138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 21:03:56 +00:00
Becca Hughes
b31c4909db
Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585
Change-Id: I6a7611e31c835d41eb53a1160bd7d7aa68b9f0ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 21:00:01 +00:00