Add the preference controller to control accessibility button location preference
cherry picked from commit 123464429d
Bug: 173940869
Test: atest AccessibilityButtonLocationPreferenceControllerTest
Change-Id: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
Merged-In: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
This commit is contained in:
@@ -25,7 +25,8 @@
|
|||||||
android:key="accessibility_button_location"
|
android:key="accessibility_button_location"
|
||||||
android:title="@string/accessibility_button_location_title"
|
android:title="@string/accessibility_button_location_title"
|
||||||
android:summary="%s"
|
android:summary="%s"
|
||||||
android:persistent="false"/>
|
android:persistent="false"
|
||||||
|
settings:controller="com.android.settings.accessibility.AccessibilityButtonLocationPreferenceController"/>
|
||||||
|
|
||||||
<ListPreference
|
<ListPreference
|
||||||
android:entries="@array/accessibility_button_size_selector_titles"
|
android:entries="@array/accessibility_button_size_selector_titles"
|
||||||
|
@@ -0,0 +1,89 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2021 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.accessibility;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.provider.Settings;
|
||||||
|
import android.util.ArrayMap;
|
||||||
|
|
||||||
|
import androidx.preference.ListPreference;
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
|
||||||
|
import com.google.common.primitives.Ints;
|
||||||
|
|
||||||
|
/** Preference controller that controls the preferred location in accessibility button page. */
|
||||||
|
public class AccessibilityButtonLocationPreferenceController extends BasePreferenceController
|
||||||
|
implements Preference.OnPreferenceChangeListener {
|
||||||
|
|
||||||
|
private final ArrayMap<String, String> mValueTitleMap = new ArrayMap<>();
|
||||||
|
private int mDefaultLocation;
|
||||||
|
|
||||||
|
public AccessibilityButtonLocationPreferenceController(Context context, String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
initValueTitleMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
return AccessibilityUtil.isGestureNavigateEnabled(mContext)
|
||||||
|
? DISABLED_DEPENDENT_SETTING : AVAILABLE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
|
final ListPreference listPreference = (ListPreference) preference;
|
||||||
|
final Integer value = Ints.tryParse((String) newValue);
|
||||||
|
if (value != null) {
|
||||||
|
Settings.Secure.putInt(mContext.getContentResolver(),
|
||||||
|
Settings.Secure.ACCESSIBILITY_BUTTON_MODE, value);
|
||||||
|
updateState(listPreference);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
super.updateState(preference);
|
||||||
|
final ListPreference listPreference = (ListPreference) preference;
|
||||||
|
|
||||||
|
listPreference.setValue(getCurrentAccessibilityButtonMode());
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getCurrentAccessibilityButtonMode() {
|
||||||
|
final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||||
|
Settings.Secure.ACCESSIBILITY_BUTTON_MODE, mDefaultLocation);
|
||||||
|
return String.valueOf(mode);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initValueTitleMap() {
|
||||||
|
if (mValueTitleMap.size() == 0) {
|
||||||
|
final String[] values = mContext.getResources().getStringArray(
|
||||||
|
R.array.accessibility_button_location_selector_values);
|
||||||
|
final String[] titles = mContext.getResources().getStringArray(
|
||||||
|
R.array.accessibility_button_location_selector_titles);
|
||||||
|
final int mapSize = values.length;
|
||||||
|
|
||||||
|
mDefaultLocation = Integer.parseInt(values[0]);
|
||||||
|
for (int i = 0; i < mapSize; i++) {
|
||||||
|
mValueTitleMap.put(values[i], titles[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,106 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2021 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.accessibility;
|
||||||
|
|
||||||
|
import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
|
||||||
|
import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
|
||||||
|
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
|
||||||
|
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
|
||||||
|
|
||||||
|
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||||
|
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.content.ContentResolver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.res.Resources;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import androidx.preference.ListPreference;
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Spy;
|
||||||
|
import org.mockito.junit.MockitoJUnit;
|
||||||
|
import org.mockito.junit.MockitoRule;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
|
||||||
|
/** Tests for {@link AccessibilityButtonLocationPreferenceController}. */
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class AccessibilityButtonLocationPreferenceControllerTest {
|
||||||
|
|
||||||
|
@Rule
|
||||||
|
public final MockitoRule mockito = MockitoJUnit.rule();
|
||||||
|
|
||||||
|
@Spy
|
||||||
|
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
@Spy
|
||||||
|
private final Resources mResources = mContext.getResources();
|
||||||
|
private final ContentResolver mContentResolver = mContext.getContentResolver();
|
||||||
|
private final ListPreference mListPreference = new ListPreference(mContext);
|
||||||
|
private AccessibilityButtonLocationPreferenceController mController;
|
||||||
|
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
mController = new AccessibilityButtonLocationPreferenceController(mContext,
|
||||||
|
"test_key");
|
||||||
|
when(mContext.getResources()).thenReturn(mResources);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_navigationGestureEnabled_returnDisabledDependentSetting() {
|
||||||
|
when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
|
||||||
|
.thenReturn(NAV_BAR_MODE_GESTURAL);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_navigationGestureDisabled_returnAvailable() {
|
||||||
|
when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
|
||||||
|
.thenReturn(NAV_BAR_MODE_2BUTTON);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_a11yBtnModeNavigationBar_navigationBarValue() {
|
||||||
|
Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
|
||||||
|
ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
|
||||||
|
|
||||||
|
mController.updateState(mListPreference);
|
||||||
|
|
||||||
|
final String navigationBarValue = String.valueOf(ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
|
||||||
|
assertThat(mListPreference.getValue()).isEqualTo(navigationBarValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_a11yBtnModeFloatingMenu_floatingMenuValue() {
|
||||||
|
final String floatingMenuValue = String.valueOf(ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU);
|
||||||
|
|
||||||
|
mController.onPreferenceChange(mListPreference, floatingMenuValue);
|
||||||
|
|
||||||
|
assertThat(mListPreference.getValue()).isEqualTo(floatingMenuValue);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user