aboutsummaryrefslogtreecommitdiff
path: root/wearable/wear/DataLayer
diff options
context:
space:
mode:
authorTakeshi Hagikura <thagikura@google.com>2014-10-31 15:52:04 +0900
committerTakeshi Hagikura <thagikura@google.com>2014-10-31 16:09:28 +0900
commitdff3866d542ed270e8e9d7287f608317466e56d6 (patch)
tree267fd1a68936357b54e29f87a1a078f5eb266e57 /wearable/wear/DataLayer
parent721f20cbc24f8a2dba213347eb2a88f944aa8939 (diff)
downloadandroid-dff3866d542ed270e8e9d7287f608317466e56d6.tar.gz
Revert the package name to the old location's ones
Change-Id: Ibdc7421e3f4bd74086673e139fb16ce27e206e53
Diffstat (limited to 'wearable/wear/DataLayer')
-rw-r--r--wearable/wear/DataLayer/Application/src/main/AndroidManifest.xml2
-rw-r--r--wearable/wear/DataLayer/Application/src/main/java/com/example/android/wearable/datalayer/MainActivity.java (renamed from wearable/wear/DataLayer/Application/src/main/java/com/example/android/datalayer/MainActivity.java)2
-rw-r--r--wearable/wear/DataLayer/Shared/src/main/AndroidManifest.xml2
-rw-r--r--wearable/wear/DataLayer/Wearable/src/main/AndroidManifest.xml4
-rw-r--r--wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/wearable/datalayer/DataLayerListenerService.java (renamed from wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/datalayer/DataLayerListenerService.java)2
-rw-r--r--wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/wearable/datalayer/MainActivity.java (renamed from wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/datalayer/MainActivity.java)4
-rw-r--r--wearable/wear/DataLayer/template-params.xml2
7 files changed, 9 insertions, 9 deletions
diff --git a/wearable/wear/DataLayer/Application/src/main/AndroidManifest.xml b/wearable/wear/DataLayer/Application/src/main/AndroidManifest.xml
index f382b255..787e2736 100644
--- a/wearable/wear/DataLayer/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/DataLayer/Application/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.datalayer" >
+ package="com.example.android.wearable.datalayer" >
<uses-sdk android:minSdkVersion="19"
android:targetSdkVersion="19" />
diff --git a/wearable/wear/DataLayer/Application/src/main/java/com/example/android/datalayer/MainActivity.java b/wearable/wear/DataLayer/Application/src/main/java/com/example/android/wearable/datalayer/MainActivity.java
index d94261dd..23bc696d 100644
--- a/wearable/wear/DataLayer/Application/src/main/java/com/example/android/datalayer/MainActivity.java
+++ b/wearable/wear/DataLayer/Application/src/main/java/com/example/android/wearable/datalayer/MainActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.example.android.datalayer;
+package com.example.android.wearable.datalayer;
import android.app.Activity;
import android.content.Context;
diff --git a/wearable/wear/DataLayer/Shared/src/main/AndroidManifest.xml b/wearable/wear/DataLayer/Shared/src/main/AndroidManifest.xml
index b7d03bfa..d05bfd5f 100644
--- a/wearable/wear/DataLayer/Shared/src/main/AndroidManifest.xml
+++ b/wearable/wear/DataLayer/Shared/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.datalayer.common">
+ package="com.example.android.wearable.datalayer.common">
<application android:allowBackup="true"
android:label="@string/app_name">
diff --git a/wearable/wear/DataLayer/Wearable/src/main/AndroidManifest.xml b/wearable/wear/DataLayer/Wearable/src/main/AndroidManifest.xml
index 7bde39a8..38c07983 100644
--- a/wearable/wear/DataLayer/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/DataLayer/Wearable/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.datalayer" >
+ package="com.example.android.wearable.datalayer" >
<uses-sdk android:minSdkVersion="20"
android:targetSdkVersion="20" />
@@ -47,7 +47,7 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
- <action android:name="com.example.android.datalayer.EXAMPLE"/>
+ <action android:name="com.example.android.wearable.datalayer.EXAMPLE"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
diff --git a/wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/datalayer/DataLayerListenerService.java b/wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/wearable/datalayer/DataLayerListenerService.java
index 9356f394..64abaf54 100644
--- a/wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/datalayer/DataLayerListenerService.java
+++ b/wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/wearable/datalayer/DataLayerListenerService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.example.android.datalayer;
+package com.example.android.wearable.datalayer;
import android.content.Intent;
import android.net.Uri;
diff --git a/wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/datalayer/MainActivity.java b/wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/wearable/datalayer/MainActivity.java
index 5f763b8b..b3121352 100644
--- a/wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/datalayer/MainActivity.java
+++ b/wearable/wear/DataLayer/Wearable/src/main/java/com/example/android/wearable/datalayer/MainActivity.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.example.android.datalayer;
+package com.example.android.wearable.datalayer;
-import static com.example.android.datalayer.DataLayerListenerService.LOGD;
+import static com.example.android.wearable.datalayer.DataLayerListenerService.LOGD;
import android.app.Activity;
import android.content.Context;
diff --git a/wearable/wear/DataLayer/template-params.xml b/wearable/wear/DataLayer/template-params.xml
index f0172ee3..fbdc201e 100644
--- a/wearable/wear/DataLayer/template-params.xml
+++ b/wearable/wear/DataLayer/template-params.xml
@@ -20,7 +20,7 @@
<sample>
<name>DataLayer</name>
<group>Wearable</group>
- <package>com.example.android.datalayer</package>
+ <package>com.example.android.wearable.datalayer</package>