From 4fca170e1ebcde0e2c3d06027c219eba7ee2ddcd Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 29 Mar 2013 12:11:36 -0700
Subject: [PATCH] Adjust some sizing behavior for task edit dialogs

---
 .../plugin-src/com/todoroo/astrid/tags/TagsControlSet.java | 7 +++++++
 astrid/res/layout/control_set_notes.xml                    | 2 ++
 astrid/res/values/styles.xml                               | 6 +++---
 astrid/src/com/todoroo/astrid/ui/PopupControlSet.java      | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
index 9f344746e..2137a826b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
@@ -15,6 +15,7 @@ import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
@@ -267,6 +268,12 @@ public final class TagsControlSet extends PopupControlSet {
         }
     }
 
+    @Override
+    protected void additionalDialogSetup() {
+        super.additionalDialogSetup();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+    }
+
     @Override
     protected void afterInflate() {
         Tag[] allTags = getTagArray();
diff --git a/astrid/res/layout/control_set_notes.xml b/astrid/res/layout/control_set_notes.xml
index 914547160..17312d9d9 100644
--- a/astrid/res/layout/control_set_notes.xml
+++ b/astrid/res/layout/control_set_notes.xml
@@ -39,8 +39,10 @@
 	      android:id="@+id/notes"
 	      android:layout_width="wrap_content"
 	      android:layout_height="wrap_content"
+	      android:minHeight="100dip"
 	      android:layout_marginLeft="9dip"
 	      android:layout_marginRight="9dip"
+	      android:layout_marginTop="5dip"
 	      android:layout_weight="100"
 	      android:scrollbars="vertical"
 	      android:gravity="top"
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 2167796c2..a8999611d 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -427,7 +427,7 @@
 	    <item name="android:windowIsFloating">true</item>
 	    <item name="android:windowContentOverlay">@null</item>
 	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-	    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
 	    <item name="asTextColor">#ffffff</item>
 	</style>
 	
@@ -442,7 +442,7 @@
 	    <item name="android:windowIsFloating">true</item>
 	    <item name="android:windowContentOverlay">@null</item>
 	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-	    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
 	    <item name="asTextColor">#ffffff</item>   	    
    	</style>
 
@@ -452,7 +452,7 @@
 	    <item name="android:windowIsFloating">true</item>
 	    <item name="android:windowContentOverlay">@null</item>
 	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-	    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
 	    <item name="asTextColor">#000000</item>   	    
    	</style>
 	
diff --git a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
index bf071bcc7..18aae75c2 100644
--- a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
@@ -105,7 +105,7 @@ public abstract class PopupControlSet extends TaskEditControlSet {
             if ((metrics.widthPixels / metrics.density) >= AndroidUtilities.MIN_TABLET_HEIGHT)
                 params.width = (3 * metrics.widthPixels) / 5;
             else if ((metrics.widthPixels / metrics.density) >= AndroidUtilities.MIN_TABLET_WIDTH)
-                params.width = (3 * metrics.widthPixels) / 4;
+                params.width = (4 * metrics.widthPixels) / 5;
         }
 
         dialog.getWindow().setAttributes((android.view.WindowManager.LayoutParams) params);