PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate disable animations preference controller from accessibility

Browse Source 
Bug: 135056871
Test: manual, robotests
Change-Id: I14f322d91179779f2d758c58a2ed729efc0b45f5
This commit is contained in:
Mill Chen
2019-06-25 23:48:04 +08:00
parent 2e3d08e8d4
commit d2deb850d3
4 changed files with 179 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -155,14 +155,6 @@ public class AccessibilitySettings extends DashboardFragment implements
// presentation.
private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
// Settings that should be changed when toggling animations
private static final String[] TOGGLE_ANIMATION_TARGETS = {
Settings.Global.WINDOW_ANIMATION_SCALE, Settings.Global.TRANSITION_ANIMATION_SCALE,
Settings.Global.ANIMATOR_DURATION_SCALE
};
private static final String ANIMATION_ON_VALUE = "1";
private static final String ANIMATION_OFF_VALUE = "0";
static final String RAMPING_RINGER_ENABLED = "ramping_ringer_enabled";
private final Map<String, String> mLongPressTimeoutValueToTitleMap = new HashMap<>();
@@ -277,7 +269,6 @@ public class AccessibilitySettings extends DashboardFragment implements
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
addPreferencesFromResource(R.xml.accessibility_settings);
initializeAllPreferences();
mDpm = (DevicePolicyManager) (getActivity()
.getSystemService(Context.DEVICE_POLICY_SERVICE));
@@ -338,9 +329,6 @@ public class AccessibilitySettings extends DashboardFragment implements
} else if (mToggleLargePointerIconPreference == preference) {
handleToggleLargePointerIconPreferenceClick();
return true;
} else if (mToggleDisableAnimationsPreference == preference) {
handleToggleDisableAnimations();
return true;
} else if (mToggleMasterMonoPreference == preference) {
handleToggleMasterMonoPreferenceClick();
return true;
@@ -404,14 +392,6 @@ public class AccessibilitySettings extends DashboardFragment implements
mToggleLargePointerIconPreference.isChecked() ? 1 : 0);
}
private void handleToggleDisableAnimations() {
String newAnimationValue = mToggleDisableAnimationsPreference.isChecked()
? ANIMATION_OFF_VALUE : ANIMATION_ON_VALUE;
for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
Settings.Global.putString(getContentResolver(), animationPreference, newAnimationValue);
}
}
private void handleToggleMasterMonoPreferenceClick() {
Settings.System.putIntForUser(getContentResolver(), Settings.System.MASTER_MONO,
mToggleMasterMonoPreference.isChecked() ? 1 : 0, UserHandle.USER_CURRENT);
@@ -728,8 +708,6 @@ public class AccessibilitySettings extends DashboardFragment implements
mToggleLargePointerIconPreference.setChecked(Settings.Secure.getInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 0) != 0);
updateDisableAnimationsToggle();
// Master mono
updateMasterMono();
@@ -864,19 +842,6 @@ public class AccessibilitySettings extends DashboardFragment implements
}
}
private void updateDisableAnimationsToggle() {
boolean allAnimationsDisabled = true;
for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
if (!TextUtils.equals(
Settings.Global.getString(getContentResolver(), animationSetting),
ANIMATION_OFF_VALUE)) {
allAnimationsDisabled = false;
break;
}
}
mToggleDisableAnimationsPreference.setChecked(allAnimationsDisabled);
}
private void updateMasterMono() {
final boolean masterMono = Settings.System.getIntForUser(
getContentResolver(), Settings.System.MASTER_MONO,