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

Create settings for window magnification (3/n)

Browse Source 
This change is for internal test.
Add a switch preference for magnification enable mode.

Bug: 146019459
Bug: 146473544
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationEnablePreferenceControllerTest -j64
Change-Id: I85fdbb5b0efc106d5301d95802b8d6b7dbe8145d
This commit is contained in:
mincheli
2020-01-08 20:26:04 +08:00
parent 5fae0c617c
commit 5b59e62ecb
6 changed files with 106 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java Normal file
View File

@@ -0,0 +1,58 @@
/*
* Copyright (C) 2020 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.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.settings.core.TogglePreferenceController;
/** Controller that shows the magnification enable mode summary. */
public class MagnificationEnablePreferenceController extends TogglePreferenceController {
private static final String KEY_ENABLE = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE;
public MagnificationEnablePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public boolean isChecked() {
final int enableMode = Settings.Secure.getIntForUser(mContext.getContentResolver(),
KEY_ENABLE,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
UserHandle.USER_CURRENT);
return enableMode == Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;
}
@Override
public boolean setChecked(boolean isChecked) {
final int value = isChecked ? Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
: Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;
return Settings.Secure.putIntForUser(mContext.getContentResolver(), KEY_ENABLE, value,
UserHandle.USER_CURRENT);
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
}

60
src/com/android/settings/accessibility/MagnificationWindowControlPreferenceController.java
View File

@@ -1,60 +0,0 @@
/*
* 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 android.os.UserHandle;
import android.provider.Settings;
import com.android.settings.core.TogglePreferenceController;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/** Controller that shows and updates the magnification window control switch. */
public class MagnificationWindowControlPreferenceController extends TogglePreferenceController {
// TODO(b/146019459): Use magnification_window_control_enabled.
private static final String KEY_CONTROL = Settings.System.MASTER_MONO;
public MagnificationWindowControlPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public boolean isChecked() {
return Settings.System.getIntForUser(mContext.getContentResolver(),
KEY_CONTROL, State.OFF, UserHandle.USER_CURRENT) == State.ON;
}
@Override
public boolean setChecked(boolean isChecked) {
return Settings.System.putIntForUser(mContext.getContentResolver(),
KEY_CONTROL, isChecked ? State.ON : State.OFF, UserHandle.USER_CURRENT);
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Retention(RetentionPolicy.SOURCE)
private @interface State {
int OFF = 0;
int ON = 1;
}
}

14
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -256,6 +256,11 @@ public class ToggleScreenMagnificationPreferenceFragment extends
updateAlertDialogCheckState();
updateAlertDialogEnableState();
// Window magnification mode doesn't support advancedView.
if (isWindowMagnification(getPrefContext())) {
advancedView.setVisibility(View.GONE);
return;
}
// Shows the triple tap checkbox directly if clicked.
if (mTripleTapTypeCheckBox.isChecked()) {
advancedView.setVisibility(View.GONE);
@@ -610,4 +615,13 @@ public class ToggleScreenMagnificationPreferenceFragment extends
}
return false;
}
private boolean isWindowMagnification(Context context) {
final int mode = Settings.Secure.getIntForUser(
context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
context.getContentResolver().getUserId());
return mode == Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;
}
}