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

Pull out a PreferenceController of lock screen from accessibility

Browse Source 
To reduce the complexity of AccessibilitySettings, we are planning to
create a bunch of preference controllers. First of all, we are converting
lock screen preference to a preference controller. The rest part will be
uploaded soon.

Bug: 135056871
Test: robotest, manual
Change-Id: I6079136f3d08934c9a5363eb4d0e0ade29f8ba99
This commit is contained in:
Mill Chen
2019-06-10 21:26:22 +08:00
parent ad363b091f
commit dce601db84
5 changed files with 213 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,8 +55,6 @@ import androidx.preference.SwitchPreference;
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.content.PackageMonitor;
import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
@@ -212,13 +210,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
private final SettingsContentObserver mSettingsContentObserver;
private final RotationPolicyListener mRotationPolicyListener = new RotationPolicyListener() {
@Override
public void onChange() {
updateLockScreenRotationCheckbox();
}
};
private final Map<String, PreferenceCategory> mCategoryToPrefCategoryMap =
new ArrayMap<>();
private final Map<Preference, PreferenceCategory> mServicePreferenceToPreferenceCategoryMap =
@@ -249,6 +240,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
private DarkUIPreferenceController mDarkUIPreferenceController;
private LiveCaptionPreferenceController mLiveCaptionPreferenceController;
private LockScreenRotationPreferenceController mLockScreenRotationPreferenceController;
private int mLongPressTimeoutDefault;
private DevicePolicyManager mDpm;
@@ -318,20 +311,12 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
mSettingsContentObserver.register(getContentResolver());
if (RotationPolicy.isRotationSupported(getActivity())) {
RotationPolicy.registerRotationPolicyListener(getActivity(),
mRotationPolicyListener);
}
}
@Override
public void onPause() {
mSettingsPackageMonitor.unregister();
mSettingsContentObserver.unregister(getContentResolver());
if (RotationPolicy.isRotationSupported(getActivity())) {
RotationPolicy.unregisterRotationPolicyListener(getActivity(),
mRotationPolicyListener);
}
super.onPause();
}
@@ -359,9 +344,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
} else if (mTogglePowerButtonEndsCallPreference == preference) {
handleTogglePowerButtonEndsCallPreferenceClick();
return true;
} else if (mToggleLockScreenRotationPreference == preference) {
handleLockScreenRotationPreferenceClick();
return true;
} else if (mToggleLargePointerIconPreference == preference) {
handleToggleLargePointerIconPreferenceClick();
return true;
@@ -415,11 +397,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
: Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
}
private void handleLockScreenRotationPreferenceClick() {
RotationPolicy.setRotationLockForAccessibility(getActivity(),
!mToggleLockScreenRotationPreference.isChecked());
}
private void handleToggleLargePointerIconPreferenceClick() {
Settings.Secure.putInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,
@@ -465,12 +442,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
}
// Lock screen rotation.
mToggleLockScreenRotationPreference =
(SwitchPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
if (!RotationPolicy.isRotationSupported(getActivity())) {
mCategoryToPrefCategoryMap.get(CATEGORY_INTERACTION_CONTROL)
.removePreference(mToggleLockScreenRotationPreference);
}
mToggleLockScreenRotationPreference = findPreference(
TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
mLockScreenRotationPreferenceController = new LockScreenRotationPreferenceController(
getContext(), TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
mLockScreenRotationPreferenceController.displayPreference(getPreferenceScreen());
// Large pointer icon.
mToggleLargePointerIconPreference =
@@ -765,7 +741,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
}
// Auto-rotate screen
updateLockScreenRotationCheckbox();
mLockScreenRotationPreferenceController.updateState(mToggleLockScreenRotationPreference);
// Large pointer icon.
mToggleLargePointerIconPreference.setChecked(Settings.Secure.getInt(getContentResolver(),
@@ -941,14 +917,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
}
}
private void updateLockScreenRotationCheckbox() {
Context context = getActivity();
if (context != null) {
mToggleLockScreenRotationPreference.setChecked(
!RotationPolicy.isRotationLocked(context));
}
}
private void updateDisableAnimationsToggle() {
boolean allAnimationsDisabled = true;
for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {

91
src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java Normal file
View File

@@ -0,0 +1,91 @@
/*
* Copyright (C) 2019 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 androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
public class LockScreenRotationPreferenceController extends TogglePreferenceController implements
LifecycleObserver, OnPause, OnResume {
private Preference mPreference;
private RotationPolicyListener mRotationPolicyListener;
public LockScreenRotationPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
/**
* Returns true if rotation lock is enabled.
*/
@Override
public boolean isChecked() {
return !RotationPolicy.isRotationLocked(mContext);
}
/**
* Enables or disables screen rotation lock from Accessibility settings. If rotation is locked
* for accessibility, the toggle in Display settings is hidden to avoid confusion.
*/
@Override
public boolean setChecked(boolean isChecked) {
RotationPolicy.setRotationLockForAccessibility(mContext, !isChecked);
return true;
}
@Override
public int getAvailabilityStatus() {
return RotationPolicy.isRotationSupported(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public void onPause() {
if (mRotationPolicyListener != null) {
RotationPolicy.unregisterRotationPolicyListener(mContext, mRotationPolicyListener);
}
}
@Override
public void onResume() {
if (mRotationPolicyListener == null) {
mRotationPolicyListener = new RotationPolicyListener() {
@Override
public void onChange() {
if (mPreference != null) {
updateState(mPreference);
}
}
};
}
RotationPolicy.registerRotationPolicyListener(mContext, mRotationPolicyListener);
}
@Override
public void displayPreference(PreferenceScreen screen) {
mPreference = screen.findPreference(getPreferenceKey());
super.displayPreference(screen);
}
}