Piotr Wilczyński
0066bdea3e
Merge "Revert "Back up the smooth display setting"" into udc-d1-dev
2023-04-27 16:06:37 +00:00
TreeHugger Robot
143f6aeb43
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: I193bbf41ec079e0266357de47661e083594d3fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:29:05 +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
9e1c1ecca5
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: Icf963af6f2d5a931b678226970cde5701edb19fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:10:16 +00:00
Menghan Li
e9427458a9
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: Iaf75b768f12728be4d6d249dd9f26ed0efeaa21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:10:01 +00:00
TreeHugger Robot
795f3d2d09
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: I61fa48523f8462a156b13d63d14035edd1dc4c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:08:50 +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
f566e6de2f
Merge "Update battery saver footer string" into udc-dev
2023-04-27 10:29:25 +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
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
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
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
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
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
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
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
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
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
39b73e1f6d
Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev
2023-04-26 16:08:34 +00:00
Ioana Alexandru
983fa8aecc
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: I796f353071fa05792129de2f44415f4d8e223ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 09:46:44 +00:00
Ioana Alexandru
361ed50185
Merge "Add keywords for AOD setting." into udc-dev
2023-04-26 09:05:08 +00:00
Chaohui Wang
db9941d6ef
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: I74cab9f6b5af834e2b57fd17627a0fe1e3fd47df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 07:42:54 +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
Treehugger Robot
8bb56294e6
Merge "Enable Wi-Fi Hotspot Speed Settings" into udc-d1-dev
2023-04-26 05:43:33 +00: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
Treehugger Robot
a71a381e59
Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556
Change-Id: Ia627bcc545e5e7e2b4761f2bc5049a519dcf5f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 04:33:06 +00:00
Weng Su
2bd7c15884
Enable Wi-Fi Hotspot Speed Settings
...
- Sets config_show_wifi_hotspot_speed to true
Bug: 245258763
Test: manual test
Change-Id: Ibd7f0284326a012ed6a0ee3e55b270cdfa216608
2023-04-26 04:02:02 +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
Becca Hughes
9cec4a5075
Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979
Change-Id: Ia907f5cb329ce87b610fa8be8fbdfedc8b37e089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 23:36:19 +00:00
Becca Hughes
ccd03c9e70
Merge "Update string based on new mocks" into udc-dev
2023-04-25 22:51:39 +00:00
Lin Yuan
383923a4df
Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947
Change-Id: I95812cb79e5e8ff8bce5f9af9e1eff79aee44e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 20:21:46 +00:00
Lin Yuan
0bb504c42c
Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev
2023-04-25 19:31:35 +00:00
Treehugger Robot
485ae146de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b
-s ours am: c7f8ae5369
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018
Change-Id: I6b72c194d13f9087b43a420433b3126291b2920c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 19:27:38 +00:00
Treehugger Robot
c7f8ae5369
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018
Change-Id: Ia5c9a7f04b6701169c45039cd955bd356a86a240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 18:31:07 +00:00
Treehugger Robot
f92fc6027c
Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018
Change-Id: I04cc1158889cdf06dac76bf66155f50d0faead4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 18:17:03 +00:00
Bill Yi
ff1898d970
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8
am: fb7650e88f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018
Change-Id: Iedd7cd020c217132bd4c2f18169c6de2394f03e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 18:15:54 +00:00
Treehugger Robot
e26112e56e
Merge changes from topic "tc_change_23042206_48" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8
Import translations. DO NOT MERGE ANYWHERE
2023-04-25 17:49:42 +00:00
Treehugger Robot
32873d192b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-04-25 17:49:42 +00:00
Treehugger Robot
0e084ba633
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours am: 6a0935a34f
-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: I603bf91d4995829fae5ef18c512f0672eaa1f240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:29:00 +00:00