Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 31bcd49..eda8815 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -240,7 +240,7 @@
<activity
android:name="com.android.gallery3d.filtershow.FilterShowActivity"
android:label="@string/title_activity_filter_show"
- android:theme="@android:style/Theme.Holo"
+ android:theme="@style/Theme.Gallery"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.EDIT" />
diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index 064b0e6..6aea8c6 100644
--- a/res/layout/filtershow_actionbar.xml
+++ b/res/layout/filtershow_actionbar.xml
@@ -19,7 +19,7 @@
android:layout_height="match_parent"
android:background="@drawable/filtershow_button_background"
android:id="@+id/filtershow_done"
- android:text="@string/done"
+ android:text="@string/save"
android:gravity="center_vertical"
android:textSize="18dip"
android:drawableLeft="?android:attr/actionModeCloseDrawable" />
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 92d4308..854893e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -500,4 +500,6 @@
<!-- Text to show with progress bar while stitching in Gallery -->
<string name="pano_progress_text">Rendering panorama</string>
+ <!-- The label on the button that will save an edited image -->
+ <string name="save" msgid="8140440041190264400">Save</string>
</resources>
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index dcc5011..aba7312 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -279,9 +279,6 @@
canvas.drawText(getImagePreset().name(), mTextPadding,
10 + mTextPadding, mPaint);
}
- mPaint.setARGB(255, 150, 150, 150);
- mPaint.setStrokeWidth(4);
- canvas.drawLine(0, 0, getWidth(), 0, mPaint);
if (showControls()) {
if (USE_SLIDER_GESTURE) {