From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 6 Aug 2015 17:04:22 +0000 (+0200)
Subject: added back translucent action bar for image preview
X-Git-Tag: oc-android-1.8~42^2~26
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6b6227125bcec0977bd5982a74b3192338466b58?ds=inline;hp=--cc

added back translucent action bar for image preview
---

6b6227125bcec0977bd5982a74b3192338466b58
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7b4d742d..d711c833 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -86,7 +86,8 @@
             android:theme="@style/Theme.ownCloud" >
         </activity>
         <activity	
-            android:name=".ui.preview.PreviewImageActivity" 
+            android:name=".ui.preview.PreviewImageActivity"
+            android:theme="@style/Theme.ownCloud.Overlay"
             />
 		        
         <activity	
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b475890e..d5969280 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -39,4 +39,7 @@
     <!-- standard material color definitions -->
     <color name="primary">@color/owncloud_blue</color>
     <color name="primary_dark">#162233</color>
+
+    <!-- special transparent action bar colors for image preview -->
+    <color name="owncloud_blue_transparent">#201D2D44</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 564278ec..d95dfafb 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,7 +30,8 @@
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
 	</style>
-	
+
+	<!-- seperate action bar style for activities without an action bar -->
 	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light.DarkActionBar">
 		<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
 		<item name="windowNoTitle">true</item>
@@ -41,6 +42,24 @@
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
     </style>
 
+	<!-- separat translucent action bar style -->
+	<style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
+		<item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
+		<item name="windowActionBarOverlay">true</item>
+		<!-- Support library compatibility -->
+		<item name="actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
+	</style>
+
+	<!-- ACTION BAR STYLES -->
+	<style name="Theme.ownCloud.Overlay.ActionBar" parent="@style/Widget.AppCompat.ActionBar">
+		<item name="android:background">@color/owncloud_blue_transparent</item>
+		<item name="android:windowActionBarOverlay">true</item>
+
+		<!-- Support library compatibility -->
+		<item name="background">@color/owncloud_blue_transparent</item>
+		<item name="windowActionBarOverlay">true</item>
+	</style>
+
 	<!-- Progress bar -->
 	<style name="Widget.ownCloud.TopProgressBar" parent="style/Widget.AppCompat.ProgressBar.Horizontal">
 		<item name="android:progressDrawable">@drawable/actionbar_progress_horizontal</item>
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index b2d0c8cf..b08a1f81 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -26,6 +26,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -104,7 +105,6 @@ public class PreviewImageActivity extends FileActivity implements
 
         // ActionBar
         ActionBar actionBar = getSupportActionBar();
-        actionBar.setIcon(DisplayUtils.getSeasonalIconId());
         updateActionBarTitleAndHomeButton(null);
         actionBar.hide();
 
@@ -132,7 +132,6 @@ public class PreviewImageActivity extends FileActivity implements
                     }
                 }
             });
-
         }
             
         if (savedInstanceState != null) {
@@ -610,7 +609,7 @@ public class PreviewImageActivity extends FileActivity implements
 
     /**
      * Checks if OS version is Honeycomb one or higher
-     * 
+     *
      * @return boolean
      */
     private boolean isHoneycombOrHigher() {