From b0d9c7e8eef419c690f47960beb35a8401627331 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 20 Jul 2016 21:00:02 +0200
Subject: [PATCH] wrap directory thumbnails in FrameLayout only on Android 4

---
 app/src/main/res/layout-v21/directory_tmb.xml |  7 +++++++
 app/src/main/res/layout/directory_item.xml    | 13 +++----------
 app/src/main/res/layout/directory_tmb.xml     | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/layout-v21/directory_tmb.xml
 create mode 100644 app/src/main/res/layout/directory_tmb.xml

diff --git a/app/src/main/res/layout-v21/directory_tmb.xml b/app/src/main/res/layout-v21/directory_tmb.xml
new file mode 100644
index 000000000..1a1caa96d
--- /dev/null
+++ b/app/src/main/res/layout-v21/directory_tmb.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.simplemobiletools.gallery.MyImageView
+    android:id="@+id/dir_thumbnail"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:foreground="@drawable/selector"/>
diff --git a/app/src/main/res/layout/directory_item.xml b/app/src/main/res/layout/directory_item.xml
index fc60d4b4f..1c982eca6 100644
--- a/app/src/main/res/layout/directory_item.xml
+++ b/app/src/main/res/layout/directory_item.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
+    android:id="@+id/dir_holder"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:foreground="@drawable/selector">
-
-        <com.simplemobiletools.gallery.MyImageView
-            android:id="@+id/dir_thumbnail"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-    </FrameLayout>
+    <include layout="@layout/directory_tmb"/>
 
     <RelativeLayout
+        android:id="@+id/dir_shadow_holder"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tmb_shadow_height"
         android:layout_alignParentBottom="true"
diff --git a/app/src/main/res/layout/directory_tmb.xml b/app/src/main/res/layout/directory_tmb.xml
new file mode 100644
index 000000000..4b5a839fb
--- /dev/null
+++ b/app/src/main/res/layout/directory_tmb.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge>
+
+    <FrameLayout
+        android:id="@+id/dir_frame"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:foreground="@drawable/selector">
+
+        <com.simplemobiletools.gallery.MyImageView
+            android:id="@+id/dir_thumbnail"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </FrameLayout>
+</merge>