diff options
author | zhuw <zhuw@codeaurora.org> | 2018-04-20 17:18:03 +0800 |
---|---|---|
committer | LuK1337 <priv.luk@gmail.com> | 2019-10-21 21:40:56 +0200 |
commit | abf30794cf496166616c7c1f06a8fa7151e0c9a0 (patch) | |
tree | 6645c35989e03f529e487023d70b60d6780f0915 | |
parent | 2e042904dac1721fc56ce1b047e626f645446c4d (diff) | |
download | android_packages_apps_Gallery2-abf30794cf496166616c7c1f06a8fa7151e0c9a0.tar.gz android_packages_apps_Gallery2-abf30794cf496166616c7c1f06a8fa7151e0c9a0.tar.bz2 android_packages_apps_Gallery2-abf30794cf496166616c7c1f06a8fa7151e0c9a0.zip |
Add new rule about watermark
watermark only support single edit operation
Change-Id: I292f545a4facf158d9efbb4a47feebb4e64ad378
-rwxr-xr-x | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 16 | ||||
-rwxr-xr-x | src/com/android/gallery3d/filtershow/category/MainPanel.java | 16 |
2 files changed, 31 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 7fad95601..7e0f3ca23 100755 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -1421,6 +1421,13 @@ DialogInterface.OnDismissListener, PopupMenu.OnDismissListener{ if (representation == null) { return; } + if (hasWaterMark && representation.getFilterType() != FilterRepresentation.TYPE_WATERMARK && + representation.getFilterType() != + FilterWatermarkRepresentation.TYPE_WATERMARK_CATEGORY) { + clearWaterMark(); + resetHistory(); + showWatermarkButton(false); + } Fragment currentPanel = getSupportFragmentManager().findFragmentByTag(MainPanel.FRAGMENT_TAG); @@ -2449,6 +2456,15 @@ DialogInterface.OnDismissListener, PopupMenu.OnDismissListener{ MasterImage.getImage().setCurrentFilter(null); MasterImage.getImage().setCurrentFilterRepresentation(null); } + showWatermarkButton(true); + } + + private void showWatermarkButton(boolean visible) { + Fragment currentPanel = getSupportFragmentManager() + .findFragmentByTag(MainPanel.FRAGMENT_TAG); + if (currentPanel instanceof MainPanel) { + ((MainPanel) currentPanel).showWatermarkButton(visible); + } } public void backToMain() { diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java index 26ae32734..cf5d2edc6 100755 --- a/src/com/android/gallery3d/filtershow/category/MainPanel.java +++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java @@ -29,6 +29,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.LinearLayout; +import android.widget.Toast; import org.codeaurora.gallery.R; import org.json.JSONObject; @@ -232,7 +233,14 @@ public class MainPanel extends Fragment implements BottomPanel.BottomPanelDelega waterMarkButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - showPanel(WATERMARK); + if (MasterImage.getImage().getHistory().getItem(1) == null) { + waterMarkButton.setVisibility(View.VISIBLE); + showPanel(WATERMARK); + } else { + Toast.makeText(getActivity(), "Watermark only support single edit", + Toast.LENGTH_SHORT).show(); + waterMarkButton.setVisibility(View.GONE); + } } }); looksButton.setOnClickListener(new View.OnClickListener() { @@ -745,4 +753,10 @@ public class MainPanel extends Fragment implements BottomPanel.BottomPanelDelega dualCamButton.setVisibility(visible ? View.VISIBLE : View.GONE); } } + + public void showWatermarkButton(boolean visible) { + if (waterMarkButton != null) { + waterMarkButton.setVisibility(visible ? View.VISIBLE : View.GONE); + } + } } |