Browse files

Did some Android Linting.

  • Loading branch information...
1 parent 04686c0 commit f9c2ad196747306532a997ba83c25fad57eca056 @jwf committed Mar 13, 2012
View
3 .classpath
@@ -13,5 +13,6 @@
<attribute name="javadoc_location" value="http://james.apache.org/mime4j/apidocs/"/>
</attributes>
</classpathentry>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+ <classpathentry kind="output" path="bin/classes"/>
</classpath>
View
32 AndroidManifest.xml
@@ -3,6 +3,22 @@
package="ca.mcgill.hs"
android:versionCode="1"
android:versionName="1.0">
+ <uses-sdk android:minSdkVersion="8" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
+ <uses-permission android:name="android.permission.BATTERY_STATS"></uses-permission>
+ <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+ <uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.VIBRATE" />
+ <uses-permission android:name="android.permission.PERSISTENT_ACTIVITY"></uses-permission>
<application android:label="@string/app_name"
android:icon="@drawable/icon">
<activity android:name=".HSAndroid"
@@ -110,20 +126,4 @@
</application>
- <uses-sdk android:minSdkVersion="8" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
- <uses-permission android:name="android.permission.BATTERY_STATS"></uses-permission>
- <uses-permission android:name="android.permission.INTERNET"></uses-permission>
- <uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission>
- <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <uses-permission android:name="android.permission.BLUETOOTH" />
- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
- <uses-permission android:name="android.permission.VIBRATE" />
- <uses-permission android:name="android.permission.PERSISTENT_ACTIVITY"></uses-permission>
</manifest>
View
13 default.properties
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Indicates whether an apk should be generated for each density.
-split.density=false
-# Project target.
-target=android-8
View
6 res/layout/file_manager.xml
@@ -5,21 +5,21 @@
android:layout_height="fill_parent">
<ListView android:id="@id/android:list"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_height="0dip"
android:layout_weight="1"
android:drawSelectorOnTop="false"/>
<TextView android:id="@id/android:empty"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:text="Empty List!"/>
+ android:text="@string/empty_list_text"/>
<LinearLayout android:id="@+id/button_layout"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<Button android:id="@+id/file_delete_button"
- android:text="Delete Checked"
+ android:text="@string/delete_checked_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
View
2 res/layout/location_status_appwidget.xml
@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/location_status_background" >
- <TextView android:text="Results Currently Unavailable"
+ <TextView android:text="@string/no_results_text"
android:id="@+id/location_status_text"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
View
4 res/layout/log_name_dialog.xml
@@ -7,5 +7,7 @@
<EditText
android:id="@+id/log_name_text"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"></EditText>
+ android:layout_width="fill_parent"
+ android:inputType="textUri"
+ android:hint="@string/log_name_hint"></EditText>
</LinearLayout>
View
16 res/layout/main.xml
@@ -10,28 +10,24 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/top_message"
- android:gravity="top"
- />
+ android:gravity="top" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center"
- >
+ android:layout_weight="1"
+ android:gravity="center" >
<Button
- android:id="@+id/button"
+ android:id="@+id/button"
android:text="@string/start_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="center"
- />
+ android:gravity="center" />
</LinearLayout>
<TableLayout
android:id="@+id/free_space"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="*"
- android:gravity="bottom"
- >
+ android:gravity="bottom" >
</TableLayout>
</LinearLayout>
View
4 res/layout/manage_unuploaded_files_check_list_footer.xml
@@ -15,14 +15,14 @@
<Button android:id="@+id/manage_unuploaded_footer_delete_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="Delete"
+ android:text="@string/delete_text"
android:gravity="center"
android:paddingTop="16dip">
</Button>
<Button android:id="@+id/manage_unuploaded_footer_close_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="Cancel"
+ android:text="@string/cancel_text"
android:gravity="center"
android:paddingTop="16dip">
</Button>
View
4 res/layout/model_files_check_list_footer.xml
@@ -15,14 +15,14 @@
<Button android:id="@+id/model_files_footer_save_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="Save"
+ android:text="@string/save_text"
android:gravity="center"
android:paddingTop="16dip">
</Button>
<Button android:id="@+id/model_files_footer_close_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="Cancel"
+ android:text="@string/cancel_text"
android:gravity="center"
android:paddingTop="16dip">
</Button>
View
2 res/layout/simple_classifier_notification_appwidget.xml
@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/simple_classifier_notification_background" >
- <TextView android:text="Results Currently Unavailable"
+ <TextView android:text="@string/no_results_text"
android:id="@+id/simple_classifier_notification_text"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
View
2 res/values/colors.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="background">#000000</color>
+<!-- <color name="background">#000000</color> -->
</resources>
View
12 res/values/strings.xml
@@ -19,7 +19,7 @@
<string name="notification_ticker">Humansense</string>
<string name="notification_text">Select to provide more information.</string>
<string name="notification_title">Humansense Unknown Activity</string>
- <string name="notification_upload_text">Uploading files to server...</string>
+ <string name="notification_upload_text">Uploading files to server&#8230;</string>
<string name="notification_upload_title">Humansense Uploader</string>
<!-- Utility Strings -->
@@ -55,7 +55,7 @@
<string name="started_notification_content">Service is Active.</string>
<string name="stop_label">STOP SERVICE</string>
<string name="upload_label">UPLOAD</string>
- <string name="uploading_label">UPLOADING...</string>
+ <string name="uploading_label">UPLOADING&#8230;</string>
<string name="upload_query">Upload data collected to online server?</string>
<string name="yes">Yes</string>
<string name="no">No</string>
@@ -77,8 +77,12 @@
<string name="uploader_no_connection">No connection could be found.</string>
<string name="activity_magnitude_graph_label">Activity Recognition Graph</string>
<string name="activity_file_manager_label">Humansense File Manager</string>
+ <string name="empty_list_text">Empty List!</string>
+ <string name="delete_checked_text">Delete Checked</string>
+ <string name="no_results_text">Results Currently Unavailable</string>
<!-- Preferences Strings -->
+ <string name="log_name_hint">example activity</string>
<string name="startup_options_cat">Startup Options</string>
<string name="auto_start_at_app_start_pref">Automatically start logging when application starts.</string>
<string name="auto_start_at_app_start_pref_title">Auto-Start at App Start</string>
@@ -244,4 +248,8 @@
<string name="notification_vibrate_title">Notification Vibration</string>
<string name="notification_vibrate_summary">Enables or disables vibration when notifications are pushed.</string>
+ <!-- Button text -->
+ <string name="delete_text">Delete</string>
+ <string name="cancel_text">Cancel</string>
+ <string name="save_text">Save</string>
</resources>

0 comments on commit f9c2ad1

Please sign in to comment.