Merge "Fix incorrect remove animation switch status after turned off Talkback"
This commit is contained in:
@@ -16,40 +16,66 @@
|
||||
|
||||
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.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.TogglePreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settingslib.core.lifecycle.events.OnStart;
|
||||
import com.android.settingslib.core.lifecycle.events.OnStop;
|
||||
|
||||
public class DisableAnimationsPreferenceController extends TogglePreferenceController {
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/** A toggle preference controller for disable animations. */
|
||||
public class DisableAnimationsPreferenceController extends TogglePreferenceController implements
|
||||
LifecycleObserver, OnStart, OnStop {
|
||||
|
||||
@VisibleForTesting
|
||||
static final String ANIMATION_ON_VALUE = "1";
|
||||
static final float ANIMATION_ON_VALUE = 1.0f;
|
||||
@VisibleForTesting
|
||||
static final String ANIMATION_OFF_VALUE = "0";
|
||||
static final float ANIMATION_OFF_VALUE = 0.0f;
|
||||
|
||||
// Settings that should be changed when toggling animations
|
||||
@VisibleForTesting
|
||||
static final String[] TOGGLE_ANIMATION_TARGETS = {
|
||||
static final List<String> TOGGLE_ANIMATION_TARGETS = Arrays.asList(
|
||||
Settings.Global.WINDOW_ANIMATION_SCALE, Settings.Global.TRANSITION_ANIMATION_SCALE,
|
||||
Settings.Global.ANIMATOR_DURATION_SCALE
|
||||
);
|
||||
|
||||
private final ContentObserver mSettingsContentObserver = new ContentObserver(
|
||||
new Handler(Looper.getMainLooper())){
|
||||
@Override
|
||||
public void onChange(boolean selfChange) {
|
||||
updateState(mPreference);
|
||||
}
|
||||
};
|
||||
|
||||
private final ContentResolver mContentResolver;
|
||||
private SwitchPreference mPreference;
|
||||
|
||||
public DisableAnimationsPreferenceController(Context context, String preferenceKey) {
|
||||
super(context, preferenceKey);
|
||||
mContentResolver = context.getContentResolver();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isChecked() {
|
||||
boolean allAnimationsDisabled = true;
|
||||
for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
|
||||
if (!TextUtils.equals(
|
||||
Settings.Global.getString(mContext.getContentResolver(), animationSetting),
|
||||
ANIMATION_OFF_VALUE)) {
|
||||
final float value = Settings.Global.getFloat(mContentResolver, animationSetting,
|
||||
ANIMATION_ON_VALUE);
|
||||
if (value > ANIMATION_OFF_VALUE) {
|
||||
allAnimationsDisabled = false;
|
||||
break;
|
||||
}
|
||||
@@ -59,11 +85,11 @@ public class DisableAnimationsPreferenceController extends TogglePreferenceContr
|
||||
|
||||
@Override
|
||||
public boolean setChecked(boolean isChecked) {
|
||||
final String newAnimationValue = isChecked ? ANIMATION_OFF_VALUE : ANIMATION_ON_VALUE;
|
||||
final float newAnimationValue = isChecked ? ANIMATION_OFF_VALUE : ANIMATION_ON_VALUE;
|
||||
boolean allAnimationSet = true;
|
||||
for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
|
||||
allAnimationSet &= Settings.Global.putString(mContext.getContentResolver(),
|
||||
animationPreference, newAnimationValue);
|
||||
allAnimationSet &= Settings.Global.putFloat(mContentResolver, animationPreference,
|
||||
newAnimationValue);
|
||||
}
|
||||
return allAnimationSet;
|
||||
}
|
||||
@@ -77,4 +103,23 @@ public class DisableAnimationsPreferenceController extends TogglePreferenceContr
|
||||
public int getSliceHighlightMenuRes() {
|
||||
return R.string.menu_key_accessibility;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
mPreference = screen.findPreference(getPreferenceKey());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
for (String key : TOGGLE_ANIMATION_TARGETS) {
|
||||
mContentResolver.registerContentObserver(Settings.Global.getUriFor(key),
|
||||
false, mSettingsContentObserver, UserHandle.USER_ALL);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
mContentResolver.unregisterContentObserver(mSettingsContentObserver);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user