Lais Andrade
82a3146c23
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb
am: c09c49fcf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337
Change-Id: I4a46a73c2901720829056efa3c5d70ad89fb1114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 00:15:40 +00:00
Weng Su
ff3ced78f9
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
am: 37169b93d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025
Change-Id: I398c19e8f68b32f47742c0c864ae57b69e30c426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 23:49:41 +00:00
Lais Andrade
9c8d1e94fb
Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev
2022-04-27 13:54:13 +00:00
Weng Su
b6629ab55b
Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev
2022-04-27 09:33:26 +00:00
Chaohui Wang
815ee3779b
Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0
am: 334335bc6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523
Change-Id: I87294478784f6518f58e57aaeba0eef5af5b0297
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-26 07:26:55 +00:00
Weng Su
71b9cc0e32
Check Wi-Fi permissions for QrCode scanner
...
- Launched package require ACCESS_WIFI_STATE and ACCESS_FINE_LOCATION permissions to get results
Bug: 187176859
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppQrCodeScannerFragmentTest
Change-Id: Ie80c4e5b3a5863749de518e4736873390478816e
2022-04-26 07:10:57 +00:00
Chaohui Wang
1a39660de0
Merge "Update Personal / work selection UI." into tm-dev
2022-04-26 06:34:37 +00:00
Hugh Chen
00a8568b1b
Merge "Implement advanced vpn ui in vpn settings"
2022-04-26 05:33:27 +00:00
Lais Andrade
cc8790f7b3
Create separate On/Off string resources for Vibration & haptics
...
Some translators need to be able to adapt the text for On/Off preference
state to match the preference title "Vibration & haptics", which
requires a different inflection and plural form on some languages.
This change separates this resource string from the more generic one
that was used before to allow this flexible translation.
Fix: 228342641
Fix: 229060423
Test: VibrationPreferenceControllerTest
Change-Id: Ib46b3e0d0a980ff57e91f55c73348c440327bad7
2022-04-25 17:15:39 +01:00
Chaohui Wang
f250493787
Update Personal / work selection UI.
...
Implement the new-look by using AlertDialog's
custom title and custom view.
Using the RecyclerView so we can display profile
horizontally.
Bug: 174626616
Test: manual & robolectric
Change-Id: I9f5a7685d9217fc62e01799ad73f9b9a3ddbf19a
2022-04-25 19:12:38 +08:00
Prabal Singh
60615cbf3b
Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
am: 9fa00378f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088
Change-Id: I8f065a47384084cee16321c2ebe9ab61aa4eaa30
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 08:13:05 +00:00
Hugh Chen
cf210dd00b
Implement advanced vpn ui in vpn settings
...
Bug: 220684478
Test: atest -c VpnSettingsTest
Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b
2022-04-25 07:59:13 +00:00
Prabal Singh
67007e5933
Use settingslib util methods for work policy info
...
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
2022-04-23 20:35:41 +01:00
PETER LIANG
b579c1aa43
Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c
am: cc4af05607
am: 37fa12e2d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267
Change-Id: I078115b77edc9cd16a8ac4c5eb56f88b2048f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:07:51 +00:00
PETER LIANG
37fa12e2d6
Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c
am: cc4af05607
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267
Change-Id: I74bb43797299b183a40f9050b6256e768361c7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 13:20:24 +00:00
PETER LIANG
cc4af05607
Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267
Change-Id: I14be163454ca16655f88e1d9195e891e065c21bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 13:01:07 +00:00
Peter_Liang
b833fe1bad
Should popup the confirmation toast after clicking the reset button.
...
Goal: Users may not notice what the change after resetting all settings configs in the Text and reading options. So we will use the toast to give nice feedback for them.
Fix: 220126995
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreferenceFragmentTest
Change-Id: Ife42b0c9d8a0241d7b8c3e5dbe7f9f1e2a6d759a
2022-04-20 15:39:11 +08:00
TreeHugger Robot
a5d6861390
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9
am: 3f7f5386c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144
Change-Id: I56f2d65fadf3e9a0143e55532f71501a5d804dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:32:23 +00:00
TreeHugger Robot
3f7f5386c5
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev am: 07950adad9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17767144
Change-Id: I283f489b4422f5cbab61626214e575ac2255d25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:24:08 +00:00
TreeHugger Robot
07950adad9
Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev
2022-04-19 23:44:38 +00:00
Abel Tesfaye
238b2cc721
Update auto-rotate strings/toggles for better accessibility
...
This change will update some strings for smart-auto-rotate and replace
the activity based switchbar with SettingsMainSwitchPreference. The
switchbar had to be replaced to allow the new text to appear above the main toggle.
Test: locally with flame and with resolver service enabled & disabled
Bug: 220182618
Change-Id: I4b60bf006bdde9e47b33a52c7719ec770caf5746
Merged-In: I4b60bf006bdde9e47b33a52c7719ec770caf5746
2022-04-19 21:21:34 +00:00
Neil Fuller
8bdd44b67e
Merge "Fix logic used for auto time zone settings"
2022-04-19 15:21:40 +00:00
Tsung-Mao Fang
4b648f335d
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
am: 9a8167a4a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I94de281b1c0c8767dc0f3ecb59486387081bc2db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:31:11 +00:00
TreeHugger Robot
ec8c96f59e
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
am: 7c47ae926d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Ia54d8a9bc60bea1816c0e7dd4ab6a8796bc5daf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:30:59 +00:00
Tsung-Mao Fang
a8d5f8dbc1
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
am: 11979785a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I6992311468464d28114e7aa07e2347fed679060a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:30:11 +00:00
TreeHugger Robot
12214747b5
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
am: 48086b485a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Iaca40b54154e5881443ba403e69c3db8ace5fb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:30:01 +00:00
Tsung-Mao Fang
9a8167a4a9
Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305
Change-Id: I6ce600c0e41f6457ab38478aba6b5cad8503618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:14:03 +00:00
TreeHugger Robot
7c47ae926d
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev am: fbaa9f3faa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799714
Change-Id: Ia8fb2c97f7055175085eccf58d25b54364f8a048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 08:13:55 +00:00
Tsung-Mao Fang
ccb8855b98
Merge "Do not expose wifi slice when no permission" into tm-dev
2022-04-19 08:12:37 +00:00
Tsung-Mao Fang
821608c5be
Do not expose wifi slice when no permission
...
Prior to this cl, slice provider always exposes wifi slice
to calling package without confirming any wifi permissions.
For current solution, we will check calling package's permission state
and decide whether slice provider should expose wifi slice or not.
Because settings search is a part of settings app,
this permission checker won't be applied to settings intelligence.
Test: manual, robotest, cts
Also run manul
Bug: 178014725
Change-Id: I2770b5b43366a5aa65c7519efc4243d350a21b26
2022-04-19 08:07:35 +00:00
TreeHugger Robot
fbaa9f3faa
Merge "Fix transparency seekbar is enabled while fade feature is disabled." into tm-dev
2022-04-19 07:52:35 +00:00
TreeHugger Robot
d89c64f189
Merge "Read CarrierConfig to get operator name" into tm-dev am: b1bdc42d52
am: eb60f31139
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17800680
Change-Id: I872cc818554a9b43e0b1dc5eb5da6a4877567fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:39:42 +00:00
Hugh Chen
1de1873320
Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev am: abad3c4a88
am: f3cdbb79eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799707
Change-Id: Id2da67f15bf9de911cb0cb30af410f931bf280ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:39:25 +00:00
TreeHugger Robot
4d001b972b
Merge "Read CarrierConfig to get operator name" into tm-dev am: b1bdc42d52
am: 0e3e447e11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17800680
Change-Id: If68a15a92b3e830b3a1fded9278898af74b6e00a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:39:13 +00:00
Hugh Chen
5dcf2d778a
Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev am: abad3c4a88
am: fb156692b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799707
Change-Id: I7dec1d842c22757250943fb9490cccbb06a0b16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:39:03 +00:00
TreeHugger Robot
eb60f31139
Merge "Read CarrierConfig to get operator name" into tm-dev am: b1bdc42d52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17800680
Change-Id: I3c9f9f8ae4c33d13add17ed282ed93bfb7af534b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:16:40 +00:00
Hugh Chen
f3cdbb79eb
Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev am: abad3c4a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799707
Change-Id: Ic7f091fe2f612edf3f6b3f0bad8f46b35158f849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 02:16:33 +00:00
TreeHugger Robot
b1bdc42d52
Merge "Read CarrierConfig to get operator name" into tm-dev
2022-04-19 02:08:35 +00:00
menghanli
7ae0b641dd
Fix transparency seekbar is enabled while fade feature is disabled.
...
Root cause: Show default status until setting key changed. It does not
show latest status when created.
Solution: Update the status when created.
Bug: 229566130
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FloatingMenuTransparencyPreferenceControllerTest
Change-Id: Ia25fe5cec0444c1771e8ce31aae2a4cb3b0405a1
2022-04-19 08:15:28 +08:00
Niklas Lindgren
8bc83ef615
Read CarrierConfig to get operator name
...
Config if operator name should be in status bar is now read
from carrier config. For dual sim devices we use data sim.
Bug: 116847905
Test: Add item for carrier in vendor.xml and swap sim cards
between ones that have the item enabled and disabled. We have
also tested to swap data sim cards on dual sim device.
Test: m RunSettingsRoboTests ROBOTEST_FILTER="ShowOperatorNamePreferenceControllerTest"
Change-Id: I03311b96ee660aed80ec867b05aa0a34cfc15f54
2022-04-18 21:34:57 +00:00
Hugh Chen
aadc44ae26
Fix default usb settings will set wrong function when onPause()
...
Bug: 229200265
Test: make -j64 RunSettingsRoboTests
Change-Id: Ibee2d39af8b341d03117d96029446ddcd45921fe
2022-04-18 12:16:57 +00:00
Kedar Chitnis
ba15580112
Merge "Guest mode UX flow updates to user settings" into tm-qpr-dev
2022-04-18 05:34:56 +00:00
ykhung
08318ce06c
Format BatteryEntry and BatteryDiffEntry class am: b593e00af0
am: ecf5574c2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782705
Change-Id: I8b03fcb6cc727360f7a5f9c72852117a3a060439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 15:37:56 +00:00
ykhung
83a47bfa33
Format BatteryEntry and BatteryDiffEntry class am: b593e00af0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782705
Change-Id: I1193e3e0638dab1b35865f8523cf08764fb0d58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 15:23:29 +00:00
ykhung
b593e00af0
Format BatteryEntry and BatteryDiffEntry class
...
Bug: N/A
Test: make RunSettingsRoboTests
Change-Id: I14e2ef4c455209e58edc5ccdbe064f469815cccd
2022-04-17 06:23:47 +00:00
TreeHugger Robot
c6e4554848
Merge "When in guest mode hide the rename button"
2022-04-15 09:07:20 +00:00
Chaohui Wang
4d0df6d16f
Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f
am: 467676063e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148
Change-Id: I696518d33b0e79f5b297c99829cf884de1a1b2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 00:03:52 +00:00
Chaohui Wang
d9c7a49ce7
Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148
Change-Id: I06abe7c118003f5b1230b77d1c3bdd724095eb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:42:01 +00:00
Chaohui Wang
fbafdbdd8f
Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev
2022-04-14 23:22:19 +00:00
Quang Luong
132e8286cb
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
am: 6f7a9b88ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I842c62d47fff47de41dcc40a18eca8f777ecc1db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:51:21 +00:00