Auto-update

BasicRenderScriptSample/AndroidManifest.xml → Application/AndroidManifest.xml

@@ -4,9 +4,7 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
 
     <application
         android:allowBackup="true"

BasicRenderScriptSample/build.gradle → Application/build.gradle

@@ -8,15 +8,14 @@ buildscript {
     }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 
 dependencies {
 
-    // Add the support lib that is appropriate for SDK 8
-    compile "com.android.support:support-v4:20.+"
-    compile "com.android.support:gridlayout-v7:20.+"
-
+    compile "com.android.support:support-v4:21.+"
+    compile "com.android.support:gridlayout-v7:21.+"
+    compile "com.android.support:cardview-v7:21.+"
 
     compile files('renderscript-v8.jar')
 }
@@ -30,9 +29,13 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 21
+    buildToolsVersion "21.0.0"
 
-    buildToolsVersion "20"
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 21
+    }
 
     sourceSets {
         main {
@@ -51,6 +54,7 @@ android {
 
         }
     }
+
 }
 
 

BasicRenderScriptSample/src/main/AndroidManifest.xml → Application/src/main/AndroidManifest.xml

@@ -20,9 +20,7 @@
     android:versionCode="1"
     android:versionName="1.0">
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
 
     <application
         android:allowBackup="true"

BasicRenderScriptSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java → Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java

@@ -21,6 +21,7 @@
 import android.os.Looper;
 import android.view.Surface;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
 import java.util.Queue;
@@ -136,7 +137,7 @@ public void setOutputFormatChangedListener(final OutputFormatChangedListener
      * @return
      */
     public static MediaCodecWrapper fromVideoFormat(final MediaFormat trackFormat,
-            Surface surface) {
+            Surface surface) throws IOException {
         MediaCodecWrapper result = null;
         MediaCodec videoCodec = null;
 

Application/src/main/res/values-v21/template-styles.xml

@@ -0,0 +1,22 @@
+<!--
+  Copyright 2014 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+
+    <!-- Activity themes -->
+    <style name="Theme.Base" parent="android:Theme.Material.Light" />
+
+</resources>

BasicRenderScriptSample/tests/AndroidManifest.xml → Application/tests/AndroidManifest.xml

@@ -20,9 +20,7 @@
           android:versionCode="1"
           android:versionName="1.0">
 
-    <uses-sdk
-            android:minSdkVersion="8"
-            android:targetSdkVersion="19" />
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
 
     <!-- We add an application tag here just so that we can indicate that
          this package needs to link against the android.test library,

settings.gradle

@@ -1,4 +1 @@
-
-
-
-include 'BasicRenderScriptSample'
+include 'Application'