Weng Su
8c50edd1e7
Fixed speed selection lost when changing password in Wi-Fi hotspot settings
...
- Use current SoftApConfiguration to build new SoftApConfiguration to keep unchanged properties
Bug: 279717060
Test: manual test
atest -c WifiTetherSettingsTest
Change-Id: I3ee7960b13b339445cc79c3d440f5c56c78c015f
2023-04-27 14:55:52 +08:00
Wesley Wang
1aaad53e09
Update battery saver footer string
...
Bug: 279825606
Test: make SettingsRoboTests
Change-Id: I8fb05d9db8037ab6b3c8be57b2891c8f022f1440
2023-04-27 13:36:45 +08: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
Zoey Chen
fa5ea719de
Fix AppEntry.extraInfo ClassCastException
...
AppEntry's extraInfo is an Object class, force cast it to Boolean may
cause ClassCastException.
Bug: 279639370
Bug: 279333773
Test: local test
Change-Id: Ie135d9a49fdac6623f6b29a13ddf83896a911712
Merged-In: Iccbe9b669011c5061f1c8b3998632f05fbd8a02f
2023-04-27 03:48:38 +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
688b023d09
DO NOT MERGE 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 22:34:07 +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
99f1d5448d
DO NOT MERGE 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 21:23:30 +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
Bill Yi
dcd5353e67
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Ie5c3efb5bce37951b544c3d8c494a97837d1b8dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 18:11:57 +00:00
Bill Yi
22ac363063
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Id50e309e1e7ec51833f650c7d962217200b4c6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 18:11:25 +00:00
Bill Yi
499308fa2c
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-04-26 17:45:07 +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