From 372500b8321febe97b10a1037faed7d1f3cd188d Mon Sep 17 00:00:00 2001 From: google-automerger Date: Thu, 21 May 2015 10:04:20 -0700 Subject: [PATCH] Auto-update --- .google/packaging.yaml | 1 + Application/build.gradle | 8 +++++++- Application/src/main/res/values-v21/base-colors.xml | 1 + .../src/main/res/values-v21/base-template-styles.xml | 1 + Application/src/main/res/values/base-strings.xml | 1 + NOTICE | 1 + README.md | 1 + 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.google/packaging.yaml b/.google/packaging.yaml index 8537d95..ac4d4fb 100644 --- a/.google/packaging.yaml +++ b/.google/packaging.yaml @@ -1,3 +1,4 @@ + # GOOGLE SAMPLE PACKAGING DATA # # This file is used by Google as part of our samples packaging process. diff --git a/Application/build.gradle b/Application/build.gradle index 4d2b73b..cd4874e 100644 --- a/Application/build.gradle +++ b/Application/build.gradle @@ -1,10 +1,11 @@ + buildscript { repositories { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.1.0' } } @@ -37,6 +38,11 @@ android { targetSdkVersion 21 } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + sourceSets { main { dirs.each { dir -> diff --git a/Application/src/main/res/values-v21/base-colors.xml b/Application/src/main/res/values-v21/base-colors.xml index 34c9cd1..8b6ec3f 100644 --- a/Application/src/main/res/values-v21/base-colors.xml +++ b/Application/src/main/res/values-v21/base-colors.xml @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + diff --git a/Application/src/main/res/values-v21/base-template-styles.xml b/Application/src/main/res/values-v21/base-template-styles.xml index 0b2948f..c778e4f 100644 --- a/Application/src/main/res/values-v21/base-template-styles.xml +++ b/Application/src/main/res/values-v21/base-template-styles.xml @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + diff --git a/Application/src/main/res/values/base-strings.xml b/Application/src/main/res/values/base-strings.xml index 08388de..186e60e 100644 --- a/Application/src/main/res/values/base-strings.xml +++ b/Application/src/main/res/values/base-strings.xml @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + Camera2Video diff --git a/NOTICE b/NOTICE index e37ec1a..05e0e2e 100644 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,4 @@ + This sample uses the following software: Copyright 2015 The Android Open Source Project diff --git a/README.md b/README.md index ff03db8..b27ca4a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + Android Camera2Video Sample =================================== -- GitLab