Commit Graph

124422 Commits

Author SHA1 Message Date
Zoey Chen
680f91b58d Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a am: 05d70bb710
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: I73963128d9cf4324bebf1d8386080a14191f476c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:48:05 +00:00
Zoey Chen
334438399d Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a am: b306c4dd5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: I89e4b3df4320d26801a35d67e0e3229cb851053a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:43:49 +00:00
TreeHugger Robot
d56c097761 Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659

Change-Id: I4ecd02f3c208395b88ab55d0adb58de1381d7f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:42:42 +00:00
TreeHugger Robot
1dd46754ea Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659

Change-Id: I0eb9118e28e66c8663dbde3915e321db9c166214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:36:52 +00:00
Automerger Merge Worker
a614d10620 Merge "Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f8278dcd99" into udc-d1-dev-plus-aosp am: 9199f72284
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: I39811dc547cb31aa57012fccdeb52b0d535c5a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:31:25 +00:00
TreeHugger Robot
f566e6de2f Merge "Update battery saver footer string" into udc-dev 2023-04-27 10:29:25 +00:00
Edgar Wang
b6a3076b1f Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: 3b9432dad2 am: 4a874fb50f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: Iea368972644552215b508f8bf69b6ec774aeea15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:28:40 +00:00
Zoey Chen
4831aff1fb Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: I1dbd6067723e33952369c0268847ba68f286427c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:21:01 +00:00
Zoey Chen
05d70bb710 Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: I1a2de67059623153f925386f410075aedae934bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:21:01 +00:00
Zoey Chen
b306c4dd5b Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: Id9c1c34ea8496bb36512740efa81903af455154f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:06:36 +00:00
Automerger Merge Worker
9199f72284 Merge "Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f8278dcd99" into udc-d1-dev-plus-aosp 2023-04-27 09:48:32 +00:00
Edgar Wang
3996c46ec2 Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f8278dcd99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

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

Change-Id: I47ca8520fd1da0142f733a1de62e0ecbfd773750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:44:55 +00:00
Zoey Chen
c9994c0a54 [Regional Preferences]] Update the string of header
Bug: 279549042
Test: local test
Change-Id: I4983618c91f0e5ea83c4095491be7bb4433f6d2b
2023-04-27 09:44:17 +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
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
3b9432dad2 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: I507600bb21802f7160df47bc4abaf6de2fcb01d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:11:28 +00:00
Edgar Wang
f8278dcd99 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: I71f04286cb8a0659e9d938f22f2b3707cc9d9ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:10:35 +00:00
menghanli
fa5f8d3b0a Fix "Open <a11y service> " starts from end for RTL language
Root cause: TextView space uses "wrap_content" to not match the parent width
Solution: Use "match_parent" instead

Bug: 279646115
Test: anual test for RTL and LTR language
Change-Id: If4091958e5ab4323c881732a7b38814dc93db4a1
2023-04-27 17:09:31 +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
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