From b014f7c2b8bda2ce9f673d0f3026063ad1ec725d Mon Sep 17 00:00:00 2001 From: Cheng-Ru Lin Date: Thu, 1 Oct 2009 14:02:04 +0800 Subject: Make new color for on screen settings. And also solve the divider disapear problem. Change-Id: I2f61ee39eb3e179f7a227e56a5dd677e6f415a2d --- src/com/android/camera/OnScreenSettings.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/camera/OnScreenSettings.java b/src/com/android/camera/OnScreenSettings.java index a152748..ffd309d 100644 --- a/src/com/android/camera/OnScreenSettings.java +++ b/src/com/android/camera/OnScreenSettings.java @@ -309,6 +309,11 @@ public class OnScreenSettings { ? ((ListPreference) preference).getEntry() : override); summary.setEnabled(override == null); + + // A little trick here, making the view focusable will eat + // both touch/key events on the view and thus make it looks + // like disabled. + convertView.setFocusable(override != null); } return convertView; } @@ -321,9 +326,7 @@ public class OnScreenSettings { @Override public boolean isEnabled(int position) { Preference preference = mPreferences.get(position); - if (preference instanceof PreferenceGroup) return false; - - return mOverride.get(preference.getKey()) == null; + return !(preference instanceof PreferenceGroup); } public int getCount() { -- cgit v1.1