Resolve merge conflicts of 2d8977f to mnc-io-docs
diff --git a/prebuilts/gradle/AgendaData/Wearable/build.gradle b/prebuilts/gradle/AgendaData/Wearable/build.gradle
index 1af261d..b753acf 100644
--- a/prebuilts/gradle/AgendaData/Wearable/build.gradle
+++ b/prebuilts/gradle/AgendaData/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 18
-
-
-
targetSdkVersion 23
}
diff --git a/prebuilts/gradle/AlwaysOn/Wearable/build.gradle b/prebuilts/gradle/AlwaysOn/Wearable/build.gradle
index b673ca6..eae0824 100644
--- a/prebuilts/gradle/AlwaysOn/Wearable/build.gradle
+++ b/prebuilts/gradle/AlwaysOn/Wearable/build.gradle
@@ -21,7 +21,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -41,12 +43,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 23
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/DataLayer/Wearable/build.gradle b/prebuilts/gradle/DataLayer/Wearable/build.gradle
index ba2d428..2f0b01e 100644
--- a/prebuilts/gradle/DataLayer/Wearable/build.gradle
+++ b/prebuilts/gradle/DataLayer/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 18
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle b/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle
index ba2d428..2f0b01e 100644
--- a/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle
+++ b/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 18
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/FindMyPhone/Wearable/build.gradle b/prebuilts/gradle/FindMyPhone/Wearable/build.gradle
index ba2d428..2f0b01e 100644
--- a/prebuilts/gradle/FindMyPhone/Wearable/build.gradle
+++ b/prebuilts/gradle/FindMyPhone/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 18
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/Flashlight/Wearable/build.gradle b/prebuilts/gradle/Flashlight/Wearable/build.gradle
index ba2d428..2f0b01e 100644
--- a/prebuilts/gradle/Flashlight/Wearable/build.gradle
+++ b/prebuilts/gradle/Flashlight/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 18
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/Geofencing/Wearable/build.gradle b/prebuilts/gradle/Geofencing/Wearable/build.gradle
index ba2d428..2f0b01e 100644
--- a/prebuilts/gradle/Geofencing/Wearable/build.gradle
+++ b/prebuilts/gradle/Geofencing/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 18
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/GridViewPager/Wearable/build.gradle b/prebuilts/gradle/GridViewPager/Wearable/build.gradle
index 2c4a7aa..87cdc93 100644
--- a/prebuilts/gradle/GridViewPager/Wearable/build.gradle
+++ b/prebuilts/gradle/GridViewPager/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 23
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/JumpingJack/Wearable/build.gradle b/prebuilts/gradle/JumpingJack/Wearable/build.gradle
index 2c4a7aa..87cdc93 100644
--- a/prebuilts/gradle/JumpingJack/Wearable/build.gradle
+++ b/prebuilts/gradle/JumpingJack/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 23
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/Notifications/Wearable/build.gradle b/prebuilts/gradle/Notifications/Wearable/build.gradle
index ba2d428..2f0b01e 100644
--- a/prebuilts/gradle/Notifications/Wearable/build.gradle
+++ b/prebuilts/gradle/Notifications/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 18
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/Quiz/Wearable/build.gradle b/prebuilts/gradle/Quiz/Wearable/build.gradle
index ba2d428..2f0b01e 100644
--- a/prebuilts/gradle/Quiz/Wearable/build.gradle
+++ b/prebuilts/gradle/Quiz/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 18
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/RuntimePermissionsWear/Wearable/build.gradle b/prebuilts/gradle/RuntimePermissionsWear/Wearable/build.gradle
index e1336ec..c44b809 100644
--- a/prebuilts/gradle/RuntimePermissionsWear/Wearable/build.gradle
+++ b/prebuilts/gradle/RuntimePermissionsWear/Wearable/build.gradle
@@ -20,7 +20,9 @@
dependencies {
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
compile project(':Shared')
}
diff --git a/prebuilts/gradle/SkeletonWearableApp/Wearable/build.gradle b/prebuilts/gradle/SkeletonWearableApp/Wearable/build.gradle
index 2c4a7aa..87cdc93 100644
--- a/prebuilts/gradle/SkeletonWearableApp/Wearable/build.gradle
+++ b/prebuilts/gradle/SkeletonWearableApp/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 23
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/build.gradle b/prebuilts/gradle/SpeedTracker/Wearable/build.gradle
index 3dc9f26..28e81c3 100644
--- a/prebuilts/gradle/SpeedTracker/Wearable/build.gradle
+++ b/prebuilts/gradle/SpeedTracker/Wearable/build.gradle
@@ -21,7 +21,9 @@
compile 'com.google.android.gms:play-services-location:8.4.0'
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
compile project(':Shared')
}
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle b/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle
index 8029d1c..e562dd5 100644
--- a/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle
@@ -20,7 +20,9 @@
dependencies {
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
compile project(':Shared')
}
diff --git a/prebuilts/gradle/Timer/Wearable/build.gradle b/prebuilts/gradle/Timer/Wearable/build.gradle
index 2c4a7aa..87cdc93 100644
--- a/prebuilts/gradle/Timer/Wearable/build.gradle
+++ b/prebuilts/gradle/Timer/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 23
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/WatchFace/Wearable/build.gradle b/prebuilts/gradle/WatchFace/Wearable/build.gradle
index 8059ed7..b7f00aa 100644
--- a/prebuilts/gradle/WatchFace/Wearable/build.gradle
+++ b/prebuilts/gradle/WatchFace/Wearable/build.gradle
@@ -15,15 +15,15 @@
dependencies {
- compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:palette-v7:23.3.0'
- compile 'com.google.android.support:wearable:2.0.0-alpha1'
compile 'com.google.android.gms:play-services-fitness:8.4.0'
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
- compile 'com.google.android.support:wearable:1.4.0'
+
+ compile 'com.google.android.support:wearable:2.0.0-alpha1'
+
}
// The sample build uses multiple directories to
@@ -43,12 +43,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 18
-
-
-
targetSdkVersion 23
}
diff --git a/prebuilts/gradle/WatchViewStub/Wearable/build.gradle b/prebuilts/gradle/WatchViewStub/Wearable/build.gradle
index 2c4a7aa..87cdc93 100644
--- a/prebuilts/gradle/WatchViewStub/Wearable/build.gradle
+++ b/prebuilts/gradle/WatchViewStub/Wearable/build.gradle
@@ -19,7 +19,9 @@
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
}
// The sample build uses multiple directories to
@@ -39,12 +41,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 23
-
-
-
targetSdkVersion 22
}
diff --git a/prebuilts/gradle/WearDrawers/Wearable/build.gradle b/prebuilts/gradle/WearDrawers/Wearable/build.gradle
index 39bf49a..02a437e 100644
--- a/prebuilts/gradle/WearDrawers/Wearable/build.gradle
+++ b/prebuilts/gradle/WearDrawers/Wearable/build.gradle
@@ -15,13 +15,14 @@
dependencies {
- compile 'com.google.android.support:wearable:2.0.0-alpha1'
provided "com.google.android.wearable:wearable:1.0.0"
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
- compile 'com.google.android.support:wearable:1.4.0'
+
+ compile 'com.google.android.support:wearable:2.0.0-alpha1'
+
}
// The sample build uses multiple directories to
@@ -41,12 +42,8 @@
versionCode 1
versionName "1.0"
-
minSdkVersion 23
-
-
-
targetSdkVersion 23
}
diff --git a/prebuilts/gradle/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java b/prebuilts/gradle/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java
index cd4cd2e..f2e00c0 100644
--- a/prebuilts/gradle/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java
+++ b/prebuilts/gradle/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java
@@ -85,17 +85,16 @@
mWearableNavigationDrawer =
(WearableNavigationDrawer) findViewById(R.id.top_navigation_drawer);
mWearableNavigationDrawer.setAdapter(new NavigationAdapter(this));
+
// Peeks Navigation drawer on the top.
mWearableDrawerLayout.peekDrawer(Gravity.TOP);
// Bottom Action Drawer
mWearableActionDrawer =
(WearableActionDrawer) findViewById(R.id.bottom_action_drawer);
- // Populate Action Drawer Menu
- Menu menu = mWearableActionDrawer.getMenu();
- MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.action_drawer_menu, menu);
+
mWearableActionDrawer.setOnMenuItemClickListener(this);
+
// Peeks action drawer on the bottom.
mWearableDrawerLayout.peekDrawer(Gravity.BOTTOM);
diff --git a/prebuilts/gradle/WearDrawers/Wearable/src/main/res/layout/activity_main.xml b/prebuilts/gradle/WearDrawers/Wearable/src/main/res/layout/activity_main.xml
index 48bc3c5..97e0366 100644
--- a/prebuilts/gradle/WearDrawers/Wearable/src/main/res/layout/activity_main.xml
+++ b/prebuilts/gradle/WearDrawers/Wearable/src/main/res/layout/activity_main.xml
@@ -17,6 +17,7 @@
<android.support.wearable.view.drawer.WearableDrawerLayout
android:id="@+id/drawer_layout"
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -38,6 +39,7 @@
android:id="@+id/bottom_action_drawer"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ app:action_menu="@menu/action_drawer_menu"
android:background="@color/grey"/>
</android.support.wearable.view.drawer.WearableDrawerLayout>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/build.gradle b/prebuilts/gradle/XYZTouristAttractions/Wearable/build.gradle
index 6cc0e39..d362f91 100644
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/build.gradle
+++ b/prebuilts/gradle/XYZTouristAttractions/Wearable/build.gradle
@@ -21,7 +21,9 @@
compile 'com.google.android.gms:play-services-location:8.4.0'
compile 'com.google.android.gms:play-services-wearable:8.4.0'
compile 'com.android.support:support-v13:23.3.0'
+
compile 'com.google.android.support:wearable:1.4.0'
+
compile project(':Shared')
}
