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

Commit 96847663 authored by Chun-Ku Lin's avatar Chun-Ku Lin Committed by Android (Google) Code Review
Browse files

Merge "a11y: Hide magnification settings during setup wizard" into main

parents 12f9d7d8 ba08c131

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

+3 −4
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import androidx.preference.PreferenceScreen; 
import com.android.settings.DialogCreatable;

import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums;

import com.android.settings.core.BasePreferenceController;



import java.util.ArrayList;

import java.util.List;
@@ -47,8 +46,8 @@ import java.util.List; 
/**

 * Controller that shows the magnification cursor following mode and the preference click behavior.

 */

public class MagnificationCursorFollowingModePreferenceController extends

        BasePreferenceController implements DialogCreatable {

public class MagnificationCursorFollowingModePreferenceController

        extends MagnificationBasePreferenceController implements DialogCreatable {

    static final String PREF_KEY =

            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CURSOR_FOLLOWING_MODE;
@@ -88,7 +87,7 @@ public class MagnificationCursorFollowingModePreferenceController extends 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return isInSetupWizard() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;

    }



    @NonNull

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

+3 −4
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import com.android.settings.DialogCreatable; 
import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums;

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

import com.android.settings.core.BasePreferenceController;

import com.android.settings.utils.AnnotationSpan;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnCreate;
@@ -55,8 +54,8 @@ import java.util.ArrayList; 
import java.util.List;



/** Controller that shows the magnification area mode summary and the preference click behavior. */

public class MagnificationModePreferenceController extends BasePreferenceController implements

        DialogCreatable, LifecycleObserver, OnCreate, OnSaveInstanceState {

public class MagnificationModePreferenceController extends MagnificationBasePreferenceController

        implements DialogCreatable, LifecycleObserver, OnCreate, OnSaveInstanceState {



    static final String PREF_KEY = "screen_magnification_mode";

    static final String EXTRA_MODE = "mode";
@@ -106,7 +105,7 @@ public class MagnificationModePreferenceController extends BasePreferenceControl 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return isInSetupWizard() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;

    }



    @NonNull

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

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ public class ToggleScreenMagnificationPreferenceFragment extends 


    private static final String TAG =

            ToggleScreenMagnificationPreferenceFragment.class.getSimpleName();

    @VisibleForTesting

    static final String KEY_MAGNIFICATION_SHORTCUT_PREFERENCE = "magnification_shortcut_preference";

    private static final char COMPONENT_NAME_SEPARATOR = ':';

    private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
@@ -298,6 +297,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
        magnificationModePreferenceController.setDialogHelper(/* dialogHelper= */this);

        mMagnificationModeDialogDelegate = magnificationModePreferenceController;

        getSettingsLifecycle().addObserver(magnificationModePreferenceController);

        magnificationModePreferenceController.setInSetupWizard(mInSetupWizard);

        magnificationModePreferenceController.displayPreference(getPreferenceScreen());

        addPreferenceController(magnificationModePreferenceController);

    }
@@ -323,6 +323,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
                        MagnificationCursorFollowingModePreferenceController.PREF_KEY);

        controller.setDialogHelper(/* dialogHelper= */this);

        mMagnificationCursorFollowingModeDialogDelegate = controller;

        controller.setInSetupWizard(mInSetupWizard);

        controller.displayPreference(getPreferenceScreen());

        addPreferenceController(controller);

    }