Permalink
Browse files

Fixes the ugly asynctask crash and improves the UI.

  • Loading branch information...
1 parent 653e026 commit 96d9de7f6559db0b22b2f6368bc236f3055b6d79 Carlos Yaconi H committed Dec 23, 2011
View
@@ -1,13 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.prey"
- android:versionName="0.5" android:versionCode="32">
+ android:versionName="0.5" android:versionCode="33">
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="13" />
<!-- Only this application can receive the messages and registration result -->
<permission android:name="com.prey.permission.C2D_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="com.prey.permission.C2D_MESSAGE" />
+
+ <uses-feature android:name="android.hardware.location.network" android:required="true" />
+ <uses-feature android:name="android.hardware.telephony" android:required="false" />
+ <uses-feature android:name="android.hardware.location" android:required="true" />
+ <uses-feature android:name="android.hardware.location.gps" android:required="false" />
+ <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+
+
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.ACTION_SHUTDOWN" />
+ <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+ <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN"/>
+ <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+
+ <!-- This app has permission to register and receive message -->
+ <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+
<application android:icon="@drawable/logo" android:label="@string/preyForAndroid_name">
@@ -106,32 +131,7 @@
<category android:name="com.prey" />
</intent-filter>
</receiver>
-
+
</application>
-
- <uses-feature android:name="android.hardware.location.network" android:required="true" />
- <uses-feature android:name="android.hardware.telephony" android:required="false" />
- <uses-feature android:name="android.hardware.location" android:required="true" />
- <uses-feature android:name="android.hardware.location.gps" android:required="false" />
- <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-
-
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
- <uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <uses-permission android:name="android.permission.ACTION_SHUTDOWN" />
- <uses-permission android:name="android.permission.RECEIVE_SMS"/>
- <uses-permission android:name="android.permission.READ_CONTACTS"/>
- <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission android:name="android.permission.SEND_SMS"/>
- <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN"/>
- <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
-
- <!-- This app has permission to register and receive message -->
- <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-
</manifest>
@@ -18,11 +18,11 @@
android:orientation="vertical" android:fadingEdge="horizontal|vertical"
android:scrollbars="vertical" android:background="@drawable/border"
android:layout_height="wrap_content"
- android:layout_width="fill_parent" android:padding="0px" android:layout_margin="10px" android:layout_gravity="center_vertical">
+ android:layout_width="280dp" android:padding="0dp" android:layout_margin="10dp" android:layout_gravity="center_horizontal|center_vertical">
<!-- Data entry layout -->
- <ScrollView android:id="@+id/ScrollView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_margin="0px">
+ <ScrollView android:id="@+id/ScrollView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_margin="0dp">
@@ -37,16 +37,16 @@
<ImageView android:id="@+id/ImageView01"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/logo"
- android:paddingTop="5px" android:layout_marginTop="10px" android:layout_marginLeft="10px"></ImageView>
+ android:paddingTop="5dp" android:layout_marginTop="10dp" android:layout_marginLeft="10dp"></ImageView>
<TextView android:id="@+id/TextView01" android:layout_height="fill_parent"
android:layout_width="fill_parent" android:text="@string/set_old_user_dialog_title"
- android:paddingRight="10px" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center_vertical" android:paddingLeft="10px"></TextView>
+ android:paddingRight="10dp" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center_vertical" android:paddingLeft="10dp"></TextView>
</LinearLayout>
<View android:id="@+id/divider"
android:background="@drawable/gradient_line"
android:layout_width="fill_parent"
- android:layout_height="1dp" android:layout_marginTop="10px" android:layout_marginLeft="15dp" android:layout_marginRight="15dp"/>
+ android:layout_height="1dp" android:layout_marginTop="10dp" android:layout_marginLeft="15dp" android:layout_marginRight="15dp"/>
<TextView
@@ -57,7 +57,7 @@
android:layout_marginRight="20dip"
android:text="@string/set_old_user_dialog_email"
android:gravity="left"
- android:textAppearance="?android:attr/textAppearanceMedium" android:paddingTop="10px"/>
+ android:textAppearance="?android:attr/textAppearanceMedium" android:paddingTop="10dp"/>
<EditText
android:id="@+id/set_old_user_dialog_email_edit"
@@ -94,7 +94,7 @@
<TextView android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_gravity="center_horizontal" android:gravity="center_horizontal" android:layout_marginBottom="15dip" android:layout_marginLeft="20dip" android:layout_marginRight="20dip" android:id="@+id/add_device_info_text" android:text="@string/add_device_info_text"></TextView><LinearLayout android:layout_height="wrap_content"
android:id="@+id/LinearLayoutButtons" android:orientation="horizontal"
android:layout_width="fill_parent"
- android:background="#CCC" android:gravity="center_vertical|center_horizontal|center" android:paddingTop="4px" android:paddingBottom="1px" android:layout_marginLeft="3px" android:layout_marginRight="3px" android:layout_marginBottom="3px">
+ android:background="#CCC" android:gravity="center_vertical|center_horizontal|center" android:paddingTop="4dp" android:paddingBottom="1dp" android:layout_marginLeft="3dp" android:layout_marginRight="3dp" android:layout_marginBottom="3dp">
<Button android:text="@string/set_old_user_dialog_create"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
@@ -16,11 +16,11 @@
android:orientation="vertical" android:fadingEdge="horizontal|vertical"
android:scrollbars="vertical" android:background="@drawable/border"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|center_vertical" android:layout_width="280px" android:padding="0px" android:layout_marginTop="10px" android:layout_marginBottom="10px">
+ android:layout_gravity="center_horizontal|center_vertical" android:layout_width="280dp" android:padding="0dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp">
<!-- Data entry layout -->
- <ScrollView android:id="@+id/ScrollView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_margin="0px">
+ <ScrollView android:id="@+id/ScrollView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_margin="0dp">
@@ -35,19 +35,19 @@
<ImageView android:id="@+id/ImageView01"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/logo"
- android:paddingTop="5px" android:layout_marginTop="10px" android:layout_marginLeft="10px"></ImageView>
+ android:paddingTop="5dp" android:layout_marginTop="10dp" android:layout_marginLeft="10dp"></ImageView>
<TextView android:id="@+id/TextView01" android:layout_height="fill_parent"
- android:layout_width="fill_parent" android:paddingRight="10px" android:gravity="center_vertical" android:paddingLeft="10px" android:text="@string/password_dialog_title" android:textAppearance="?android:attr/textAppearanceLarge"></TextView>
+ android:layout_width="fill_parent" android:paddingRight="10dp" android:gravity="center_vertical" android:paddingLeft="10dp" android:text="@string/password_dialog_title" android:textAppearance="?android:attr/textAppearanceLarge"></TextView>
</LinearLayout>
<View android:id="@+id/divider"
android:background="@drawable/gradient_line"
android:layout_width="fill_parent"
- android:layout_height="1dp" android:layout_marginTop="10px" android:layout_marginLeft="15dp" android:layout_marginRight="15dp"/>
+ android:layout_height="1dp" android:layout_marginTop="10dp" android:layout_marginLeft="15dp" android:layout_marginRight="15dp"/>
<TextView android:id="@+id/username_label" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip" android:gravity="left" android:paddingTop="10px" android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/password_dialog_label"/>
+ android:layout_marginRight="20dip" android:gravity="left" android:paddingTop="10dp" android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/password_dialog_label"/>
@@ -78,19 +78,19 @@
android:layout_gravity="center_vertical|center_horizontal"
android:text="@string/password_dialog_forgot_text2"
android:clickable="true"
- android:id="@+id/check_password_forgot_text2" android:gravity="center_vertical" android:paddingLeft="3px"/>
+ android:id="@+id/check_password_forgot_text2" android:gravity="center_vertical" android:paddingLeft="3dp"/>
</LinearLayout>
<LinearLayout android:layout_height="wrap_content"
android:id="@+id/LinearLayoutButtons" android:orientation="horizontal"
android:layout_width="fill_parent"
- android:background="#CCC" android:gravity="center_vertical|center_horizontal|center" android:paddingTop="4px" android:paddingBottom="1px" android:layout_marginLeft="3px" android:layout_marginRight="3px" android:layout_marginBottom="3px">
+ android:background="#CCC" android:gravity="center_vertical|center_horizontal|center" android:paddingTop="4dp" android:paddingBottom="1dp" android:layout_marginLeft="3dp" android:layout_marginRight="3dp" android:layout_marginBottom="3dp">
<Button android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
- android:gravity="center_vertical|center_horizontal|center" android:text="@string/ok" android:id="@+id/check_password_ok_button" android:minWidth="100px"></Button>
+ android:gravity="center_vertical|center_horizontal|center" android:text="@string/ok" android:id="@+id/check_password_ok_button" android:minWidth="100dp"></Button>
<Button android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
- android:gravity="center_vertical|center_horizontal|center" android:text="@string/cancel" android:id="@+id/check_password_cancel_button" android:minWidth="100px"></Button>
+ android:gravity="center_vertical|center_horizontal|center" android:text="@string/cancel" android:id="@+id/check_password_cancel_button" android:minWidth="100dp"></Button>
</LinearLayout>
@@ -15,11 +15,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:scrollbars="vertical" android:background="@drawable/border"
android:layout_height="wrap_content"
- android:padding="0px" android:layout_width="fill_parent" android:layout_margin="10px" android:layout_gravity="center_vertical">
+ android:padding="0dp" android:layout_width="280dp" android:layout_margin="10dp" android:layout_gravity="center_horizontal|center_vertical">
<!-- Data entry layout -->
- <ScrollView android:id="@+id/ScrollView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_margin="0px">
+ <ScrollView android:id="@+id/ScrollView01" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_margin="0dp">
@@ -34,21 +34,21 @@
<ImageView android:id="@+id/ImageView01"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/logo"
- android:paddingTop="5px" android:layout_marginTop="10px" android:layout_marginLeft="10px"></ImageView>
+ android:paddingTop="5dp" android:layout_marginTop="10dp" android:layout_marginLeft="10dp"></ImageView>
<TextView android:id="@+id/TextView01" android:layout_height="fill_parent"
android:layout_width="fill_parent" android:text="@string/set_new_user_dialog_title"
- android:paddingRight="10px" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center_vertical" android:paddingLeft="10px"></TextView>
+ android:paddingRight="10dp" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center_vertical" android:paddingLeft="10dp"></TextView>
</LinearLayout>
<View android:id="@+id/divider"
android:background="@drawable/gradient_line"
android:layout_width="fill_parent"
- android:layout_height="1dp" android:layout_marginTop="10px" android:layout_marginLeft="15dp" android:layout_marginRight="15dp"/>
+ android:layout_height="1dp" android:layout_marginTop="10dp" android:layout_marginLeft="15dp" android:layout_marginRight="15dp"/>
<TextView android:id="@+id/username_label" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" android:text="@string/set_new_user_dialog_name"
- android:gravity="left" android:paddingTop="10px" android:textAppearance="?android:attr/textAppearanceMedium"/>
+ android:gravity="left" android:paddingTop="10dp" android:textAppearance="?android:attr/textAppearanceMedium"/>
@@ -62,7 +62,7 @@
<TextView android:id="@+id/email_view" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:text="@string/set_new_user_dialog_email"
- android:gravity="left" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginLeft="20dip" android:width="200px"/>
+ android:gravity="left" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginLeft="20dip" android:width="200dp"/>
<EditText android:id="@+id/set_new_user_dialog_email_edit"
android:layout_height="wrap_content" android:layout_width="fill_parent"
@@ -88,7 +88,7 @@
<LinearLayout android:layout_height="wrap_content"
android:id="@+id/LinearLayoutButtons" android:orientation="horizontal"
android:layout_width="fill_parent"
- android:background="#CCC" android:gravity="center_vertical|center_horizontal|center" android:paddingTop="4px" android:paddingBottom="1px" android:layout_marginLeft="3px" android:layout_marginRight="3px" android:layout_marginBottom="3px">
+ android:background="#CCC" android:gravity="center_vertical|center_horizontal|center" android:paddingTop="4dp" android:paddingBottom="1dp" android:layout_marginLeft="3dp" android:layout_marginRight="3dp" android:layout_marginBottom="3dp">
<Button android:text="@string/set_new_user_dialog_create"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
Oops, something went wrong.

0 comments on commit 96d9de7

Please sign in to comment.