Bill Yi
2e39766a1f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d
-s ours am: c88b882013
-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: I2edb7f5be9795a90d85fe3a328c870df2278a761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 06:12:31 +00:00
Bill Yi
a20fed1d1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55
-s ours am: 5e99e584f5
-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: I754ea0efc92ac2178e7d6b64773e46536109897f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 06:12:30 +00:00
Bill Yi
cc6641c043
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54
-s ours am: 9d597ae5b0
-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: I7ecd596c4f3d96940cca64a5296acc451039d79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 06:06:21 +00:00
Xin Li
39e1357748
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8
-s ours am: 024fe4b39a
-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: I129b65c2db67aa72a0f3d4de00b598e2fa64e09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 04:47:34 +00:00
Menghan Li
4d1e327457
Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev
2022-04-20 03:36:56 +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
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
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
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
0f23863e33
Merge "Fix UiBlcoker regression" into tm-dev
2022-04-19 09:11:51 +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
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
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
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
aa1f86f18d
Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
Import translations. DO NOT MERGE ANYWHERE
2022-04-18 18:14:25 +00:00
TreeHugger Robot
5e411c38cb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-18 18:14:25 +00:00
Bill Yi
6c46c20518
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801766
Change-Id: I5fbaef29db47314d259051001fc284f01b627229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:00:04 +00:00
Peiyong Lin
bd26c3c747
Merge "Clean up extra app info." into tm-dev
2022-04-18 17:37:41 +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
Bill Yi
64a0937f54
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia7d7f009e6a1f4698d7d302ce3440b60f679e672
2022-04-18 10:57:25 +00:00
Bill Yi
442f62eb55
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I69867d36d9dfef29de295def3477ccd9222b24da
2022-04-18 10:42:59 +00:00
Bill Yi
fc86f72e65
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7d547343a1ce1a358b12ab082db4378d88b67c14
2022-04-18 10:36:04 +00:00
Bill Yi
fb20f3183b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765
Change-Id: I0c632c34915f66123287353900d59d4e31010a25
2022-04-18 10:32:54 +00:00
Bill Yi
d5de2ec5ae
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If4034c0729c04a0a0dd7a3d3690303c616e67516
2022-04-18 10:32:41 +00:00
Bill Lin
f5496a99cd
Remove redundant margin from SudContentFrame
...
Test: make and diff screen
Bug: 229197953
Change-Id: I8d4de113ba69ee72b0eb36ad95ae395afa6eab11
2022-04-18 17:47:50 +08:00
TreeHugger Robot
708c2d2fd5
Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev
2022-04-18 08:20:48 +00:00
Edgar Wang
4dc79d92f0
Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev
2022-04-18 06:45:02 +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
Edgar Wang
ca7f11d965
Adjust the padding between profile tab and app filter spinner
...
Bug: 223952727
Test: visual
Change-Id: I88411d554975953d29a24a88b6cf948f7f6d7ac8
2022-04-18 12:48:35 +08:00
TreeHugger Robot
edf39d0e45
Merge "Fix sub status of LocationSettings" into tm-dev
2022-04-18 04:20:09 +00:00