UI Restructuring

.classpath

@@ -4,8 +4,9 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="lib" path="libs/bugsense3.0.6.jar"/>
+	<classpathentry kind="lib" path="libs/bugsense3.2.jar"/>
 	<classpathentry kind="src" path="lib-src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ActionBarSherlock4.2.0"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

.gitignore

@@ -10,3 +10,4 @@ assets/Thumbs.db
 # Swap files #
 ##############
 *.swp
+/proguard

.settings/org.eclipse.jdt.core.prefs

@@ -68,7 +68,7 @@ org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=1000
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
@@ -276,16 +276,16 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.lineSplit=1000
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.tabulation.char=mixed
+org.eclipse.jdt.core.formatter.tabulation.size=8
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=false

.settings/org.eclipse.jdt.ui.prefs

@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_profile=_My Java Conventions
 formatter_settings_version=12

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.metawatch.communityedition"
-      android:versionCode="21"
-      android:installLocation="internalOnly" android:versionName="1.24.0.0">
+      package="org.metawatch.manager"
+      android:versionCode="77"
+      android:installLocation="internalOnly" android:versionName="1.0.0.198">
 
     <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
     <supports-screens android:resizeable="true" android:normalScreens="true" android:anyDensity="true" 
@@ -32,8 +32,9 @@
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 	<uses-permission android:name="android.permission.RECEIVE_SMS"/>
 	<uses-permission android:name="android.permission.RECEIVE_MMS"/>
-	<uses-permission android:name="android.permission.WAKE_LOCK"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.READ_CALL_LOG"/>
+	<uses-permission android:name="android.permission.WAKE_LOCK" />
 
 	<uses-permission android:name="com.fsck.k9.permission.READ_MESSAGES"/>
 
@@ -48,55 +49,43 @@
 	<uses-feature android:name="android.hardware.location.gps" android:required="false" />
 	<uses-feature android:name="android.hardware.wifi" android:required="false" />
 
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme">
-        <activity android:name="org.metawatch.manager.MetaWatch"
-                  android:configChanges="keyboardHidden|orientation"
-                  android:launchMode="singleTask">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:hardwareAccelerated="true" android:theme="@style/Theme.Styled">
+        <activity android:name="org.metawatch.manager.MainActivity" android:configChanges="keyboardHidden|orientation" android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-		<activity
-			android:label="Send to Watch"
-			android:name="org.metawatch.manager.ImageViewer"
-			android:configChanges="keyboardHidden|orientation"
-            android:launchMode="singleTask">
-			<intent-filter>
-				<action	android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<data android:mimeType="image/*" />
-			</intent-filter>
-			<intent-filter>
-				<action	android:name="android.intent.action.SEND" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<data android:mimeType="image/*" />
-			</intent-filter>
-		</activity>
-		<activity 
-			android:label="Send to Watch"
-			android:name="org.metawatch.manager.SendTextReceiver"
-        	android:launchMode="singleTask">
+		<activity android:label="Send to Watch" android:name="org.metawatch.manager.SendTextReceiver" android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="android.intent.action.SEND" />
 				<category android:name="android.intent.category.DEFAULT" />
 				<data android:mimeType="text/plain" />
 			</intent-filter>
        	</activity>
-		<activity
-			android:label="Device Selection"
-			android:name="org.metawatch.manager.DeviceSelection"
-			android:configChanges="keyboardHidden|orientation"
-            android:launchMode="singleTask">
+		<activity android:label="Device Selection" android:name="org.metawatch.manager.DeviceSelection" android:configChanges="keyboardHidden|orientation" android:launchMode="singleTask">
 		</activity>
 		<activity
 			android:label="Other Apps"
 			android:name="org.metawatch.manager.OtherAppsList"
 			android:configChanges="keyboardHidden|orientation"
 			android:launchMode="singleTask">
 		</activity>
+		<activity android:label="Send to Watch" android:name="org.metawatch.manager.ImageViewer">
+			<intent-filter>
+				<action	android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<data android:mimeType="image/*" />
+			</intent-filter>
+			<intent-filter>
+				<action	android:name="android.intent.action.SEND" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<data android:mimeType="image/*" />
+			</intent-filter>
+		</activity>
         <receiver android:name="org.metawatch.manager.IntentReceiver" android:exported="true">
             <intent-filter>
+				<action android:name="android.bluetooth.adapter.action.STATE_CHANGED"/>
             	<action android:name="android.intent.action.BATTERY_LOW"/>
             	<action android:name="android.intent.action.NEW_OUTGOING_CALL" /> 
             	<action android:name="android.intent.action.TIME_SET"/>
@@ -116,7 +105,6 @@
             	<action android:name="org.metawatch.manager.UPDATE_APPSCREEN_CLOCK"/>
             	<action android:name="com.usk.app.notifymyandroid.NEW_NOTIFICATION" />
             	<action android:name="fm.last.android.metachanged" />
-
             </intent-filter>
             <intent-filter>
 	            <action android:name="android.intent.action.EVENT_REMINDER" />
@@ -150,7 +138,6 @@
 				<action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED" />
 				<data android:mimeType="application/vnd.wap.mms-message" />
 			</intent-filter>
-
 			<intent-filter>
               <action android:name="android.intent.action.PACKAGE_INSTALL" /> 
                 <action android:name="android.intent.action.PACKAGE_ADDED" /> 
@@ -164,7 +151,6 @@
             	<action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
-
         <receiver android:name="org.metawatch.manager.ApiIntentReceiver"> 
             <intent-filter>
             	<action android:name="org.metawatch.manager.APPLICATION_UPDATE" />  
@@ -179,38 +165,16 @@
         </receiver> 
         <receiver android:name="org.metawatch.manager.AlarmReceiver"></receiver>
         <service android:name="org.metawatch.manager.MetaWatchService"></service>
-	    <service android:name="org.metawatch.manager.MetaWatchAccessibilityService"
-	        android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+		<service android:name="org.metawatch.manager.MetaWatchAccessibilityService" android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
 			<intent-filter>
 				<action android:name="android.accessibilityservice.AccessibilityService" />
 			</intent-filter>
 		</service>      
-		<activity android:name="org.metawatch.manager.MetaWatchStatus" 
-                  android:launchMode="standard">
-        </activity>  
-        <activity android:name="org.metawatch.manager.Settings" 
-        		  android:launchMode="standard">
-        </activity>
-        <activity android:name="org.metawatch.manager.WidgetSetup"
-        		  android:configChanges="keyboardHidden|orientation" 
-        		  android:launchMode="standard">
-        </activity>
-        <activity android:name="org.metawatch.manager.WidgetPicker" 
-        		  android:launchMode="standard">
-        </activity>        
-        <activity android:name="org.metawatch.manager.ThemeContainer" 
-        		  android:launchMode="standard">
-        </activity>  
-        <activity android:name="org.metawatch.manager.ThemeGallery" 
-        		  android:launchMode="standard">
-        </activity>  
-        <activity android:name="org.metawatch.manager.ThemePicker" 
-        		  android:launchMode="standard">
-        </activity>  
-        <activity android:name="org.metawatch.manager.Test" 
-                  android:launchMode="singleTask">
-        </activity>
-
+        <activity android:name="org.metawatch.manager.Settings" android:launchMode="standard"/>
+        <activity android:name="org.metawatch.manager.WidgetPicker" android:launchMode="standard"/>
+        <activity android:name="org.metawatch.manager.ThemeContainer" android:launchMode="standard"/>
+        <activity android:name="org.metawatch.manager.ThemeGallery" android:launchMode="standard"/>
+        <activity android:name="org.metawatch.manager.ThemePicker" android:launchMode="standard"/>
+        <activity android:name="org.metawatch.manager.Test" android:launchMode="singleTask"/>
     </application>
-
 </manifest>