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

Commit 0df6a277 authored by Amith Yamasani's avatar Amith Yamasani Committed by Gerrit Code Review
Browse files

Merge "Grey out settings icon when it is in disabled state"

parents e2d893e2 96577681

src/com/android/settings/DreamSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ public class DreamSettings extends SettingsPreferenceFragment { 


            ImageView settingsButton = (ImageView) row.findViewById(android.R.id.button2);

            settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);

            settingsButton.setAlpha(dreamInfo.isActive ? 1f : 0.33f);

            settingsButton.setAlpha(dreamInfo.isActive ? 1f : Utils.DISABLED_ALPHA);

            settingsButton.setEnabled(dreamInfo.isActive);

            settingsButton.setOnClickListener(new OnClickListener(){

                @Override

src/com/android/settings/Utils.java

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ public class Utils { 
     */

    public static final int UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY = 1;



    /**

     * The opacity level of a disabled icon.

     */

    public static final float DISABLED_ALPHA = 0.4f;



    /**

     * Name of the meta-data item that should be set in the AndroidManifest.xml

     * to specify the icon that should be displayed for the preference.

src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.inputmethod; 


import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;



import android.content.Context;

import android.content.Intent;
@@ -29,7 +30,6 @@ import android.widget.ImageView; 
import android.widget.TextView;



public class CheckBoxAndSettingsPreference extends CheckBoxPreference {

    private static final float DISABLED_ALPHA = 0.4f;



    private SettingsPreferenceFragment mFragment;

    private TextView mTitleText;
@@ -103,7 +103,7 @@ public class CheckBoxAndSettingsPreference extends CheckBoxPreference { 
                mSettingsButton.setClickable(checked);

                mSettingsButton.setFocusable(checked);

                if (!checked) {

                    mSettingsButton.setAlpha(DISABLED_ALPHA);

                    mSettingsButton.setAlpha(Utils.DISABLED_ALPHA);

                }

            }

        }

src/com/android/settings/inputmethod/InputMethodPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.inputmethod; 


import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;



import android.app.AlertDialog;

import android.app.Fragment;
@@ -47,7 +48,6 @@ import java.util.List; 
public class InputMethodPreference extends CheckBoxPreference

        implements Comparator<InputMethodPreference> {

    private static final String TAG = InputMethodPreference.class.getSimpleName();

    private static final float DISABLED_ALPHA = 0.4f;

    private final SettingsPreferenceFragment mFragment;

    private final InputMethodInfo mImi;

    private final InputMethodManager mImm;
@@ -172,7 +172,7 @@ public class InputMethodPreference extends CheckBoxPreference 
            mInputMethodSettingsButton.setClickable(checked);

            mInputMethodSettingsButton.setFocusable(checked);

            if (!checked) {

                mInputMethodSettingsButton.setAlpha(DISABLED_ALPHA);

                mInputMethodSettingsButton.setAlpha(Utils.DISABLED_ALPHA);

            }

        }

        if (mTitleText != null) {

src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java

+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.inputmethod;



import com.android.settings.R;

import com.android.settings.Utils;



import android.app.AlertDialog;

import android.content.ActivityNotFoundException;
@@ -37,7 +38,6 @@ import android.widget.TextView; 
import android.widget.Toast;



public class SingleSpellCheckerPreference extends Preference {

    private static final float DISABLED_ALPHA = 0.4f;

    private static final String TAG = SingleSpellCheckerPreference.class.getSimpleName();

    private static final boolean DBG = false;
@@ -198,7 +198,7 @@ public class SingleSpellCheckerPreference extends Preference { 
                mSettingsButton.setClickable(enabled);

                mSettingsButton.setFocusable(enabled);

                if (!enabled) {

                    mSettingsButton.setAlpha(DISABLED_ALPHA);

                    mSettingsButton.setAlpha(Utils.DISABLED_ALPHA);

                }

            }

        }
@@ -210,7 +210,7 @@ public class SingleSpellCheckerPreference extends Preference { 
                mSubtypeButton.setClickable(enabled);

                mSubtypeButton.setFocusable(enabled);

                if (!enabled) {

                    mSubtypeButton.setAlpha(DISABLED_ALPHA);

                    mSubtypeButton.setAlpha(Utils.DISABLED_ALPHA);

                }

            }

        }