Commit Graph

122315 Commits

Author SHA1 Message Date
TreeHugger Robot
b5773f95c7 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-03 20:57:21 +00:00
Treehugger Robot
00efff2f18 Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae am: c3d6820ffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: I6e2b48adfd124bd1d7aa67cc975fb6dc2e4d3350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 20:23:29 +00:00
Treehugger Robot
c3d6820ffd Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: Id1f507633ad33b5b0719dba4bc507e73ce7832e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:36:46 +00:00
Treehugger Robot
7244f3a0ae Merge "Update auto_rotate_summary string for different product" into udc-dev 2023-05-03 19:09:07 +00:00
David Gutierrez
19da9aeb52 Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: 6a8a9492d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391

Change-Id: Ie27314bb320132fe579c48099fa34f4508c77ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:41:55 +00:00
Becca Hughes
b20744c9fc Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 454cfbf2cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: I535bbe38e6ac91ed1c635c5ac8d8a399d4f701ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:41:11 +00:00
David Gutierrez
6a8a9492d7 Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391

Change-Id: I71a855eb9c082e8c32d6a56c07722c08984b019e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:37:22 +00:00
Becca Hughes
454cfbf2cc Merge "Align settings with new mocks" into udc-dev am: 21733fa106
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: I2a423b8a0a96ebcc51f04f0603e73e4f2fd24bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:36:56 +00:00
David Gutierrez
570943637c Merge "Revert "Disable Settings large-screen optimization"" into udc-dev 2023-05-03 16:17:31 +00:00
Becca Hughes
21733fa106 Merge "Align settings with new mocks" into udc-dev 2023-05-03 16:14:12 +00:00
Priyanka Advani
77f76267d2 Revert "Disable Settings large-screen optimization"
Revert submission 22926596-disable_large_screen_opt

Reason for revert: b/280606740

Reverted changes: /q/submissionid:22926596-disable_large_screen_opt

Change-Id: Ib918705206dc6b8bcbce21f83494d1108c6b8393
2023-05-03 16:05:25 +00:00
Treehugger Robot
1b72fd9f3c Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6 am: 67215bb0db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

Change-Id: I0e7b334b914601a10e7adb452c29eccaeb01ece2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 12:02:52 +00:00
Treehugger Robot
67215bb0db Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596

Change-Id: I1e231a4a909a1fa48034107e62a62f4ef75421ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 11:21:47 +00:00
Treehugger Robot
8060347ec6 Merge "Reducing slice requesting logging" into udc-dev 2023-05-03 10:37:24 +00:00
Edgar Wang
f6b49a0204 Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c am: 2c1ad2142f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436

Change-Id: I7dcdc2a450761ee48b7439e66c3d28cedf858afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 10:18:31 +00:00
Vania Januar
c584bfae60 Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e am: 3f449e0c49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945

Change-Id: Ieec3b8affc3f6f1226aacf214a458ea5cd2ec48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 10:18:03 +00:00
Edgar Wang
2c1ad2142f Merge "Add new page enum for Account detail" into udc-dev am: 089217a19c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22986436

Change-Id: Ibd7bcc5f3bc4c2abc79f30c8b4a93cd2503167d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 09:57:21 +00:00
Edgar Wang
089217a19c Merge "Add new page enum for Account detail" into udc-dev 2023-05-03 09:49:11 +00:00
Edgar Wang
e416e27543 Update auto_rotate_summary string for different product
Bug: 279769863
Test: presubmit
Change-Id: I98ceddc54bf5ea27cf862e96fe6358b3b885db0b
2023-05-03 17:44:42 +08:00
Vania Januar
3f449e0c49 Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945

Change-Id: Id38d54a83868152b6267b83b5292d9e251fb8381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 09:35:59 +00:00
Edgar Wang
fae664c79c Reducing slice requesting logging
Bug: 253684322
Test: rebuild
Change-Id: If0e884875e09bd43b88f6b5f205ad450de488552
2023-05-03 17:04:38 +08:00
Vania Januar
e78b1f377e Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev 2023-05-03 09:00:56 +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
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
d66335ae1c Merge "Use correct App info screen's trash can icon" into udc-dev 2023-05-03 07:01:57 +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
Wenhui Yang
25de3b2b9c Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev 2023-05-03 06:11:23 +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
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
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
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
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
Gil Cukierman
6a2f6960ab Merge "Enable null cipher toggle by default" into udc-dev 2023-05-02 23:11:40 +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
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
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
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
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
0fd75f93c7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia6aaf9c31feca8252ebbfb1bb48fb9f251595f76
2023-05-02 13:29:49 -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
Ioana Alexandru
e0551da7c5 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I0e8043ab275a62be19c5ed8a210e5f426c295d53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:12:50 +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