From 043b5c18b078702bb376a7d14fdd5a3861d0d194 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sat, 3 Apr 2010 10:21:57 -0500
Subject: [PATCH] Remove the dialer input preference

It is not hooked up to anything anymore since supporting it with an SQl query
would be complicated.
---
 res/values/strings.xml                  | 3 ---
 res/xml/preferences.xml                 | 5 -----
 src/org/kreed/vanilla/SongSelector.java | 8 +-------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 267f016c..e660cd46 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -38,9 +38,6 @@
 	<string name="notification_mode_title">Notification Mode</string>
 	<string name="notification_mode_summary">When to show the notification</string>
 
-	<string name="phone_input_title">Use Phone Dialer Input</string>
-	<string name="phone_input_summary">Enter filter text using buttons 1-9, where 1 matches 1, a, b or c, etc</string>
-
 	<string name="filter_suggestions_title">Use Suggestions in Filter Text</string>
 	<string name="filter_suggestions_summary">Use text suggestions when editing the filter text</string>
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 64bc798d..8ec7006f 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -30,11 +30,6 @@
 			android:summaryOff="@string/remote_player_summary_off" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/pref_song_selector">
-		<CheckBoxPreference
-			android:key="phone_input"
-			android:title="@string/phone_input_title"
-			android:summary="@string/phone_input_summary"
-			android:defaultValue="false" />
 		<CheckBoxPreference
 			android:key="filter_suggestions"
 			android:title="@string/filter_suggestions_title"
diff --git a/src/org/kreed/vanilla/SongSelector.java b/src/org/kreed/vanilla/SongSelector.java
index 3a68d103..1f8f688a 100644
--- a/src/org/kreed/vanilla/SongSelector.java
+++ b/src/org/kreed/vanilla/SongSelector.java
@@ -120,13 +120,7 @@ public class SongSelector extends Dialog implements AdapterView.OnItemClickListe
 	public void onStart()
 	{
 		SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getContext());
-		int inputType;
-		if (settings.getBoolean("phone_input", false))
-			inputType = InputType.TYPE_CLASS_PHONE;
-		else if (!settings.getBoolean("filter_suggestions", false))
-			inputType = InputType.TYPE_TEXT_VARIATION_FILTER;
-		else
-			inputType = InputType.TYPE_CLASS_TEXT;
+		int inputType = settings.getBoolean("filter_suggestions", false) ? InputType.TYPE_CLASS_TEXT : InputType.TYPE_TEXT_VARIATION_FILTER;
 		mTextFilter.setInputType(inputType);
 
 		mDefaultAction = Integer.parseInt(settings.getString("default_action_int", "0"));