Commit Graph

1068 Commits

Author SHA1 Message Date
Jason Hsu
5180aac160 Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f am: 0465a872ae am: b5b53be007 am: ef912409a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126

Change-Id: I711401aba794431717176c06ba1f153a55b94a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:05:37 +00:00
Jason Hsu
c53c5a906f Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev 2022-05-04 08:03:58 +00:00
jasonwshsu
2119458e6d Save user's option when clicking 'Change setting' in triple-tap warning dialog
Root Cause: Did not save user's option when clicking 'Change setting'.

Solution: user did click on "save" before that dialog showed up, so it is their intention to save.

Fix: 228405345
Test: manual test
Change-Id: I28e3cb372419ec3b4f27ee84051f58d37e7c5c46
2022-05-01 00:05:21 +08:00
PETER LIANG
b503d57563 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: d6e516f32f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: I4f472beabfa87d2519f32e7b897ef07b69ae7b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:59:57 +00:00
PETER LIANG
27aa5f9d94 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev 2022-04-28 06:45:11 +00:00
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
Lais Andrade
9c8d1e94fb Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev 2022-04-27 13:54:13 +00:00
Peter_Liang
fcce62aa77 Logging for the feature "Text and reading options" in Android T.
Logging for the status of five features “Font size”, “Display size”, “Bold Text”, “High contrast text”, and “Reset” in the “Display size and text” page.

Bug: 222661478
Test: manual test
Change-Id: I33060fca860e02ddac7716275e8682e70fbaff1f
2022-04-27 15:25:30 +08:00
Jason Hsu
2482997860 Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: fd112cd79b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: Ie0f6543f8f8e895581ba257203af14082f409298
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 11:34: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
jasonwshsu
e48ebb9755 Correct Magnification shortcut title
Root Cause: Magnification has its own ShortcutPreference, but we did not
update correct title with getShortcutTitle()

Solution: Call setTitle(getShortcutTitle()) in initShortcutPreference()

Bug: 228752572
Test: manual test
Change-Id: I85b09a22032bad0a0c840590a98be88538a0499b
2022-04-25 02:53:15 +08:00
Ricky Wai
8886c7cc83 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 3ab907b968
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I9a995000d3a7b44bd3de1f48363949c0d45191fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:44:37 +00:00
Ricky Wai
fd7153ed39 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev 2022-04-22 14:53:00 +00:00
Menghan Li
c8ad8d1095 Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f am: d14121e919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333

Change-Id: I1326f80afb4db7ac3dbce3b44bf93b9138a813e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 13:41:44 +00:00
menghanli
0d47c548d9 Fix Live Caption does not follow caption size if caption is not enabled
Root cause: Changing captions style without turning on the preference WHILE Live Caption is running works when it shouldn't.
Solution: Turn on the show caption if users change caption size and style by UX suggestion.

Bug: 221051127
Test: Manual testing
  1. Turning on/off Live Caption and Caption Manager
  2. Changing styles when Caption Manager is off
Change-Id: Ie6cfb9e0b7325c2e469ac8b6a7d359b843cc173a
2022-04-21 17:01:15 +08:00
Menghan Li
21679fdaf9 Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev am: ef9178146c am: caf42f2cc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799712

Change-Id: Ic889b5a640662656b0b9ab3790a1cf685f5ade69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:46:03 +00:00
Menghan Li
ef9178146c Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev 2022-04-20 21:05:29 +00: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
menghanli
a9e6e8c811 Fix quick settings tooltip changed when color correction fab clicked
Root cause: Users click on color correction fab to make foreground activity recreate. When recreated, the ag/13472947 makes the MainSwitch updates to ON status and get the callback for #onPreferenceToggled. It pops up the direct-use style tooltip rather than the edit style tooltip.
Soluton: Reference #updateSwitchBarToggleSwitch to early returns if values are same.

Bug: 229167631
Test: Manual testing
Change-Id: I6781fd509db7538898ad6ff0ae47124c9b9e1bc5
2022-04-20 19:18:43 +08: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
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
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
Menghan Li
7878848acc Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev am: 361d42afe5 am: 5e8bdb4332
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17759934

Change-Id: I9dfd907c21980e8165b55029b575709458a3959a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 04:45:52 +00:00
Menghan Li
361d42afe5 Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev 2022-04-15 04:00:11 +00:00
menghanli
50520c2d3f Fix inconsistent shortcut strings on accessibility setting and edit dialog
Root cause: Base class provides an override function for accessibility settings shortcut preference. But, it cannot update to the edit dialog.
Solution: Refine the resilience function and base class apply into accessibility settings shortcut preference and edit dailog.

Bug: 228830417
Test: Manual testing on all accessibility page and edit dialog
Change-Id: I84bc63a39cd9cfa7e12944dff20ee6b92879008d
2022-04-15 00:31:03 +00:00
Presubmit Automerger Backend
8eadfcd0d6 [automerge] Fix that device isn't responding for a while when resetting all settings on “Display size and text” page. 2p: 09a2a49bd3 am: 74dd53583b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614845

Change-Id: I76f447e38c77aff30b587694088d053d50a524c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 01:25:25 +00:00
PETER LIANG
8bd6647885 Merge "Fix that device isn't responding for a while when resetting all settings on “Display size and text” page." into tm-dev 2022-04-13 00:39:27 +00:00
Presubmit Automerger Backend
74dd53583b [automerge] Fix that device isn't responding for a while when resetting all settings on “Display size and text” page. 2p: 09a2a49bd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614845

Bug: 223747686
Bug: 220082104
Bug: 220070773
Change-Id: If66da507a1e49fa2abec0f4a36507cb73fb176b4
2022-04-13 00:38:51 +00:00
Peter_Liang
09a2a49bd3 Fix that device isn't responding for a while when resetting all settings on “Display size and text” page.
Goal:
Probably has the race condition issue between "Bold text" and  the other features including "Display Size", “Font Size” if they would be enabled at the same time, so our workaround is that the “Bold text” would be reset first and then do the remaining to avoid flickering problem.

Bug: 223747686
Bug: 220082104
Bug: 220070773
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreferenceFragmentTest
Change-Id: If1425fe2579bec8dded69680ac73fbfb03c37321
2022-04-13 00:38:44 +00:00
TreeHugger Robot
6a489ca8b7 Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7a4f6a5ba3 am: 54f6f65f13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474927

Change-Id: I221b376e3d1f844aa970b84936570d6bfd5c70ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:36:36 +00:00
TreeHugger Robot
7a4f6a5ba3 Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev 2022-04-12 17:24:05 +00:00
Jason Hsu
7a5ade7e9f Merge "Write default accessibility service only when user enter into corresponding page." into tm-dev 2022-04-12 10:18:43 +00:00
Presubmit Automerger Backend
5ce913b1a7 [automerge] Write default accessibility service only when user enter into corresponding page. 2p: 2f2f0e982f 2p: e1e4a6747f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026

Change-Id: I53be724a2717e6d3c5ee74859e3b6d761d348fa7
2022-04-12 07:12:37 +00:00
Presubmit Automerger Backend
e1e4a6747f [automerge] Write default accessibility service only when user enter into corresponding page. 2p: 2f2f0e982f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026

Change-Id: Iced39d75bb57ea4cf0ba12b598c8a74193d9d8b1
2022-04-12 07:12:28 +00:00
jasonwshsu
2f2f0e982f Write default accessibility service only when user enter into corresponding page.
Based on ag/17463205, to help users not to mis-triggered
volume-key-accessibility shortcut, we will only write default
accessibility service when user enter into corresponding service page.

Fix: 228562075
Fix: 226866175
Test: manual test ->
      1. Do not enter into default config accessibility service page during setup wizard then finish setup wizard.
      2. Observe settings value of shortcut targets. It should be null.
Change-Id: I4f26598d646c8e6b312debd03eaaa9d2cd7010ea
2022-04-12 15:10:38 +08:00
Ricky Wai
0cacded5ca Apply enhanced confirmation mode OEM config to Settings
So Settings app will block user accessing restricted settings
if OEM config is off.

Bug: 217709978
Test: With OEM config on, accessibility page for unknown source app is
disabled by default.
Test: With OEM config off, accessibility page for unknown source app is
not disabled.

Change-Id: Id25e8fd76e6192fd4db64f81903449bb02785b39
2022-04-08 13:57:02 +00:00
Menghan Li
0b5e543f9d Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 1031406227 am: b08cb9b548
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465488

Change-Id: Idfa32f4657f414bc61a39d7407ab941ed8fb4c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 06:24:01 +00:00
menghanli
18ddc6525b Remove dependency of SudGlifTheme from SettingsTheme
Root cause: Inherit from the glif themes in setupdesign library
Solution: Not inherit from the glif themes and set Setting theme before
applying the dynamic color

Bug: 225800660
Test: Manual testing
Change-Id: Ic4d71bf7a754888c1ed1590c0483360d65f5da44
2022-04-01 11:00:45 +08:00
Jason Hsu
9519e55315 Merge "Extract inner helper from AccessibilitySettings to public" into tm-dev am: a0eeda0d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321712

Change-Id: I8c5c462cd1c78da69d2931d3cf82719e285d3118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 17:45:51 +00:00
Jason Hsu
a0eeda0d65 Merge "Extract inner helper from AccessibilitySettings to public" into tm-dev 2022-03-31 17:26:41 +00:00
Lais Andrade
7ee344ab54 Apply only RING_VIBRATION_INTENSITY to ringtone vibrations
Ignore the VIBRATE_WHEN_RINGING deprecated settings for ring vibrations.
Old behavior applied this settings only to ringer-mode normal, but never
to vibrate-only ringer mode.

This is being deprecated in favor of the INTENSITY_OFF value in
RING_VIBRATION_INTENSITY.

Fix: 222697191
Test: RingVibrationIntensityPreferenceControllerTest
Change-Id: Ic05f06c6a1df392ced1bf91f67380c0c65257aea
2022-03-31 16:12:38 +01:00
jasonwshsu
f02c069f3d Extract inner helper from AccessibilitySettings to public
* Need to be used in 'Connected device' page for hearing aid device

Bug: 225117933
Bug: 227172850
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RestrictedPreferenceHelperTest
Change-Id: Icda456aa9c7597dc113775d1359acb0a8430768c
2022-03-31 21:49:13 +08:00
Jason Hsu
33a5139d0e Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806

Change-Id: I5cfa8a58fb3a3f204b3978b473fe993091e9826a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 06:17:46 +00:00
Jason Hsu
abd4fd54b1 Merge "Set title to the hearing aid pair instruction dialog" into tm-dev 2022-03-30 06:03:00 +00:00
jasonwshsu
906805a591 Set title to the hearing aid pair instruction dialog
Bug: 225117843
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidDialogFragmentTest
Change-Id: Ia1f3dadba84e3302a87aba1274e77f31a74eea1b
2022-03-28 15:31:43 +08:00
Menghan Li
7325d18d30 Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev am: c122879474
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348586

Change-Id: I3e7576cc35c3088957d2976726c14971bf9defe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:06:25 +00:00
Menghan Li
c122879474 Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev 2022-03-28 06:43:20 +00:00
menghanli
917ab11ed1 Fix Caption preview SubtitleView textSize cannot update correctly
Root caue: When received #OnLayoutChangeListener callback, the mPainText size keeps "zero" after called setTextSize() because the requestLayout() does not trigger the whole view re-measure & re-layout in not ui thread.
Solution: Post #refreshPreviewText to ui thread to get correct bounds to
measure & layout.

Bug: 223696269
Bug: 211178478
Test: Manually test
Change-Id: Idcbeba52876171e5f3641eafc77d203764c78788
2022-03-28 12:30:29 +08:00
PETER LIANG
199c83b9fc Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev am: d4cd689c8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17166624

Change-Id: I2d340008e2f75efd9b4c5f3398e133569139b70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 16:53:02 +00:00
PETER LIANG
d4cd689c8f Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev 2022-03-25 14:06:00 +00:00