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

Commit 12b03b27 authored by Fan Zhang's avatar Fan Zhang
Browse files

Clean up: remove dimmableIconPreference 

- DimmableIconPreference is not a support pattern.
- Also updated a few icon tint colors to match with the rest of screen.

Bug: 68426851
Test: visual
Change-Id: Ia18d9f74458237403b94d3474cf09050d2039428
parent f68e6ec2

res/drawable/ic_menu_add.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="?android:attr/colorAccent">

    android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M18,13h-5v5c0,0.55-0.45,1-1,1h0c-0.55,0-1-0.45-1-1v-5H6c-0.55,0-1-0.45-1-1v0c0-0.55,0.45-1,1-1h5V6c0-0.55,0.45-1,1-1h0

res/drawable/ic_menu_delete.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        android:height="24.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0"

        android:tint="?android:attr/colorAccent">

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12.0,38.0c0.0,2.21 1.79,4.0 4.0,4.0l16.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L36.0,14.0L12.0,14.0l0.0,24.0zM38.0,8.0l-7.0,0.0l-2.0,-2.0L19.0,6.0l-2.0,2.0l-7.0,0.0l0.0,4.0l28.0,0.0L38.0,8.0z"/>

res/xml/user_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
            android:title="@string/user_list_title">

    </PreferenceCategory>



    <com.android.settings.DimmableIconPreference

    <com.android.settingslib.RestrictedPreference

            android:key="user_add"

            android:title="@string/user_add_user_or_profile_menu"

            android:icon="@drawable/ic_menu_add" />

res/xml/vpn_app_management.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
                settings:useAdditionalSummary="true"

                settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />



        <com.android.settings.DimmableIconPreference

        <com.android.settingslib.RestrictedPreference

                android:key="forget_vpn"

                android:title="@string/vpn_forget_long"

                android:icon="@drawable/ic_menu_delete"

src/com/android/settings/DimmableIconPreference.java

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

 * Copyright (C) 2014 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;



import android.annotation.Nullable;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceViewHolder;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.widget.TextView;



import com.android.settingslib.RestrictedPreference;



/**

 * A preference item that can dim the icon when it's disabled, either directly or because its parent

 * is disabled.

 */

public class DimmableIconPreference extends RestrictedPreference {

    private static final int ICON_ALPHA_ENABLED = 255;

    private static final int ICON_ALPHA_DISABLED = 102;



    private final CharSequence mContentDescription;



    public DimmableIconPreference(Context context) {

        this(context, (AttributeSet) null);

    }



    public DimmableIconPreference(Context context, AttributeSet attrs) {

        super(context, attrs);

        mContentDescription = null;

        useAdminDisabledSummary(true);

    }



    public DimmableIconPreference(Context context, @Nullable CharSequence contentDescription) {

        super(context);

        mContentDescription = contentDescription;

        useAdminDisabledSummary(true);

    }



    private void dimIcon(boolean dimmed) {

        Drawable icon = getIcon();

        if (icon != null) {

            icon.mutate().setAlpha(dimmed ? ICON_ALPHA_DISABLED : ICON_ALPHA_ENABLED);

            setIcon(icon);

        }

    }



    @Override

    public void onBindViewHolder(PreferenceViewHolder view) {

        super.onBindViewHolder(view);

        if (!TextUtils.isEmpty(mContentDescription)) {

            final TextView titleView = (TextView) view.findViewById(android.R.id.title);

            titleView.setContentDescription(mContentDescription);

        }

        dimIcon(!isEnabled());

    }

}