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

Commit 55e51376 authored by hjchangliao's avatar hjchangliao Committed by android-build-merger
Browse files

Merge "Convert Magnify controller to TogglePrefController" into pi-dev 

am: cd28a977

Change-Id: Ic118ddc1915e26c9317f0c53edbf60539fc78534
parents 4381e162 cd28a977

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

+16 −7
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ import android.provider.Settings; 
import android.support.v7.preference.Preference;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.TogglePreferenceController;



public class MagnificationGesturesPreferenceController extends BasePreferenceController {

public class MagnificationGesturesPreferenceController extends TogglePreferenceController {



    private boolean mIsFromSUW = false;
@@ -29,6 +29,18 @@ public class MagnificationGesturesPreferenceController extends BasePreferenceCon 
        super(context, key);

    }



    @Override

    public boolean isChecked() {

        return MagnificationPreferenceFragment.isChecked(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        return MagnificationPreferenceFragment.setChecked(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, isChecked);

    }



    public void setIsFromSUW(boolean fromSUW) {

        mIsFromSUW = fromSUW;

    }
@@ -38,6 +50,7 @@ public class MagnificationGesturesPreferenceController extends BasePreferenceCon 
        if (getPreferenceKey().equals(preference.getKey())) {

            Bundle extras = preference.getExtras();

            populateMagnificationGesturesPreferenceExtras(extras, mContext);

            extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED, isChecked());

            extras.putBoolean(AccessibilitySettings.EXTRA_LAUNCHED_FROM_SUW, mIsFromSUW);

        }

        return false;
@@ -54,8 +67,7 @@ public class MagnificationGesturesPreferenceController extends BasePreferenceCon 
        if (mIsFromSUW) {

            resId = R.string.accessibility_screen_magnification_short_summary;

        } else {

            final boolean enabled = Settings.Secure.getInt(mContext.getContentResolver(),

                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;

            final boolean enabled = isChecked();

            resId = (enabled ? R.string.accessibility_feature_state_on :

                    R.string.accessibility_feature_state_off);

        }
@@ -69,9 +81,6 @@ public class MagnificationGesturesPreferenceController extends BasePreferenceCon 
                R.string.accessibility_screen_magnification_gestures_title);

        extras.putInt(AccessibilitySettings.EXTRA_SUMMARY_RES,

                R.string.accessibility_screen_magnification_summary);

        extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED,

                Settings.Secure.getInt(context.getContentResolver(),

                        Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1);

        extras.putInt(AccessibilitySettings.EXTRA_VIDEO_RAW_RESOURCE_ID,

                R.raw.accessibility_screen_magnification);

    }

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

+16 −8
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ import android.provider.Settings; 
import android.support.v7.preference.Preference;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.TogglePreferenceController;



public class MagnificationNavbarPreferenceController extends BasePreferenceController {

public class MagnificationNavbarPreferenceController extends TogglePreferenceController {



    private boolean mIsFromSUW = false;
@@ -29,6 +29,18 @@ public class MagnificationNavbarPreferenceController extends BasePreferenceContr 
        super(context, key);

    }



    @Override

    public boolean isChecked() {

        return MagnificationPreferenceFragment.isChecked(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED);

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        return MagnificationPreferenceFragment.setChecked(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, isChecked);

    }



    public void setIsFromSUW(boolean fromSUW) {

        mIsFromSUW = fromSUW;

    }
@@ -43,10 +55,7 @@ public class MagnificationNavbarPreferenceController extends BasePreferenceContr 
                    R.string.accessibility_screen_magnification_navbar_title);

            extras.putInt(AccessibilitySettings.EXTRA_SUMMARY_RES,

                    R.string.accessibility_screen_magnification_navbar_summary);

            extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED,

                    Settings.Secure.getInt(mContext.getContentResolver(),

                            Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0)

                            == 1);

            extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED, isChecked());

            extras.putBoolean(AccessibilitySettings.EXTRA_LAUNCHED_FROM_SUW, mIsFromSUW);

        }

        return false;
@@ -65,8 +74,7 @@ public class MagnificationNavbarPreferenceController extends BasePreferenceContr 
        if (mIsFromSUW) {

            resId = R.string.accessibility_screen_magnification_navbar_short_summary;

        } else {

            final boolean enabled = Settings.Secure.getInt(mContext.getContentResolver(),

                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0) == 1;

            final boolean enabled = isChecked();

            resId = (enabled ? R.string.accessibility_feature_state_on :

                    R.string.accessibility_feature_state_off);

        }

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

+15 −0
Original line number Diff line number Diff line
@@ -18,11 +18,13 @@ package com.android.settings.accessibility; 


import android.accessibilityservice.AccessibilityServiceInfo;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;

import android.os.Bundle;

import android.provider.SearchIndexableResource;

import android.provider.Settings;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.Preference;

import android.text.TextUtils;

import android.view.accessibility.AccessibilityManager;
@@ -39,6 +41,10 @@ import java.util.Arrays; 
import java.util.List;



public final class MagnificationPreferenceFragment extends DashboardFragment {

    @VisibleForTesting

    static final int ON = 1;

    @VisibleForTesting

    static final int OFF = 0;



    private static final String TAG = "MagnificationPreferenceFragment";
@@ -132,6 +138,15 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { 
        return null;

    }



    static boolean isChecked(ContentResolver contentResolver, String settingsKey) {

        return Settings.Secure.getInt(contentResolver, settingsKey, OFF) == ON;

    }



    static boolean setChecked(ContentResolver contentResolver, String settingsKey,

            boolean isChecked) {

        return Settings.Secure.putInt(contentResolver, settingsKey, isChecked ? ON : OFF);

    }



    /**

     * @return {@code true} if this fragment should be shown, {@code false} otherwise. This

     * fragment is shown in the case that more than one magnification mode is available.

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

+2 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.media.MediaPlayer; 
import android.media.MediaPlayer.OnPreparedListener;

import android.net.Uri;

import android.os.Bundle;

import android.provider.Settings;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.support.v7.preference.PreferenceViewHolder;
@@ -174,7 +173,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends 


    @Override

    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {

        Settings.Secure.putInt(getContentResolver(), preferenceKey, enabled ? 1 : 0);

        MagnificationPreferenceFragment.setChecked(getContentResolver(), preferenceKey, enabled);

        updateConfigurationWarningIfNeeded();

    }
@@ -183,7 +182,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
        super.onInstallSwitchBarToggleSwitch();



        mSwitchBar.setCheckedInternal(

                Settings.Secure.getInt(getContentResolver(), mPreferenceKey, 0) == 1);

                MagnificationPreferenceFragment.isChecked(getContentResolver(), mPreferenceKey));

        mSwitchBar.addOnSwitchChangeListener(this);

    }

src/com/android/settings/core/TogglePreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle 
    public void updateState(Preference preference) {

        if (preference instanceof TwoStatePreference) {

            ((TwoStatePreference) preference).setChecked(isChecked());

        } if (preference instanceof MasterSwitchPreference) {

        } else if (preference instanceof MasterSwitchPreference) {

            ((MasterSwitchPreference) preference).setChecked(isChecked());

        } else {

            refreshSummary(preference);

        }

    }