Bill Lin
3eb3923248
Merge "Remove redundant margin from SudContentFrame" into tm-dev am: dc9df4db50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799709
Change-Id: Ia8fc650c1cc7943b38aa8bb5d7470b9fbfb272b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:18:00 +00:00
Arc Wang
f94760e74c
Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722
Change-Id: I7aa4104198b2210aad9b65cb5834ebc7eb0e2784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:17:52 +00:00
Bill Lin
dc9df4db50
Merge "Remove redundant margin from SudContentFrame" into tm-dev
2022-04-20 01:15:18 +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
952408cabe
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437
Change-Id: I5bb5e77892ef34b5528a4ea2b419234da1f96350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 00:24:26 +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
Abel Tesfaye
c4c027a89d
Add accessibility string description for auto rotate
...
Bug: 221191444
Change-Id: Id82aed3dd648c2b116e831488a0c23fa3efe3ee3
2022-04-20 00:11:46 +00:00
TreeHugger Robot
883f14f01a
Merge "Remove config_showOperatorNameInStatusBar" into tm-dev
2022-04-20 00:03:18 +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
Bill Yi
1f7be3a07f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifea98ccc023a80a3849c32e89cda6917b4bd0250
2022-04-19 23:26:09 +00:00
Bill Yi
e14416d5a3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1f4739dad8ac51dc429e6e1d8fa57c4c45ca2017
2022-04-19 23:22:30 +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
TreeHugger Robot
7fe08d0272
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708
Change-Id: Ie1367eabc70bdaeace5807ba088b8092556c6137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 17:29:09 +00:00
TreeHugger Robot
cc27e34330
Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev
2022-04-19 17:02:54 +00:00
Niklas Lindgren
87e2471ab6
Remove config_showOperatorNameInStatusBar
...
config_showOperatorNameInStatusBar has moved to
CarrierConfigManager.KEY_SHOW_OPERATOR_NAME_IN_STATUSBAR_BOOL
Bug: 116847905
Test: Build Product
Change-Id: Ia5e7b5e498ce33ffe58ff922ab3799a1b263a88b
2022-04-19 14:21:38 +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
30fb5348f2
Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706
Change-Id: Ib3cfe231aa6a6250a7840fd187c63a64f26b7da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 09:34:46 +00:00
TreeHugger Robot
0f23863e33
Merge "Fix UiBlcoker regression" into tm-dev
2022-04-19 09:11:51 +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
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
menghanli
e488927e34
Fix wrong glifLayout padding for tablet resolution
...
Root cause: Override the padding by phone padding to caues inconsisstent
behahvior.
Solution: Remove the attributes
Bug: 229106829
Test: Manual testing in t6 (tablet) and raven (phone)
Change-Id: I583626a00088d36bda311087e8830f47e49a1152
2022-04-19 13:36:45 +08:00
Milton Wu
a4f30404f0
Not relaunch BiometricEnrollActivity durng SUW
...
Biometric fingerprint flow is abnormal because BiometricEnrollActivity
is relaunched during SUW because diplay or orientation is changed.
Bug: 205059704
Bug: 228812876
Test: atest BiometricEnrollActivityTest
Test: Before clicking "No thanks" manully unfold or rotate device on the
fingerprint setup screen of SUW
Change-Id: If0abe785c74c7fb40da779af166d79eeba6ad57f
2022-04-19 03:48:22 +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
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
Bill Yi
c88b882013
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: I647d7ed44ee15b1c55ae97993b5c15ab16157438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:46:10 +00:00
Bill Yi
5e99e584f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: Ie8c3416a031f791d4e4603c39aea24932c835360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:46:08 +00:00
Bill Yi
9d597ae5b0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801771
Change-Id: I9f6767d2a7e0cadb67eb58cb0464880acfbcc6e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:45:44 +00:00
Bill Yi
738e92a0fb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784947
Change-Id: I43a1bfc8f493004e16420725d037178f592851f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:40:48 +00:00
Bill Yi
9d63f65466
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784947
Change-Id: I2979722889c7a3664c3730fc1f2343957c2df4d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:40:43 +00:00
TreeHugger Robot
d5f23afcc8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784946
Change-Id: I03063bc040ff8432f92639d7abd9d9c5436831e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:39:11 +00:00
Bill Yi
6c8a55e3a7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784946
Change-Id: I1cf43b27d3698aad7231934b41a5e631e72e5a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:39:10 +00:00
Bill Yi
052970997d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-19 00:27:54 +00:00
Bill Yi
b9dd1a3a2d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-19 00:22:17 +00:00
TreeHugger Robot
db7228fd26
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-19 00:17:15 +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
Xin Li
024fe4b39a
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17805671
Change-Id: Ia9158c51f249227851e314b45566de1f7bfec848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 00:08:18 +00: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
Xin Li
99d834b0b8
Merge sc-v2-dev-plus-aosp-without-vendor@8433047
...
Bug: 226662282
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Change-Id: I71459583120f712298f47b4dbd2c791d8ef4e022
2022-04-18 21:01:08 +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
TreeHugger Robot
5734853d61
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb
-s ours am: 467b85d088
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765
Change-Id: I61575bf7aeb0e1bf99e275a3ece78d3f3db325d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 19:26:13 +00:00
TreeHugger Robot
467b85d088
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765
Change-Id: I4435f6f1918ce336ee104c933f7d040a165f2153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:51:14 +00:00
TreeHugger Robot
5bf683e8f5
Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765
Change-Id: I19124fd659f0faa1e212e1dd35aa2133552880f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:44:24 +00:00
Bill Yi
2631a9a4f1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
am: fb20f3183b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765
Change-Id: I07f502dac11a5c652c4a248dd90c127949678afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:44:23 +00:00