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

Commit 332822e3 authored by Lifu Tang's avatar Lifu Tang
Browse files

Revert "Dim icons when recent apps category is disabled" 

This change makes all the icons in the system dimmed, not only on Location Settings page. I haven't managed to find a simple fix to that problem. I think we should abandon this feature, and revert this CL.

This reverts commit ebcd196a.

Change-Id: If39f2892c82643b936d2d9ff7b1d1c027018f3f6
parent ebcd196a

src/com/android/settings/location/DimmableIconPreference.java

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 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.location;



import android.content.Context;

import android.graphics.drawable.Drawable;

import android.preference.Preference;

import android.util.AttributeSet;



/**

 * A preference item that can dim the icon when it's disabled.

 */

public class DimmableIconPreference extends Preference {

    private static final int ICON_ALPHA_ENABLED = 255;

    private static final int ICON_ALPHA_DISABLED = 102;



    public DimmableIconPreference(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

    }



    public DimmableIconPreference(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    public DimmableIconPreference(Context context) {

        super(context);

    }



    @Override

    public void onParentChanged(Preference parent, boolean disableChild) {

        Drawable icon = getIcon();

        if (icon != null) {

            icon.setAlpha(disableChild ? ICON_ALPHA_DISABLED : ICON_ALPHA_ENABLED);

            setIcon(icon);

        }

        super.onParentChanged(parent, disableChild);

    }

}

src/com/android/settings/location/RecentLocationApps.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class RecentLocationApps { 
            CharSequence label,

            boolean isHighBattery,

            Preference.OnPreferenceClickListener listener) {

        Preference pref = new DimmableIconPreference(mActivity);

        Preference pref = new Preference(mActivity);

        pref.setIcon(icon);

        pref.setTitle(label);

        if (isHighBattery) {