Arc Wang
1cdcca0064
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9 am: 5202c0db9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: I7224cc93d6057a3afb3b451f5a9b50d6155fcd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:49:21 +00:00
Arc Wang
96491e1ea9
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev
2022-04-20 00:54:15 +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
Yasin Kilicdere
cdc0f7213d
Merge "Revert "Revert "Remove the fallback AddSupervisedUserActivity."""
2022-04-19 15:37:34 +00:00
Neil Fuller
8bdd44b67e
Merge "Fix logic used for auto time zone settings"
2022-04-19 15:21:40 +00:00
TreeHugger Robot
58650e8d55
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33 am: 2a85dfb5f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: I708eff8349c69d441dd6eca5793fa26ffefc8ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 09:49:34 +00:00
Arc Wang
ea4260c0e7
Fix ManageStoragePreferenceController always consume click event
...
ManageStoragePreferenceController should only consume click
event when its preference key matches the key of the clicked
preference.
Bug: 228970667
Test: atest ManageStoragePreferenceControllerTest
Change-Id: Ia6c62cf457fc4cadc27dc160dbd9b04ec3392d68
2022-04-19 17:35:05 +08:00
TreeHugger Robot
0f23863e33
Merge "Fix UiBlcoker regression" into tm-dev
2022-04-19 09:11:51 +00:00
TreeHugger Robot
b0f783b29d
Merge "[Settings] Code refactor for Lifecycle listening"
2022-04-19 08:54:35 +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
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
Bonian Chen
9a4c66d23b
[Settings] Code refactor for Lifecycle listening
...
This is an abstract class for building a set of callback behavior
based on Lifecycle status change.
Through extending this class, the implemented methods are invoked
only when required.
Bug: 229689535
Test: unit test
Change-Id: I7534393546f821738a63ebde121a5a88ee03b23b
2022-04-19 15:12:59 +08:00
Yi-Ling Chuang
61022c6419
Fix UiBlcoker regression
...
We determine if the visibility should be updated by mIsFirstLaunch, and
mIsFirstLaunch is set to false in onStop(). This breaks the updatability
if there's a change before onStop() gets called.
So we move the value assignment to the end of checkUiBlocker() because
at that time, all blocker work should be either finished or timeout.
Also remove mIsFirstLaunch since mUiBlockerFinished can cover the
determination with the new design.
Fixes: 229565193
Test: Toggle Use Location in the location page and see the Recent used
section react accordingly.
Change-Id: Id6005e5b8b29cb8a6309068d0a2177489a3fb2f4
2022-04-19 15:12:29 +08:00
Joshua Mccloskey
eabf1f82d9
Merge "SUW enrolls FP before Face" into tm-d1-dev am: 179b83ac7c am: 9896d485ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17776660
Change-Id: I19d80c22f4b001d410b55cce3f659f7699f03393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 04:28:10 +00:00
Joshua Mccloskey
9896d485ef
Merge "SUW enrolls FP before Face" into tm-d1-dev am: 179b83ac7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17776660
Change-Id: I4d45e6eaa7cfea582e6d4d60cedd861335a2e1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 04:10:41 +00:00
Joshua Mccloskey
179b83ac7c
Merge "SUW enrolls FP before Face" into tm-d1-dev
2022-04-19 03:45:45 +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
Hugh Chen
abad3c4a88
Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev
2022-04-19 01:56:59 +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
Joshua McCloskey
1dd4f54d58
SUW enrolls FP before Face
...
Test: During SUW verified Fingerprint enrollment
comes before face.
Test: During SUW enrolled multiple fingerprints than 1 face.
Test: Skipped and cancelled on every possible screen to ensure behavior
was correct.
Bug: 228607474
Change-Id: I4c50763a804fe4eb9d62451eb2f957545857723e
2022-04-18 19:42:35 +00:00
Yuri Lin
d6dc2708c7
Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: d21ef57315
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955
Change-Id: I67ea5071f8d033af594467c0903f442916cc79e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 17:52:45 +00:00
Yuri Lin
d21ef57315
Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955
Change-Id: I4e88828a7d398b014be9313bf59819a3edf9322f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 17:24:04 +00:00
Yuri Lin
52b7e8ced6
Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: 075dd07035
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955
Change-Id: I76b9cc331e0af9d874d241c6d2c1c97b7997a04e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 17:23:40 +00:00
Yuri Lin
a73c850aa5
Merge "Special handling for intent coming from "welcome" notification." into tm-dev
2022-04-18 17:09:02 +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
TreeHugger Robot
2c1171000f
Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2fd5 am: d9db15cd77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704
Change-Id: I0306a9b7d37caaba971c167500b731180ce0316f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 09:02:22 +00:00
TreeHugger Robot
71ec7bc229
Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2fd5 am: f821e55653
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704
Change-Id: I933d281c9ee05b32cd1e1ade9a17549b980b63ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 09:01:57 +00:00
TreeHugger Robot
d9db15cd77
Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2fd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704
Change-Id: Ifa16e70b61a75252c8a5ba9f6fc25f7786be8349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 08:44:14 +00:00
ykhung
0f8ee91e1e
Remove the legacy getReplacingActivity() method from feature provider
...
Bug: 195306545
Test: make RunSettingsRoboTests
Change-Id: Ie7ae30ad671ec2ee2659e64ee4f191728edab4e8
2022-04-18 05:59:58 +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
TreeHugger Robot
fcc6398b78
Merge "Fix sub status of LocationSettings" into tm-dev am: edf39d0e45 am: 4827d18f47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730657
Change-Id: I85fe2faa11b976c18bc6868893a4ca77acbc08c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 04:56:13 +00:00
TreeHugger Robot
eec3d74bba
Merge "Fix sub status of LocationSettings" into tm-dev am: edf39d0e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730657
Change-Id: I7fed1181a83f6a6246bba3edb5e7be59d98f0263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 04:42:15 +00:00
TreeHugger Robot
edf39d0e45
Merge "Fix sub status of LocationSettings" into tm-dev
2022-04-18 04:20:09 +00:00
ykhung
12a191a3b8
Use en-dash in the time range instead of a hyphen for different format am: 91adbd3b16 am: f76aeea8a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782706
Change-Id: I0254ef363b418e35f82c6bbdc980f1d7f3d0da86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 15:38:05 +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
24707ec043
Use en-dash in the time range instead of a hyphen for different format am: 91adbd3b16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782706
Change-Id: I4616826eb10441dd13c2eeec9c09262d86e23bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 15:23:35 +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
Chaohui Wang
37375565e5
Fix sub status of LocationSettings
...
Fix the followings:
Recent access apps are not displayed after toggling off/on
"Use location".
When "Use location" is enabled, "Location for work profile" switch is
disable and gray out.
Fix: 227621199
Fix: 227265216
Test: manual
Change-Id: I9f955a381827eb020fbd0d6ebeb9fced3dec1dcf
2022-04-17 19:38:39 +08:00
ykhung
91adbd3b16
Use en-dash in the time range instead of a hyphen for different format
...
Expected format: 00:00–02:00 or (2pm – 4pm)
Screenshots:
https://screenshot.googleplex.com/4RvaovK6RN7kjqo
https://screenshot.googleplex.com/ADZRr2TPuuctFre
Bug: 229264053
Test: make RunSettingsRoboTests
Change-Id: Ifd9bea0ce4525c8b582778e255104e875d365563
2022-04-17 06:52:24 +00:00