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
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
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
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
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
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
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
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
Treehugger Robot
8aad80fe7c
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
am: 648266e8d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: I3f6ce4bb58a9454b195dcdcb0e399f5fdb07fa79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:45:19 +00:00
Lucas Silva
bece3e4b9f
Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741
Change-Id: If83df1299e3c8c48850ed9a924485e45d2bc85cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:35:09 +00:00
Lucas Silva
0ff016cb7b
Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741
Change-Id: I6ea288b4d1b61b7fae5e52dfd57f6edec5bb3b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:31:11 +00:00
Chaohui Wang
719b2f1f60
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba
am: ef748cfc36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: Icdb02006b5c1370bf1e6a754b5f557309ab07def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:27:56 +00:00
Lucas Silva
9bd47de298
Merge "Fix colors for dreams settings according to new spec" into udc-dev
2023-05-02 14:00:22 +00:00
Treehugger Robot
aa354d5666
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
am: 01d7ed6a61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: I0f8ba89b5d6d2968b4770591218a786bdac00e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 13:58:28 +00:00
Ankita Vyas
b32d02c293
Add tests for config check in ClonedAppsPreferenceController
...
Bug: 280071827
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=ClonedAppsPreferenceControllerTest
Change-Id: Id7c2e73bdb0c2af3e700b3620bde2fe77c47f3e6
2023-05-02 12:03:42 +00:00
Chaohui Wang
0f915a4c35
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: Ic155aa679959e8c8d49092869113cf24aa49c148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:39:17 +00:00
Chaohui Wang
ef748cfc36
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: I8e058b75c12a4bf2bf3462b83a23804e42db2acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:35:15 +00:00
Treehugger Robot
01d7ed6a61
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: Ie0c10646accf9a9e9fdc219a76b84cf3cfd76872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:24:59 +00:00
Treehugger Robot
648266e8d7
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: I26d8b679b5783c6b86128ec9ac91a54592854f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:19:39 +00:00
Chaohui Wang
bf9ba71cba
Merge "Fix Data Saver page crashed when rotate" into udc-dev
2023-05-02 09:50:17 +00:00
Treehugger Robot
3b60e2a9c3
Merge "Fix battery percentage is inconsistent in settings" into udc-dev
2023-05-02 05:08:39 +00:00
ykhung
0288b6d4af
Fix battery percentage is inconsistent in settings
...
Fix: 275217364
Test: make test RunSettingsRoboTests
Change-Id: I16dd772aacaea3f8ddb6da579adb033124e3dbb7
2023-05-02 11:58:08 +08:00
Edgar Wang
a7b9264095
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
am: 2d11be89ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: Ife96f8b3d6237f0520516ffee98f980a9d9c5bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:21:59 +00:00