Auto-update

googlearchive · Nov 19, 2014 · cfe40cb · cfe40cb
1 parent 7f10147
commit cfe40cb
Show file tree

Hide file tree

Showing 29 changed files with 213 additions and 104 deletions.
diff --git a/Camera2VideoSample/build.gradle → Application/build.gradle b/Camera2VideoSample/build.gradle → Application/build.gradle
@@ -1,6 +1,3 @@
-
-
-
 buildscript {
     repositories {
         mavenCentral()
@@ -11,13 +8,14 @@ buildscript {
     }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 
 dependencies {
 
-    compile "com.android.support:support-v4:20.+"
-    compile "com.android.support:support-v13:20.+"
+    compile "com.android.support:support-v4:21.+"
+    compile "com.android.support:support-v13:21.+"
+    compile "com.android.support:cardview-v7:21.+"
 
 }
 
@@ -30,9 +28,13 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion "android-L"
+    compileSdkVersion 21
+    buildToolsVersion "21.0.0"
 
-    buildToolsVersion "20.0.0"
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 21
+    }
 
     sourceSets {
         main {

diff --git a/...2VideoSample/src/main/AndroidManifest.xml → Application/src/main/AndroidManifest.xml b/...2VideoSample/src/main/AndroidManifest.xml → Application/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
     android:versionCode="1"
     android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="L" android:targetSdkVersion="L" />
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
 
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>

diff --git a/...roid/camera2video/AutoFitTextureView.java → ...roid/camera2video/AutoFitTextureView.java b/...roid/camera2video/AutoFitTextureView.java → ...roid/camera2video/AutoFitTextureView.java