Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 575259e0 authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge changes Ife935485,Ic9b44d73,I44f7f058,I39868ac1,I05c59a76 into main 

* changes:
  chore(magnification suw): hide joystick toggle in setup wizard
  chore(magnification suw): hide one finger pan toggle in setup wizard
  refactor(magnification suw): hide follow typing toggle in setup wizard
  chore(magnification suw): hide always on toggle in setup wizard
  chore(magnification suw): create MagnificationFeaturePreferenceController
parents fd5e9718 a511ddb7

src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java

+3 −4
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; 


import com.android.settings.R;

import com.android.settings.accessibility.MagnificationCapabilities.MagnificationMode;

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;
@@ -44,8 +43,8 @@ import com.android.settingslib.core.lifecycle.events.OnResume; 
 * feature, where the magnifier will not deactivate on Activity transitions; it will only zoom out

 * to 100%.

 */

public class MagnificationAlwaysOnPreferenceController extends TogglePreferenceController

        implements LifecycleObserver, OnResume, OnPause {

public class MagnificationAlwaysOnPreferenceController extends

        MagnificationFeaturePreferenceController implements LifecycleObserver, OnResume, OnPause {



    private static final String TAG =

            MagnificationAlwaysOnPreferenceController.class.getSimpleName();
@@ -89,7 +88,7 @@ public class MagnificationAlwaysOnPreferenceController extends TogglePreferenceC 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return isInSetupWizard() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;

    }



    @Override

src/com/android/settings/accessibility/MagnificationFeaturePreferenceController.java

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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 com.android.settings.core.TogglePreferenceController;



/**

 * A base preference controller of magnification feature with common methods.

 */

public abstract class MagnificationFeaturePreferenceController extends TogglePreferenceController {



    private boolean mInSetupWizard;



    protected MagnificationFeaturePreferenceController(Context context,

            String preferenceKey) {

        super(context, preferenceKey);

    }



    protected final boolean isInSetupWizard() {

        return mInSetupWizard;

    }



    protected final void setInSetupWizard(boolean inSetupWizard) {

        mInSetupWizard = inSetupWizard;

    }

}

src/com/android/settings/accessibility/MagnificationFollowTypingPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ import android.content.Context; 
import android.provider.Settings;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;



/** Controller that accesses and switches the preference status of following typing feature */

public class MagnificationFollowTypingPreferenceController extends TogglePreferenceController {

public class MagnificationFollowTypingPreferenceController extends

        MagnificationFeaturePreferenceController {



    private static final String TAG =

            MagnificationFollowTypingPreferenceController.class.getSimpleName();
@@ -38,7 +38,7 @@ public class MagnificationFollowTypingPreferenceController extends TogglePrefere 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return isInSetupWizard() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;

    }



    @Override

src/com/android/settings/accessibility/MagnificationJoystickPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import android.content.Context; 
import android.provider.Settings;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;



/**

 * Controller that accesses and switches the preference status of the magnification joystick feature

 */

public class MagnificationJoystickPreferenceController extends TogglePreferenceController {

public class MagnificationJoystickPreferenceController extends

        MagnificationFeaturePreferenceController {



    private static final String TAG =

            MagnificationJoystickPreferenceController.class.getSimpleName();
@@ -40,7 +40,7 @@ public class MagnificationJoystickPreferenceController extends TogglePreferenceC 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return isInSetupWizard() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;

    }



    @Override

src/com/android/settings/accessibility/MagnificationOneFingerPanningPreferenceController.java

+3 −4
Original line number Diff line number Diff line
@@ -35,13 +35,12 @@ import androidx.preference.TwoStatePreference; 


import com.android.settings.R;

import com.android.settings.accessibility.MagnificationCapabilities.MagnificationMode;

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 MagnificationOneFingerPanningPreferenceController

        extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause {

public class MagnificationOneFingerPanningPreferenceController extends

        MagnificationFeaturePreferenceController implements LifecycleObserver, OnResume, OnPause {

    static final String PREF_KEY = Settings.Secure.ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED;



    private TwoStatePreference mSwitchPreference;
@@ -82,7 +81,7 @@ public class MagnificationOneFingerPanningPreferenceController 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return isInSetupWizard() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;

    }



    @Override