diff options
| author | Trevor Johns <trevorjohns@google.com> | 2015-03-30 13:44:30 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2015-03-30 15:58:45 -0700 |
| commit | ababd389951170f605d0f48f1b7877ab7b7cbe1c (patch) | |
| tree | cb31b0ba8937337ce45b6f973c1fe1893dcbc4cf /prebuilts/gradle/BasicMediaDecoder | |
| parent | 21e64c7921d245ed0540747f6fd4ae2cba25f0ba (diff) | |
| download | build-ababd389951170f605d0f48f1b7877ab7b7cbe1c.tar.gz | |
Update prebuilts for Android samples
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.
Change-Id: Icba85cdb6246b3fc11a72a20b10cd2658c5f42d7
Diffstat (limited to 'prebuilts/gradle/BasicMediaDecoder')
3 files changed, 2 insertions, 41 deletions
diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle b/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle index d727e2a8..72d79436 100644 --- a/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle +++ b/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle @@ -14,13 +14,10 @@ repositories { jcenter() } - dependencies { - compile "com.android.support:support-v4:21.0.2" compile "com.android.support:support-v13:21.0.2" compile "com.android.support:cardview-v7:21.0.2" - } // The sample build uses multiple directories to @@ -33,7 +30,7 @@ List<String> dirs = [ android { compileSdkVersion 21 - buildToolsVersion "21.1.1" + buildToolsVersion "21.1.2" defaultConfig { minSdkVersion 17 diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml deleted file mode 100755 index be1aa49d..00000000 --- a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,36 +0,0 @@ -<!-- - Copyright 2013 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. - --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <LinearLayout style="@style/Widget.SampleMessageTile" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView style="@style/Widget.SampleMessage" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/horizontal_page_margin" - android:layout_marginRight="@dimen/horizontal_page_margin" - android:layout_marginTop="@dimen/vertical_page_margin" - android:layout_marginBottom="@dimen/vertical_page_margin" - android:text="@string/intro_message" /> - </LinearLayout> -</LinearLayout> diff --git a/prebuilts/gradle/BasicMediaDecoder/README.md b/prebuilts/gradle/BasicMediaDecoder/README.md index 1f5ec4a4..8552e591 100644 --- a/prebuilts/gradle/BasicMediaDecoder/README.md +++ b/prebuilts/gradle/BasicMediaDecoder/README.md @@ -54,7 +54,7 @@ Pre-requisites -------------- - Android SDK v21 -- Android Build Tools v21.1.1 +- Android Build Tools v21.1.2 - Android Support Repository Screenshots |