Merge lp:~rexbron/astrid/num_keyboard_fix into lp:~tim-todoroo/astrid/2.8.7

[Andrew Hunter]

[Andrew Hunter (rexbron)]

Also suggesting to merge this into the 2.8.7 bugfix release.

This is the first piece of Android software I've hacked on. I was able to test it in an emulator but don't have spare hardware to do an on device test. Hopefully I haven't made any mistakes.

[Tim Su (tim-todoroo)]

> Also suggesting to merge this into the 2.8.7 bugfix release.
>
> This is the first piece of Android software I've hacked on. I was able to test
> it in an emulator but don't have spare hardware to do an on device test.
> Hopefully I haven't made any mistakes.

Looks good. I'm not going to incorporate the manifest and default.properties file, but otherwise, I'm going to go ahead with the merge. Thanks so much!

[Andrew Hunter (rexbron)]

> > Also suggesting to merge this into the 2.8.7 bugfix release.
> >
> > This is the first piece of Android software I've hacked on. I was able to
> test
> > it in an emulator but don't have spare hardware to do an on device test.
> > Hopefully I haven't made any mistakes.
>
> Looks good. I'm not going to incorporate the manifest and default.properties
> file, but otherwise, I'm going to go ahead with the merge. Thanks so much!

Cool, I updated the project to get the build.xml file to try and build astrid from the command line but ended up using eclipse instead.

[Tim Su (tim-todoroo)]

Awesome. Last thing: you should mark this branch as "merged" instead of
"development", since you're done with it.

Did you know that if you have an Android phone, you can do development
on your phone? The only caveat is if you already have Astrid installed
from the market, you'll have to uninstall, which means you may want to
back up your data (i.e. from /data/data/com.timsu.astrid). Let me know
if you want more info about this.

Thanks again!

Andrew Hunter wrote:
>>> Also suggesting to merge this into the 2.8.7 bugfix release.
>>>
>>> This is the first piece of Android software I've hacked on. I was able to
>>>
>> test
>>
>>> it in an emulator but don't have spare hardware to do an on device test.
>>> Hopefully I haven't made any mistakes.
>>>
>> Looks good. I'm not going to incorporate the manifest and default.properties
>> file, but otherwise, I'm going to go ahead with the merge. Thanks so much!
>>
>
> Cool, I updated the project to get the build.xml file to try and build astrid from the command line but ended up using eclipse instead.
>

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2009-06-13 20:37:20 +0000
+++ AndroidManifest.xml	2009-07-14 16:14:39 +0000
@@ -16,7 +16,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     
-    <uses-sdk android:minSdkVersion="1" />
+    <uses-sdk android:minSdkVersion="3"/>
     
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
     
@@ -97,4 +97,5 @@
 
     </application>    
         
+
 </manifest> 
 
=== modified file 'default.properties'
--- default.properties	2009-05-18 00:37:17 +0000
+++ default.properties	2009-07-14 16:14:39 +0000
@@ -7,8 +7,6 @@
 # "build.properties", and override values to adapt the script to your
 # project structure.
 
-# Project target.
-target=android-2
 # apk configurations. This property allows creation of APK files with limited
 # resources. For example, if your application contains many locales and
 # you wish to release multiple smaller apks instead of a large one, you can
@@ -20,3 +18,5 @@
 #     apk-config-european=en,fr,it,de,es
 #     apk-config-northamerica=en,es
 apk-configurations=
+# Project target.
+target=android-3
 
=== modified file 'res/layout/number_picker.xml'
--- res/layout/number_picker.xml	2008-12-26 10:22:13 +0000
+++ res/layout/number_picker.xml	2009-07-14 16:14:39 +0000
@@ -28,7 +28,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:singleLine="true"
+            android:inputType="time"
             style="?android:attr/textAppearanceLargeInverse"
             android:textSize="30sp"
             android:background="@drawable/timepicker_input"
@@ -40,4 +40,4 @@
         android:background="@drawable/timepicker_down_btn"
         />
         
-</merge>
 \ No newline at end of file
+</merge>
 
=== modified file 'res/layout/number_picker_dialog.xml'
--- res/layout/number_picker_dialog.xml	2008-12-26 10:22:13 +0000
+++ res/layout/number_picker_dialog.xml	2009-07-14 16:14:39 +0000
@@ -23,4 +23,4 @@
     <com.timsu.astrid.widget.NumberPicker android:id="@+id/numberPicker"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"/>
-</FrameLayout>
 \ No newline at end of file
+</FrameLayout>