summaryrefslogtreecommitdiffstats
path: root/res/layout
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
commita55d51cfa1165bf6233c1b0c713cd2571860c691 (patch)
treef011123781d96dea7bea51756b8da2bec76eafe3 /res/layout
parent3ff75bc0cc30d621a4c213364efcd62c1f8c5180 (diff)
parent8cb3c51b16dc4aa9aea1a252eb59d6b5cbb33af3 (diff)
downloadandroid_packages_apps_Gallery2-a55d51cfa1165bf6233c1b0c713cd2571860c691.tar.gz
android_packages_apps_Gallery2-a55d51cfa1165bf6233c1b0c713cd2571860c691.tar.bz2
android_packages_apps_Gallery2-a55d51cfa1165bf6233c1b0c713cd2571860c691.zip
Merge "Fix b/5182741: Add 'Edit' title in the action-bar."
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/photoeditor_main.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/res/layout/photoeditor_main.xml b/res/layout/photoeditor_main.xml
index dd7551ff6..ed4841ab3 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">