summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-02-26 14:13:48 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-26 14:13:48 -0800
commita77524bfb7ac6d797b66da0ed39d4e4a7d8cface (patch)
tree44074f2721f1d4c01c10c95f556e969322591ff4 /res
parent09d74ee21ee847e149e704cb4076612f115d7401 (diff)
parent1d5c898a3df11e922a98098de905a8ea311b4333 (diff)
downloadpackages_apps_settings-a77524bfb7ac6d797b66da0ed39d4e4a7d8cface.zip
packages_apps_settings-a77524bfb7ac6d797b66da0ed39d4e4a7d8cface.tar.gz
packages_apps_settings-a77524bfb7ac6d797b66da0ed39d4e4a7d8cface.tar.bz2
Merge "Fix for 2284833 : Remove big brightness icon and make it a small one on the title bar."
Diffstat (limited to 'res')
-rw-r--r--res/layout/preference_dialog_brightness.xml3
-rw-r--r--res/xml/display_settings.xml1
2 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
index 0fa01e4..a6893e7 100644
--- a/res/layout/preference_dialog_brightness.xml
+++ b/res/layout/preference_dialog_brightness.xml
@@ -30,7 +30,8 @@
<ImageView android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="20dip" />
+ android:paddingTop="20dip"
+ android:visibility="gone" />
<CheckBox android:id="@+id/automatic_mode"
android:layout_width="match_parent"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 5b73924..7fe7f76 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -21,7 +21,6 @@
<com.android.settings.BrightnessPreference
android:key="brightness"
android:title="@string/brightness"
- android:dialogIcon="@drawable/ic_popup_brightness"
android:dialogTitle="@string/brightness" />
<CheckBoxPreference