summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuli Huang <yuli@google.com>2011-09-14 01:16:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-14 01:16:55 -0700
commit3312c9b950e7183e45243083186bcd25e87a8338 (patch)
treea6a05b21e327ea66b7488b776c7ad26c4e01ba68
parentbc552bd908babd43087dba4638ea974892264c30 (diff)
parentc1b2e954f031b0299ebd749b5e3b92e86dd79d18 (diff)
downloadandroid_packages_apps_Snap-3312c9b950e7183e45243083186bcd25e87a8338.zip
android_packages_apps_Snap-3312c9b950e7183e45243083186bcd25e87a8338.tar.gz
android_packages_apps_Snap-3312c9b950e7183e45243083186bcd25e87a8338.tar.bz2
Merge "Fix b/5182741: Add 'Edit' title in the action-bar."
-rw-r--r--res/layout/photoeditor_main.xml5
-rwxr-xr-xres/values-sw320dp/photoeditor_dimens.xml2
-rwxr-xr-xres/values-sw600dp/photoeditor_dimens.xml2
-rwxr-xr-xres/values-sw800dp/photoeditor_dimens.xml2
4 files changed, 7 insertions, 4 deletions
diff --git a/res/layout/photoeditor_main.xml b/res/layout/photoeditor_main.xml
index dd7551f..ed4841a 100644
--- a/res/layout/photoeditor_main.xml
+++ b/res/layout/photoeditor_main.xml
@@ -63,7 +63,10 @@
<ImageView style="@style/ActionBarIcon"/>
</LinearLayout>
- <TextView android:id="@+id/action_bar_title" style="@style/ActionBarText"/>
+ <TextView
+ android:id="@+id/action_bar_title"
+ style="@style/ActionBarText"
+ android:text="@string/edit"/>
</LinearLayout>
<LinearLayout style="@style/ActionBarLinearLayout" android:layout_alignParentRight="true">
diff --git a/res/values-sw320dp/photoeditor_dimens.xml b/res/values-sw320dp/photoeditor_dimens.xml
index cde3fe9..c0f523f 100755
--- a/res/values-sw320dp/photoeditor_dimens.xml
+++ b/res/values-sw320dp/photoeditor_dimens.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<dimen name="effect_label_text_size">11sp</dimen>
- <dimen name="effect_label_width">98sp</dimen>
+ <dimen name="effect_label_width">98dp</dimen>
<dimen name="effect_icon_size">72dp</dimen>
<dimen name="effect_padding_left_right">2dp</dimen>
<dimen name="effects_container_padding">12dp</dimen>
diff --git a/res/values-sw600dp/photoeditor_dimens.xml b/res/values-sw600dp/photoeditor_dimens.xml
index 285420a..413347d 100755
--- a/res/values-sw600dp/photoeditor_dimens.xml
+++ b/res/values-sw600dp/photoeditor_dimens.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<dimen name="effect_label_text_size">14sp</dimen>
- <dimen name="effect_label_width">120sp</dimen>
+ <dimen name="effect_label_width">120dp</dimen>
<dimen name="effect_icon_size">90dp</dimen>
<dimen name="effect_padding_left_right">2dp</dimen>
<dimen name="effects_container_padding">12dp</dimen>
diff --git a/res/values-sw800dp/photoeditor_dimens.xml b/res/values-sw800dp/photoeditor_dimens.xml
index 8cce1ba..3b054ce 100755
--- a/res/values-sw800dp/photoeditor_dimens.xml
+++ b/res/values-sw800dp/photoeditor_dimens.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<dimen name="effect_label_text_size">15sp</dimen>
- <dimen name="effect_label_width">138sp</dimen>
+ <dimen name="effect_label_width">138dp</dimen>
<dimen name="effect_icon_size">100dp</dimen>
<dimen name="effect_padding_left_right">3dp</dimen>
<dimen name="effects_container_padding">18dp</dimen>