Moved sample to different package name to avoid conflict with Play store version

30 files changed, 109 insertions, 109 deletions

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index df2c0f5..3bcdd74 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="com.davemorrissey.labs.subscaleview.sample"
+          package="com.davemorrissey.labs.subscaleview.test"
           android:versionCode="4"
           android:versionName="3.1.0"
           android:hardwareAccelerated="true">
@@ -10,7 +10,7 @@
 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove"/>
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove"/>
 <application android:label="@string/app.name" android:theme="@style/sampleTheme" android:icon="@mipmap/ic_launcher" android:allowBackup="false">
-    <activity android:name=".MainActivity" android:label="Scale View Demo">
+    <activity android:name=".MainActivity" android:label="@string/app.name">
         <intent-filter>
             <action android:name="android.intent.action.MAIN"/>
             <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractFragmentsActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/AbstractFragmentsActivity.java
index 1bbe522..1694d2a 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractFragmentsActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/AbstractFragmentsActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample;
+package com.davemorrissey.labs.subscaleview.test;
 
 import android.app.ActionBar;
 import android.os.Bundle;
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractPagesActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/AbstractPagesActivity.java
index de0711f..f8de39a 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/AbstractPagesActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/AbstractPagesActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample;
+package com.davemorrissey.labs.subscaleview.test;
 
 import android.app.ActionBar;
 import android.os.Bundle;
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/MainActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/MainActivity.java
index f49bf8f..28e9089 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/MainActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/MainActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample;
+package com.davemorrissey.labs.subscaleview.test;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -23,15 +23,15 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.animation.AnimationActivity;
-import com.davemorrissey.labs.subscaleview.sample.basicfeatures.BasicFeaturesActivity;
-import com.davemorrissey.labs.subscaleview.sample.configuration.ConfigurationActivity;
-import com.davemorrissey.labs.subscaleview.sample.eventhandling.EventHandlingActivity;
-import com.davemorrissey.labs.subscaleview.sample.eventhandlingadvanced.AdvancedEventHandlingActivity;
-import com.davemorrissey.labs.subscaleview.sample.extension.ExtensionActivity;
-import com.davemorrissey.labs.subscaleview.sample.imagedisplay.ImageDisplayActivity;
-import com.davemorrissey.labs.subscaleview.sample.viewpager.ViewPagerActivity;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.animation.AnimationActivity;
+import com.davemorrissey.labs.subscaleview.test.basicfeatures.BasicFeaturesActivity;
+import com.davemorrissey.labs.subscaleview.test.configuration.ConfigurationActivity;
+import com.davemorrissey.labs.subscaleview.test.eventhandling.EventHandlingActivity;
+import com.davemorrissey.labs.subscaleview.test.eventhandlingadvanced.AdvancedEventHandlingActivity;
+import com.davemorrissey.labs.subscaleview.test.extension.ExtensionActivity;
+import com.davemorrissey.labs.subscaleview.test.imagedisplay.ImageDisplayActivity;
+import com.davemorrissey.labs.subscaleview.test.viewpager.ViewPagerActivity;
 
 public class MainActivity extends Activity implements View.OnClickListener {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/Page.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/Page.java
index f489f6e..2582334 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/Page.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/Page.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample;
+package com.davemorrissey.labs.subscaleview.test;
 
 public class Page {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/animation/AnimationActivity.java
index 008691d..31cd2fd 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/animation/AnimationActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.animation;
+package com.davemorrissey.labs.subscaleview.test.animation;
 
 import android.graphics.PointF;
 import android.os.Bundle;
@@ -23,17 +23,17 @@ import android.view.View;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.AnimationBuilder;
-import com.davemorrissey.labs.subscaleview.sample.AbstractPagesActivity;
-import com.davemorrissey.labs.subscaleview.sample.Page;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.extension.views.PinView;
+import com.davemorrissey.labs.subscaleview.test.AbstractPagesActivity;
+import com.davemorrissey.labs.subscaleview.test.Page;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.extension.views.PinView;
 
 import java.util.Arrays;
 import java.util.Random;
 
 import static com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.*;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.*;
-import static com.davemorrissey.labs.subscaleview.sample.R.layout.*;
+import static com.davemorrissey.labs.subscaleview.test.R.string.*;
+import static com.davemorrissey.labs.subscaleview.test.R.layout.*;
 
 public class AnimationActivity extends AbstractPagesActivity {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/basicfeatures/BasicFeaturesActivity.java
index a89619a..654ca02 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/basicfeatures/BasicFeaturesActivity.java
@@ -14,21 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.basicfeatures;
+package com.davemorrissey.labs.subscaleview.test.basicfeatures;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.AbstractPagesActivity;
-import com.davemorrissey.labs.subscaleview.sample.Page;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
+import com.davemorrissey.labs.subscaleview.test.AbstractPagesActivity;
+import com.davemorrissey.labs.subscaleview.test.Page;
+import com.davemorrissey.labs.subscaleview.test.R.id;
 
 import java.util.Arrays;
 
-import static com.davemorrissey.labs.subscaleview.sample.R.string.*;
-import static com.davemorrissey.labs.subscaleview.sample.R.layout.*;
+import static com.davemorrissey.labs.subscaleview.test.R.string.*;
+import static com.davemorrissey.labs.subscaleview.test.R.layout.*;
 
 public class BasicFeaturesActivity extends AbstractPagesActivity {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/configuration/ConfigurationActivity.java
index 39c4b24..1f81295 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/configuration/ConfigurationActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.configuration;
+package com.davemorrissey.labs.subscaleview.test.configuration;
 
 import android.graphics.PointF;
 import android.os.Bundle;
@@ -22,14 +22,14 @@ import android.support.annotation.Nullable;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.AbstractPagesActivity;
-import com.davemorrissey.labs.subscaleview.sample.Page;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
+import com.davemorrissey.labs.subscaleview.test.AbstractPagesActivity;
+import com.davemorrissey.labs.subscaleview.test.Page;
+import com.davemorrissey.labs.subscaleview.test.R.id;
 
 import java.util.Arrays;
 
-import static com.davemorrissey.labs.subscaleview.sample.R.string.*;
-import static com.davemorrissey.labs.subscaleview.sample.R.layout.*;
+import static com.davemorrissey.labs.subscaleview.test.R.string.*;
+import static com.davemorrissey.labs.subscaleview.test.R.layout.*;
 
 public class ConfigurationActivity extends AbstractPagesActivity {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/eventhandling/EventHandlingActivity.java
index bd5613a..dac6f08 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/eventhandling/EventHandlingActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.eventhandling;
+package com.davemorrissey.labs.subscaleview.test.eventhandling;
 
 import android.os.Bundle;
 import android.view.View;
@@ -22,14 +22,14 @@ import android.widget.Toast;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.AbstractPagesActivity;
-import com.davemorrissey.labs.subscaleview.sample.Page;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
+import com.davemorrissey.labs.subscaleview.test.AbstractPagesActivity;
+import com.davemorrissey.labs.subscaleview.test.Page;
+import com.davemorrissey.labs.subscaleview.test.R.id;
 
 import java.util.Arrays;
 
-import static com.davemorrissey.labs.subscaleview.sample.R.layout.*;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.*;
+import static com.davemorrissey.labs.subscaleview.test.R.layout.*;
+import static com.davemorrissey.labs.subscaleview.test.R.string.*;
 
 public class EventHandlingActivity extends AbstractPagesActivity {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/eventhandlingadvanced/AdvancedEventHandlingActivity.java
index e2c34fd..1e65f1f 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/eventhandlingadvanced/AdvancedEventHandlingActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.eventhandlingadvanced;
+package com.davemorrissey.labs.subscaleview.test.eventhandlingadvanced;
 
 import android.graphics.PointF;
 import android.os.Bundle;
@@ -25,14 +25,14 @@ import android.widget.Toast;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.AbstractPagesActivity;
-import com.davemorrissey.labs.subscaleview.sample.Page;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
+import com.davemorrissey.labs.subscaleview.test.AbstractPagesActivity;
+import com.davemorrissey.labs.subscaleview.test.Page;
+import com.davemorrissey.labs.subscaleview.test.R.id;
 
 import java.util.Arrays;
 
-import static com.davemorrissey.labs.subscaleview.sample.R.string.*;
-import static com.davemorrissey.labs.subscaleview.sample.R.layout.*;
+import static com.davemorrissey.labs.subscaleview.test.R.string.*;
+import static com.davemorrissey.labs.subscaleview.test.R.layout.*;
 
 public class AdvancedEventHandlingActivity extends AbstractPagesActivity {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/ExtensionActivity.java
index 1b143d7..b767a42 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/ExtensionActivity.java
@@ -14,27 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.extension;
+package com.davemorrissey.labs.subscaleview.test.extension;
 
 import android.support.v4.app.Fragment;
 import android.util.Log;
 
-import com.davemorrissey.labs.subscaleview.sample.AbstractFragmentsActivity;
-import com.davemorrissey.labs.subscaleview.sample.Page;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.imagedisplay.ImageDisplayActivity;
+import com.davemorrissey.labs.subscaleview.test.AbstractFragmentsActivity;
+import com.davemorrissey.labs.subscaleview.test.Page;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.imagedisplay.ImageDisplayActivity;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static com.davemorrissey.labs.subscaleview.sample.R.layout.fragments_activity;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.extension_p1_subtitle;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.extension_p1_text;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.extension_p2_subtitle;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.extension_p2_text;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.extension_p3_subtitle;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.extension_p3_text;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.extension_title;
+import static com.davemorrissey.labs.subscaleview.test.R.layout.fragments_activity;
+import static com.davemorrissey.labs.subscaleview.test.R.string.extension_p1_subtitle;
+import static com.davemorrissey.labs.subscaleview.test.R.string.extension_p1_text;
+import static com.davemorrissey.labs.subscaleview.test.R.string.extension_p2_subtitle;
+import static com.davemorrissey.labs.subscaleview.test.R.string.extension_p2_text;
+import static com.davemorrissey.labs.subscaleview.test.R.string.extension_p3_subtitle;
+import static com.davemorrissey.labs.subscaleview.test.R.string.extension_p3_text;
+import static com.davemorrissey.labs.subscaleview.test.R.string.extension_title;
 
 public class ExtensionActivity extends AbstractFragmentsActivity {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/ExtensionCircleFragment.java
index 3cb3866..e448e7a 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/ExtensionCircleFragment.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.extension;
+package com.davemorrissey.labs.subscaleview.test.extension;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -24,8 +24,8 @@ import android.view.ViewGroup;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.R.layout;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.R.layout;
 
 public class ExtensionCircleFragment extends Fragment {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/ExtensionFreehandFragment.java
index e77f882..4d2c5c5 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/ExtensionFreehandFragment.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.extension;
+package com.davemorrissey.labs.subscaleview.test.extension;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -23,9 +23,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.R.layout;
-import com.davemorrissey.labs.subscaleview.sample.extension.views.FreehandView;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.R.layout;
+import com.davemorrissey.labs.subscaleview.test.extension.views.FreehandView;
 
 public class ExtensionFreehandFragment extends Fragment {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/ExtensionPinFragment.java
index d8e4e71..4dd4c4f 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/ExtensionPinFragment.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.extension;
+package com.davemorrissey.labs.subscaleview.test.extension;
 
 import android.graphics.PointF;
 import android.os.Bundle;
@@ -24,9 +24,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.R.layout;
-import com.davemorrissey.labs.subscaleview.sample.extension.views.PinView;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.R.layout;
+import com.davemorrissey.labs.subscaleview.test.extension.views.PinView;
 
 public class ExtensionPinFragment extends Fragment {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/views/CircleView.java
index 9a7a6aa..f3045f0 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/views/CircleView.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.extension.views;
+package com.davemorrissey.labs.subscaleview.test.extension.views;
 
 import android.content.Context;
 import android.graphics.*;
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/views/FreehandView.java
index 6d49aca..c815749 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/views/FreehandView.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.extension.views;
+package com.davemorrissey.labs.subscaleview.test.extension.views;
 
 import android.content.Context;
 import android.graphics.*;
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/views/PinView.java
index fda8f73..f219aec 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/extension/views/PinView.java
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.extension.views;
+package com.davemorrissey.labs.subscaleview.test.extension.views;
 
 import android.content.Context;
 import android.graphics.*;
 import android.util.AttributeSet;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.R.drawable;
+import com.davemorrissey.labs.subscaleview.test.R.drawable;
 
 
 public class PinView extends SubsamplingScaleImageView {
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/imagedisplay/ImageDisplayActivity.java
index 7d0df3b..d871ee4 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/imagedisplay/ImageDisplayActivity.java
@@ -14,20 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.imagedisplay;
+package com.davemorrissey.labs.subscaleview.test.imagedisplay;
 
 import android.support.v4.app.Fragment;
 import android.util.Log;
 
-import com.davemorrissey.labs.subscaleview.sample.AbstractFragmentsActivity;
-import com.davemorrissey.labs.subscaleview.sample.Page;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
+import com.davemorrissey.labs.subscaleview.test.AbstractFragmentsActivity;
+import com.davemorrissey.labs.subscaleview.test.Page;
+import com.davemorrissey.labs.subscaleview.test.R.id;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static com.davemorrissey.labs.subscaleview.sample.R.string.*;
-import static com.davemorrissey.labs.subscaleview.sample.R.layout.*;
+import static com.davemorrissey.labs.subscaleview.test.R.string.*;
+import static com.davemorrissey.labs.subscaleview.test.R.layout.*;
 
 public class ImageDisplayActivity extends AbstractFragmentsActivity {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/imagedisplay/ImageDisplayLargeFragment.java
index 7e8542f..ada7aa6 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/imagedisplay/ImageDisplayLargeFragment.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.imagedisplay;
+package com.davemorrissey.labs.subscaleview.test.imagedisplay;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -24,8 +24,8 @@ import android.view.ViewGroup;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.R.layout;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.R.layout;
 
 public class ImageDisplayLargeFragment extends Fragment {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRegionFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/imagedisplay/ImageDisplayRegionFragment.java
index 517948f..889e064 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRegionFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/imagedisplay/ImageDisplayRegionFragment.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.imagedisplay;
+package com.davemorrissey.labs.subscaleview.test.imagedisplay;
 
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -25,8 +25,8 @@ import android.view.ViewGroup;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.R.layout;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.R.layout;
 
 public class ImageDisplayRegionFragment extends Fragment {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/imagedisplay/ImageDisplayRotateFragment.java
index 1ec199a..15632db 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/imagedisplay/ImageDisplayRotateFragment.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.imagedisplay;
+package com.davemorrissey.labs.subscaleview.test.imagedisplay;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -24,8 +24,8 @@ import android.view.ViewGroup;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.R.layout;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.R.layout;
 
 public class ImageDisplayRotateFragment extends Fragment {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/viewpager/VerticalViewPager.java
index 86d2e85..3d64042 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/VerticalViewPager.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/viewpager/VerticalViewPager.java
@@ -1,4 +1,4 @@
-package com.davemorrissey.labs.subscaleview.sample.viewpager;
+package com.davemorrissey.labs.subscaleview.test.viewpager;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/viewpager/ViewPagerActivity.java
index ba7fb7f..30eebfe 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/viewpager/ViewPagerActivity.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.viewpager;
+package com.davemorrissey.labs.subscaleview.test.viewpager;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -23,18 +23,18 @@ import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
-import com.davemorrissey.labs.subscaleview.sample.AbstractPagesActivity;
-import com.davemorrissey.labs.subscaleview.sample.Page;
-import com.davemorrissey.labs.subscaleview.sample.R;
+import com.davemorrissey.labs.subscaleview.test.AbstractPagesActivity;
+import com.davemorrissey.labs.subscaleview.test.Page;
+import com.davemorrissey.labs.subscaleview.test.R;
 
 import java.util.Arrays;
 
-import static com.davemorrissey.labs.subscaleview.sample.R.layout.view_pager;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.pager_p1_subtitle;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.pager_p1_text;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.pager_p2_subtitle;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.pager_p2_text;
-import static com.davemorrissey.labs.subscaleview.sample.R.string.pager_title;
+import static com.davemorrissey.labs.subscaleview.test.R.layout.view_pager;
+import static com.davemorrissey.labs.subscaleview.test.R.string.pager_p1_subtitle;
+import static com.davemorrissey.labs.subscaleview.test.R.string.pager_p1_text;
+import static com.davemorrissey.labs.subscaleview.test.R.string.pager_p2_subtitle;
+import static com.davemorrissey.labs.subscaleview.test.R.string.pager_p2_text;
+import static com.davemorrissey.labs.subscaleview.test.R.string.pager_title;
 
 public class ViewPagerActivity extends AbstractPagesActivity {
 
diff --git a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/viewpager/ViewPagerFragment.java
index 442c84b..7058137 100644
--- a/sample/src/main/java/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java
+++ b/sample/src/main/java/com/davemorrissey/labs/subscaleview/test/viewpager/ViewPagerFragment.java
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.davemorrissey.labs.subscaleview.sample.viewpager;
+package com.davemorrissey.labs.subscaleview.test.viewpager;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -24,8 +24,8 @@ import android.view.ViewGroup;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
-import com.davemorrissey.labs.subscaleview.sample.R.id;
-import com.davemorrissey.labs.subscaleview.sample.R.layout;
+import com.davemorrissey.labs.subscaleview.test.R.id;
+import com.davemorrissey.labs.subscaleview.test.R.layout;
 
 public class ViewPagerFragment extends Fragment {
 
diff --git a/sample/src/main/res/layout/animation_activity.xml b/sample/src/main/res/layout/animation_activity.xml
index 5416a88..c8adca9 100644
--- a/sample/src/main/res/layout/animation_activity.xml
+++ b/sample/src/main/res/layout/animation_activity.xml
@@ -19,6 +19,6 @@
 
     </RelativeLayout>
 
-    <com.davemorrissey.labs.subscaleview.sample.extension.views.PinView style="@style/mainPanel" android:id="@+id/imageView"/>
+    <com.davemorrissey.labs.subscaleview.test.extension.views.PinView style="@style/mainPanel" android:id="@+id/imageView"/>
 
 </RelativeLayout>
diff --git a/sample/src/main/res/layout/extension_circle_fragment.xml b/sample/src/main/res/layout/extension_circle_fragment.xml
index b1bcd76..1ad2add 100644
--- a/sample/src/main/res/layout/extension_circle_fragment.xml
+++ b/sample/src/main/res/layout/extension_circle_fragment.xml
@@ -14,6 +14,6 @@
 
     </RelativeLayout>
 
-    <com.davemorrissey.labs.subscaleview.sample.extension.views.CircleView style="@style/mainPanel" android:id="@+id/imageView"/>
+    <com.davemorrissey.labs.subscaleview.test.extension.views.CircleView style="@style/mainPanel" android:id="@+id/imageView"/>
 
 </RelativeLayout>
diff --git a/sample/src/main/res/layout/extension_freehand_fragment.xml b/sample/src/main/res/layout/extension_freehand_fragment.xml
index 006aa0f..4dead6d 100644
--- a/sample/src/main/res/layout/extension_freehand_fragment.xml
+++ b/sample/src/main/res/layout/extension_freehand_fragment.xml
@@ -20,6 +20,6 @@
 
     </RelativeLayout>
 
-    <com.davemorrissey.labs.subscaleview.sample.extension.views.FreehandView style="@style/mainPanel" android:id="@+id/imageView"/>
+    <com.davemorrissey.labs.subscaleview.test.extension.views.FreehandView style="@style/mainPanel" android:id="@+id/imageView"/>
 
 </RelativeLayout>
diff --git a/sample/src/main/res/layout/extension_pin_fragment.xml b/sample/src/main/res/layout/extension_pin_fragment.xml
index fd67b84..4b55e59 100644
--- a/sample/src/main/res/layout/extension_pin_fragment.xml
+++ b/sample/src/main/res/layout/extension_pin_fragment.xml
@@ -14,6 +14,6 @@
 
     </RelativeLayout>
 
-    <com.davemorrissey.labs.subscaleview.sample.extension.views.PinView style="@style/mainPanel" android:id="@+id/imageView"/>
+    <com.davemorrissey.labs.subscaleview.test.extension.views.PinView style="@style/mainPanel" android:id="@+id/imageView"/>
 
 </RelativeLayout>
diff --git a/sample/src/main/res/layout/view_pager.xml b/sample/src/main/res/layout/view_pager.xml
index c6c7bfc..6188097 100644
--- a/sample/src/main/res/layout/view_pager.xml
+++ b/sample/src/main/res/layout/view_pager.xml
@@ -15,6 +15,6 @@
 
     <android.support.v4.view.ViewPager style="@style/mainPanel" android:id="@+id/horizontal_pager" android:visibility="gone" />
 
-    <com.davemorrissey.labs.subscaleview.sample.viewpager.VerticalViewPager style="@style/mainPanel" android:id="@+id/vertical_pager" android:visibility="gone"/>
+    <com.davemorrissey.labs.subscaleview.test.viewpager.VerticalViewPager style="@style/mainPanel" android:id="@+id/vertical_pager" android:visibility="gone"/>
 
 </RelativeLayout>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 3c5a1f4..e291448 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app.name">Scale Image View Demo</string>
+    <string name="app.name">SSIV Test App</string>
 
     <string name="main.title">Subsampling Scale Image View</string>