From 3d00a75e2be0acf1e10b6de64b92303ecd9c3a21 Mon Sep 17 00:00:00 2001
From: Sam Steele <sam@last.fm>
Date: Tue, 17 Jan 2012 20:01:40 -0800
Subject: [PATCH] Remove unused sync prompt activities

---
 app/AndroidManifest.xml                       | 16 +-----
 app/res/layout/calendar_sync_prompt.xml       | 24 ---------
 app/res/layout/contacts_sync_prompt.xml       | 24 ---------
 .../android/activity/CalendarSyncPrompt.java  | 50 -------------------
 .../android/activity/ContactsSyncPrompt.java  | 50 -------------------
 5 files changed, 1 insertion(+), 163 deletions(-)
 delete mode 100644 app/res/layout/calendar_sync_prompt.xml
 delete mode 100644 app/res/layout/contacts_sync_prompt.xml
 delete mode 100644 app/src/fm/last/android/activity/CalendarSyncPrompt.java
 delete mode 100644 app/src/fm/last/android/activity/ContactsSyncPrompt.java

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index ae8f24e8..620db2c4 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -203,21 +203,7 @@
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".activity.ContactsSyncPrompt"
-			android:theme="@android:style/Theme.Dialog">
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
-		</activity>
-		<activity android:name=".activity.CalendarSyncPrompt"
-			android:theme="@android:style/Theme.Dialog">
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
-		</activity>
-		    		<receiver android:name="LocaleReceiver">
+   		<receiver android:name="LocaleReceiver">
 			<intent-filter>
 				<action android:name="android.intent.action.LOCALE_CHANGED"/>
 			</intent-filter>
diff --git a/app/res/layout/calendar_sync_prompt.xml b/app/res/layout/calendar_sync_prompt.xml
deleted file mode 100644
index f1f977b3..00000000
--- a/app/res/layout/calendar_sync_prompt.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="wrap_content"
-	android:layout_height="wrap_content">
-	<TextView android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"
-		android:textColor="#fff" android:textSize="24sp"
-		android:layout_margin="6dip" android:text="@string/cal_sync_prompt_title"></TextView>
-	<ImageView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:src="@android:drawable/divider_horizontal_dim_dark"></ImageView>
-	<TextView android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:gravity="center"
-		android:textColor="#fff"
-		android:textSize="18sp" android:layout_margin="6dip" android:text="@string/cal_sync_prompt_body"></TextView>
-	<LinearLayout android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:gravity="center"
-		android:background="@android:drawable/bottom_bar" android:padding="2dip">
-		<Button android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:layout_weight="1"
-			android:id="@+id/yes" android:text="@string/common_yes"></Button>
-		<Button android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:layout_weight="1"
-			android:text="@string/common_no" android:id="@+id/no"></Button>
-	</LinearLayout>
-</LinearLayout>
diff --git a/app/res/layout/contacts_sync_prompt.xml b/app/res/layout/contacts_sync_prompt.xml
deleted file mode 100644
index 97b4d3a7..00000000
--- a/app/res/layout/contacts_sync_prompt.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="wrap_content"
-	android:layout_height="wrap_content">
-	<TextView android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center"
-		android:textColor="#fff" android:textSize="24sp"
-		android:layout_margin="6dip" android:text="@string/sync_prompt_title"></TextView>
-	<ImageView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:src="@android:drawable/divider_horizontal_dim_dark"></ImageView>
-	<TextView android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:gravity="center"
-		android:textColor="#fff"
-		android:textSize="18sp" android:layout_margin="6dip" android:text="@string/sync_prompt_body"></TextView>
-	<LinearLayout android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:gravity="center"
-		android:background="@android:drawable/bottom_bar" android:padding="2dip">
-		<Button android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:layout_weight="1"
-			android:id="@+id/yes" android:text="@string/common_yes"></Button>
-		<Button android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:layout_weight="1"
-			android:text="@string/common_no" android:id="@+id/no"></Button>
-	</LinearLayout>
-</LinearLayout>
diff --git a/app/src/fm/last/android/activity/CalendarSyncPrompt.java b/app/src/fm/last/android/activity/CalendarSyncPrompt.java
deleted file mode 100644
index 37cb7ac1..00000000
--- a/app/src/fm/last/android/activity/CalendarSyncPrompt.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 
- */
-package fm.last.android.activity;
-
-import fm.last.android.R;
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.os.Bundle;
-import android.provider.CalendarContract;
-import android.view.View;
-import android.view.Window;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-/**
- * @author sam
- *
- */
-public class CalendarSyncPrompt extends Activity {
-	@Override
-	public void onCreate(Bundle icicle) {
-		super.onCreate(icicle);
-		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		setContentView(R.layout.calendar_sync_prompt);
-		
-		Button yes = (Button)findViewById(R.id.yes);
-		yes.setOnClickListener(new OnClickListener() {
-
-			public void onClick(View v) {
-				AccountManager am = AccountManager.get(CalendarSyncPrompt.this);
-				Account[] accounts = am.getAccountsByType(getString(R.string.ACCOUNT_TYPE));
-				ContentResolver.setIsSyncable(accounts[0], CalendarContract.AUTHORITY, 1);
-	            ContentResolver.setSyncAutomatically(accounts[0], CalendarContract.AUTHORITY, true);
-	            finish();
-			}
-		});
-
-		Button no = (Button)findViewById(R.id.no);
-		no.setOnClickListener(new OnClickListener() {
-
-			public void onClick(View v) {
-				finish();
-			}
-			
-		});
-	}
-}
diff --git a/app/src/fm/last/android/activity/ContactsSyncPrompt.java b/app/src/fm/last/android/activity/ContactsSyncPrompt.java
deleted file mode 100644
index 896d4b44..00000000
--- a/app/src/fm/last/android/activity/ContactsSyncPrompt.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 
- */
-package fm.last.android.activity;
-
-import fm.last.android.R;
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.view.View;
-import android.view.Window;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-/**
- * @author sam
- *
- */
-public class ContactsSyncPrompt extends Activity {
-	@Override
-	public void onCreate(Bundle icicle) {
-		super.onCreate(icicle);
-		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		setContentView(R.layout.contacts_sync_prompt);
-		
-		Button yes = (Button)findViewById(R.id.yes);
-		yes.setOnClickListener(new OnClickListener() {
-
-			public void onClick(View v) {
-				AccountManager am = AccountManager.get(ContactsSyncPrompt.this);
-				Account[] accounts = am.getAccountsByType(getString(R.string.ACCOUNT_TYPE));
-				ContentResolver.setIsSyncable(accounts[0], ContactsContract.AUTHORITY, 1);
-	            ContentResolver.setSyncAutomatically(accounts[0], ContactsContract.AUTHORITY, true);
-	            finish();
-			}
-		});
-
-		Button no = (Button)findViewById(R.id.no);
-		no.setOnClickListener(new OnClickListener() {
-
-			public void onClick(View v) {
-				finish();
-			}
-			
-		});
-	}
-}