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
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
Chaohui Wang
80462c370b
FRP bypass defense in the Settings App for SPA
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Fix: 280154358
Test: Unit test
Change-Id: I06e73386711d5ad13c89d033cf0fe3164781c0ef
2023-05-03 10:53:27 +08:00
Xiaozhen Lin
bb54d71a33
Password clearing in Settings App
...
Pixel Imprint will call onDestroy() whenever its menu is invisible.
(https://cs.android.com/android/platform/superproject/+/master:packages/apps/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java;l=639?q=packages%2Fapps%2FSettings%2Fsrc%2Fcom%2Fandroid%2Fsettings%2Fbiometrics%2Ffingerprint%2FFingerprintSettings.java&ss=android )
However, Screen lock should have the same behavior as Pixel Imprint but
it doesn't.
onDestroy() for Screen lock should be called whenever we exit the menu
or the menu becomes invisible. Otherwise, the password may be leaked to
RAM unexpectedly in some situations.
Bug: 233373529
Bug: 278488549
Bug: 278530059
Test: manual
Change-Id: Ib11af7073aa1c49096a66c9f5a462e7caf18df5e
2023-05-03 02:04:59 +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
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
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
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
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
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
Bill Yi
c206bd1217
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6837f08c5af272b81db9ece46d63b09dfb2e5757
2023-05-02 13:43:14 -07:00
Bill Yi
1e2f1374d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I290a28733ab5a271def74e43c8c9f9e60c734589
2023-05-02 13:33:13 -07:00
Becca Hughes
ddf359d0f8
Fork autofill default app selection
...
We are merging the default app selection for autofill
with credman so this forks the existing UI (so we can
flag it off).
Test: ondevice
Bug: 278919696
Change-Id: I96bcf1ff86b169a182b9974f7384c45b474c3d5d
2023-05-02 20:31:14 +00:00
Bill Yi
e5d0ccf90c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I36ec35914f0caacbed18b699b8a40a1fbe445392
2023-05-02 13:29:01 -07:00
Becca Hughes
99f45dd59b
Merge "Add combined provider class that manages new settings UI" into udc-dev
2023-05-02 20:16:32 +00:00
Bill Yi
6096cceb3c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If492025e729d55de4965fecb78a01471ee031f28
2023-05-02 12:53:06 -07:00
Bill Yi
dc96a91fff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I03ad9b85b7b5eb9d96bd50e44d312d57b9d4ffac
2023-05-02 12:49:37 -07:00
Bill Yi
5c7368b683
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f16d7fd8a5d28fda2eb4b50d4882f721dee6c7e
2023-05-02 12:47:06 -07:00
Bill Yi
e23f6ea87c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If02b1ac12116337530648f57bf21e401e752dcdd
2023-05-02 12:45:14 -07:00
Bill Yi
86c5b0816b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib806a3814281762ba94854a746b9c269de731785
2023-05-02 12:43:59 -07:00
Bill Yi
437972564f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b7680565a7eebacce97ba3f8868d190252962d2
2023-05-02 12:41:32 -07:00
Bill Yi
a68ce93fbe
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I923b5604d38de2cf630a11d9dc7faca02311801a
2023-05-02 12:39:11 -07:00
Ioana Alexandru
4f42a56682
Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
am: ca769153a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539
Change-Id: I14a4b5da948cf0eba3d609e5635b82f3e08fc3ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 18:11:50 +00:00
Ioana Alexandru
11c63e7479
Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
am: c1c20274c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539
Change-Id: I95477a582ab7e7e1424dc67814aa0c4dba05bab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 18:10:04 +00:00
Becca Hughes
ea03b3e2a0
Add combined provider class that manages new settings UI
...
Example of how to use: https://paste.googleplex.com/6523798525313024
Test: make
Bug: 278919696
Change-Id: I934a5f6d02b50f8c97bda6d997902a42ff88e26f
2023-05-02 17:37:44 +00:00
Ioana Alexandru
c1c20274c6
Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539
Change-Id: Ia4348c7ab9369a0bb40dd30c2db39e6824e1bc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 17:32:30 +00:00