Commit Graph

103052 Commits

Author SHA1 Message Date
Peter_Liang
c5551dc974 Fix that the color of each option and subtext of Display size and text has the color difference.
Change the android:selectable from false to true to avoid the title and summary impacted by color style.

Fix: 229560847
Test: manual test
Change-Id: Iec2ba560538a4f69f79198015bf6a24fb9a7caca
2022-04-20 16:29:36 +08:00
TreeHugger Robot
f792528a8f Merge "Check null BT profile to prevent crash" into tm-dev 2022-04-20 07:43:49 +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
Bill Lin
426f8a58e1 Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev 2022-04-20 06:17:35 +00:00
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
843b2da970 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -s ours am: 39e1357748 -s ours am: c5d14a8728 -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: I43f69b433b13247aa6066cd12e66f1869eb8dea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:33:21 +00:00
Peter_Liang
3954a79773 Prevent cutting the thumb of the LabeledSeekBarPreference from different themes.
Add the attribute “clipChildren” as false to avoid cutting.

Bug: 219415822
Test: manual test
Change-Id: I0c565896279111e65600d1b41c576106a8de7136
2022-04-20 13:18:56 +08:00
Xin Li
c5d14a8728 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -s ours am: 39e1357748 -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: I62a0028ef31599133269dcda6631a9c19d0e9007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:13:28 +00:00
Hugh Chen
76e230918f Check null BT profile to prevent crash
Bug: 229802811
Test: build pass
Change-Id: Idf9f32ec08793784fbce05d34c53cdf53cddb312
2022-04-20 04:53:23 +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
4d749fca2b Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev am: 4d1e327457 am: 901c166927
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799717

Change-Id: I9d28328428f5720c6059de0c03ef01aa972714ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:33:12 +00:00
Menghan Li
901c166927 Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev am: 4d1e327457
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799717

Change-Id: I98e81cc16c1b4790f864ac85d31c7608f9ea13ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:07:21 +00:00
Bill Yi
af08983841 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0334114d89432b00e1bd029ff6cf13c4f841c6de
2022-04-20 04:02:18 +00:00
Bill Yi
8460461f4d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8f58b870b348c8e7af0fbaec8a339b7210250a96
2022-04-20 03:58:37 +00:00
Bill Yi
e6d15f05d2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1268b667ca64c62679665e30f9db7e53c3d8143a
2022-04-20 03:55:00 +00:00
Bill Yi
9896cc4089 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1f8f3afe70d6fddf885a37b9ba3cae0946d7d692
2022-04-20 03:47:49 +00:00
Bill Yi
5e411e93e7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I30071aea5bd518f7310a25a7274b350f2f66f634
2022-04-20 03:46:27 +00:00
Bill Yi
e9381013a1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I13495ba94ac07a6ce1b900b68607c684fbb5fda1
2022-04-20 03:45:05 +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
93d68ac7b5 Merge "Remove redundant margin from SudContentFrame" into tm-dev am: dc9df4db50 am: 3eb3923248
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799709

Change-Id: I54886bcc2c2464eb63fe5dd40c86a9bd3cb4bbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 01:49:56 +00:00
Arc Wang
4eafad5f36 Merge "Fix ManageStoragePreferenceController always consume click event" into tm-dev am: 96491e1ea9 am: f94760e74c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799722

Change-Id: Ia4fe33d0b2fa089b84d19abd39d5b61db1a3b4c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 01:49:50 +00:00
lbill
6a45659d7b Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText
Without IME_FLAG_NO_EXTRACT_UI, device launch ChooseLockPassword
in some cases, mPasswordEntry will go to extrac UI which is
not compliance UI/UX design.

Test: make and check visual of com.android.settings.password
      ChooseLockPassword & SetupChooseLockPassword activities.
Bug: 222219535
Change-Id: I19777954b5edbc9064a8e930b84d2b4e8337c34a
2022-04-20 09:22:14 +08:00
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
228c26e21a Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f01a am: 952408cabe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17821437

Change-Id: I5bb7d93944b4c2ce482e178118b59335075b36b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 00:47:28 +00: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
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
7c1f9fbbe0 Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330 am: 7fe08d0272
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708

Change-Id: I0c2aac770e289d218d63d8b9d497313f91dae589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 17:53:10 +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
Neil Fuller
3fe57a8ac3 Fix logic used for auto time zone settings
Fix the logic used that determines whether the automatic time
zone detection toggle is available in the Settings UI Date & Time
screen. Also, ensure that the TimeZonePreferenceController uses correct
logic for whether the user can manually enter a time zone.

This change migrates the controllers to use a existing high-level
TimeManager API rather than (incorrectly) duplicating in Settings UI the
logic for whether time zone detection is supported / enabled.

Without this change, WiFi-only devices _with_ location-based time zone
detection enabled would incorrectly hide the "auto time zone" toggle,
which would have the knock-on of making it look like the user is allowed
to enter a time zone manually when they aren't (because it is
enabled/disabled based on the presence of the toggle).

That toggle still needs to be present while there is a possible time
zone detection mechanism. All the (quite complex) logic around this is
already considered by the TimeManager API.

Possible side effects:

This change decouples the "does the toggle show true or false?"
(isEnabled()) from the "should the toggle be shown at all?"
(isAvailable()) logic by removing a call to isAvailable() inside of
isEnabled(). This is to avoid making multiple (probably more expensive
than what it was doing before) calls to the time_zone_detector service,
and avoid the extra complexity of caching / cache invalidation that
would be needed to mitigate it. Previously, as a result of the call to
isAvailable(), isEnabled() would always return false when mIsFromSUW is
true, but now it will return the underlying value of the device's
auto_time_zone setting. This means that if the UI is changed in future
to render a visible-but-can't-be-changed-by-the-user toggle for auto
time zone, it will display the current setting value, which is perfectly
reasonable.  It is assumed it will have no other side effects.

The AutoTimeZonePreferenceControllerTest.isFromSUW_notEnable test has
been changed to reflect the change in behavior. Various name changes
made to tests to reflect the new behavior.

Bug: 228247623
Bug: 186625820
Bug: 172891783
Test: treehugger
Test: Manual test on a device with telephony
Test: m ROBOTEST_FILTER=AutoTimeZonePreferenceControllerTest RunSettingsRoboTests -j40
Test: m ROBOTEST_FILTER=TimeZonePreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: I4c7608e8645eee5994c8ecf85a14a27d3278ac04
(cherry picked from commit 7a8ac683d4)
2022-04-19 15:27:29 +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
TreeHugger Robot
d3efd93dc4 Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e33 am: 30fb5348f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799706

Change-Id: I5e8f1d2bcdf1eea55a839e10b71b0f244881e95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 09:57:05 +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
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
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