Commit Graph

122738 Commits

Author SHA1 Message Date
Chaohui Wang
ff5c206d48 Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: a90bbde69f am: 046d7356c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: I296016f53a577cfc7f455a0c4c2510c96b74d33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 08:55:32 +00:00
Chaohui Wang
3b2e9a6b49 Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: e548290d95 am: 14cefd4c22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: I82500c575a8cf4e70e948a0e4d1fdfe10821dfe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 08:53:45 +00:00
Chaohui Wang
5b9d15074a Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: a90bbde69f am: c2fc133cc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: Ibfb703eb136ac170f250267f3d2a397af4f9aa1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 08:53:23 +00:00
Chaohui Wang
14cefd4c22 Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: e548290d95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: Ia95b3cbbbdabc15df6da3fdaf6737ddf1189b3ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 08:13:15 +00:00
Chaohui Wang
046d7356c2 Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: a90bbde69f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: I20704202fa0e85f67dfb56e17a808e25ed30f343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 08:13:07 +00:00
Chaohui Wang
c2fc133cc2 Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: a90bbde69f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: I627724bf83f86f57b13f16e20db6905911eaa071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 08:09:14 +00:00
Chaohui Wang
a90bbde69f Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: Iaf2a725e7dea566fe1bff5dd805598587482b1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:30:56 +00:00
Chaohui Wang
e548290d95 Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: I475da5b3c533b950a466af49e4ea9af7b5e32622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:26:40 +00:00
Wenhui Yang
2df5c77cf5 Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 4e4941480f am: 66defa99d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: I287f969b8e30b2d0f5a21e14b9df9c59f038754b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:12:03 +00:00
Charles Chen
03afefbdf1 Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: 2258dd83cd am: 497393ed85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: I66938c4fc1a746598d42568829ccdcdc15e2610c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:11:08 +00:00
Wenhui Yang
a65f94af21 Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 4e4941480f am: c4bc904c00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: I927833c44fef741b315509c5e2930c435648aee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:10:23 +00:00
Wenhui Yang
90be9e8b21 Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 2755f17587 am: bae452979c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: I1be4b55eddc5db23677431f87b7634ad0847af80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:10:11 +00:00
Charles Chen
a0b911119b Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: f8d75358ea am: a278f65bc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: If5b5c5f8fe084bb6078937df4fd9de9cc1012159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:09:51 +00:00
Charles Chen
29af9eb40a Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: 2258dd83cd am: fd34dac5ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: Iba244853e17971998b61ff6b9ff8e62ecccaa6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:07:22 +00:00
Chaohui Wang
d66335ae1c Merge "Use correct App info screen's trash can icon" into udc-dev 2023-05-03 07:01:57 +00:00
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
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
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