Rename "wearable" module to "wear" module.
Test: N/A
Change-Id: Iabc7e5523859f33482274c55d38a9b3f0f646bf7
diff --git a/api/26.0.0-SNAPSHOT.txt b/api/26.0.0-SNAPSHOT.txt
index 01f5cab..b368def 100644
--- a/api/26.0.0-SNAPSHOT.txt
+++ b/api/26.0.0-SNAPSHOT.txt
@@ -12778,7 +12778,7 @@
}
-package android.support.wearable.widget {
+package android.support.wear.widget {
public class BoxInsetLayout extends android.view.ViewGroup {
ctor public BoxInsetLayout(android.content.Context);
@@ -12795,7 +12795,7 @@
ctor public BoxInsetLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
ctor public BoxInsetLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
ctor public BoxInsetLayout.LayoutParams(android.widget.FrameLayout.LayoutParams);
- ctor public BoxInsetLayout.LayoutParams(android.support.wearable.widget.BoxInsetLayout.LayoutParams);
+ ctor public BoxInsetLayout.LayoutParams(android.support.wear.widget.BoxInsetLayout.LayoutParams);
field public static final int BOX_ALL = 15; // 0xf
field public static final int BOX_BOTTOM = 8; // 0x8
field public static final int BOX_LEFT = 1; // 0x1
@@ -12805,7 +12805,7 @@
field public int boxedEdges;
}
- public class CurvingLayoutCallback extends android.support.wearable.widget.WearableLinearLayoutManager.LayoutCallback {
+ public class CurvingLayoutCallback extends android.support.wear.widget.WearableLinearLayoutManager.LayoutCallback {
ctor public CurvingLayoutCallback(android.content.Context);
method public void adjustAnchorOffsetXY(android.view.View, float[]);
method public void onLayoutFinished(android.view.View, android.support.v7.widget.RecyclerView);
@@ -12816,22 +12816,22 @@
ctor public SwipeDismissFrameLayout(android.content.Context, android.util.AttributeSet);
ctor public SwipeDismissFrameLayout(android.content.Context, android.util.AttributeSet, int);
ctor public SwipeDismissFrameLayout(android.content.Context, android.util.AttributeSet, int, int);
- method public void addCallback(android.support.wearable.widget.SwipeDismissFrameLayout.Callback);
- method public void removeCallback(android.support.wearable.widget.SwipeDismissFrameLayout.Callback);
+ method public void addCallback(android.support.wear.widget.SwipeDismissFrameLayout.Callback);
+ method public void removeCallback(android.support.wear.widget.SwipeDismissFrameLayout.Callback);
}
public static abstract class SwipeDismissFrameLayout.Callback {
ctor public SwipeDismissFrameLayout.Callback();
- method public void onDismissed(android.support.wearable.widget.SwipeDismissFrameLayout);
- method public void onSwipeCanceled(android.support.wearable.widget.SwipeDismissFrameLayout);
- method public void onSwipeStarted(android.support.wearable.widget.SwipeDismissFrameLayout);
+ method public void onDismissed(android.support.wear.widget.SwipeDismissFrameLayout);
+ method public void onSwipeCanceled(android.support.wear.widget.SwipeDismissFrameLayout);
+ method public void onSwipeStarted(android.support.wear.widget.SwipeDismissFrameLayout);
}
public class WearableLinearLayoutManager extends android.support.v7.widget.LinearLayoutManager {
- ctor public WearableLinearLayoutManager(android.content.Context, android.support.wearable.widget.WearableLinearLayoutManager.LayoutCallback);
+ ctor public WearableLinearLayoutManager(android.content.Context, android.support.wear.widget.WearableLinearLayoutManager.LayoutCallback);
ctor public WearableLinearLayoutManager(android.content.Context);
- method public android.support.wearable.widget.WearableLinearLayoutManager.LayoutCallback getLayoutCallback();
- method public void setLayoutCallback(android.support.wearable.widget.WearableLinearLayoutManager.LayoutCallback);
+ method public android.support.wear.widget.WearableLinearLayoutManager.LayoutCallback getLayoutCallback();
+ method public void setLayoutCallback(android.support.wear.widget.WearableLinearLayoutManager.LayoutCallback);
}
public static abstract class WearableLinearLayoutManager.LayoutCallback {
diff --git a/pathmap.mk b/pathmap.mk
index a389936..3e73be7 100644
--- a/pathmap.mk
+++ b/pathmap.mk
@@ -41,7 +41,7 @@
v14/preference \
v17/leanback \
v17/preference-leanback \
- wearable
+ wear
#
# A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from
diff --git a/settings.gradle b/settings.gradle
index 3c2fb34..6a0e562 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -88,8 +88,8 @@
include ':support-exifinterface'
project(':support-exifinterface').projectDir = new File(rootDir, 'exifinterface')
-include ':support-wearable'
-project(':support-wearable').projectDir = new File(rootDir, 'wearable')
+include ':support-wear'
+project(':support-wear').projectDir = new File(rootDir, 'wear')
include ':support-tv-provider'
project(':support-tv-provider').projectDir = new File(rootDir, 'tv-provider')
diff --git a/wearable/Android.mk b/wear/Android.mk
similarity index 94%
rename from wearable/Android.mk
rename to wear/Android.mk
index 7339f55..a4127ce 100644
--- a/wearable/Android.mk
+++ b/wear/Android.mk
@@ -18,14 +18,14 @@
# Applications that use this library must specify
#
# LOCAL_STATIC_ANDROID_LIBRARIES := \
-# android-support-wearable \
+# android-support-wear \
# android-support-core-ui \
# android-support-v7-recyclerview
#
# in their makefiles to include the resources and their dependencies in their package.
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
-LOCAL_MODULE := android-support-wearable
+LOCAL_MODULE := android-support-wear
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/wearable/AndroidManifest.xml b/wear/AndroidManifest.xml
similarity index 94%
rename from wearable/AndroidManifest.xml
rename to wear/AndroidManifest.xml
index e4b1897..fda54e2 100644
--- a/wearable/AndroidManifest.xml
+++ b/wear/AndroidManifest.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.support.wearable">
+ package="android.support.wear">
<uses-sdk android:minSdkVersion="22"/>
<application>
<meta-data android:name="android.support.VERSION" android:value="${support-version}" />
diff --git a/wearable/README.txt b/wear/README.txt
similarity index 100%
rename from wearable/README.txt
rename to wear/README.txt
diff --git a/wearable/build.gradle b/wear/build.gradle
similarity index 96%
rename from wearable/build.gradle
rename to wear/build.gradle
index 81ec6654..f0733ea 100644
--- a/wearable/build.gradle
+++ b/wear/build.gradle
@@ -1,5 +1,5 @@
apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'wearable'
+archivesBaseName = 'wear'
dependencies {
compile project(':support-annotations')
diff --git a/wearable/proguard-rules.pro b/wear/proguard-rules.pro
similarity index 100%
rename from wearable/proguard-rules.pro
rename to wear/proguard-rules.pro
diff --git a/wearable/res-public/values/public_attrs.xml b/wear/res-public/values/public_attrs.xml
similarity index 100%
rename from wearable/res-public/values/public_attrs.xml
rename to wear/res-public/values/public_attrs.xml
diff --git a/wearable/res/values/attrs.xml b/wear/res/values/attrs.xml
similarity index 100%
rename from wearable/res/values/attrs.xml
rename to wear/res/values/attrs.xml
diff --git a/wearable/res/values/dimens.xml b/wear/res/values/dimens.xml
similarity index 100%
rename from wearable/res/values/dimens.xml
rename to wear/res/values/dimens.xml
diff --git a/wearable/src/android/support/wearable/widget/BoxInsetLayout.java b/wear/src/android/support/wear/widget/BoxInsetLayout.java
similarity index 99%
rename from wearable/src/android/support/wearable/widget/BoxInsetLayout.java
rename to wear/src/android/support/wear/widget/BoxInsetLayout.java
index 92c64b6..ba35f2c 100644
--- a/wearable/src/android/support/wearable/widget/BoxInsetLayout.java
+++ b/wear/src/android/support/wear/widget/BoxInsetLayout.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import android.content.Context;
import android.content.res.Resources;
@@ -27,7 +27,7 @@
import android.support.annotation.RestrictTo;
import android.support.annotation.StyleRes;
import android.support.annotation.UiThread;
-import android.support.wearable.R;
+import android.support.wear.R;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
diff --git a/wearable/src/android/support/wearable/widget/CurvingLayoutCallback.java b/wear/src/android/support/wear/widget/CurvingLayoutCallback.java
similarity index 98%
rename from wearable/src/android/support/wearable/widget/CurvingLayoutCallback.java
rename to wear/src/android/support/wear/widget/CurvingLayoutCallback.java
index 6b2545e..f6eed46 100644
--- a/wearable/src/android/support/wearable/widget/CurvingLayoutCallback.java
+++ b/wear/src/android/support/wear/widget/CurvingLayoutCallback.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import android.content.Context;
import android.graphics.Path;
import android.graphics.PathMeasure;
import android.support.annotation.VisibleForTesting;
import android.support.v7.widget.RecyclerView;
-import android.support.wearable.R;
+import android.support.wear.R;
import android.view.View;
/**
diff --git a/wearable/src/android/support/wearable/widget/ScrollManager.java b/wear/src/android/support/wear/widget/ScrollManager.java
similarity index 99%
rename from wearable/src/android/support/wearable/widget/ScrollManager.java
rename to wear/src/android/support/wear/widget/ScrollManager.java
index dd90ad4..8155f62 100644
--- a/wearable/src/android/support/wearable/widget/ScrollManager.java
+++ b/wear/src/android/support/wear/widget/ScrollManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
diff --git a/wearable/src/android/support/wearable/widget/SwipeDismissFrameLayout.java b/wear/src/android/support/wear/widget/SwipeDismissFrameLayout.java
similarity index 99%
rename from wearable/src/android/support/wearable/widget/SwipeDismissFrameLayout.java
rename to wear/src/android/support/wear/widget/SwipeDismissFrameLayout.java
index a84766f..449356f 100644
--- a/wearable/src/android/support/wearable/widget/SwipeDismissFrameLayout.java
+++ b/wear/src/android/support/wear/widget/SwipeDismissFrameLayout.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import android.content.Context;
import android.support.annotation.UiThread;
diff --git a/wearable/src/android/support/wearable/widget/SwipeDismissLayout.java b/wear/src/android/support/wear/widget/SwipeDismissLayout.java
similarity index 99%
rename from wearable/src/android/support/wearable/widget/SwipeDismissLayout.java
rename to wear/src/android/support/wear/widget/SwipeDismissLayout.java
index 78fef0b..6e7a6f3 100644
--- a/wearable/src/android/support/wearable/widget/SwipeDismissLayout.java
+++ b/wear/src/android/support/wear/widget/SwipeDismissLayout.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
diff --git a/wearable/src/android/support/wearable/widget/WearableLinearLayoutManager.java b/wear/src/android/support/wear/widget/WearableLinearLayoutManager.java
similarity index 98%
rename from wearable/src/android/support/wearable/widget/WearableLinearLayoutManager.java
rename to wear/src/android/support/wear/widget/WearableLinearLayoutManager.java
index 935ee0c..9c882ab 100644
--- a/wearable/src/android/support/wearable/widget/WearableLinearLayoutManager.java
+++ b/wear/src/android/support/wear/widget/WearableLinearLayoutManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import android.content.Context;
import android.support.annotation.Nullable;
diff --git a/wearable/src/android/support/wearable/widget/WearableRecyclerView.java b/wear/src/android/support/wear/widget/WearableRecyclerView.java
similarity index 98%
rename from wearable/src/android/support/wearable/widget/WearableRecyclerView.java
rename to wear/src/android/support/wear/widget/WearableRecyclerView.java
index 0c854da..5cacdfc 100644
--- a/wearable/src/android/support/wearable/widget/WearableRecyclerView.java
+++ b/wear/src/android/support/wear/widget/WearableRecyclerView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import android.annotation.TargetApi;
import android.content.Context;
@@ -23,7 +23,7 @@
import android.os.Build;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
-import android.support.wearable.R;
+import android.support.wear.R;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
diff --git a/wearable/tests/AndroidManifest.xml b/wear/tests/AndroidManifest.xml
similarity index 85%
rename from wearable/tests/AndroidManifest.xml
rename to wear/tests/AndroidManifest.xml
index 5cb9908..15d8de7 100644
--- a/wearable/tests/AndroidManifest.xml
+++ b/wear/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="android.support.wearable.test">
+ package="android.support.wear.test">
<uses-sdk android:minSdkVersion="20"
android:targetSdkVersion="23"
tools:overrideLibrary="android.support.test, android.app, android.support.test.rule,
@@ -25,13 +25,13 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<application android:supportsRtl="true">
- <activity android:name="android.support.wearable.widget.LayoutTestActivity">
+ <activity android:name="android.support.wear.widget.LayoutTestActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="android.support.wearable.widget.SwipeDismissFrameLayoutTestActivity"
+ <activity android:name="android.support.wear.widget.SwipeDismissFrameLayoutTestActivity"
android:theme="@style/AppThemeNoSwipe" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -39,7 +39,7 @@
</intent-filter>
</activity>
- <activity android:name="android.support.wearable.widget.WearableRecyclerViewTestActivity">
+ <activity android:name="android.support.wear.widget.WearableRecyclerViewTestActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/wearable/tests/NO_DOCS b/wear/tests/NO_DOCS
similarity index 100%
rename from wearable/tests/NO_DOCS
rename to wear/tests/NO_DOCS
diff --git a/wearable/tests/res/layout/box_inset_layout_testcase_1.xml b/wear/tests/res/layout/box_inset_layout_testcase_1.xml
similarity index 80%
rename from wearable/tests/res/layout/box_inset_layout_testcase_1.xml
rename to wear/tests/res/layout/box_inset_layout_testcase_1.xml
index 3d194d3..7da6191 100644
--- a/wearable/tests/res/layout/box_inset_layout_testcase_1.xml
+++ b/wear/tests/res/layout/box_inset_layout_testcase_1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.wearable.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -18,4 +18,4 @@
android:text="Test Case 1"/>
</FrameLayout>
-</android.support.wearable.widget.BoxInsetLayout>
+</android.support.wear.widget.BoxInsetLayout>
diff --git a/wearable/tests/res/layout/box_inset_layout_testcase_2.xml b/wear/tests/res/layout/box_inset_layout_testcase_2.xml
similarity index 95%
rename from wearable/tests/res/layout/box_inset_layout_testcase_2.xml
rename to wear/tests/res/layout/box_inset_layout_testcase_2.xml
index e6c065b..a20d71d 100644
--- a/wearable/tests/res/layout/box_inset_layout_testcase_2.xml
+++ b/wear/tests/res/layout/box_inset_layout_testcase_2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.wearable.widget.BoxInsetLayout
+<android.support.wear.widget.BoxInsetLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -63,4 +63,4 @@
</FrameLayout>
-</android.support.wearable.widget.BoxInsetLayout>
+</android.support.wear.widget.BoxInsetLayout>
diff --git a/wearable/tests/res/layout/box_inset_layout_testcase_3.xml b/wear/tests/res/layout/box_inset_layout_testcase_3.xml
similarity index 95%
rename from wearable/tests/res/layout/box_inset_layout_testcase_3.xml
rename to wear/tests/res/layout/box_inset_layout_testcase_3.xml
index 5c3faf0..47fe749 100644
--- a/wearable/tests/res/layout/box_inset_layout_testcase_3.xml
+++ b/wear/tests/res/layout/box_inset_layout_testcase_3.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.wearable.widget.BoxInsetLayout
+<android.support.wear.widget.BoxInsetLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -62,4 +62,4 @@
android:text="Bottom Left"/>
</FrameLayout>
-</android.support.wearable.widget.BoxInsetLayout>
+</android.support.wear.widget.BoxInsetLayout>
diff --git a/wearable/tests/res/layout/box_inset_layout_testcase_4.xml b/wear/tests/res/layout/box_inset_layout_testcase_4.xml
similarity index 93%
rename from wearable/tests/res/layout/box_inset_layout_testcase_4.xml
rename to wear/tests/res/layout/box_inset_layout_testcase_4.xml
index 7a92d18..1f32b10 100644
--- a/wearable/tests/res/layout/box_inset_layout_testcase_4.xml
+++ b/wear/tests/res/layout/box_inset_layout_testcase_4.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <android.support.wearable.widget.BoxInsetLayout
+ <android.support.wear.widget.BoxInsetLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -27,6 +27,6 @@
app:boxedEdges="left|right" />
- </android.support.wearable.widget.BoxInsetLayout>
+ </android.support.wear.widget.BoxInsetLayout>
</ScrollView>
diff --git a/wearable/tests/res/layout/curved_offsetting_helper_child.xml b/wear/tests/res/layout/curved_offsetting_helper_child.xml
similarity index 100%
rename from wearable/tests/res/layout/curved_offsetting_helper_child.xml
rename to wear/tests/res/layout/curved_offsetting_helper_child.xml
diff --git a/wearable/tests/res/layout/swipe_dismiss_layout_testcase_1.xml b/wear/tests/res/layout/swipe_dismiss_layout_testcase_1.xml
similarity index 92%
rename from wearable/tests/res/layout/swipe_dismiss_layout_testcase_1.xml
rename to wear/tests/res/layout/swipe_dismiss_layout_testcase_1.xml
index 3eb9197..a3d6e67 100644
--- a/wearable/tests/res/layout/swipe_dismiss_layout_testcase_1.xml
+++ b/wear/tests/res/layout/swipe_dismiss_layout_testcase_1.xml
@@ -14,7 +14,7 @@
~ limitations under the License.
-->
-<android.support.wearable.widget.SwipeDismissFrameLayout
+<android.support.wear.widget.SwipeDismissFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -37,4 +37,4 @@
android:textStyle="bold"
tools:ignore="HardcodedText,RtlHardcoded" />
-</android.support.wearable.widget.SwipeDismissFrameLayout>
+</android.support.wear.widget.SwipeDismissFrameLayout>
diff --git a/wearable/tests/res/layout/swipe_dismiss_layout_testcase_2.xml b/wear/tests/res/layout/swipe_dismiss_layout_testcase_2.xml
similarity index 90%
rename from wearable/tests/res/layout/swipe_dismiss_layout_testcase_2.xml
rename to wear/tests/res/layout/swipe_dismiss_layout_testcase_2.xml
index 7a08597..93420a1 100644
--- a/wearable/tests/res/layout/swipe_dismiss_layout_testcase_2.xml
+++ b/wear/tests/res/layout/swipe_dismiss_layout_testcase_2.xml
@@ -14,7 +14,7 @@
~ limitations under the License.
-->
-<android.support.wearable.widget.SwipeDismissFrameLayout
+<android.support.wear.widget.SwipeDismissFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -29,4 +29,4 @@
android:paddingTop="80dp"
android:id="@+id/recycler_container"/>
-</android.support.wearable.widget.SwipeDismissFrameLayout>
+</android.support.wear.widget.SwipeDismissFrameLayout>
diff --git a/wearable/tests/res/layout/swipe_dismiss_layout_testcase_3.xml b/wear/tests/res/layout/swipe_dismiss_layout_testcase_3.xml
similarity index 100%
rename from wearable/tests/res/layout/swipe_dismiss_layout_testcase_3.xml
rename to wear/tests/res/layout/swipe_dismiss_layout_testcase_3.xml
diff --git a/wearable/tests/res/layout/wearable_recycler_view_basic.xml b/wear/tests/res/layout/wearable_recycler_view_basic.xml
similarity index 88%
rename from wearable/tests/res/layout/wearable_recycler_view_basic.xml
rename to wear/tests/res/layout/wearable_recycler_view_basic.xml
index 9af0048..69952c7 100644
--- a/wearable/tests/res/layout/wearable_recycler_view_basic.xml
+++ b/wear/tests/res/layout/wearable_recycler_view_basic.xml
@@ -15,10 +15,10 @@
~ limitations under the License.
-->
-<android.support.wearable.widget.WearableRecyclerView
+<android.support.wear.widget.WearableRecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/wrv">
-</android.support.wearable.widget.WearableRecyclerView>
+</android.support.wear.widget.WearableRecyclerView>
diff --git a/wearable/tests/res/values/styles.xml b/wear/tests/res/values/styles.xml
similarity index 100%
rename from wearable/tests/res/values/styles.xml
rename to wear/tests/res/values/styles.xml
diff --git a/wearable/tests/src/android/support/wearable/widget/BoxInsetLayoutTest.java b/wear/tests/src/android/support/wear/widget/BoxInsetLayoutTest.java
similarity index 94%
rename from wearable/tests/src/android/support/wearable/widget/BoxInsetLayoutTest.java
rename to wear/tests/src/android/support/wear/widget/BoxInsetLayoutTest.java
index c7daaa3f..731f57a 100644
--- a/wearable/tests/src/android/support/wearable/widget/BoxInsetLayoutTest.java
+++ b/wear/tests/src/android/support/wear/widget/BoxInsetLayoutTest.java
@@ -14,20 +14,20 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.wearable.widget.util.MoreViewAssertions.approximateBottom;
-import static android.support.wearable.widget.util.MoreViewAssertions.approximateTop;
-import static android.support.wearable.widget.util.MoreViewAssertions.bottom;
-import static android.support.wearable.widget.util.MoreViewAssertions.left;
-import static android.support.wearable.widget.util.MoreViewAssertions.right;
-import static android.support.wearable.widget.util.MoreViewAssertions.screenBottom;
-import static android.support.wearable.widget.util.MoreViewAssertions.screenLeft;
-import static android.support.wearable.widget.util.MoreViewAssertions.screenRight;
-import static android.support.wearable.widget.util.MoreViewAssertions.screenTop;
-import static android.support.wearable.widget.util.MoreViewAssertions.top;
+import static android.support.wear.widget.util.MoreViewAssertions.approximateBottom;
+import static android.support.wear.widget.util.MoreViewAssertions.approximateTop;
+import static android.support.wear.widget.util.MoreViewAssertions.bottom;
+import static android.support.wear.widget.util.MoreViewAssertions.left;
+import static android.support.wear.widget.util.MoreViewAssertions.right;
+import static android.support.wear.widget.util.MoreViewAssertions.screenBottom;
+import static android.support.wear.widget.util.MoreViewAssertions.screenLeft;
+import static android.support.wear.widget.util.MoreViewAssertions.screenRight;
+import static android.support.wear.widget.util.MoreViewAssertions.screenTop;
+import static android.support.wear.widget.util.MoreViewAssertions.top;
import static org.hamcrest.Matchers.closeTo;
import static org.hamcrest.Matchers.equalTo;
@@ -38,8 +38,8 @@
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.wearable.test.R;
-import android.support.wearable.widget.util.WakeLockRule;
+import android.support.wear.test.R;
+import android.support.wear.widget.util.WakeLockRule;
import android.util.DisplayMetrics;
import android.view.View;
diff --git a/wearable/tests/src/android/support/wearable/widget/LayoutTestActivity.java b/wear/tests/src/android/support/wear/widget/LayoutTestActivity.java
similarity index 96%
rename from wearable/tests/src/android/support/wearable/widget/LayoutTestActivity.java
rename to wear/tests/src/android/support/wear/widget/LayoutTestActivity.java
index 64d1103..ec909db 100644
--- a/wearable/tests/src/android/support/wearable/widget/LayoutTestActivity.java
+++ b/wear/tests/src/android/support/wear/widget/LayoutTestActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import android.app.Activity;
import android.content.Intent;
diff --git a/wearable/tests/src/android/support/wearable/widget/ScrollManagerTest.java b/wear/tests/src/android/support/wear/widget/ScrollManagerTest.java
similarity index 98%
rename from wearable/tests/src/android/support/wearable/widget/ScrollManagerTest.java
rename to wear/tests/src/android/support/wear/widget/ScrollManagerTest.java
index 127cd90..34faea3 100644
--- a/wearable/tests/src/android/support/wearable/widget/ScrollManagerTest.java
+++ b/wear/tests/src/android/support/wear/widget/ScrollManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -26,7 +26,7 @@
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.wearable.widget.util.WakeLockRule;
+import android.support.wear.widget.util.WakeLockRule;
import android.view.MotionEvent;
import org.junit.Before;
diff --git a/wearable/tests/src/android/support/wearable/widget/SwipeDismissFrameLayoutTest.java b/wear/tests/src/android/support/wear/widget/SwipeDismissFrameLayoutTest.java
similarity index 97%
rename from wearable/tests/src/android/support/wearable/widget/SwipeDismissFrameLayoutTest.java
rename to wear/tests/src/android/support/wear/widget/SwipeDismissFrameLayoutTest.java
index b3b22ac..177c9ae 100644
--- a/wearable/tests/src/android/support/wearable/widget/SwipeDismissFrameLayoutTest.java
+++ b/wear/tests/src/android/support/wear/widget/SwipeDismissFrameLayoutTest.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.swipeRight;
import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.wearable.widget.util.AsyncViewActions.waitForMatchingView;
-import static android.support.wearable.widget.util.MoreViewAssertions
+import static android.support.wear.widget.util.AsyncViewActions.waitForMatchingView;
+import static android.support.wear.widget.util.MoreViewAssertions
.withPositiveVerticalScrollOffset;
-import static android.support.wearable.widget.util.MoreViewAssertions.withTranslationX;
+import static android.support.wear.widget.util.MoreViewAssertions.withTranslationX;
import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertFalse;
@@ -44,9 +44,9 @@
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.support.v7.widget.RecyclerView;
-import android.support.wearable.test.R;
-import android.support.wearable.widget.util.ArcSwipe;
-import android.support.wearable.widget.util.WakeLockRule;
+import android.support.wear.test.R;
+import android.support.wear.widget.util.ArcSwipe;
+import android.support.wear.widget.util.WakeLockRule;
import android.view.View;
import org.junit.Rule;
diff --git a/wearable/tests/src/android/support/wearable/widget/SwipeDismissFrameLayoutTestActivity.java b/wear/tests/src/android/support/wear/widget/SwipeDismissFrameLayoutTestActivity.java
similarity index 96%
rename from wearable/tests/src/android/support/wearable/widget/SwipeDismissFrameLayoutTestActivity.java
rename to wear/tests/src/android/support/wear/widget/SwipeDismissFrameLayoutTestActivity.java
index b58ecb1..5d86832 100644
--- a/wearable/tests/src/android/support/wearable/widget/SwipeDismissFrameLayoutTestActivity.java
+++ b/wear/tests/src/android/support/wear/widget/SwipeDismissFrameLayoutTestActivity.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
-import android.support.wearable.test.R;
+import android.support.wear.test.R;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
diff --git a/wearable/tests/src/android/support/wearable/widget/SwipeDismissPreferenceFragment.java b/wear/tests/src/android/support/wear/widget/SwipeDismissPreferenceFragment.java
similarity index 96%
rename from wearable/tests/src/android/support/wearable/widget/SwipeDismissPreferenceFragment.java
rename to wear/tests/src/android/support/wear/widget/SwipeDismissPreferenceFragment.java
index 913d943d..a892cb6 100644
--- a/wearable/tests/src/android/support/wearable/widget/SwipeDismissPreferenceFragment.java
+++ b/wear/tests/src/android/support/wear/widget/SwipeDismissPreferenceFragment.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import android.os.Bundle;
import android.preference.PreferenceFragment;
-import android.support.wearable.widget.SwipeDismissFrameLayout.Callback;
+import android.support.wear.widget.SwipeDismissFrameLayout.Callback;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/wearable/tests/src/android/support/wearable/widget/WearableLinearLayoutManagerTest.java b/wear/tests/src/android/support/wear/widget/WearableLinearLayoutManagerTest.java
similarity index 97%
rename from wearable/tests/src/android/support/wearable/widget/WearableLinearLayoutManagerTest.java
rename to wear/tests/src/android/support/wear/widget/WearableLinearLayoutManagerTest.java
index 058e72f..74b0f3a 100644
--- a/wearable/tests/src/android/support/wearable/widget/WearableLinearLayoutManagerTest.java
+++ b/wear/tests/src/android/support/wear/widget/WearableLinearLayoutManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import static junit.framework.Assert.assertEquals;
@@ -23,8 +23,8 @@
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.wearable.test.R;
-import android.support.wearable.widget.util.WakeLockRule;
+import android.support.wear.test.R;
+import android.support.wear.widget.util.WakeLockRule;
import android.view.View;
import android.widget.FrameLayout;
diff --git a/wearable/tests/src/android/support/wearable/widget/WearableRecyclerViewTest.java b/wear/tests/src/android/support/wear/widget/WearableRecyclerViewTest.java
similarity index 94%
rename from wearable/tests/src/android/support/wearable/widget/WearableRecyclerViewTest.java
rename to wear/tests/src/android/support/wear/widget/WearableRecyclerViewTest.java
index 0eb5c10..ba6fbe7 100644
--- a/wearable/tests/src/android/support/wearable/widget/WearableRecyclerViewTest.java
+++ b/wear/tests/src/android/support/wear/widget/WearableRecyclerViewTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.wearable.widget.util.AsyncViewActions.waitForMatchingView;
-import static android.support.wearable.widget.util.MoreViewAssertions.withNoVerticalScrollOffset;
-import static android.support.wearable.widget.util.MoreViewAssertions.withPositiveVerticalScrollOffset;
+import static android.support.wear.widget.util.AsyncViewActions.waitForMatchingView;
+import static android.support.wear.widget.util.MoreViewAssertions.withNoVerticalScrollOffset;
+import static android.support.wear.widget.util.MoreViewAssertions.withPositiveVerticalScrollOffset;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
@@ -41,8 +41,8 @@
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.support.v7.widget.RecyclerView;
-import android.support.wearable.test.R;
-import android.support.wearable.widget.util.WakeLockRule;
+import android.support.wear.test.R;
+import android.support.wear.widget.util.WakeLockRule;
import android.view.View;
import org.junit.Before;
diff --git a/wearable/tests/src/android/support/wearable/widget/WearableRecyclerViewTestActivity.java b/wear/tests/src/android/support/wear/widget/WearableRecyclerViewTestActivity.java
similarity index 91%
rename from wearable/tests/src/android/support/wearable/widget/WearableRecyclerViewTestActivity.java
rename to wear/tests/src/android/support/wear/widget/WearableRecyclerViewTestActivity.java
index cad8608..2329fc5 100644
--- a/wearable/tests/src/android/support/wearable/widget/WearableRecyclerViewTestActivity.java
+++ b/wear/tests/src/android/support/wear/widget/WearableRecyclerViewTestActivity.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package android.support.wearable.widget;
+package android.support.wear.widget;
import android.app.Activity;
import android.os.Bundle;
import android.support.v7.widget.RecyclerView;
-import android.support.wearable.test.R;
+import android.support.wear.test.R;
import android.view.ViewGroup;
import android.widget.TextView;
@@ -28,8 +28,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.wearable_recycler_view_basic);
- WearableRecyclerView wrv =
- findViewById(android.support.wearable.test.R.id.wrv);
+ WearableRecyclerView wrv = findViewById(R.id.wrv);
wrv.setLayoutManager(new WearableLinearLayoutManager(this));
wrv.setAdapter(new TestAdapter());
}
diff --git a/wearable/tests/src/android/support/wearable/widget/util/ArcSwipe.java b/wear/tests/src/android/support/wear/widget/util/ArcSwipe.java
similarity index 98%
rename from wearable/tests/src/android/support/wearable/widget/util/ArcSwipe.java
rename to wear/tests/src/android/support/wear/widget/util/ArcSwipe.java
index 49e0a27..2630d19 100644
--- a/wearable/tests/src/android/support/wearable/widget/util/ArcSwipe.java
+++ b/wear/tests/src/android/support/wear/widget/util/ArcSwipe.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget.util;
+package android.support.wear.widget.util;
import android.graphics.Path;
import android.graphics.PathMeasure;
diff --git a/wearable/tests/src/android/support/wearable/widget/util/ArcSwipeTest.java b/wear/tests/src/android/support/wear/widget/util/ArcSwipeTest.java
similarity index 97%
rename from wearable/tests/src/android/support/wearable/widget/util/ArcSwipeTest.java
rename to wear/tests/src/android/support/wear/widget/util/ArcSwipeTest.java
index 0b958e3..e443ca0f 100644
--- a/wearable/tests/src/android/support/wearable/widget/util/ArcSwipeTest.java
+++ b/wear/tests/src/android/support/wear/widget/util/ArcSwipeTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget.util;
+package android.support.wear.widget.util;
import static junit.framework.Assert.assertEquals;
diff --git a/wearable/tests/src/android/support/wearable/widget/util/AsyncViewActions.java b/wear/tests/src/android/support/wear/widget/util/AsyncViewActions.java
similarity index 97%
rename from wearable/tests/src/android/support/wearable/widget/util/AsyncViewActions.java
rename to wear/tests/src/android/support/wear/widget/util/AsyncViewActions.java
index 7f2f6f2..3db4619 100644
--- a/wearable/tests/src/android/support/wearable/widget/util/AsyncViewActions.java
+++ b/wear/tests/src/android/support/wear/widget/util/AsyncViewActions.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget.util;
+package android.support.wear.widget.util;
import android.support.test.espresso.PerformException;
import android.support.test.espresso.UiController;
diff --git a/wearable/tests/src/android/support/wearable/widget/util/MoreViewAssertions.java b/wear/tests/src/android/support/wear/widget/util/MoreViewAssertions.java
similarity index 98%
rename from wearable/tests/src/android/support/wearable/widget/util/MoreViewAssertions.java
rename to wear/tests/src/android/support/wear/widget/util/MoreViewAssertions.java
index fef3b5c..503336b 100644
--- a/wearable/tests/src/android/support/wearable/widget/util/MoreViewAssertions.java
+++ b/wear/tests/src/android/support/wear/widget/util/MoreViewAssertions.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget.util;
+package android.support.wear.widget.util;
import static android.support.test.espresso.matcher.ViewMatchers.assertThat;
diff --git a/wearable/tests/src/android/support/wearable/widget/util/WakeLockRule.java b/wear/tests/src/android/support/wear/widget/util/WakeLockRule.java
similarity index 97%
rename from wearable/tests/src/android/support/wearable/widget/util/WakeLockRule.java
rename to wear/tests/src/android/support/wear/widget/util/WakeLockRule.java
index 5ec2d09..13b627e 100644
--- a/wearable/tests/src/android/support/wearable/widget/util/WakeLockRule.java
+++ b/wear/tests/src/android/support/wear/widget/util/WakeLockRule.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.wearable.widget.util;
+package android.support.wear.widget.util;
import android.content.Context;
import android.os.PowerManager;