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
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
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
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
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
Marcello Galhardo
6518e0253b
Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d
am: e1f076595e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722
Change-Id: I1c2ba6b49490fbd065a3d1dbc415226a24250f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 17:06:00 +00:00
Marcello Galhardo
eaa418020f
Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev am: 39b73e1f6d
am: 61ecc27e5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22709722
Change-Id: Ia520e935c817de414a9d438e56467a95b1b0fcd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 16:30:09 +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
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
8582f841bb
Merge "Add keywords for AOD setting." into udc-dev am: 361ed50185
am: 983fa8aecc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761786
Change-Id: I2133d581682ce7403b3ca76cb690dbd3a8f6650f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 10:24:37 +00:00
Ioana Alexandru
3ecfa4b910
Merge "Add keywords for AOD setting." into udc-dev am: 361ed50185
am: 029ef0b51c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761786
Change-Id: I03c451c741480df974ed767fc7c16a1755a617c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 10:10:24 +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
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
f5988e3e9a
Merge "Fix Settings crashed when WIFI_ADD_NETWORKS" into udc-dev am: 4132d3b560
am: b3a321105b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22874904
Change-Id: I4567b928022c1ebe6e879533ab3b79d29d579773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 08:24:48 +00:00
Chaohui Wang
41e71746c3
Merge "Fix Settings crashed when WIFI_ADD_NETWORKS" into udc-dev am: 4132d3b560
am: db9941d6ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22874904
Change-Id: Ie62338969618beb68ae2694ac8a7675039d0112e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 08:19:59 +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
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
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
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
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
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
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
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
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
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
Becca Hughes
ccd03c9e70
Merge "Update string based on new mocks" into udc-dev
2023-04-25 22:51:39 +00:00
Lin Yuan
210225128d
Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c
am: 6c3155eb61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947
Change-Id: I2cc79eca082044e37e7ddce2e9982f8372c2d638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 20:29:09 +00:00
Treehugger Robot
d4e2709506
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018
Change-Id: I3f7bfc71ff5ed20b2e7007b9d146741b00b2a762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 20:26:17 +00:00
Lin Yuan
7d2f92b77e
Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c
am: 383923a4df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947
Change-Id: I34b6aaddeecbfa05953b5a568d4890c679c6a915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 20:23:13 +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
Treehugger Robot
13b2843d72
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018
Change-Id: I18a5daad08d50f46a1736e308e82ed530115b810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 20:14:45 +00:00
Lin Yuan
6c3155eb61
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: Ie2f5204a3a4d0dc4372fc7bfb8582502da792e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 20:13:55 +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
0df1e40d65
[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: Id119791e36ea8b96cd2a4046fd00c76ff2a2f0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 19:13:12 +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
Automerger Merge Worker
a4087417f0
Merge changes from topic "am-2885c7fd0b6a4f7fb5c86c6e0f3706a9" into udc-d1-dev-plus-aosp
...
* changes:
Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e
am: 281aaed283
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8
am: fb7650e88f
-s ours am: 457185d226
-s ours
2023-04-25 18:20:57 +00:00