Merge "MidiSynth: Add a new sample" into mnc-dev
diff --git a/admin/NfcProvisioning/template-params.xml b/admin/NfcProvisioning/template-params.xml
index cba9e9e..1152cae 100644
--- a/admin/NfcProvisioning/template-params.xml
+++ b/admin/NfcProvisioning/template-params.xml
@@ -20,6 +20,7 @@
<package>com.example.android.nfcprovisioning</package>
<minSdk>21</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/content/contacts/BasicContactables/template-params.xml b/content/contacts/BasicContactables/template-params.xml
index 01274ae..3b5245c 100644
--- a/content/contacts/BasicContactables/template-params.xml
+++ b/content/contacts/BasicContactables/template-params.xml
@@ -19,11 +19,9 @@
<group>Content</group>
<package>com.example.android.basiccontactables</package>
-
-
<!-- change minSdk if needed-->
<minSdk>18</minSdk>
-
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/content/documentsUi/StorageProvider/template-params.xml b/content/documentsUi/StorageProvider/template-params.xml
index 058aace..d0eaeef 100644
--- a/content/documentsUi/StorageProvider/template-params.xml
+++ b/content/documentsUi/StorageProvider/template-params.xml
@@ -15,15 +15,14 @@
limitations under the License.
-->
-
-
<sample>
- <name>MyCloud</name>
+ <name>StorageProvider</name>
<group>Content</group>
<package>com.example.android.storageprovider</package>
<!-- change minSdk if needed-->
<minSdk>19</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/media/Camera2Basic/template-params.xml b/media/Camera2Basic/template-params.xml
index b4afe4c..9841830 100644
--- a/media/Camera2Basic/template-params.xml
+++ b/media/Camera2Basic/template-params.xml
@@ -22,7 +22,7 @@
<group>Media</group>
<package>com.example.android.camera2basic</package>
<minSdk>21</minSdk>
- <compileSdkVersion>21</compileSdkVersion>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
<![CDATA[
diff --git a/media/Camera2Raw/template-params.xml b/media/Camera2Raw/template-params.xml
index 3d735e8..18a0a7f 100644
--- a/media/Camera2Raw/template-params.xml
+++ b/media/Camera2Raw/template-params.xml
@@ -20,7 +20,7 @@
<group>Media</group>
<package>com.example.android.camera2raw</package>
<minSdk>21</minSdk>
- <compileSdkVersion>21</compileSdkVersion>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
<![CDATA[
diff --git a/media/Camera2Video/template-params.xml b/media/Camera2Video/template-params.xml
index 320f3ac..9a5d8c4 100644
--- a/media/Camera2Video/template-params.xml
+++ b/media/Camera2Video/template-params.xml
@@ -21,7 +21,7 @@
<package>com.example.android.camera2video</package>
<minSdk>21</minSdk>
- <compileSdkVersion>21</compileSdkVersion>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/media/HdrViewfinder/template-params.xml b/media/HdrViewfinder/template-params.xml
index 183aad8..c91e3ce 100644
--- a/media/HdrViewfinder/template-params.xml
+++ b/media/HdrViewfinder/template-params.xml
@@ -23,6 +23,8 @@
<targetSdkVersion>23</targetSdkVersion>
<compileSdkVersion>23</compileSdkVersion>
+ <dependency>com.android.support:design:23.0.0</dependency>
+
<strings>
<intro>
<![CDATA[
diff --git a/media/MediaRecorder/template-params.xml b/media/MediaRecorder/template-params.xml
index a057637..e79c506 100644
--- a/media/MediaRecorder/template-params.xml
+++ b/media/MediaRecorder/template-params.xml
@@ -19,6 +19,7 @@
<group>Media</group>
<package>com.example.android.mediarecorder</package>
<minSdk>16</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
<![CDATA[
diff --git a/notification/LNotifications/template-params.xml b/notification/LNotifications/template-params.xml
index 88b2b13..9d327a4 100644
--- a/notification/LNotifications/template-params.xml
+++ b/notification/LNotifications/template-params.xml
@@ -22,6 +22,7 @@
<!-- change minSdk if needed-->
<minSdk>21</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/ui/graphics/DisplayingBitmaps/template-params.xml b/ui/graphics/DisplayingBitmaps/template-params.xml
index 3d685cf..643e049 100644
--- a/ui/graphics/DisplayingBitmaps/template-params.xml
+++ b/ui/graphics/DisplayingBitmaps/template-params.xml
@@ -21,6 +21,7 @@
<!-- change minSdk if needed-->
<minSdk>9</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/wearable/wear/AgendaData/template-params.xml b/wearable/wear/AgendaData/template-params.xml
index 1414944..3331da2 100644
--- a/wearable/wear/AgendaData/template-params.xml
+++ b/wearable/wear/AgendaData/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.agendadata</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/DataLayer/template-params.xml b/wearable/wear/DataLayer/template-params.xml
index 8f89d67..f40b9d6 100644
--- a/wearable/wear/DataLayer/template-params.xml
+++ b/wearable/wear/DataLayer/template-params.xml
@@ -20,6 +20,7 @@
<package>com.example.android.wearable.datalayer</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/DelayedConfirmation/template-params.xml b/wearable/wear/DelayedConfirmation/template-params.xml
index 0b2f014..5f77d65 100644
--- a/wearable/wear/DelayedConfirmation/template-params.xml
+++ b/wearable/wear/DelayedConfirmation/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.delayedconfirmation</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/ElizaChat/template-params.xml b/wearable/wear/ElizaChat/template-params.xml
index 76ed57f..ea26b5c 100644
--- a/wearable/wear/ElizaChat/template-params.xml
+++ b/wearable/wear/ElizaChat/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.elizachat</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/wearable/wear/EmbeddedApp/template-params.xml b/wearable/wear/EmbeddedApp/template-params.xml
index 9eb6378..13186e5 100644
--- a/wearable/wear/EmbeddedApp/template-params.xml
+++ b/wearable/wear/EmbeddedApp/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.embeddedapp</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/FindMyPhone/template-params.xml b/wearable/wear/FindMyPhone/template-params.xml
index f8cc0cf..e8d71c6 100644
--- a/wearable/wear/FindMyPhone/template-params.xml
+++ b/wearable/wear/FindMyPhone/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.findphone</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/Flashlight/template-params.xml b/wearable/wear/Flashlight/template-params.xml
index 4e0d2cd..e1ec869 100644
--- a/wearable/wear/Flashlight/template-params.xml
+++ b/wearable/wear/Flashlight/template-params.xml
@@ -24,6 +24,7 @@
<!-- change minSdk if needed-->
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/wearable/wear/Geofencing/template-params.xml b/wearable/wear/Geofencing/template-params.xml
index 66bfcc0..00fd3b3 100644
--- a/wearable/wear/Geofencing/template-params.xml
+++ b/wearable/wear/Geofencing/template-params.xml
@@ -23,6 +23,8 @@
<package>com.example.android.wearable.geofencing</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
+
<dependency>com.google.android.gms:play-services-location:7.3.0</dependency>
<wearable>
diff --git a/wearable/wear/GridViewPager/template-params.xml b/wearable/wear/GridViewPager/template-params.xml
index 1aa4523..f6dc567 100644
--- a/wearable/wear/GridViewPager/template-params.xml
+++ b/wearable/wear/GridViewPager/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.gridviewpager</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/wearable/wear/JumpingJack/template-params.xml b/wearable/wear/JumpingJack/template-params.xml
index 96ce475..692a6a5 100644
--- a/wearable/wear/JumpingJack/template-params.xml
+++ b/wearable/wear/JumpingJack/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.jumpingjack</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/wearable/wear/Notifications/template-params.xml b/wearable/wear/Notifications/template-params.xml
index 853c48a..c4936ea 100644
--- a/wearable/wear/Notifications/template-params.xml
+++ b/wearable/wear/Notifications/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.support.wearable.notifications</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/Quiz/template-params.xml b/wearable/wear/Quiz/template-params.xml
index 1952f2c..297bf19 100644
--- a/wearable/wear/Quiz/template-params.xml
+++ b/wearable/wear/Quiz/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.quiz</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/RecipeAssistant/template-params.xml b/wearable/wear/RecipeAssistant/template-params.xml
index 9207a44..943b368 100644
--- a/wearable/wear/RecipeAssistant/template-params.xml
+++ b/wearable/wear/RecipeAssistant/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.recipeassistant</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/wearable/wear/SkeletonWearableApp/template-params.xml b/wearable/wear/SkeletonWearableApp/template-params.xml
index c8527c4..b0f4b36 100644
--- a/wearable/wear/SkeletonWearableApp/template-params.xml
+++ b/wearable/wear/SkeletonWearableApp/template-params.xml
@@ -20,6 +20,7 @@
<package>com.example.android.google.wearable.app</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/wearable/wear/SpeedTracker/template-params.xml b/wearable/wear/SpeedTracker/template-params.xml
index 71c5ac2..1cf3161 100644
--- a/wearable/wear/SpeedTracker/template-params.xml
+++ b/wearable/wear/SpeedTracker/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.speedtracker</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/SynchronizedNotifications/template-params.xml b/wearable/wear/SynchronizedNotifications/template-params.xml
index ab76712..799b226 100644
--- a/wearable/wear/SynchronizedNotifications/template-params.xml
+++ b/wearable/wear/SynchronizedNotifications/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.synchronizednotifications</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/Timer/template-params.xml b/wearable/wear/Timer/template-params.xml
index 507b0a2..1188402 100644
--- a/wearable/wear/Timer/template-params.xml
+++ b/wearable/wear/Timer/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.timer</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml
index fc3a2c7..cedf8db 100644
--- a/wearable/wear/WatchFace/template-params.xml
+++ b/wearable/wear/WatchFace/template-params.xml
@@ -23,6 +23,7 @@
<package>com.example.android.wearable.watchface</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<dependency_wearable>com.android.support:palette-v7:21.0.0</dependency_wearable>
<dependency>com.google.android.support:wearable:1.3.0</dependency>
diff --git a/wearable/wear/WatchViewStub/template-params.xml b/wearable/wear/WatchViewStub/template-params.xml
index e06543a..ff7e7f8 100644
--- a/wearable/wear/WatchViewStub/template-params.xml
+++ b/wearable/wear/WatchViewStub/template-params.xml
@@ -20,6 +20,7 @@
<package>com.example.android.google.wearable.watchviewstub</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<strings>
<intro>
diff --git a/wearable/wear/XYZTouristAttractions/template-params.xml b/wearable/wear/XYZTouristAttractions/template-params.xml
index 033e59e..cfa368f 100644
--- a/wearable/wear/XYZTouristAttractions/template-params.xml
+++ b/wearable/wear/XYZTouristAttractions/template-params.xml
@@ -19,6 +19,7 @@
<group>Wearable</group>
<package>com.example.android.xyztouristattractions</package>
<minSdk>18</minSdk>
+ <targetSdkVersion>22</targetSdkVersion>
<wearable>
<has_handheld_app>true</has_handheld_app>