Don't cut off long notes when keyboard is up

astrid/res/layout/control_dialog_ok.xml

@@ -2,7 +2,7 @@
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
 	    android:id="@+id/edit_dlg_ok"
 	    android:layout_width="150dip"
-	    android:layout_height="50dip"
+	    android:layout_height="45dip"
 	    android:layout_marginTop="10dip"
 	    android:layout_marginBottom="5dip"
 	    android:layout_weight="1"

astrid/res/layout/control_set_notes.xml

@@ -6,11 +6,14 @@
   android:layout_height="fill_parent">
   
   <!-- notes -->
-  <LinearLayout
-    android:orientation="horizontal"
+  <ScrollView
       android:layout_width="fill_parent"
    	  android:layout_height="wrap_content"
       android:layout_weight="100">
+	  <LinearLayout
+	    android:orientation="horizontal"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content">
 	    <!-- Voice Add Note Button -->
 	    <ImageButton
 	      android:id="@+id/voiceAddNoteButton"
@@ -35,5 +38,6 @@
 	      android:singleLine="false"
 	      android:freezesText="true" />
 	  </LinearLayout>
+  </ScrollView>
   <include layout="@layout/control_dialog_ok"/>
 </LinearLayout>

astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java

@@ -23,7 +23,7 @@ public class EditNotesControlSet extends PopupControlSet {
         editText = (EditText) getView().findViewById(R.id.notes);
         notesPreview = (TextView) getDisplayView().findViewById(R.id.notes_display);
         dialog.getWindow()
-              .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+              .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
     }
 
     @Override