From ed305acc296495c46d7dda01467bdfdeb92918c3 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Mon, 16 Sep 2013 15:40:05 +0100
Subject: [PATCH] Move the Preference implementations to
 com.reecedunn.espeak.preference.

---
 android/src/com/reecedunn/espeak/TtsSettingsActivity.java  | 4 ++++
 .../espeak/{ => preference}/SeekBarPreference.java         | 4 +++-
 .../{ => preference}/SpeakPunctuationPreference.java       | 6 +++++-
 .../espeak/{ => preference}/VoiceVariantPreference.java    | 7 ++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)
 rename android/src/com/reecedunn/espeak/{ => preference}/SeekBarPreference.java (98%)
 rename android/src/com/reecedunn/espeak/{ => preference}/SpeakPunctuationPreference.java (96%)
 rename android/src/com/reecedunn/espeak/{ => preference}/VoiceVariantPreference.java (98%)

diff --git a/android/src/com/reecedunn/espeak/TtsSettingsActivity.java b/android/src/com/reecedunn/espeak/TtsSettingsActivity.java
index e140f6d1..af2de603 100644
--- a/android/src/com/reecedunn/espeak/TtsSettingsActivity.java
+++ b/android/src/com/reecedunn/espeak/TtsSettingsActivity.java
@@ -29,6 +29,10 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceManager;
 
+import com.reecedunn.espeak.preference.SeekBarPreference;
+import com.reecedunn.espeak.preference.SpeakPunctuationPreference;
+import com.reecedunn.espeak.preference.VoiceVariantPreference;
+
 public class TtsSettingsActivity extends PreferenceActivity {
     @Override
     @SuppressWarnings("deprecation")
diff --git a/android/src/com/reecedunn/espeak/SeekBarPreference.java b/android/src/com/reecedunn/espeak/preference/SeekBarPreference.java
similarity index 98%
rename from android/src/com/reecedunn/espeak/SeekBarPreference.java
rename to android/src/com/reecedunn/espeak/preference/SeekBarPreference.java
index 0979c427..f2823b04 100644
--- a/android/src/com/reecedunn/espeak/SeekBarPreference.java
+++ b/android/src/com/reecedunn/espeak/preference/SeekBarPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.reecedunn.espeak;
+package com.reecedunn.espeak.preference;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -26,6 +26,8 @@ import android.widget.Button;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import com.reecedunn.espeak.R;
+
 public class SeekBarPreference extends DialogPreference implements SeekBar.OnSeekBarChangeListener
 {
     private SeekBar mSeekBar;
diff --git a/android/src/com/reecedunn/espeak/SpeakPunctuationPreference.java b/android/src/com/reecedunn/espeak/preference/SpeakPunctuationPreference.java
similarity index 96%
rename from android/src/com/reecedunn/espeak/SpeakPunctuationPreference.java
rename to android/src/com/reecedunn/espeak/preference/SpeakPunctuationPreference.java
index 2aaacd71..7b792118 100644
--- a/android/src/com/reecedunn/espeak/SpeakPunctuationPreference.java
+++ b/android/src/com/reecedunn/espeak/preference/SpeakPunctuationPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.reecedunn.espeak;
+package com.reecedunn.espeak.preference;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -29,6 +29,10 @@ import android.widget.RadioButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import com.reecedunn.espeak.R;
+import com.reecedunn.espeak.SpeechSynthesis;
+import com.reecedunn.espeak.VoiceSettings;
+
 public class SpeakPunctuationPreference extends DialogPreference {
     private RadioButton mAll;
     private RadioButton mCustom;
diff --git a/android/src/com/reecedunn/espeak/VoiceVariantPreference.java b/android/src/com/reecedunn/espeak/preference/VoiceVariantPreference.java
similarity index 98%
rename from android/src/com/reecedunn/espeak/VoiceVariantPreference.java
rename to android/src/com/reecedunn/espeak/preference/VoiceVariantPreference.java
index 64f8f861..a9a9ceb0 100644
--- a/android/src/com/reecedunn/espeak/VoiceVariantPreference.java
+++ b/android/src/com/reecedunn/espeak/preference/VoiceVariantPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.reecedunn.espeak;
+package com.reecedunn.espeak.preference;
 
 import android.app.Activity;
 import android.content.Context;
@@ -34,6 +34,11 @@ import android.widget.RadioButton;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.reecedunn.espeak.R;
+import com.reecedunn.espeak.ResourceIdListAdapter;
+import com.reecedunn.espeak.VoiceSettings;
+import com.reecedunn.espeak.VoiceVariant;
+
 import java.util.List;
 
 public class VoiceVariantPreference extends DialogPreference {