From d1140c37f8ffdfb191e250e0cb92edf9c1a9162a Mon Sep 17 00:00:00 2001
From: Federico Iosue <federico.iosue@gmail.com>
Date: Sun, 26 Jul 2015 20:07:03 +0200
Subject: [PATCH] Reverted tablet optimization modifications to focus on them
 in a feature branch

---
 .../omninotes/NavigationDrawerFragment.java   |  7 +--
 .../res/layout-sw600dp-land/activity_main.xml | 61 +++++++++++++++++++
 omniNotes/src/main/res/raw/changelog.xml      |  4 +-
 3 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 omniNotes/src/main/res/layout-sw600dp-land/activity_main.xml

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/NavigationDrawerFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/NavigationDrawerFragment.java
index 0f0d20cabd..c5d79e1ce7 100644
--- a/omniNotes/src/main/java/it/feio/android/omninotes/NavigationDrawerFragment.java
+++ b/omniNotes/src/main/java/it/feio/android/omninotes/NavigationDrawerFragment.java
@@ -241,9 +241,8 @@ void animateBurger(int targetShape) {
 
 
 	public static boolean isDoublePanelActive() {
-//		Resources resources = OmniNotes.getAppContext().getResources();
-//		return resources.getDimension(R.dimen.navigation_drawer_width) == resources.getDimension(R.dimen
-//				.navigation_drawer_reserved_space);
-		return false;
+		Resources resources = OmniNotes.getAppContext().getResources();
+		return resources.getDimension(R.dimen.navigation_drawer_width) == resources.getDimension(R.dimen
+				.navigation_drawer_reserved_space);
 	}
 }
diff --git a/omniNotes/src/main/res/layout-sw600dp-land/activity_main.xml b/omniNotes/src/main/res/layout-sw600dp-land/activity_main.xml
new file mode 100644
index 0000000000..bd2b48012a
--- /dev/null
+++ b/omniNotes/src/main/res/layout-sw600dp-land/activity_main.xml
@@ -0,0 +1,61 @@
+<!--
+  ~ Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com)
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:fitsSystemWindows="false"
+        tools:context="it.feio.android.omninotes.MainActivity">
+
+    <android.support.v4.widget.DrawerLayout
+            android:id="@+id/drawer_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <fragment
+                android:id="@+id/navigation_drawer"
+                android:name="it.feio.android.omninotes.NavigationDrawerFragment"
+                android:layout_width="@dimen/navigation_drawer_width"
+                android:layout_height="match_parent"
+                android:layout_gravity="left|start"
+                android:orientation="vertical"/>
+
+    </android.support.v4.widget.DrawerLayout>
+
+
+    <FrameLayout
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="@dimen/padding_top_kitkat"
+            android:layout_marginLeft="@dimen/navigation_drawer_reserved_space"
+            android:background="@color/gray_bg"/>
+
+
+    <include android:id="@+id/toolbar" layout="@layout/toolbar"/>
+
+    <View
+            android:layout_width="match_parent"
+            android:layout_height="4dp"
+            android:background="@drawable/toolbar_dropshadow"/>
+
+    <include android:id="@+id/crouton_handle" layout="@layout/crouton_handle"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/omniNotes/src/main/res/raw/changelog.xml b/omniNotes/src/main/res/raw/changelog.xml
index beb77781c7..d9128f61e8 100644
--- a/omniNotes/src/main/res/raw/changelog.xml
+++ b/omniNotes/src/main/res/raw/changelog.xml
@@ -17,14 +17,14 @@
   -->
 <changelog bulletedList="true">
 
-    <changelogversion versionName="5.1.0 Beta 1" changeDate="Jul 26, 2015">
+    <changelogversion versionName="5.1.0" changeDate="Jul 21, 2015">
         <changelogtext>[b]New![/b] Added app intro</changelogtext>
+        <changelogtext>[b]New![/b] Optimized layout for tablets</changelogtext>
         <changelogtext>[b]New![/b] Statistics available from settings (no more just as an easter egg)</changelogtext>
         <changelogtext>[b]New![/b] Omni Notes is now FOSS, libraries included</changelogtext>
         <changelogtext>[i]Improved[/i] Merging notes will now keep the first valid category, position and reminder from selected notes</changelogtext>
         <changelogtext>[i]Improved[/i] Optionally disable swipe action in notes list</changelogtext>
         <changelogtext>[u]Fix[/u] Theme inconsistences</changelogtext>
-        <changelogtext>[u]Fix[/u] Keyboard not shown on app's start when password was required</changelogtext>
     </changelogversion>
 
     <changelogversion versionName="5.0.4" changeDate="Jul 8, 2015">