fix RTL menu issues

[android-x86/packages-apps-Gallery2.git] / src / com / android / gallery3d / filtershow / editors / Editor.java

diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java
index a9e56e0..e3eec39 100644 (file)
--- a/src/com/android/gallery3d/filtershow/editors/Editor.java
+++ b/src/com/android/gallery3d/filtershow/editors/Editor.java
@@ -17,7 +17,9 @@
 package com.android.gallery3d.filtershow.editors;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -94,12 +96,12 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
         mEditTitle = editTitle;
         mFilterTitle = stateButton;
         mButton = editTitle;
-        setMenuIcon(true);
+        MasterImage.getImage().resetGeometryImages(false);
         setUtilityPanelUI(actionButton, editControl);
     }
 
     public boolean showsPopupIndicator() {
-        return true;
+        return false;
     }
 
     /**
@@ -116,21 +118,16 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
                 R.layout.filtershow_seekbar, (ViewGroup) editControl, true);
         mSeekBar = (SeekBar) lp.findViewById(R.id.primarySeekBar);
         mSeekBar.setOnSeekBarChangeListener(this);
-
-        if (showsSeekBar()) {
-            mSeekBar.setOnSeekBarChangeListener(this);
-            mSeekBar.setVisibility(View.VISIBLE);
-        } else {
-            mSeekBar.setVisibility(View.INVISIBLE);
+        mSeekBar.setVisibility(View.GONE);
+        if (context.getResources().getConfiguration().orientation
+                == Configuration.ORIENTATION_PORTRAIT) {
+            if (showsSeekBar()) {
+               mSeekBar.setVisibility(View.VISIBLE);
+            }
         }
 
         if (mButton != null) {
-            if (showsPopupIndicator()) {
-                mButton.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0,
-                        R.drawable.filtershow_menu_marker, 0);
-            } else {
-                mButton.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0);
-            }
+            setMenuIcon(showsPopupIndicator());
         }
     }
 
@@ -143,7 +140,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
 
     }
 
-    public void createEditor(Context context,FrameLayout frameLayout) {
+    public void createEditor(Context context, FrameLayout frameLayout) {
         mContext = context;
         mFrameLayout = frameLayout;
         mLocalRepresentation = null;
@@ -210,17 +207,17 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
     }
 
     /**
-     *  Call this to update the preset in MasterImage with the current representation
-     *  returned by getLocalRepresentation.  This causes the preview bitmap to be
-     *  regenerated.
+     * Call this to update the preset in MasterImage with the current representation
+     * returned by getLocalRepresentation.  This causes the preview bitmap to be
+     * regenerated.
      */
     public void commitLocalRepresentation() {
         commitLocalRepresentation(getLocalRepresentation());
     }
 
     /**
-     *  Call this to update the preset in MasterImage with a given representation.
-     *  This causes the preview bitmap to be regenerated.
+     * Call this to update the preset in MasterImage with a given representation.
+     * This causes the preview bitmap to be regenerated.
      */
     public void commitLocalRepresentation(FilterRepresentation rep) {
         ArrayList<FilterRepresentation> filter = new ArrayList<FilterRepresentation>(1);
@@ -229,8 +226,8 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
     }
 
     /**
-     *  Call this to update the preset in MasterImage with a collection of FilterRepresnations.
-     *  This causes the preview bitmap to be regenerated.
+     * Call this to update the preset in MasterImage with a collection of FilterRepresentations.
+     * This causes the preview bitmap to be regenerated.
      */
     public void commitLocalRepresentation(Collection<FilterRepresentation> reps) {
         ImagePreset preset = MasterImage.getImage().getPreset();
@@ -240,11 +237,10 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
         }
         if (mChangesGeometry) {
             // Regenerate both the filtered and the geometry-only bitmaps
-            MasterImage.getImage().updatePresets(true);
-        } else {
-            // Regenerate only the filtered bitmap.
-            MasterImage.getImage().invalidateFiltersOnly();
+            MasterImage.getImage().resetGeometryImages(true);
         }
+        // Regenerate the filtered bitmap.
+        MasterImage.getImage().invalidateFiltersOnly();
         preset.fillImageStateAdapter(MasterImage.getImage().getState());
     }
 
@@ -281,7 +277,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
     }
 
     public void openUtilityPanel(LinearLayout mAccessoryViewList) {
-        setMenuIcon(false);
+        setMenuIcon(showsPopupIndicator());
         if (mImageShow != null) {
             mImageShow.openUtilityPanel(mAccessoryViewList);
         }
@@ -289,7 +285,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
 
     protected void setMenuIcon(boolean on) {
         mEditTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                0, 0, on ? R.drawable.filtershow_menu_marker : 0, 0);
+                0, 0, on ? R.drawable.filtershow_menu_marker_rtl : 0, 0);
     }
 
     protected void createMenu(int[] strId, View button) {
@@ -305,6 +301,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
     public Control[] getControls() {
         return null;
     }
+
     @Override
     public void onStartTrackingTouch(SeekBar arg0) {
 
@@ -326,5 +323,8 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
     }
 
     public void detach() {
+        if (mImageShow != null) {
+            mImageShow.detach();
+        }
     }
 }