summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-06-11 14:18:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-11 14:18:35 -0700
commit53cb7a2ff28c53f80e1404d92923e41ceaac4f32 (patch)
treef2c68f73e1d2d94dc8b765392e5dba98f7d33b8a
parentecac7751630b9bbf760e6cc700574835ffa6697d (diff)
parent3de1ebebe75042cd7dc342c4e3fa094bbb5cbc8d (diff)
downloadandroid_packages_apps_Gallery2-53cb7a2ff28c53f80e1404d92923e41ceaac4f32.tar.gz
android_packages_apps_Gallery2-53cb7a2ff28c53f80e1404d92923e41ceaac4f32.tar.bz2
android_packages_apps_Gallery2-53cb7a2ff28c53f80e1404d92923e41ceaac4f32.zip
am 3de1ebeb: am a4d93ac0: Fix text size in the state panel
* commit '3de1ebebe75042cd7dc342c4e3fa094bbb5cbc8d': Fix text size in the state panel
-rw-r--r--res/values/filtershow_values.xml5
-rw-r--r--src/com/android/gallery3d/filtershow/state/StateView.java1
2 files changed, 5 insertions, 1 deletions
diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml
index f516a39ba..2e7dce493 100644
--- a/res/values/filtershow_values.xml
+++ b/res/values/filtershow_values.xml
@@ -17,4 +17,7 @@
<resources>
<!-- Specify the screen orientation -->
<bool name="only_use_portrait">true</bool>
-</resources> \ No newline at end of file
+
+ <!-- Text size for the state panel -->
+ <dimen name="state_panel_text_size">16dip</dimen>
+</resources>
diff --git a/src/com/android/gallery3d/filtershow/state/StateView.java b/src/com/android/gallery3d/filtershow/state/StateView.java
index 9353a430a..73d57846a 100644
--- a/src/com/android/gallery3d/filtershow/state/StateView.java
+++ b/src/com/android/gallery3d/filtershow/state/StateView.java
@@ -78,6 +78,7 @@ public class StateView extends View {
mTextColor = res.getColor(R.color.filtershow_stateview_text);
mSelectedBackgroundColor = res.getColor(R.color.filtershow_stateview_selected_background);
mSelectedTextColor = res.getColor(R.color.filtershow_stateview_selected_text);
+ mTextSize = res.getDimensionPixelSize(R.dimen.state_panel_text_size);
}
public String getText() {