summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCheng-Ru Lin <owenlin@google.com>2009-10-01 14:02:04 +0800
committerCheng-Ru Lin <owenlin@google.com>2009-10-01 15:56:59 +0800
commitb014f7c2b8bda2ce9f673d0f3026063ad1ec725d (patch)
tree2e2b729d2c42222731c7c8cfa8e1c287db1932e3 /src
parent1a7d45ef86666bda67a4be6e49d56bbf102eba78 (diff)
downloadLegacyCamera-b014f7c2b8bda2ce9f673d0f3026063ad1ec725d.zip
LegacyCamera-b014f7c2b8bda2ce9f673d0f3026063ad1ec725d.tar.gz
LegacyCamera-b014f7c2b8bda2ce9f673d0f3026063ad1ec725d.tar.bz2
Make new color for on screen settings.
And also solve the divider disapear problem. Change-Id: I2f61ee39eb3e179f7a227e56a5dd677e6f415a2d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/OnScreenSettings.java9
1 files changed, 6 insertions, 3 deletions
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() {