Commit Graph

124348 Commits

Author SHA1 Message Date
Edgar Wang
a74527da3d Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f4d498093b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: If16496eca5a1a627046e9b3bc909e7ff9d4e0f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:43:52 +00:00
Edgar Wang
f4d498093b Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: I5c1f5a05c618e290fbb7a7b02db6adcd52c48af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:13:29 +00:00
Edgar Wang
e0049f0ae8 Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev 2023-04-27 08:27:42 +00:00
Grace Cheng
cb39261886 Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1 am: 340a0870d7 am: 341e8f5cf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: If44c7fd3261611dd979fbf4f9380763d1a04cef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 04:03:12 +00:00
Grace Cheng
860379eaf8 Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1 am: 68b55e2a0a am: b4b04e0ac7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: Ib9d56f3037ce3c080297f0b8ccbfa84bade78778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 04:01:37 +00:00
Grace Cheng
341e8f5cf7 Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1 am: 340a0870d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: Ie7ec99a31764fc0b1710d80149ec24c4793183f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 03:25:09 +00:00
Grace Cheng
b4b04e0ac7 Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1 am: 68b55e2a0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: I0dd5cd0424778067b617c23b89c5941c4d39c5ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 03:22:15 +00:00
Grace Cheng
c1e5cc8891 Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1 am: abdd8bcccc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: I42c288d653bb1a22cfa910b94b37f595644d2b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 03:19:36 +00:00
Automerger Merge Worker
393917e9e6 Merge "Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3 am: 265281dee1" into udc-d1-dev-plus-aosp am: 5d4bdc9e3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22889321

Change-Id: I3fbfa5eb1f2c291b484bbae2cddec0ed9c9f7b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 03:00:59 +00:00
Julia Reynolds
c90d781e14 Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3 am: 042df72ace am: 1fb3351a24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22889321

Change-Id: If8bbcb37cb2f0ac77507794d1815f30bfec11043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 02:58:03 +00:00
Grace Cheng
68b55e2a0a Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: I758d59f4f5a2360c768471fea32e3c221c301a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 02:44:17 +00:00
Grace Cheng
abdd8bcccc Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: I8e492529fa8d41f7d76f63148129c73c89b501c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 02:42:58 +00:00
Grace Cheng
340a0870d7 Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: I09645651a8da18508f7155dc0d0a075f44da8bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 02:37:49 +00:00
Automerger Merge Worker
5d4bdc9e3f Merge "Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3 am: 265281dee1" into udc-d1-dev-plus-aosp 2023-04-27 02:19:35 +00:00
Julia Reynolds
c0409df971 Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3 am: 265281dee1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22889321

Change-Id: I2159089f077f8a51d81ce24d99becacd28c1d623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 02:18:01 +00:00
Julia Reynolds
1fb3351a24 Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3 am: 042df72ace
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22889321

Change-Id: Id6161a089f4e42097138afb2105eb0c732beab5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 02:16:35 +00:00
Julia Reynolds
716f199c2d Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3 am: 1190d97b08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22889321

Change-Id: I7ea117fa32dbc26a265d2fae44fc8403f2799d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 02:15:28 +00:00
Grace Cheng
2b44fc26d1 Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev 2023-04-27 01:57:39 +00:00
Julia Reynolds
042df72ace Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22889321

Change-Id: I5f156185c0f3976fa2c05a7d6d280b43531d8738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 01:38:19 +00:00
Julia Reynolds
1190d97b08 Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22889321

Change-Id: Iafada4274bd080b63f9947ddb131a037759aed0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 01:38:10 +00:00
Julia Reynolds
265281dee1 Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22889321

Change-Id: I9c2f6c39a13bfa8275e22d97aaa534a088cc2d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 01:35:48 +00:00
Julia Reynolds
6c7a1524d3 Merge "Fix channel panel UI on 3 button nav devices" into udc-dev 2023-04-27 00:52:15 +00:00
Grace Cheng
54d1cfdae0 Fix flicker of “touch to unlock anytime” toggle
Fixes flicker of toggle by setting not visible when launching confirm
pin/pattern/password or enrollment prior to displaying
FingerprintSettings. Also cleans up FingerprintSettings and
security_settings_fingerprint.xml to better separate SFPS and non-SFPS
logic and rename methods for clarity

Test: (manual) navigate to sfps fp settings and observe toggle doesn’t flicker
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsUnlockCategoryControllerTest
Fixes: 263843645
Change-Id: Ide3a666fc31b926ac14645dc22d090f77d81f901
2023-04-27 00:29:09 +00:00
Menghan Li
41d5392135 [automerger skipped] Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev am: 1f4ec6257f am: 20b3bb1c17 -s ours am: a6858b28c0 -s ours
am skip reason: Merged-In If94af75172ace137ac5168763f4cb47951f9e943 with SHA-1 87bc65c9e4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869958

Change-Id: Ia796eba4cf0eb71bae7aa2411b8c74b0c60bbef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 23:55:35 +00:00
Menghan Li
bc303c73cf [automerger skipped] Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev am: 1f4ec6257f am: 53fd3feb7e am: 49e1d1eebe -s ours
am skip reason: Merged-In If94af75172ace137ac5168763f4cb47951f9e943 with SHA-1 87bc65c9e4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869958

Change-Id: I865f567b4b501317cbe95e220e39f229986d0e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 23:51:41 +00:00
Menghan Li
a6858b28c0 [automerger skipped] Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev am: 1f4ec6257f am: 20b3bb1c17 -s ours
am skip reason: Merged-In If94af75172ace137ac5168763f4cb47951f9e943 with SHA-1 87bc65c9e4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869958

Change-Id: I7497f7cb8a405533b456d526510d10c488b80c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:51:44 +00:00
Menghan Li
49e1d1eebe Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev am: 1f4ec6257f am: 53fd3feb7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869958

Change-Id: Ic1e832033d91087aa7325d4adbada809d74ea453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:48:44 +00:00
Menghan Li
a7bf96086d [automerger skipped] Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev am: 1f4ec6257f am: eb5dd7ba2b -s ours
am skip reason: Merged-In If94af75172ace137ac5168763f4cb47951f9e943 with SHA-1 95fbb04106 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869958

Change-Id: Ia200afd2f0cc87c3a41c718a2d9b9b6738e104cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:46:30 +00:00
Becca Hughes
c34a24c074 Merge "Listen for updates to autofill/credman provider" 2023-04-26 22:33:22 +00:00
Menghan Li
53fd3feb7e Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev am: 1f4ec6257f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869958

Change-Id: I741cc4bb840b517ea1d8545e12fe3b0f1a8c3b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:09:24 +00:00
Menghan Li
eb5dd7ba2b Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev am: 1f4ec6257f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869958

Change-Id: I4a8b9a6c5a8f8ce18cb1e592ed81435a92a4448c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:08:37 +00:00
Menghan Li
20b3bb1c17 Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev am: 1f4ec6257f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869958

Change-Id: Id25283b14118bcc075158c6dd53e255f9b449c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:04:51 +00:00
Menghan Li
1f4ec6257f Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev 2023-04-26 21:27:47 +00:00
Becca Hughes
ca31aac260 Merge "Hide provider from this list if autofill provider" 2023-04-26 20:59:43 +00:00
Becca Hughes
f6f4995015 Listen for updates to autofill/credman provider
The provider for both of these are in Settings
and this will refresh the CredMan section of
the page if either of these change.

Test: make
Bug: 278919696
Change-Id: Ia82c3533540e52aaa26a68e0a27f0e496728b87f
2023-04-26 20:41:39 +00:00
Julia Reynolds
766ec49e8d Fix channel panel UI on 3 button nav devices
Test: edit panel on 3 button & gesture nav devices
Fixes: 278710039
Change-Id: I45b7e7c942578c4f49be8a0d193893cf872ff36e
2023-04-26 19:34:50 +00:00
Marcello Galhardo
d5528d6f3a Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d am: e1f076595e am: 6518e0253b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722

Change-Id: I3f96c4172895dbbac911c9c566833d27b6a1cb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:26:58 +00:00
Marcello Galhardo
6518e0253b Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d am: e1f076595e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722

Change-Id: I1c2ba6b49490fbd065a3d1dbc415226a24250f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:06:00 +00:00
Marcello Galhardo
c56fb7d9eb Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d am: 61ecc27e5d am: eaa418020f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722

Change-Id: Ia5cb878494204dad6923cdadc56c4863cc3cd761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:52:05 +00:00
Marcello Galhardo
2afb8ff290 Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d am: af0483697d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722

Change-Id: I3ca721a5915b75846e05f5f9333ca48e367793d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:45:53 +00:00
Marcello Galhardo
eaa418020f Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d am: 61ecc27e5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722

Change-Id: Ia520e935c817de414a9d438e56467a95b1b0fcd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:30:09 +00:00
Marcello Galhardo
af0483697d Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722

Change-Id: Id5b8f3075f3e44396f02c00b108f39e040b86132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:30:06 +00:00
Marcello Galhardo
e1f076595e Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722

Change-Id: I8bd92c773353abe1588efd8aeaa80ee6d038e52e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:28:26 +00:00
Marcello Galhardo
61ecc27e5d Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722

Change-Id: I2d63582ff665ea6928435d87947ec5ccc9666153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:27:59 +00:00
Becca Hughes
02ca65edaa Hide provider from this list if autofill provider
Since we are merging the two lists we should
hide the provider from this list to avoid
duplicates.

Test: local & unit
Bug: 279205251
Change-Id: I70ec4a4bda13bdcd5fd8f82f6ba6045e94d5daa9
2023-04-26 16:19:51 +00:00
Marcello Galhardo
39b73e1f6d Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev 2023-04-26 16:08:34 +00:00
Ioana Alexandru
5ba22651c4 Merge "Add keywords for AOD setting." into udc-dev am: 361ed50185 am: 983fa8aecc am: 8582f841bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761786

Change-Id: Ie43432d14f3bcf11a42c42e8cdc362eecc4b443d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 10:52:34 +00:00
Ioana Alexandru
c43d5250ac Merge "Add keywords for AOD setting." into udc-dev am: 361ed50185 am: 029ef0b51c am: 3ecfa4b910
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761786

Change-Id: I7fb8e781510d6250520abbae826fc12f89ba6caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 10:46:50 +00:00
Ioana Alexandru
3bfb41cc89 Merge "Add keywords for AOD setting." into udc-dev am: 361ed50185 am: 823b522488
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761786

Change-Id: I9e94bc996a269a0a7c458325dc39e827a22d588c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 10:24:39 +00:00
Ioana Alexandru
8582f841bb Merge "Add keywords for AOD setting." into udc-dev am: 361ed50185 am: 983fa8aecc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761786

Change-Id: I2133d581682ce7403b3ca76cb690dbd3a8f6650f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 10:24:37 +00:00