From af9f75a5461e53e862ff41fb1985aa9266878af2 Mon Sep 17 00:00:00 2001
From: Matthias Kaeppler <m.kaeppler@gmail.com>
Date: Fri, 7 Nov 2014 15:04:06 +0100
Subject: [PATCH] Move samples to new rx.android package

---
 samples/app/src/main/AndroidManifest.xml                      | 2 +-
 .../rxjava => rx}/android/samples/ListFragmentActivity.java   | 2 +-
 .../rxjava => rx}/android/samples/ListenInOutActivity.java    | 2 +-
 .../android/samples/ListeningFragmentActivity.java            | 2 +-
 .../android/samples/RetainedFragmentActivity.java             | 2 +-
 .../rxjava => rx}/android/samples/SampleObservables.java      | 2 +-
 .../rxjava => rx}/android/samples/SamplesApplication.java     | 2 +-
 .../rxjava => rx}/android/samples/UIBindingActivity.java      | 2 +-
 samples/app/src/main/res/layout/list_fragment_activity.xml    | 4 ++--
 samples/app/src/main/res/layout/listen_in_out_activity.xml    | 2 +-
 .../app/src/main/res/layout/listening_fragment_activity.xml   | 4 ++--
 .../app/src/main/res/layout/retained_fragment_activity.xml    | 4 ++--
 samples/app/src/main/res/layout/ui_binding_activity.xml       | 4 ++--
 13 files changed, 17 insertions(+), 17 deletions(-)
 rename samples/app/src/main/java/{com/netflix/rxjava => rx}/android/samples/ListFragmentActivity.java (98%)
 rename samples/app/src/main/java/{com/netflix/rxjava => rx}/android/samples/ListenInOutActivity.java (98%)
 rename samples/app/src/main/java/{com/netflix/rxjava => rx}/android/samples/ListeningFragmentActivity.java (98%)
 rename samples/app/src/main/java/{com/netflix/rxjava => rx}/android/samples/RetainedFragmentActivity.java (98%)
 rename samples/app/src/main/java/{com/netflix/rxjava => rx}/android/samples/SampleObservables.java (96%)
 rename samples/app/src/main/java/{com/netflix/rxjava => rx}/android/samples/SamplesApplication.java (84%)
 rename samples/app/src/main/java/{com/netflix/rxjava => rx}/android/samples/UIBindingActivity.java (99%)

diff --git a/samples/app/src/main/AndroidManifest.xml b/samples/app/src/main/AndroidManifest.xml
index 96b3fcb7..018e199e 100644
--- a/samples/app/src/main/AndroidManifest.xml
+++ b/samples/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.netflix.rxjava.android.samples" >
+    package="rx.android.samples" >
 
     <application
         android:name=".SamplesApplication"
diff --git a/samples/app/src/main/java/com/netflix/rxjava/android/samples/ListFragmentActivity.java b/samples/app/src/main/java/rx/android/samples/ListFragmentActivity.java
similarity index 98%
rename from samples/app/src/main/java/com/netflix/rxjava/android/samples/ListFragmentActivity.java
rename to samples/app/src/main/java/rx/android/samples/ListFragmentActivity.java
index 446bffa5..0a3d549d 100644
--- a/samples/app/src/main/java/com/netflix/rxjava/android/samples/ListFragmentActivity.java
+++ b/samples/app/src/main/java/rx/android/samples/ListFragmentActivity.java
@@ -1,4 +1,4 @@
-package com.netflix.rxjava.android.samples;
+package rx.android.samples;
 
 import android.app.Activity;
 import android.app.ListFragment;
diff --git a/samples/app/src/main/java/com/netflix/rxjava/android/samples/ListenInOutActivity.java b/samples/app/src/main/java/rx/android/samples/ListenInOutActivity.java
similarity index 98%
rename from samples/app/src/main/java/com/netflix/rxjava/android/samples/ListenInOutActivity.java
rename to samples/app/src/main/java/rx/android/samples/ListenInOutActivity.java
index 893124b2..6d4432af 100644
--- a/samples/app/src/main/java/com/netflix/rxjava/android/samples/ListenInOutActivity.java
+++ b/samples/app/src/main/java/rx/android/samples/ListenInOutActivity.java
@@ -1,4 +1,4 @@
-package com.netflix.rxjava.android.samples;
+package rx.android.samples;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/samples/app/src/main/java/com/netflix/rxjava/android/samples/ListeningFragmentActivity.java b/samples/app/src/main/java/rx/android/samples/ListeningFragmentActivity.java
similarity index 98%
rename from samples/app/src/main/java/com/netflix/rxjava/android/samples/ListeningFragmentActivity.java
rename to samples/app/src/main/java/rx/android/samples/ListeningFragmentActivity.java
index f5b5f471..00a6e971 100644
--- a/samples/app/src/main/java/com/netflix/rxjava/android/samples/ListeningFragmentActivity.java
+++ b/samples/app/src/main/java/rx/android/samples/ListeningFragmentActivity.java
@@ -1,4 +1,4 @@
-package com.netflix.rxjava.android.samples;
+package rx.android.samples;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/samples/app/src/main/java/com/netflix/rxjava/android/samples/RetainedFragmentActivity.java b/samples/app/src/main/java/rx/android/samples/RetainedFragmentActivity.java
similarity index 98%
rename from samples/app/src/main/java/com/netflix/rxjava/android/samples/RetainedFragmentActivity.java
rename to samples/app/src/main/java/rx/android/samples/RetainedFragmentActivity.java
index b598fe5c..c161f511 100644
--- a/samples/app/src/main/java/com/netflix/rxjava/android/samples/RetainedFragmentActivity.java
+++ b/samples/app/src/main/java/rx/android/samples/RetainedFragmentActivity.java
@@ -1,4 +1,4 @@
-package com.netflix.rxjava.android.samples;
+package rx.android.samples;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/samples/app/src/main/java/com/netflix/rxjava/android/samples/SampleObservables.java b/samples/app/src/main/java/rx/android/samples/SampleObservables.java
similarity index 96%
rename from samples/app/src/main/java/com/netflix/rxjava/android/samples/SampleObservables.java
rename to samples/app/src/main/java/rx/android/samples/SampleObservables.java
index 7a17beda..d4cbf315 100644
--- a/samples/app/src/main/java/com/netflix/rxjava/android/samples/SampleObservables.java
+++ b/samples/app/src/main/java/rx/android/samples/SampleObservables.java
@@ -1,4 +1,4 @@
-package com.netflix.rxjava.android.samples;
+package rx.android.samples;
 
 import android.os.SystemClock;
 
diff --git a/samples/app/src/main/java/com/netflix/rxjava/android/samples/SamplesApplication.java b/samples/app/src/main/java/rx/android/samples/SamplesApplication.java
similarity index 84%
rename from samples/app/src/main/java/com/netflix/rxjava/android/samples/SamplesApplication.java
rename to samples/app/src/main/java/rx/android/samples/SamplesApplication.java
index e91e7d54..d90ba339 100644
--- a/samples/app/src/main/java/com/netflix/rxjava/android/samples/SamplesApplication.java
+++ b/samples/app/src/main/java/rx/android/samples/SamplesApplication.java
@@ -1,4 +1,4 @@
-package com.netflix.rxjava.android.samples;
+package rx.android.samples;
 
 import android.app.Application;
 import android.os.StrictMode;
diff --git a/samples/app/src/main/java/com/netflix/rxjava/android/samples/UIBindingActivity.java b/samples/app/src/main/java/rx/android/samples/UIBindingActivity.java
similarity index 99%
rename from samples/app/src/main/java/com/netflix/rxjava/android/samples/UIBindingActivity.java
rename to samples/app/src/main/java/rx/android/samples/UIBindingActivity.java
index 8d450884..3c34494c 100644
--- a/samples/app/src/main/java/com/netflix/rxjava/android/samples/UIBindingActivity.java
+++ b/samples/app/src/main/java/rx/android/samples/UIBindingActivity.java
@@ -1,4 +1,4 @@
-package com.netflix.rxjava.android.samples;
+package rx.android.samples;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/samples/app/src/main/res/layout/list_fragment_activity.xml b/samples/app/src/main/res/layout/list_fragment_activity.xml
index f741ee62..dcf41594 100644
--- a/samples/app/src/main/res/layout/list_fragment_activity.xml
+++ b/samples/app/src/main/res/layout/list_fragment_activity.xml
@@ -2,12 +2,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.netflix.rxjava.android.samples.ListeningFragmentActivity">
+    tools:context="rx.android.samples.ListeningFragmentActivity">
 
     <fragment
         android:tag="retained_list_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:name="com.netflix.rxjava.android.samples.ListFragmentActivity$RetainedListFragment" />
+        android:name="rx.android.samples.ListFragmentActivity$RetainedListFragment" />
 
 </RelativeLayout>
diff --git a/samples/app/src/main/res/layout/listen_in_out_activity.xml b/samples/app/src/main/res/layout/listen_in_out_activity.xml
index bc2c1e1a..94c1fd86 100644
--- a/samples/app/src/main/res/layout/listen_in_out_activity.xml
+++ b/samples/app/src/main/res/layout/listen_in_out_activity.xml
@@ -6,7 +6,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.netflix.rxjava.android.samples.ListenInOutActivity">
+    tools:context="rx.android.samples.ListenInOutActivity">
 
     <TextView
         android:id="@android:id/text1"
diff --git a/samples/app/src/main/res/layout/listening_fragment_activity.xml b/samples/app/src/main/res/layout/listening_fragment_activity.xml
index ecfc325d..8b267945 100644
--- a/samples/app/src/main/res/layout/listening_fragment_activity.xml
+++ b/samples/app/src/main/res/layout/listening_fragment_activity.xml
@@ -2,13 +2,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.netflix.rxjava.android.samples.ListeningFragmentActivity">
+    tools:context="rx.android.samples.ListeningFragmentActivity">
 
     <fragment
         android:tag="retained_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:name="com.netflix.rxjava.android.samples.ListeningFragmentActivity$ListeningFragment"
+        android:name="rx.android.samples.ListeningFragmentActivity$ListeningFragment"
         tools:layout="@layout/retained_fragment" />
 
 </RelativeLayout>
diff --git a/samples/app/src/main/res/layout/retained_fragment_activity.xml b/samples/app/src/main/res/layout/retained_fragment_activity.xml
index e5eb51fb..2ac313cc 100644
--- a/samples/app/src/main/res/layout/retained_fragment_activity.xml
+++ b/samples/app/src/main/res/layout/retained_fragment_activity.xml
@@ -2,13 +2,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.netflix.rxjava.android.samples.RetainedFragmentActivity">
+    tools:context="rx.android.samples.RetainedFragmentActivity">
 
     <fragment
         android:tag="retained_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:name="com.netflix.rxjava.android.samples.RetainedFragmentActivity$RetainedFragment"
+        android:name="rx.android.samples.RetainedFragmentActivity$RetainedFragment"
         tools:layout="@layout/retained_fragment" />
 
 </RelativeLayout>
diff --git a/samples/app/src/main/res/layout/ui_binding_activity.xml b/samples/app/src/main/res/layout/ui_binding_activity.xml
index 106d534a..a2d28e8f 100644
--- a/samples/app/src/main/res/layout/ui_binding_activity.xml
+++ b/samples/app/src/main/res/layout/ui_binding_activity.xml
@@ -2,13 +2,13 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                tools:context="com.netflix.rxjava.android.samples.RetainedFragmentActivity">
+                tools:context="rx.android.samples.RetainedFragmentActivity">
 
     <fragment
             android:tag="retained_fragment_v2"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:name="com.netflix.rxjava.android.samples.UIBindingActivity$RetainedBindingFragment"
+            android:name="rx.android.samples.UIBindingActivity$RetainedBindingFragment"
             tools:layout="@layout/retained_fragment" />
 
 </RelativeLayout>