From a731e09f6b6d4e0d0d13640610d4834d4f12e650 Mon Sep 17 00:00:00 2001
From: Chao Zhang <chaoz@codeaurora.org>
Date: Fri, 1 Apr 2016 10:49:29 +0800
Subject: 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
---
 res/values-zh-rCN/filtershow_strings.xml | 2 +-
 res/values/colors.xml                    | 2 +-
 res/values/filtershow_strings.xml        | 2 +-
 res/values/styles.xml                    | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'res')

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">
-- 
cgit v1.2.3