Skip to content
This repository has been archived by the owner on Sep 17, 2019. It is now read-only.

Commit

Permalink
Auto-update
Browse files Browse the repository at this point in the history
  • Loading branch information
google-automerger committed Dec 3, 2014
1 parent 04e8d43 commit ffbc6d7
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 36 deletions.
12 changes: 12 additions & 0 deletions .google/packaging.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# GOOGLE SAMPLE PACKAGING DATA
#
# This file is used by Google as part of our samples packaging process.
# End users may safely ignore this file. It has no relevance to other systems.
---
status: PUBLISHED
technologies: [Android]
categories: [UI]
languages: [Java]
solutions: [Mobile]
github: android-CardView Sample
license: apache2
10 changes: 7 additions & 3 deletions Application/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
buildscript {
repositories {
mavenCentral()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:0.12.+'
classpath 'com.android.tools.build:gradle:1.0.0-rc1'
}
}

apply plugin: 'com.android.application'

repositories {
jcenter()
}


dependencies {

Expand All @@ -27,7 +31,7 @@ List<String> dirs = [

android {
compileSdkVersion 21
buildToolsVersion "21.0.0"
buildToolsVersion "21.1.1"

defaultConfig {
minSdkVersion 21
Expand Down
20 changes: 20 additions & 0 deletions Application/src/main/res/values-v21/base-colors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<resources>


</resources>
23 changes: 23 additions & 0 deletions Application/src/main/res/values-v21/base-template-styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<resources>

<!-- Activity themes -->
<style name="Theme.Base" parent="android:Theme.Material.Light">
</style>

</resources>
22 changes: 0 additions & 22 deletions Application/src/main/res/values-v21/template-styles.xml

This file was deleted.

4 changes: 2 additions & 2 deletions CONTRIB.md → CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Please fill out either the individual or corporate Contributor License Agreement

* If you are an individual writing original source code and you're sure you
own the intellectual property, then you'll need to sign an [individual CLA]
(https://developers.google.com/open-source/cla/individual).
(https://cla.developers.google.com).
* If you work for a company that wants to allow you to contribute your work,
then you'll need to sign a [corporate CLA]
(https://developers.google.com/open-source/cla/corporate).
(https://cla.developers.google.com).

Follow either of the two links above to access the appropriate CLA and
instructions for how to sign and return it. Once we receive it, we'll be able to
Expand Down
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
Android CardView Sample
=======================
Android CardView Sample Sample
===================================

Demonstration of the CardView API introduced in Android L.
This sample demonstrates how to use CardView introduced in the support library for the
Android L preview.

Pre-requisites
--------------

- Android SDK (L Developer Preview)
- Android Build Tools v20
- Android SDK v21
- Android Build Tools v21.1.1
- Android Support Repository

Getting Started
Expand All @@ -23,7 +24,7 @@ Support
- Stack Overflow: http://stackoverflow.com/questions/tagged/android

If you've found an error in this sample, please file an issue:
https://github.com/googlesamples/android-BasicAndroidKeyStore
https://github.com/googlesamples/android-CardView Sample

Patches are encouraged, and may be submitted by forking this project and
submitting a pull request through GitHub. Please see CONTRIBUTING.md for more details.
Expand All @@ -40,8 +41,8 @@ file to you 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
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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

0 comments on commit ffbc6d7

Please sign in to comment.