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

Merge "Removes magnification enable preference" am: 37d38b9846

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11700103

Change-Id: I79da0f2a8eba41ead1233b18b89972317f25afa5
This commit is contained in:
TreeHugger Robot
2020-06-05 04:09:38 +00:00
committed by Automerger Merge Worker
parent a231e1c2a8 37d38b9846
commit aa305c9890
4 changed files with 0 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -4905,8 +4905,6 @@
<string name="accessibility_screen_magnification_title">Magnification</string>
<!-- Title for the accessibility preference screen to edit magnification area. [CHAR LIMIT=35] -->
<string name="accessibility_magnification_mode_title">Magnification area</string>
<!-- Title for the accessibility preference screen to edit magnification enable mode. [CHAR LIMIT=35] -->
<string name="accessibility_magnification_enable_mode_title">Magnification enable</string>
<!-- Message for the accessibility preference screen to edit magnification area dialog. [CHAR LIMIT=none] -->
<string name="accessibility_magnification_area_settings_message">Choose the magnification area(s) you want to use when magnifying the screen</string>
<!-- Summary for the accessibility preference screen to edit full screen. [CHAR LIMIT=none] -->

9
res/xml/accessibility_magnification_service_settings.xml
View File

@@ -29,13 +29,4 @@
settings:searchable="false"
settings:controller="com.android.settings.accessibility.MagnificationModePreferenceController" />
<SwitchPreference
android:key="magnification_enable"
android:persistent="false"
android:title="@string/accessibility_magnification_enable_mode_title"
android:summaryOn="@string/accessibility_magnification_area_settings_full_screen_summary"
android:summaryOff="@string/accessibility_magnification_area_settings_window_screen_summary"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.MagnificationEnablePreferenceController" />
</PreferenceScreen>

55
src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java
View File

@@ -1,55 +0,0 @@
/*
* 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 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;
}
}

93
tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.java
View File

@@ -1,93 +0,0 @@
/*
* 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 static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.SwitchPreference;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class MagnificationEnablePreferenceControllerTest {
private static final String PREF_KEY = "screen_magnification_enable";
private static final String KEY_ENABLE = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE;
private static final int UNKNOWN = -1;
private Context mContext;
private SwitchPreference mPreference;
private MagnificationEnablePreferenceController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mPreference = new SwitchPreference(mContext);
mController = new MagnificationEnablePreferenceController(mContext, PREF_KEY);
}
@Test
public void isChecked_enabledFullscreenMagnificationMode_shouldReturnTrue() {
Settings.Secure.putIntForUser(mContext.getContentResolver(),
KEY_ENABLE, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
UserHandle.USER_CURRENT);
mController.updateState(mPreference);
assertThat(mController.isChecked()).isTrue();
assertThat(mPreference.isChecked()).isTrue();
}
@Test
public void isChecked_enabledWindowMagnificationMode_shouldReturnFalse() {
Settings.Secure.putIntForUser(mContext.getContentResolver(),
KEY_ENABLE, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW,
UserHandle.USER_CURRENT);
mController.updateState(mPreference);
assertThat(mController.isChecked()).isFalse();
assertThat(mPreference.isChecked()).isFalse();
}
@Test
public void setChecked_setTrue_shouldEnableFullscreenMagnificationMode() {
mController.setChecked(true);
assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
KEY_ENABLE, UNKNOWN,
UserHandle.USER_CURRENT)).isEqualTo(
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
}
@Test
public void setChecked_setFalse_shouldEnableWindowMagnificationMode() {
mController.setChecked(false);
assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
KEY_ENABLE, UNKNOWN,
UserHandle.USER_CURRENT)).isEqualTo(
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
}
}