Commit Graph

124898 Commits

Author SHA1 Message Date
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
3c98529179 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: Ic61c810a26773faabf47ae36d7dbacb109e928e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 07:42:48 +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
Treehugger Robot
cf0967236b Merge "Enable Wi-Fi Hotspot Speed Settings" into udc-d1-dev am: 8bb56294e6 am: a325205548
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22727409

Change-Id: Ie3361846c51a49dac3f89900c571cfd05550ecdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 07:00:04 +00:00
Treehugger Robot
a325205548 Merge "Enable Wi-Fi Hotspot Speed Settings" into udc-d1-dev am: 8bb56294e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22727409

Change-Id: I0af5178cd5f439c61d6a8276456e09bd1a682fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 06:14:11 +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
92b7adb001 Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458 am: 685826a459 am: 8ffac33fb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556

Change-Id: I2159cae8332f425b5cb6fc8c3e75f9b6a1b57fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:54:20 +00:00
Treehugger Robot
5778289d82 Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458 am: a71a381e59 am: c06abe31b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556

Change-Id: I2f92988b2fbb67bba23bd7d730f265a3595b5108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:53:09 +00: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
8ffac33fb3 Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458 am: 685826a459
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556

Change-Id: I9abe93455e33d943d76964fce51758a4ad11a48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:15:49 +00: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
c06abe31b2 Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458 am: a71a381e59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556

Change-Id: I5a7288c2e0ac86775071d966f8238836392456bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:10:46 +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
Treehugger Robot
03ec360960 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: Id871118108437270ddac593adefa863b910d9762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:33:03 +00:00
Treehugger Robot
685826a459 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: If81fda473dae436a06b123928e942d19d8e3402d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:29:15 +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
Becca Hughes
38fc5d6ac4 Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70 am: 9cec4a5075 am: bb0d8fc591
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: Idbeb095d8148a709e0e7a4e9f6116d1330b0bade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 03:36:56 +00:00
Becca Hughes
1ee3b292d8 Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70 am: 63f71a54e4 am: 501def715b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: I186b1c4c2520c1655cbd23b4a827c89bc29edfd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 03:12:46 +00:00
Lin Yuan
9cf28e9629 Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c am: 6c3155eb61 am: 210225128d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: Ia2813cc67a763c52d6cdebafa4ea318733709414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 02:54:33 +00:00
Treehugger Robot
14f8450ddb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours am: 0df1e40d65 -s ours am: d4e2709506 -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: I7ab33544e2b9c4c4c05855b4415a153b8ea9d9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 02:43:51 +00:00
Lin Yuan
5894e69d95 Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c am: 383923a4df am: 7d2f92b77e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I76508c6c04c2207e083fe55b7090d7c0a4fa79ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 02:33:03 +00:00
Treehugger Robot
7ba13306fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours am: 485ae146de -s ours am: 13b2843d72 -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: If12ab7e0e190222e69f797b4fa62571a90caf14b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 02:23:23 +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
Becca Hughes
fa1dda894f Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70 am: 2727a730ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: I7efdab16bae882d9fc44623be21582e6ec7b783a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:14:15 +00:00
Becca Hughes
bb0d8fc591 Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70 am: 9cec4a5075
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: I4aa22cbe43f11850c8a68b27d70febe32b83f8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:14:03 +00:00
Automerger Merge Worker
5a56e26ab8 Merge changes from topic "am-2885c7fd0b6a4f7fb5c86c6e0f3706a9" into udc-d1-dev-plus-aosp am: a4087417f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: I6217c4dffbf65926b19145f8c248bd8cf0822a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:13:04 +00:00
Bill Yi
accfee6fc2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours am: 457185d226 -s ours am: b998328021 -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: Ic11a1396ad115429f22aeb5dc359209d0b7e3609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:13:01 +00:00
Treehugger Robot
f883bc1c67 Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e am: f92fc6027c am: 3054854afe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: I1dcaab6779b42e753c9c80706269fcf679500ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:05:57 +00:00
Bill Yi
f179cbd400 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours am: ff1898d970 -s ours am: f791f438b7 -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: I3e83a67186b2439b4dfdb4fa2964a2f702aa93b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:05:22 +00:00
Becca Hughes
501def715b Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70 am: 63f71a54e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: Ib9e4e29c38685b05ac61c34b9bfc0619c0dd87ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:01:18 +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
2727a730ee 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: I0eefbcc9008570a6d47436ccd49e2be23b160a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 23:35:42 +00:00
Becca Hughes
63f71a54e4 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: Ic56c750748920a3c568199c20a2717b453af359f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 23:30:50 +00:00
Treehugger Robot
ae7e77574e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours am: 0e084ba633 -s ours am: 3a1955f7e4 -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: Ifb53c74f88cdadd09f7ce830ad93b3be547b96ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 23:03:36 +00:00
Bill Yi
a033231b90 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours am: b9e6bd201f -s ours am: 100c003117 -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: I6dea768f9c87d2418bd031ac9672945cee5ffeb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 23:02:57 +00:00
Becca Hughes
ccd03c9e70 Merge "Update string based on new mocks" into udc-dev 2023-04-25 22:51:39 +00:00
Treehugger Robot
e7ab278e0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours am: 114f7ae8a2 -s ours am: bb734a9397 -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: I23e5d83de76da85074e304a28866ef884d7abcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 22:46:24 +00:00
Bill Yi
4ff6d2ae5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours am: b0cb91a1bc -s ours am: 5fb8a7edcb -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: I0f8bd44668982c25cd601bc80582287884775ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 22:45:43 +00:00
Treehugger Robot
e8fb45ba75 Merge changes from topic "tc_change_23042206_55" into udc-dev-plus-aosp am: 2fbc693eaa am: f7660ac12b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: Id90af208e5dd5dc8b0b2b0ec0d4583eb38042a87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 22:07:37 +00:00
Bill Yi
c22f635211 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab 2p: aaa28fb0e7 am: 6c113d0c54 -s ours am: 47cb4197f1 -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: Id11619f0b0b5b23d2055d0ce0061be214f11616f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 22:06:38 +00:00
Treehugger Robot
054b8294ae Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: f91d762067 am: f928142955
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862

Change-Id: If7065291551e9fd0ca9366980bd3030eb53dca28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 21:50:18 +00:00
YK Hung
fb7527f1fd Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733 am: 245759ba42 am: 1b9cdf1ac1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117

Change-Id: I302604e8c3d1026486b1c87ddf0ab5fd58b2f742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 21:49:25 +00:00
Treehugger Robot
8965d5e5e7 Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: 525000b2ab am: 92d559063f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862

Change-Id: Iaa5af9f361aa09b601a532500be5a90c11946d24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 21:48:02 +00:00
YK Hung
ee0c19a841 Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733 am: 8c1bae8a06 am: 79042d3db5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117

Change-Id: I3a29fb0a7c2ee28508ffcbbba09333f097baaee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 21:47:48 +00:00
Fangqiu Su
14dd0af87c Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 am: 8d16e20d78 am: 29f3d022f7 am: 924208bb0f am: ef47b4b811
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

Change-Id: I533e328fda6796e068f42b5477988a2448b156ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 21:47:38 +00:00
Matías Hernández
93dc316043 Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c am: cb13bd964d am: 92799de2d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580

Change-Id: Ifc0cbfdec68d1078a9fbd9dd9a8ce847f782a4ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 21:47:25 +00:00