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
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
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
Bill Yi
b9e6bd201f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab
-s ours am: ffe604c85c
-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: Ib0fd25bf66e535f59b20ba717ba5e28ea39b0416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:28:08 +00:00
Treehugger Robot
6a0935a34f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-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: I11af2e25300a6dc5f106b694ffb2fc5a558c52c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:06:44 +00:00
Bill Yi
ffe604c85c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab
-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: Ice851b6bd9aed5f50ea95b4ab778793eff02b3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:05:38 +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
33837c6766
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-25 16:17:03 +00:00
Treehugger Robot
525000b2ab
Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862
Change-Id: I5446a849786124fec429c50c1cc7b6b373400a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:43:59 +00:00
YK Hung
8c1bae8a06
Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117
Change-Id: Ic85524a805665044aa826656a88bc52e9a5e79b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:43:12 +00:00
Treehugger Robot
59461ffd6f
Merge "[UI][Modifier key remapping] Use new color token." into udc-dev
2023-04-25 15:21:36 +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
8a98f248c1
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I81999f1723a8b3fee260334c39fddd5a1689f34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:41:11 +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
04f9745471
Replace the SlicePreference with Preference am: 794fc58235
am: c054498357
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: Iba37ecd28590de9ca276c4cce3cec73324650e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 07:11:05 +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
Treehugger Robot
9b25f5ac88
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519
Change-Id: Ia19da83e61ec2bfbfbbb61110c605c401dd0295e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:12:11 +00:00
Treehugger Robot
ea3a970826
Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev
2023-04-25 03:59:03 +00:00
Zaiyue Xue
796c2ef5ca
Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776
Change-Id: I6a72fe235b10dccd92cc56be7cf4e5f5e7a170f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:49:44 +00:00
Zaiyue Xue
8892fd48ca
Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758
Change-Id: Ic49b7f1c2382914ac42bd213629150f7dfc35dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:49:13 +00:00
Zaiyue Xue
f3a3634aa5
Merge "Replace Screen system component time with device screen on time" into udc-dev
2023-04-25 03:32:02 +00:00
Zaiyue Xue
cfa374f997
Merge "Combine screen on time map into battery usage map" into udc-dev
2023-04-25 03:31:39 +00:00