Commit Graph

121643 Commits

Author SHA1 Message Date
Bill Yi
9b25911c3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a04b6df040 -s ours am: 9bb60a200e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5480716680eb2a785cff991e320999dd0671e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 16:07:51 +00:00
Bill Yi
49103dfc2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c -s ours am: 9abc703e40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I370319fcbc37e1a632a2e8a6d20083ece4b69566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 16:07:43 +00:00
Bill Yi
155b5266fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours am: 4caa1ee4c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If51f800f04ad40049ee3508ff02d9ded8cf7f7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 16:07:37 +00:00
Bill Yi
0ebc9d790d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours am: d4ba4def6a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6058d58565c8b9f65cc7cb5a61b1367141dd17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 16:07:30 +00:00
Bill Yi
a70fa93e6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c -s ours am: dcd5353e67 -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: Ib6beab44e6862b85e5a5ebb28f9573b894a69dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 16:07:19 +00:00
Bill Yi
340b85bb5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a -s ours am: 22ac363063 -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: Idb3db0d1797033ce2854741532be1f0eb32823fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 16:06:56 +00:00
Treehugger Robot
46bd7feab6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 0cb641a695 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1943d52ba4d0aa955897e823a3860ef619d98915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 16:05:02 +00:00
Treehugger Robot
0b8d81c18c Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: I6372af8e100d0ab6d7709cc180c13efce4ff40fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 16:04:44 +00:00
TreeHugger Robot
ffb6adb9e6 Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739

Change-Id: Ia3b6ce10e3db8a9a04c43251e96468fbb6dbde05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 11:28:41 +00:00
Treehugger Robot
118a51ad6d Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740

Change-Id: I6a566a5438d02e0600465072e971b2c0ea4a28ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 11:27:47 +00:00
Menghan Li
cd4c0f15a8 Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105

Change-Id: I85ac1c91d02661c77259fdb54d1e8c23a79971dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 11:24:35 +00:00
TreeHugger Robot
d3897afda6 Merge "Change drop down strings to "View by ..."" into udc-dev 2023-04-27 11:12:45 +00:00
Treehugger Robot
d12716bb12 Merge "[Regional Preferences]] Update the string of header" into udc-dev 2023-04-27 11:02:53 +00:00
Menghan Li
0e32500259 Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev 2023-04-27 10:57:17 +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
f566e6de2f Merge "Update battery saver footer string" into udc-dev 2023-04-27 10:29:25 +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
c9994c0a54 [Regional Preferences]] Update the string of header
Bug: 279549042
Test: local test
Change-Id: I4983618c91f0e5ea83c4095491be7bb4433f6d2b
2023-04-27 09:44:17 +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
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
Wesley Wang
1aaad53e09 Update battery saver footer string
Bug: 279825606
Test: make SettingsRoboTests
Change-Id: I8fb05d9db8037ab6b3c8be57b2891c8f022f1440
2023-04-27 13:36:45 +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
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
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
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
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
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
9bb60a200e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a04b6df040 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83bcae760b426573f76b2216712fd4815f964c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:12:35 +00:00
Bill Yi
9abc703e40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8fe784ece407d89b1f38ecd8280272c5d4e6242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:12:28 +00:00
Bill Yi
4caa1ee4c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaae0d0239170fac7cf719a9d1541ea8e2f44032a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:12:18 +00:00
Bill Yi
d4ba4def6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f1c1c8b713057d874add1f53f93140696c4935d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:12:05 +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
a04b6df040 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-04-26 17:45:07 +00:00
Bill Yi
171e66e000 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-04-26 17:45:07 +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
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
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
029ef0b51c Merge "Add keywords for AOD setting." into udc-dev am: 361ed50185
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761786

Change-Id: I2771a67f8df44c37a0a61d5380a26330e7f38b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 09:42:41 +00:00
Ioana Alexandru
361ed50185 Merge "Add keywords for AOD setting." into udc-dev 2023-04-26 09:05:08 +00:00
Chaohui Wang
b3a321105b Merge "Fix Settings crashed when WIFI_ADD_NETWORKS" into udc-dev am: 4132d3b560
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22874904

Change-Id: Ib2f97351daf5b40cb1d70b598c5b2971b9639d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 07:38:38 +00:00
Chaohui Wang
4132d3b560 Merge "Fix Settings crashed when WIFI_ADD_NETWORKS" into udc-dev 2023-04-26 07:01:19 +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
Chaohui Wang
dfd7f8f87c Fix Settings crashed when WIFI_ADD_NETWORKS
And when rotate screen on tablet.

Fix: 279684281
Test: Manual
Change-Id: I297fefad0686722907ff4de5f2d8c1793bb783d8
2023-04-26 05:17:42 +00:00