Gallery2: fix display abnormal of photo editor.

1. fix CompareButton's position changed when switch filter.
2. fix editor image's position changed when switch filter.
3. modify exit dialog function.
4. set editor's actionbar not translucent.

Change-Id: I5e8445d91a0215d93cf19c7ac44fe98ff2b5fae6
CRs-Fixed: 995996

6 files changed, 17 insertions, 51 deletions

diff --git a/res/values-zh-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml
index c3e37e697..62001b1c7 100644
--- a/res/values-zh-rCN/filtershow_strings.xml
+++ b/res/values-zh-rCN/filtershow_strings.xml
@@ -43,7 +43,7 @@
     <string name="save_and_exit" msgid="3628425023766687419">"保存并退出"</string>
     <string name="discard">"放弃"</string>
     <string name="save_and_processing" msgid="6371565035837463194">"正在处理完整分辨率图片…"</string>
-    <string name="exit" msgid="242642957038770113">"取消"</string>
+    <string name="exit" msgid="242642957038770113">"退出"</string>
     <string name="history" msgid="455767361472692409">"历史记录"</string>
     <string name="reset" msgid="9013181350779592937">"重置"</string>
     <!-- no translation found for history_original (150973253194312841) -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9fd91923f..b6645629a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -79,7 +79,7 @@
     <color name="toolbar_theme">#e53935</color>
     <color name="multiselect_background">#ffffff</color>
     <color name="edit_background">#212121</color>
-    <color name="edit_actionbar_background">#8A000000</color>
+    <color name="edit_actionbar_background">#000000</color>
     <color name="dialog_button_color">#009688</color>
     <color name="timeline_title_text_color">#26000000</color>
     <color name="timeline_title_number_text_color">#1a000000</color>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 53a5b5c23..234ed78e4 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -83,7 +83,7 @@
     <!--  String displayed when saving and exiting editor [CHAR LIMIT=NONE] -->
     <string name="save_and_processing">Processing full resolution image...</string>
     <!--  String displayed when exiting editor[CHAR LIMIT=NONE] -->
-    <string name="exit">Cancel</string>
+    <string name="exit">Exit</string>
 
     <!--  History Panel -->
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e4b02fc04..f34f829a8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -35,6 +35,7 @@
     </style>
     <style name="Theme.FilterShow" parent="Theme.Gallery">
         <item name="android:windowBackground">@null</item>
+        <item name="android:windowTranslucentStatus">false</item>
         <item name="android:actionBarStyle">@style/FilterShowActionBar</item>
     </style>
     <style name="Theme.Crop" parent="Theme.GalleryBase">
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 2db66e05b..7cf8e992b 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -73,7 +73,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.RelativeLayout;
-import android.widget.RelativeLayout.LayoutParams;
 import android.widget.ShareActionProvider;
 import android.widget.ShareActionProvider.OnShareTargetSelectedListener;
 import android.widget.Toast;
@@ -207,7 +206,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     private PopupMenu mCurrentMenu = null;
     private boolean mReleaseDualCamOnDestory = true;
     private ImageButton imgComparison;
-    private String mPopUpText, mExit;
+    private String mPopUpText, mCancel;
     RelativeLayout rlImageContainer;
     boolean isOrientationChanged;
     private boolean isComingFromEditorScreen;
@@ -377,7 +376,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         setActionBar(false);
         mPopUpText = r.getString(R.string.discard).toUpperCase(
                 Locale.getDefault());
-        mExit = r.getString(R.string.exit).toUpperCase(Locale.getDefault());
+        mCancel = r.getString(R.string.cancel).toUpperCase(Locale.getDefault());
         int marginTop = r.getDimensionPixelSize(R.dimen.compare_margin_top);
         int marginRight = r.getDimensionPixelSize(R.dimen.compare_margin_right);
         imgComparison = (ImageButton) findViewById(R.id.imgComparison);
@@ -533,18 +532,13 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     }
 
     public void adjustCompareButton(boolean scaled) {
+        if (imgComparison == null) {
+            return;
+        }
         Resources r = getResources();
         int marginTop, marginRight;
-        if (scaled) {
-            marginTop = r
-                    .getDimensionPixelSize(R.dimen.compare_margin_top_scaled);
-            marginRight = r
-                    .getDimensionPixelSize(R.dimen.compare_margin_right_scaled);
-        } else {
-            marginTop = r.getDimensionPixelSize(R.dimen.compare_margin_top);
-            marginRight = r.getDimensionPixelSize(R.dimen.compare_margin_right);
-
-        }
+        marginTop = r.getDimensionPixelSize(R.dimen.compare_margin_top);
+        marginRight = r.getDimensionPixelSize(R.dimen.compare_margin_right);
         RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) imgComparison
                 .getLayoutParams();
         params.setMargins(0, marginTop, marginRight, 0);
@@ -763,29 +757,11 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
 
     private void setupEditors() {
         FrameLayout editorContainer = (FrameLayout) findViewById(R.id.editorContainer);
-        LayoutParams layoutParams = (LayoutParams) editorContainer.getLayoutParams();
-        // if topMargin is not set in xml, set a default value here.
-        if (layoutParams.topMargin == 0) {
-            layoutParams.topMargin = getActionBarHeight() + getStatusBarHeight();
-            editorContainer.setLayoutParams(layoutParams);
-        }
-
         mEditorPlaceHolder.setContainer(editorContainer);
         EditorManager.addEditors(mEditorPlaceHolder);
         mEditorPlaceHolder.setOldViews(mImageViews);
     }
 
-    private int getActionBarHeight() {
-        ActionBar actionBar = getActionBar();
-        return actionBar == null ? 0 : actionBar.getHeight();
-    }
-
-    private int getStatusBarHeight() {
-        Rect frame = new Rect();
-        getWindow().getDecorView().getWindowVisibleDisplayFrame(frame);
-        return frame.top;
-    }
-
     private void setDefaultValues() {
         Resources res = getResources();
 
@@ -974,6 +950,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
 
     public void setCurrentPanel(int currentPanel) {
         mCurrentPanel = currentPanel;
+        if (mMasterImage == null) {
+            return;
+        }
         HistoryManager adapter = mMasterImage.getHistory();
         adapter.setActiveFilter(currentPanel);
     }
@@ -1720,16 +1699,11 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
                                 done();
                             }
                         });
-                builder.setNegativeButton(mExit,
+                builder.setNegativeButton(mCancel,
                         new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int id) {
-                                HistoryManager adapter = mMasterImage.getHistory();
-                                int position = adapter.undoCurrentFilter();
-                                mMasterImage.onHistoryItemClick(position);
-                                adapter.resetActiveFilter();
-                                backToMain();
-                                invalidateViews();
+                                dialog.dismiss();
                             }
                         });
                 builder.show();
diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java
index fa583c91b..94282e7dd 100644
--- a/src/com/android/gallery3d/filtershow/category/MainPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java
@@ -139,11 +139,6 @@ public class MainPanel extends Fragment {
             makeupButton.setVisibility(View.VISIBLE);
         }
 
-        boolean showPanel = false;
-        if (getArguments() != null) {
-            showPanel = getArguments().getBoolean(EDITOR_TAG);
-        }
-
         if (makeupButton != null) {
             makeupButton.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -223,9 +218,7 @@ public class MainPanel extends Fragment {
 
         FilterShowActivity activity = (FilterShowActivity) getActivity();
 //        showImageStatePanel(activity.isShowingImageStatePanel());
-        if (showPanel) {
-            showPanel(activity.getCurrentPanel());
-        }
+        showPanel(activity.getCurrentPanel());
         return mMainView;
     }
 
@@ -432,10 +425,8 @@ public class MainPanel extends Fragment {
             }
         }
         if (currentPanel > 0) {
-            activity.setScaleImage(true);
             activity.adjustCompareButton(true);
         } else {
-            activity.setScaleImage(false);
             activity.adjustCompareButton(false);
         }
     }