Add the preference controller to control accessibility button fade preference
* Opacity preference will be disabled when fade is disabled Bug: 173940869 Test: atest AccessibilityButtonFadePreferenceControllerTest AccessibilityButtonOactiyPreferenceControllerTest Change-Id: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba
This commit is contained in:
@@ -50,7 +50,8 @@
|
|||||||
android:key="accessibility_button_fade"
|
android:key="accessibility_button_fade"
|
||||||
android:title="@string/accessibility_button_fade_title"
|
android:title="@string/accessibility_button_fade_title"
|
||||||
android:summary="@string/accessibility_button_fade_summary"
|
android:summary="@string/accessibility_button_fade_summary"
|
||||||
android:persistent="false"/>
|
android:persistent="false"
|
||||||
|
settings:controller="com.android.settings.accessibility.FloatingMenuFadePreferenceController"/>
|
||||||
|
|
||||||
<com.android.settings.widget.SeekBarPreference
|
<com.android.settings.widget.SeekBarPreference
|
||||||
android:key="accessibility_button_opacity"
|
android:key="accessibility_button_opacity"
|
||||||
|
@@ -0,0 +1,116 @@
|
|||||||
|
/*
|
||||||
|
* 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.ContentResolver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.database.ContentObserver;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
import androidx.preference.SwitchPreference;
|
||||||
|
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnPause;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnResume;
|
||||||
|
|
||||||
|
/** Preference controller that controls the fade switch button in accessibility button page. */
|
||||||
|
public class FloatingMenuFadePreferenceController extends BasePreferenceController implements
|
||||||
|
Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
|
||||||
|
|
||||||
|
private static final int OFF = 0;
|
||||||
|
private static final int ON = 1;
|
||||||
|
|
||||||
|
private final ContentResolver mContentResolver;
|
||||||
|
@VisibleForTesting
|
||||||
|
final ContentObserver mContentObserver;
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
SwitchPreference mPreference;
|
||||||
|
|
||||||
|
public FloatingMenuFadePreferenceController(Context context, String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
mContentResolver = context.getContentResolver();
|
||||||
|
mContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
|
||||||
|
@Override
|
||||||
|
public void onChange(boolean selfChange) {
|
||||||
|
updateAvailabilityStatus();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
return AccessibilityUtil.isFloatingMenuEnabled(mContext)
|
||||||
|
? AVAILABLE : DISABLED_DEPENDENT_SETTING;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
|
||||||
|
mPreference = screen.findPreference(getPreferenceKey());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
|
final boolean isEnabled = (boolean) newValue;
|
||||||
|
putFloatingMenuFadeValue(isEnabled);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
super.updateState(preference);
|
||||||
|
final SwitchPreference switchPreference = (SwitchPreference) preference;
|
||||||
|
|
||||||
|
switchPreference.setChecked(getFloatingMenuFadeValue() == ON);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
mContentResolver.registerContentObserver(
|
||||||
|
Settings.Secure.getUriFor(
|
||||||
|
Settings.Secure.ACCESSIBILITY_BUTTON_MODE),
|
||||||
|
/* notifyForDescendants= */ false, mContentObserver);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
mContentResolver.unregisterContentObserver(mContentObserver);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateAvailabilityStatus() {
|
||||||
|
mPreference.setEnabled(AccessibilityUtil.isFloatingMenuEnabled(mContext));
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getFloatingMenuFadeValue() {
|
||||||
|
return Settings.Secure.getInt(mContentResolver,
|
||||||
|
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, ON);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void putFloatingMenuFadeValue(boolean isEnabled) {
|
||||||
|
Settings.Secure.putInt(mContentResolver,
|
||||||
|
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,
|
||||||
|
isEnabled ? ON : OFF);
|
||||||
|
}
|
||||||
|
}
|
@@ -38,6 +38,7 @@ public class FloatingMenuOpacityPreferenceController extends SliderPreferenceCon
|
|||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
static final float DEFAULT_OPACITY = 0.55f;
|
static final float DEFAULT_OPACITY = 0.55f;
|
||||||
|
private static final int FADE_ENABLED = 1;
|
||||||
private static final float MIN_PROGRESS = 10f;
|
private static final float MIN_PROGRESS = 10f;
|
||||||
private static final float MAX_PROGRESS = 100f;
|
private static final float MAX_PROGRESS = 100f;
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
@@ -87,7 +88,10 @@ public class FloatingMenuOpacityPreferenceController extends SliderPreferenceCon
|
|||||||
Settings.Secure.getUriFor(
|
Settings.Secure.getUriFor(
|
||||||
Settings.Secure.ACCESSIBILITY_BUTTON_MODE), /* notifyForDescendants= */
|
Settings.Secure.ACCESSIBILITY_BUTTON_MODE), /* notifyForDescendants= */
|
||||||
false, mContentObserver);
|
false, mContentObserver);
|
||||||
|
mContentResolver.registerContentObserver(
|
||||||
|
Settings.Secure.getUriFor(
|
||||||
|
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED),
|
||||||
|
/* notifyForDescendants= */ false, mContentObserver);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -119,7 +123,11 @@ public class FloatingMenuOpacityPreferenceController extends SliderPreferenceCon
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void updateAvailabilityStatus() {
|
private void updateAvailabilityStatus() {
|
||||||
mPreference.setEnabled(AccessibilityUtil.isFloatingMenuEnabled(mContext));
|
final boolean fadeEnabled = Settings.Secure.getInt(mContentResolver,
|
||||||
|
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, FADE_ENABLED)
|
||||||
|
== FADE_ENABLED;
|
||||||
|
|
||||||
|
mPreference.setEnabled(AccessibilityUtil.isFloatingMenuEnabled(mContext) && fadeEnabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
private int convertOpacityFloatToInt(float value) {
|
private int convertOpacityFloatToInt(float value) {
|
||||||
|
@@ -0,0 +1,131 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.content.ContentResolver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import androidx.preference.SwitchPreference;
|
||||||
|
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.Mock;
|
||||||
|
import org.mockito.Spy;
|
||||||
|
import org.mockito.junit.MockitoJUnit;
|
||||||
|
import org.mockito.junit.MockitoRule;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
|
||||||
|
/** Tests for {@link FloatingMenuFadePreferenceController}. */
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class FloatingMenuFadePreferenceControllerTest {
|
||||||
|
|
||||||
|
@Rule
|
||||||
|
public MockitoRule mocks = MockitoJUnit.rule();
|
||||||
|
|
||||||
|
private static final int OFF = 0;
|
||||||
|
private static final int ON = 1;
|
||||||
|
|
||||||
|
@Spy
|
||||||
|
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
@Mock
|
||||||
|
private ContentResolver mContentResolver;
|
||||||
|
private final SwitchPreference mSwitchPreference = new SwitchPreference(mContext);
|
||||||
|
private FloatingMenuFadePreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
when(mContext.getContentResolver()).thenReturn(mContentResolver);
|
||||||
|
mController = new FloatingMenuFadePreferenceController(mContext, "test_key");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_a11yBtnModeFloatingMenu_returnAvailable() {
|
||||||
|
Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
|
||||||
|
ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_a11yBtnModeNavigationBar_returnDisabledDependentSetting() {
|
||||||
|
Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
|
||||||
|
ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
|
||||||
|
|
||||||
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_keyFloatingMenuFadeDisabled_fadeIsDisabled() {
|
||||||
|
Settings.Secure.putInt(mContentResolver,
|
||||||
|
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, OFF);
|
||||||
|
|
||||||
|
mController.updateState(mSwitchPreference);
|
||||||
|
|
||||||
|
assertThat(mSwitchPreference.isChecked()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_floatingMenuFadeEnabled_keyFloatingMenuFadeIsOn() {
|
||||||
|
mController.onPreferenceChange(mSwitchPreference, Boolean.TRUE);
|
||||||
|
|
||||||
|
final int actualValue = Settings.Secure.getInt(mContentResolver,
|
||||||
|
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, OFF);
|
||||||
|
assertThat(actualValue).isEqualTo(ON);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onChange_floatingMenuFadeChangeToDisabled_preferenceDisabled() {
|
||||||
|
mController.mPreference = mSwitchPreference;
|
||||||
|
Settings.Secure.putInt(mContentResolver,
|
||||||
|
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, OFF);
|
||||||
|
|
||||||
|
mController.mContentObserver.onChange(false);
|
||||||
|
|
||||||
|
assertThat(mController.mPreference.isEnabled()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onResume_registerSpecificContentObserver() {
|
||||||
|
mController.onResume();
|
||||||
|
|
||||||
|
verify(mContentResolver).registerContentObserver(
|
||||||
|
Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_MODE), false,
|
||||||
|
mController.mContentObserver);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPause_unregisterContentObserver() {
|
||||||
|
mController.onPause();
|
||||||
|
|
||||||
|
verify(mContentResolver).unregisterContentObserver(mController.mContentObserver);
|
||||||
|
}
|
||||||
|
}
|
@@ -126,6 +126,10 @@ public class FloatingMenuOpacityPreferenceControllerTest {
|
|||||||
verify(mContentResolver).registerContentObserver(
|
verify(mContentResolver).registerContentObserver(
|
||||||
Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_MODE), false,
|
Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_MODE), false,
|
||||||
mController.mContentObserver);
|
mController.mContentObserver);
|
||||||
|
verify(mContentResolver).registerContentObserver(
|
||||||
|
Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED),
|
||||||
|
false,
|
||||||
|
mController.mContentObserver);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Reference in New Issue
Block a user