Add Settings for vector-specific PointerIcon scale.

Bug: 305193969
Test: PointerScaleSeekBarControllerTest
Flag: com.android.systemui.enable_vector_cursor_a11y_settings
Change-Id: I2f344f1d5fc6d5c8eb7159570287b8ce6f9ac070
This commit is contained in:
Pat Manning
2024-03-08 16:56:03 +00:00
parent ca90cf1fbe
commit d303afbbd7
6 changed files with 213 additions and 1 deletions

View File

@@ -179,6 +179,9 @@
<dimen name="pointer_fill_style_circle_padding">8dp</dimen> <dimen name="pointer_fill_style_circle_padding">8dp</dimen>
<dimen name="pointer_fill_style_shape_default_stroke">1dp</dimen> <dimen name="pointer_fill_style_shape_default_stroke">1dp</dimen>
<dimen name="pointer_fill_style_shape_hovered_stroke">3dp</dimen> <dimen name="pointer_fill_style_shape_hovered_stroke">3dp</dimen>
<dimen name="pointer_scale_padding">8dp</dimen>
<item name="pointer_scale_size_start" format="float" type="dimen">1.0</item>
<item name="pointer_scale_size_end" format="float" type="dimen">2.5</item>
<!-- RemoteAuth--> <!-- RemoteAuth-->
<dimen name="remoteauth_fragment_padding_horizontal">40dp</dimen> <dimen name="remoteauth_fragment_padding_horizontal">40dp</dimen>

View File

@@ -36,4 +36,8 @@
<integer name="enrollment_progress_minimum_time_display">0</integer> <integer name="enrollment_progress_minimum_time_display">0</integer>
<!-- The time (in millis) to wait to collect messages in fingerprint enrollment before displaying it. --> <!-- The time (in millis) to wait to collect messages in fingerprint enrollment before displaying it. -->
<integer name="enrollment_collect_time">0</integer> <integer name="enrollment_collect_time">0</integer>
<!-- PointerIcon Settings -->
<integer name="pointer_scale_seek_bar_start">0</integer>
<integer name="pointer_scale_seek_bar_end">3</integer>
</resources> </resources>

View File

@@ -4571,6 +4571,12 @@
<!-- On Languages & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] --> <!-- On Languages & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] -->
<string name="pointer_speed">Pointer speed</string> <string name="pointer_speed">Pointer speed</string>
<!-- Setting for mouse pointer scale. [CHAR LIMIT=35] -->
<string name="pointer_scale">Pointer scale</string>
<!-- Content description for decreasing pointer scale. [CHAR LIMIT=35] -->
<string name="pointer_scale_decrease_content_description">Decrease pointer scale</string>
<!-- Setting for mouse pointer scale. [CHAR LIMIT=35] -->
<string name="pointer_scale_increase_content_description">Increase pointer scale</string>
<!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] --> <!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
<string name="game_controller_settings_category">Game Controller</string> <string name="game_controller_settings_category">Game Controller</string>

View File

@@ -66,9 +66,19 @@
android:key="pointer_fill_style" android:key="pointer_fill_style"
android:title="@string/pointer_fill_style" android:title="@string/pointer_fill_style"
android:order="50" android:order="50"
android:dialogTitle="@string/pointer_fill_style"
settings:controller="com.android.settings.inputmethod.PointerFillStylePreferenceController"/> settings:controller="com.android.settings.inputmethod.PointerFillStylePreferenceController"/>
<com.android.settings.widget.LabeledSeekBarPreference
android:key="pointer_scale"
android:title="@string/pointer_scale"
android:order="70"
android:max="@integer/pointer_scale_seek_bar_end"
settings:iconStart="@drawable/ic_remove_24dp"
settings:iconStartContentDescription="@string/pointer_scale_decrease_content_description"
settings:iconEnd="@drawable/ic_add_24dp"
settings:iconEndContentDescription="@string/pointer_scale_increase_content_description"
settings:controller="com.android.settings.inputmethod.PointerScaleSeekBarController" />
<com.android.settingslib.widget.ButtonPreference <com.android.settingslib.widget.ButtonPreference
android:key="trackpad_touch_gesture" android:key="trackpad_touch_gesture"
android:title="@string/trackpad_touch_gesture" android:title="@string/trackpad_touch_gesture"

View File

@@ -0,0 +1,95 @@
/*
* Copyright 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.inputmethod;
import static android.view.PointerIcon.DEFAULT_POINTER_SCALE;
import android.content.Context;
import android.content.res.Resources;
import android.os.UserHandle;
import android.provider.Settings;
import android.widget.SeekBar;
import androidx.annotation.NonNull;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.widget.LabeledSeekBarPreference;
public class PointerScaleSeekBarController extends BasePreferenceController {
private final int mProgressMin;
private final int mProgressMax;
private final float mScaleMin;
private final float mScaleMax;
public PointerScaleSeekBarController(@NonNull Context context, @NonNull String key) {
super(context, key);
Resources res = context.getResources();
mProgressMin = res.getInteger(R.integer.pointer_scale_seek_bar_start);
mProgressMax = res.getInteger(R.integer.pointer_scale_seek_bar_end);
mScaleMin = res.getFloat(R.dimen.pointer_scale_size_start);
mScaleMax = res.getFloat(R.dimen.pointer_scale_size_end);
}
@AvailabilityStatus
public int getAvailabilityStatus() {
return android.view.flags.Flags.enableVectorCursorA11ySettings() ? AVAILABLE
: CONDITIONALLY_UNAVAILABLE;
}
@Override
public void displayPreference(@NonNull PreferenceScreen screen) {
super.displayPreference(screen);
LabeledSeekBarPreference seekBarPreference = screen.findPreference(getPreferenceKey());
seekBarPreference.setMax(mProgressMax);
seekBarPreference.setContinuousUpdates(/* continuousUpdates= */ true);
seekBarPreference.setProgress(scaleToProgress(
Settings.System.getFloatForUser(mContext.getContentResolver(),
Settings.System.POINTER_SCALE, DEFAULT_POINTER_SCALE,
UserHandle.USER_CURRENT)));
seekBarPreference.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(@NonNull SeekBar seekBar, int progress,
boolean fromUser) {
Settings.System.putFloatForUser(mContext.getContentResolver(),
Settings.System.POINTER_SCALE, progressToScale(progress),
UserHandle.USER_CURRENT);
}
@Override
public void onStartTrackingTouch(@NonNull SeekBar seekBar) {}
@Override
public void onStopTrackingTouch(@NonNull SeekBar seekBar) {}
});
}
private float progressToScale(int progress) {
return (((progress - mProgressMin) * (mScaleMax - mScaleMin)) / (mProgressMax
- mProgressMin)) + mScaleMin;
}
private int scaleToProgress(float scale) {
return (int) (
(((scale - mScaleMin) * (mProgressMax - mProgressMin)) / (mScaleMax - mScaleMin))
+ mProgressMin);
}
}

View File

@@ -0,0 +1,94 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.inputmethod;
import static android.view.flags.Flags.enableVectorCursorA11ySettings;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeTrue;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import android.widget.SeekBar;
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.shadow.ShadowSystemSettings;
import com.android.settings.widget.LabeledSeekBarPreference;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
/** Tests for {@link PointerScaleSeekBarController} */
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
ShadowSystemSettings.class,
})
public class PointerScaleSeekBarControllerTest {
private static final String PREFERENCE_KEY = "pointer_scale";
@Rule public MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock private PreferenceScreen mPreferenceScreen;
private Context mContext;
private LabeledSeekBarPreference mPreference;
private PointerScaleSeekBarController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mPreference = new LabeledSeekBarPreference(mContext, null);
mController = new PointerScaleSeekBarController(mContext, PREFERENCE_KEY);
}
@Test
public void getAvailabilityStatus_flagEnabled() {
assumeTrue(enableVectorCursorA11ySettings());
assertEquals(mController.getAvailabilityStatus(), AVAILABLE);
}
@Test
public void onProgressChanged_changeListenerUpdatesSetting() {
when(mPreferenceScreen.findPreference(anyString())).thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
SeekBar seekBar = mPreference.getSeekbar();
int sliderValue = 1;
mPreference.onProgressChanged(seekBar, sliderValue, false);
float expectedScale = 1.5f;
float currentScale = Settings.System.getFloatForUser(mContext.getContentResolver(),
Settings.System.POINTER_SCALE, -1, UserHandle.USER_CURRENT);
assertEquals(expectedScale, currentScale, /* delta= */ 0.001f);
}
}