Becca Hughes
99f1d5448d
DO NOT MERGE Hide provider from this list if autofill provider
...
Since we are merging the two lists we should
hide the provider from this list to avoid
duplicates.
Test: local & unit
Bug: 279205251
Change-Id: I70ec4a4bda13bdcd5fd8f82f6ba6045e94d5daa9
2023-04-26 21:23:30 +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
Shen Lin
6beffd5bf6
Fix AppEntry.extraInfo ClassCastException
...
AppEntry's extraInfo is an Object class, force cast it to Boolean may
cause ClassCastException.
Bug: 279639370
Test: presubmit
Change-Id: Iccbe9b669011c5061f1c8b3998632f05fbd8a02f
2023-04-26 10:14:22 +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
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
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
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
Brian Lee
2bb2b5f534
Set minHeight for remote lockscreen validation checkbox
...
Bug: 279138756
Test: Accessibility Scanner
Change-Id: I83df33b3d922bce857d8c9a21bfda06cc8ef5659
2023-04-25 14:39:27 -07: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
Lin Yuan
062a9ca549
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Bug: 277333746
Bug: 277333781
Change-Id: I91aa143223d7d37751120aa9246bce4dc31a54a6
2023-04-25 19:24:13 +00:00
Lin Yuan
7591fff234
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 19:23:53 +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
Treehugger Robot
281aaed283
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: I68de386f4bf0b59ee1c287d80bfa11637fafdf46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 18:12:02 +00:00
Bill Yi
457185d226
[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: I38b647218f87c8cf818dcdcdb7d7876e416de256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 18:11:10 +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
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
114f7ae8a2
[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: Ic7447951a151b87e2535c3ecdfd25b82984ee588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:27:04 +00:00
Bill Yi
b0cb91a1bc
[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: I5b8e9fff5b23f359c30611ad308d2fad4bafd167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:26:24 +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
Treehugger Robot
0cb641a695
[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: I3c3aea61ecf73401c0545f194bf54c1ab05ec0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:00:30 +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
953f6167e9
Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab
Import translations. DO NOT MERGE ANYWHERE
2023-04-25 16:17:15 +00:00
Treehugger Robot
2fbc693eaa
Merge changes from topic "tc_change_23042206_55" into udc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab
2p: aaa28fb0e7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab
Import translations. DO NOT MERGE ANYWHERE
2023-04-25 16:17:15 +00: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
f91d762067
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: I903d55885c376719d05b09cf00d7954f4e55434d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:44:23 +00:00
YK Hung
245759ba42
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: I08cedbf20a7693a92ab0163277e4d31c62cf44e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:43:00 +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
Fangqiu Su
924208bb0f
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
am: 8d16e20d78
am: 29f3d022f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350
Change-Id: If98e04dea79ae03a0f1cfe3969df530583c66289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:44:36 +00:00