From 381d94be0b069051b12b9e69a257b2d415d15f10 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 28 Mar 2013 11:32:41 -0700
Subject: [PATCH] Improved menu on tablets when in phone layout

---
 ..._menu_popover_body_tablet_phone_layout.xml | 39 +++++++++++++++++++
 .../main_menu_popover_tablet_phone_layout.xml | 35 +++++++++++++++++
 .../astrid/activity/TaskListActivity.java     |  8 ++--
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml
 create mode 100644 astrid/res/layout/main_menu_popover_tablet_phone_layout.xml

diff --git a/astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml b/astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml
new file mode 100644
index 000000000..482b2fb29
--- /dev/null
+++ b/astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+** Copyright (c) 2012 Todoroo Inc
+**
+** See the file "LICENSE" for the full license governing this code. 
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <ScrollView
+        android:layout_width="280dip"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/gdi_arrow_up"
+        android:background="?attr/asListPopoverBg">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+	        <LinearLayout
+	            android:id="@+id/topFixedItems"
+	            android:layout_width="280dip"
+	            android:layout_height="wrap_content"
+	            android:background="@android:color/transparent"
+	            android:orientation="vertical"/>
+	        <include layout="@layout/fla_separator"/>
+		    <LinearLayout
+		        android:id="@+id/content"
+		        android:layout_width="280dip"
+		        android:layout_height="wrap_content"
+		        android:background="@android:color/transparent"
+		        android:orientation="vertical"/>
+	        <include layout="@layout/fla_separator"/>
+	        <LinearLayout
+	            android:id="@+id/bottomFixedItems"
+	            android:layout_width="280dip"
+	            android:layout_height="wrap_content"
+	            android:background="@android:color/transparent"
+	            android:orientation="vertical"/>
+        </LinearLayout>
+    </ScrollView>
+</merge>
diff --git a/astrid/res/layout/main_menu_popover_tablet_phone_layout.xml b/astrid/res/layout/main_menu_popover_tablet_phone_layout.xml
new file mode 100644
index 000000000..dc10d8c38
--- /dev/null
+++ b/astrid/res/layout/main_menu_popover_tablet_phone_layout.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+** Copyright (c) 2012 Todoroo Inc
+**
+** See the file "LICENSE" for the full license governing this code. 
+-->
+<com.todoroo.astrid.ui.TouchInterceptingFrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+	<RelativeLayout
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:paddingLeft="10dip">
+	
+	    <include layout="@layout/main_menu_popover_body_tablet_phone_layout"/>
+	
+	    <ImageView
+	        android:id="@+id/gdi_arrow_up"
+	        android:layout_width="27dip"
+	        android:layout_height="27dip"
+	        android:layout_marginLeft="-10dip"
+	        android:scaleType="fitCenter"
+	        android:layout_marginBottom="-8dip"
+	        android:src="?attr/asListArrowUp" />
+	
+	    <ImageView
+	        android:id="@+id/gdi_arrow_down"
+	        android:layout_width="27dip"
+	        android:layout_height="27dip"
+	        android:scaleType="fitCenter"
+	        android:layout_marginBottom="-8dip"
+	        android:layout_below="@android:id/list"/>
+	</RelativeLayout>
+</com.todoroo.astrid.ui.TouchInterceptingFrameLayout>
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index dc578eb32..a1aae3fec 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -363,9 +363,11 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     private void createMainMenuPopover() {
         int layout;
-        boolean isTablet = AstridPreferences.useTabletLayout(this);
-        if (isTablet)
+        boolean isTabletLayout = AstridPreferences.useTabletLayout(this);
+        if (isTabletLayout)
             layout = R.layout.main_menu_popover_tablet;
+        else if (AndroidUtilities.isTabletSized(this))
+            layout = R.layout.main_menu_popover_tablet_phone_layout;
         else
             layout = R.layout.main_menu_popover;
 
@@ -377,7 +379,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             }
         });
 
-        if (isTablet)
+        if (isTabletLayout)
             mainMenuPopover.refreshFixedItems();
     }