Implement home/work selection map activity and supporting utils

Author: mitchtech

AndroidManifest.xml

@@ -16,6 +16,8 @@
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
+		
+		<activity android:name="edu.fsu.cs.contextprovider.map.AddPlaceMapActivity" android:label="@string/app_name" />		
 
 		<activity android:name="PrefsActivity" android:label="@string/app_name"
 			android:screenOrientation="portrait" />
@@ -117,6 +119,7 @@
 				<action android:name="android.intent.action.CLOSE_SYSTEM_DIALOGS" />
 			</intent-filter>
 		</receiver>
+		<uses-library android:name="com.google.android.maps" />
 
 	</application>
 

assets/EntityConfiguration.xml

@@ -9,4 +9,4 @@
 
 sdk-folder=/opt/android-sdk-linux_x86-1.1_r1
 # Project target.
-target=android-8
+target=Google Inc.:Google APIs:8

default.properties

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	<com.google.android.maps.MapView
+		android:id="@+id/mapView" android:layout_width="fill_parent"
+		android:layout_height="fill_parent" android:enabled="true"
+		android:clickable="true" android:apiKey="0xOAiU9b5S5OkTHpM2IskmeoBeE1grUgfG2Uecw" />
+</LinearLayout>

defunct/ContextServiceStarter.java

@@ -92,9 +92,11 @@ public class ContextExpandableListActivity extends ExpandableListActivity implem
 
 	private ExpandableListAdapter mAdapter;
 
-	private static final int MENU_REFRESH_ID = Menu.FIRST + 1;
-	private static final int MENU_ADD_ID = Menu.FIRST + 2;
-	private static final int MENU_SHARE_ID = Menu.FIRST + 3;
+	// private static final int MENU_ADD_ID = Menu.FIRST + 2;
+	// private static final int MENU_SHARE_ID = Menu.FIRST + 3;
+	private static final int MENU_SET_HOME_ID = Menu.FIRST + 1;
+	private static final int MENU_SET_WORK_ID = Menu.FIRST + 2;
+	private static final int MENU_REFRESH_ID = Menu.FIRST + 3;
 	private static final int MENU_PREFS_ID = Menu.FIRST + 4;
 	private static final int MENU_ABOUT_ID = Menu.FIRST + 5;
 
@@ -132,8 +134,7 @@ public class ContextExpandableListActivity extends ExpandableListActivity implem
 	// debug
 	private boolean ttsEnabled;
 	private boolean shakeEnabled;
-	
-	
+
 	public static boolean running = false;
 	public static TextToSpeech tts;
 
@@ -163,7 +164,7 @@ public void onServiceDisconnected(ComponentName name) {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
+
 		getPrefs();
 
 		// startup the primary context service (if just installed)
@@ -183,54 +184,28 @@ public void onCreate(Bundle savedInstanceState) {
 		bindService(new Intent(this, ContextProviderService.class), conn, Context.BIND_AUTO_CREATE);
 
 		if (locationEnabled) {
-//			/* Start GPS Service */
-//			intent = new Intent(this.getApplicationContext(), edu.fsu.cs.contextprovider.sensor.GPSService.class);
-//			startService(intent);
-//			/* Start Network Service */
-//			intent = new Intent(this.getApplicationContext(), edu.fsu.cs.contextprovider.sensor.NetworkService.class);
-//			startService(intent);
-//			/* Start LocationMonitor */
-//			Geocoder geocoder = new Geocoder(this, Locale.getDefault());
-//			LocationMonitor.StartThread(5, geocoder);
 			refreshLocation();
 		}
-		
+
 		if (movementEnabled) {
-//			/* Start Accelerometer Service */
-//			intent = new Intent(this.getApplicationContext(), edu.fsu.cs.contextprovider.sensor.AccelerometerService.class);
-//			startService(intent);
-//			/* Start movement context */
-//			MovementMonitor.StartThread(5);
 			refreshMovement();
 		}
-		
+
 		if (weatherEnabled) {
-//			/* Start weather monitor */
-//			WeatherMonitor.StartThread(60);
 			refreshWeather();
 		}
-		
+
 		if (systemEnabled) {
-//			/* Start Phone/SMS State Monitor Services */
-//			intent = new Intent(this.getApplicationContext(), edu.fsu.cs.contextprovider.sensor.TelephonyService.class);
-//			startService(intent);
 			refreshSystem();
 		}
-		
+
 		if (socialEnabled) {
-//			/* Start social monitor */
-//			SocialMonitor.StartThread(60);
 			refreshSocial();
 		}
 		if (derivedEnabled) {
-//			/* Start derived monitor */
-//			DerivedMonitor.StartThread(60);
 			refreshDerived();
 		}
-		
-			
 
-		// Set up our adapter
 		mAdapter = new SimpleExpandableListAdapter(this, groupData, android.R.layout.simple_expandable_list_item_1, new String[] { NAME, VALUE }, new int[] {
 				android.R.id.text1, android.R.id.text2 }, childData, android.R.layout.simple_expandable_list_item_2, new String[] { NAME, VALUE }, new int[] {
 				android.R.id.text1, android.R.id.text2 });
@@ -251,12 +226,12 @@ public void onInit(int status) {
 
 	private void getPrefs() {
 
-//		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-//		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+		// SharedPreferences prefs =
+		// PreferenceManager.getDefaultSharedPreferences(this);
 		SharedPreferences prefs = getSharedPreferences(ContextConstants.CONTEXT_PREFS, MODE_WORLD_READABLE);
 
 		// general
-//		startupEnabled = prefs.getBoolean("PREFS_STARTUP_ENABLED", true);
+		// startupEnabled = prefs.getBoolean("PREFS_STARTUP_ENABLED", true);
 		ttsEnabled = prefs.getBoolean("PREFS_TTS_ENABLED", false);
 
 		locationEnabled = prefs.getBoolean("PREFS_LOCATION_ENABLED", true);
@@ -549,9 +524,14 @@ public void onDestroy() {
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
+
+		// menu.add(Menu.NONE, MENU_ADD_ID, Menu.NONE,
+		// "Add").setIcon(android.R.drawable.ic_menu_add).setAlphabeticShortcut('a');
+		menu.add(Menu.NONE, MENU_SET_HOME_ID, Menu.NONE, "Set Home").setIcon(android.R.drawable.ic_menu_compass).setAlphabeticShortcut('h');
+		menu.add(Menu.NONE, MENU_SET_WORK_ID, Menu.NONE, "Set Work").setIcon(android.R.drawable.ic_menu_compass).setAlphabeticShortcut('w');
 		menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE, "Refresh").setIcon(android.R.drawable.ic_menu_rotate).setAlphabeticShortcut('r');
-		menu.add(Menu.NONE, MENU_ADD_ID, Menu.NONE, "Add").setIcon(android.R.drawable.ic_menu_add).setAlphabeticShortcut('a');
-		menu.add(Menu.NONE, MENU_SHARE_ID, Menu.NONE, "Share").setIcon(android.R.drawable.ic_menu_share).setAlphabeticShortcut('s');
+		// menu.add(Menu.NONE, MENU_SHARE_ID, Menu.NONE,
+		// "Share").setIcon(android.R.drawable.ic_menu_share).setAlphabeticShortcut('s');
 		menu.add(Menu.NONE, MENU_PREFS_ID, Menu.NONE, "Prefs").setIcon(android.R.drawable.ic_menu_preferences).setAlphabeticShortcut('p');
 		menu.add(Menu.NONE, MENU_ABOUT_ID, Menu.NONE, "About").setIcon(android.R.drawable.ic_menu_info_details).setAlphabeticShortcut('i');
 
@@ -564,28 +544,39 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		case MENU_REFRESH_ID:
 			refresh();
 			return true;
-		case MENU_ADD_ID:
-			refresh();
-			Context context = getApplicationContext();
-			String address = null;
-			try {
-				address = mService.getCurrentAddress();
-			} catch (RemoteException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			AddressDialog.add addAddressDialog = new AddressDialog.add(this, address);
-			addAddressDialog.show();
-			this.refreshProximity();
-			return (true);
-		case MENU_SHARE_ID:
-			try {
-				exportToFile();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
+		case MENU_SET_HOME_ID:
+			startActivityForResult(new Intent(getApplicationContext(), edu.fsu.cs.contextprovider.map.AddPlaceMapActivity.class),
+					ContextConstants.SET_HOME_REQUEST);
+			// refresh();
+			return true;
+		case MENU_SET_WORK_ID:
+			startActivityForResult(new Intent(getApplicationContext(), edu.fsu.cs.contextprovider.map.AddPlaceMapActivity.class),
+					ContextConstants.SET_WORK_REQUEST);
+			// refresh();
 			return true;
+			// case MENU_ADD_ID:
+			// refresh();
+			// Context context = getApplicationContext();
+			// String address = null;
+			// try {
+			// address = mService.getCurrentAddress();
+			// } catch (RemoteException e) {
+			// // TODO Auto-generated catch block
+			// e.printStackTrace();
+			// }
+			// AddressDialog.add addAddressDialog = new AddressDialog.add(this,
+			// address);
+			// addAddressDialog.show();
+			// this.refreshProximity();
+			// return (true);
+			// case MENU_SHARE_ID:
+			// try {
+			// exportToFile();
+			// } catch (IOException e) {
+			// // TODO Auto-generated catch block
+			// e.printStackTrace();
+			// }
+			// return true;
 		case MENU_PREFS_ID:
 			editPrefs();
 			return true;
@@ -597,6 +588,22 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		return (super.onOptionsItemSelected(item));
 	}
 
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (requestCode == ContextConstants.SET_HOME_REQUEST) {
+			if (resultCode == RESULT_OK) {
+				// Toast.makeText(this, "My Location:" + location.getLatitude()
+				// + "," + location.getLongitude(), Toast.LENGTH_LONG);
+				Toast.makeText(this, "Home Set Sucessfully", Toast.LENGTH_LONG);
+			}
+		} else if (requestCode == ContextConstants.SET_WORK_REQUEST) {
+			if (resultCode == RESULT_OK) {
+				// Toast.makeText(this, "My Location:" + location.getLatitude()
+				// + "," + location.getLongitude(), Toast.LENGTH_LONG);
+				Toast.makeText(this, "Work Set Sucessfully", Toast.LENGTH_LONG);
+			}
+		}
+	}
+
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
 		menu.add(Menu.NONE, CONTEXT_DELETE_ID, Menu.NONE, "Delete").setIcon(android.R.drawable.ic_menu_delete).setAlphabeticShortcut('d');