summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-01-15 04:31:01 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-01-15 04:31:01 -0800
commit213ab8cfb5f23b2086415ffdde6a8cb07cb57e9e (patch)
treebc4d9462e8e6e1c7291dded7f8b3758e4da99162 /src/com/android
parent3d26d079ec0d4dcdd81184088cae66b4d8e0b442 (diff)
parent2a611a4ee5171b360dffcc685be7e04a68902cf6 (diff)
downloadandroid_packages_apps_Gallery2-213ab8cfb5f23b2086415ffdde6a8cb07cb57e9e.tar.gz
android_packages_apps_Gallery2-213ab8cfb5f23b2086415ffdde6a8cb07cb57e9e.tar.bz2
android_packages_apps_Gallery2-213ab8cfb5f23b2086415ffdde6a8cb07cb57e9e.zip
Merge "Gallery2: Hide "Delete" button on photo page if need."
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 1b2a68245..4e61df9c7 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -655,7 +655,7 @@ public abstract class PhotoPage extends ActivityState implements
mShareIntent = new Intent(Intent.ACTION_SEND);
return mShowBars;
case R.id.photopage_bottom_control_delete:
- return mShowBars;
+ return mShowBars && !mReadOnlyView;
default:
return false;
}