Commit Graph

122688 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
e0ea63b4e1 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6 am: e0551da7c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: Ie4018c6917a02d42585997c3c670cc9d4a1e78a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:56:55 +00:00
Ioana Alexandru
22ca48e667 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: ca769153a0 am: 4f42a56682
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I076bc4d91e32e13c1d14791cc2fece3fcddfe61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:53:23 +00:00
Ioana Alexandru
a0458d4301 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6 am: 11c63e7479
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I8ffe4113904c38aafc4fb2accd537a93bc21f00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:51:28 +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
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
Ioana Alexandru
ca769153a0 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: Idb7f1807b789a1050e31e137f81631fc7f39f8e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:28:49 +00:00
Ioana Alexandru
e0a4a343c4 Fix AmbientDisplayAlwaysOn isSliceable.
I changed this method to return true in ag/22761786 thinking that it was
necessary (as per the example at
https://g3doc.corp.google.com/company/teams/apps-android-settings/howto/settings_slices.md#preference-controller),
but this breaks a test, so I'm rolling back that part of the change.

Fix: 279881487
Test: presubmit
Change-Id: I87716a0daf5face9a79f98353b49ea2166226279
2023-05-02 16:52:26 +00:00
Diya Bera
9814931fd8 Remove "Try again" from fingerprint error dialog
Test: Manual (Start enrollment and don't complete it for 10 minutes;
observe the dialog; screenshot in bug)
Bug: 279648300

Change-Id: I88280e3a5d47735285d89174ad8bcb0da8d39282
2023-05-02 09:51:36 -07:00
Treehugger Robot
aba69c0643 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: dc5e91cec8 am: 3d746f793e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I29d7e009245653a6e1506d8c277c71017acff340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:45:09 +00:00
Treehugger Robot
3d746f793e Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: dc5e91cec8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I2daba6bdb99534ca9a943e7c5fc98c2ca96f943d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:04:32 +00:00
Treehugger Robot
181580bf38 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf am: 251da57429
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: Iaf57a8355fbfba35fdec560c26417c6c4fd56677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:30:12 +00:00
Lucas Silva
f3c0f501ce Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f am: 439cdd904f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: Iaa0011e01dac28edd8f78dd855c50f0c1b3dc1cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:29:24 +00:00
Chaohui Wang
0f1ccb0cff Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: ef748cfc36 am: 34deed3eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: Ifa33066316870345c9181d84d99971f1da022033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:28:45 +00:00
Treehugger Robot
8bfd465696 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf am: 9b53ff64ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I9b044d09821de4e62332770701ef0dda622de2de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:28:26 +00:00
Treehugger Robot
b7b13ceb41 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61 am: e769c5b4c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I6adb04c194e7c064b69f9f575a2c508acca3ea93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:28:05 +00:00
Lucas Silva
038cae6393 Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: 0ff016cb7b am: c3284ad39a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: Ie7d234d0513199ec13869deb5a62ce919ec9d5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:27:50 +00:00
Chaohui Wang
21835b0e83 Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: 0f915a4c35 am: 55ee4d3d9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I7e90fef152c992efe5f901769c18bbd3612d350a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:26:32 +00:00
Treehugger Robot
251da57429 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I55486c2659d78ccb300f19f26b20425b315ed5ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:20:43 +00:00
Lucas Silva
da2d82c1f2 Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f am: 65c8f6bcc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: I63fcd27fb57d16edbb9dad3cdca80c00dda329d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:18:50 +00:00
Treehugger Robot
9b53ff64ab Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: Id16884d7d94fa7f214e34bea5e98271dbdf34cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:16:19 +00:00
Treehugger Robot
dc5e91cec8 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: If4ea67c5c9ac76a576fa94fd6b9673082039ca1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:15:41 +00:00
Treehugger Robot
85c1ead6eb Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 648266e8d7 am: 8aad80fe7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I2ad446b943e9c374b0fb7e7539aad26f421f9945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:02:42 +00:00
Chaohui Wang
507be6a484 Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: ef748cfc36 am: 719b2f1f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: If9b754e56b5f09c323f4dda804d47f300ed1fc66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:00:47 +00:00
Lucas Silva
c3284ad39a Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: 0ff016cb7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: Ie413cb1e36ad0c870633b02c8571086761ac8655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:00:16 +00:00
Chaohui Wang
55ee4d3d9b Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: 0f915a4c35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I25e90c935c9a363127f9bbdf79b90670fbe47fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:58:29 +00:00
Treehugger Robot
d5921d0bcf Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I18fe27407d8f6003b597a4a9e98ed3b30cefe626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:58:21 +00:00
Treehugger Robot
92124f26b6 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61 am: aa354d5666
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: Icac7ab915fd8da8cead98dbfe10cd7ef904f7e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:57:43 +00:00
Lucas Silva
65c8f6bcc6 Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: If495e687ef0f1cf0b5419e4a664cccaa68b3ef4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:53:43 +00:00
Treehugger Robot
d624141732 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev 2023-05-02 14:47:48 +00:00
Lucas Silva
439cdd904f Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: I8a912351bcd312ca984343dc24e4a44d61520167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:47:12 +00:00