Commit Graph

48296 Commits

Author SHA1 Message Date
TreeHugger Robot
bb49ef02f9 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: d1ebd886db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I7007257549a53aabbede5faed635066bb8f82a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:22:15 +00:00
TreeHugger Robot
32602794ed Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev 2023-04-27 18:55:20 +00:00
Becca Hughes
c74ccee659 Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev 2023-04-27 16:35:18 +00:00
Becca Hughes
4fc5b0e7b3 Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev 2023-04-27 16:35:07 +00:00
TreeHugger Robot
7b102e8288 Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6 am: 29d3ac3432
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739

Change-Id: I4fc4dd51e69ebc7217af23e4b80b25e0b008eedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 11:33:40 +00:00
TreeHugger Robot
d3897afda6 Merge "Change drop down strings to "View by ..."" into udc-dev 2023-04-27 11:12:45 +00:00
Zoey Chen
8a7883299e Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a am: 4831aff1fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: Ib716861a6294f4ae978dd8ced9870503ca9bcade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 11:03:59 +00:00
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
Zoey Chen
bee241bd5a Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev 2023-04-27 09:35:24 +00:00
Zaiyue Xue
8888e5eea7 Change drop down strings to "View by ..."
https://screenshot.googleplex.com/8J4KQW9FKB9yjsL.png

Bug: 279654750
Fix: 279654750
Test: manual
Change-Id: Ia66db0910b318b1e819960d08294a4303497b3e7
2023-04-27 17:33:04 +08:00
Edgar Wang
e0049f0ae8 Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev 2023-04-27 08:27:42 +00:00
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
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
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
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
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
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
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
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
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
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
361ed50185 Merge "Add keywords for AOD setting." into udc-dev 2023-04-26 09:05:08 +00:00
Edgar Wang
cd74f76a43 Remove restricted icon in SettingsMainSwitchBar
- display disable status directly
- click disabled MainSwitchBar will show devicepolicy dialog
- make sure BT and location use MainSwitchBar correctly

Bug: 260406688
Test: manual
Change-Id: I8bb57213eec6dd5e991af580e1a06ebf8a867c28
2023-04-26 14:06:22 +08:00
Treehugger Robot
a33d6c5061 Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458 am: 03ec360960
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556

Change-Id: Ic38356dae643818061a9d06b4b1a81debcc2667a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:11:01 +00:00
Treehugger Robot
9cdf565458 Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev 2023-04-26 03:59:47 +00:00
menghanli
87bc65c9e4 Fix the gradient drawable orientation is not mirrored for RTL alignment
Root cause: The orientation of the gradient drawable follows the view alignment. It should consider the text alignment.
Solution: Use getLayoutDirectionFromLocale# to get the text alignment to
set the correct orientation of the gradient drawable.

Bug: 278950655
Test: Manual test for RTL and LTR language
Change-Id: If94af75172ace137ac5168763f4cb47951f9e943
Merged-In: If94af75172ace137ac5168763f4cb47951f9e943
(cherry picked from commit 95fbb04106)
2023-04-26 01:37:42 +00:00
Menghan Li
70386a477f Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" 2023-04-26 01:22:32 +00:00
Lin Yuan
f94aae1766 Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c am: 42188dcd5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I64705175f3a4ff791baf2cece3b528f24814bc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 20:24:56 +00:00
Treehugger Robot
05067bd2e1 Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: 5e53a4aa56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862

Change-Id: I1c4c0a0805b9f74fdb57de4f242dc7722dd67d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 16:36:48 +00:00
YK Hung
c2474363a7 Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733 am: 4fb520d99a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117

Change-Id: Ie87d989de63a331c6a5e278a983cffae9ad23594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 16:35:05 +00:00
Lin Yuan
f57e52a64d Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.

screenshot: http://shortn/_kkK3BMTSh1

Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
2023-04-25 12:30:03 -04:00
Treehugger Robot
59461ffd6f Merge "[UI][Modifier key remapping] Use new color token." into udc-dev 2023-04-25 15:21:36 +00:00
Matías Hernández
78b7892f2f Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c am: b168628c13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580

Change-Id: I020f10a1b238245175e299a23bd3c48cdd89a241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 15:18:40 +00:00
YK Hung
6853b5d733 Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev 2023-04-25 15:01:51 +00:00
Matías Hernández
c49cb1014c Merge "Tweak refresh of notification channel group preferences" into udc-dev 2023-04-25 14:00:14 +00:00
danielwbhuang
077293b72d [UI][Modifier key remapping] Use new color token.
Chnage materialColorPrimaryContainer to materialColorPrimary
Change materialColorSurfaceContainerHigh to
materialColorSurfaceContainerHighest

Bug: 277712746
Test: manual
Change-Id: I7b23850a24718d28020f6a7b13119c69f50861b1
2023-04-25 09:58:21 +00:00
Marcello Galhardo
0061d4093a Create the Note Task shortcut using the SystemUI Context
By using the SystemUI Context to create the shortcut, we allow SystemUI to manipulate the shortcut and apply updates such as enabling or disabling the shortcut, or even updating the app badge override package.

Test: manual

Fixes: b/278724068
Change-Id: I926a775923528aacfaf9b62141234b770f381c79
2023-04-25 09:49:40 +00:00
Wesley Wang
a4bafafb21 Fix Settings app crash cause by BadParcelableException
Bug: 279391146
Test: make SettingsLibRoboTests
Change-Id: I32dd0aa87c405786fe28b15721e4edbcb4d73a98
2023-04-25 17:49:12 +08:00
SongFerngWang
539266a2f3 Replace the SlicePreference with Preference am: 794fc58235 am: c054498357 am: c070721d96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I69ce2df75d1bee0eb1ad048bc253658e9af2ca62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 09:00:40 +00:00
SongFerngWang
c054498357 Replace the SlicePreference with Preference am: 794fc58235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I5e9032624347b27acb02eafd28002744d92b5f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 06:23:25 +00:00
menghanli
95fbb04106 Fix the gradient drawable orientation is not mirrored for RTL alignment
Root cause: The orientation of the gradient drawable follows the view alignment. It should consider the text alignment.
Solution: Use getLayoutDirectionFromLocale# to get the text alignment to
set the correct orientation of the gradient drawable.


Bug: 278950655
Test: Manual test for RTL and LTR language
Change-Id: If94af75172ace137ac5168763f4cb47951f9e943
2023-04-25 05:43:29 +00:00
Treehugger Robot
e4919398a9 Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev am: ea3a970826 am: 9f7e3227bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519

Change-Id: I660e68c1ed0fe1f833901f93c3a08adfcd732c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 05:02:17 +00:00