summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLifu Tang <lifu@google.com>2013-09-07 22:15:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-07 22:15:58 -0700
commit033899161e3c4c7016af4a418e2d036f91221b53 (patch)
tree02b5688e904375bdea038753ee8edd170ea4d896
parent00457ee68d63e885e9d9f001f02094cedfcc31b7 (diff)
parente13049b04a62212f8d47a822350a165ff9a76a2a (diff)
downloadpackages_apps_Settings-033899161e3c4c7016af4a418e2d036f91221b53.zip
packages_apps_Settings-033899161e3c4c7016af4a418e2d036f91221b53.tar.gz
packages_apps_Settings-033899161e3c4c7016af4a418e2d036f91221b53.tar.bz2
am e13049b0: am 5999658e: Merge "Dim icons when recent apps category is disabled" into klp-dev
* commit 'e13049b04a62212f8d47a822350a165ff9a76a2a': Dim icons when recent apps category is disabled
-rw-r--r--src/com/android/settings/location/DimmableIconPreference.java52
-rw-r--r--src/com/android/settings/location/RecentLocationApps.java2
2 files changed, 53 insertions, 1 deletions
diff --git a/src/com/android/settings/location/DimmableIconPreference.java b/src/com/android/settings/location/DimmableIconPreference.java
new file mode 100644
index 0000000..bc75fc4
--- /dev/null
+++ b/src/com/android/settings/location/DimmableIconPreference.java
@@ -0,0 +1,52 @@
+/*
+ * 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);
+ }
+}
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
index 1fa8aac..84178e8 100644
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -96,7 +96,7 @@ public class RecentLocationApps {
CharSequence label,
boolean isHighBattery,
Preference.OnPreferenceClickListener listener) {
- Preference pref = new Preference(mActivity);
+ Preference pref = new DimmableIconPreference(mActivity);
pref.setIcon(icon);
pref.setTitle(label);
if (isHighBattery) {