Skip to content
This repository has been archived by the owner on Oct 12, 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 Nov 19, 2014
1 parent 75f364e commit d6a7d86
Show file tree
Hide file tree
Showing 29 changed files with 33 additions and 8 deletions.
15 changes: 9 additions & 6 deletions RepeatingAlarmSample/build.gradle → Application/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ buildscript {
}
}

apply plugin: 'android'
apply plugin: 'com.android.application'


dependencies {

// Add the support lib that is appropriate for SDK 4
compile "com.android.support:support-v4:20.+"

compile "com.android.support:support-v4:21.+"

}

Expand All @@ -28,9 +26,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 4
targetSdkVersion 21
}

sourceSets {
main {
Expand All @@ -43,6 +45,7 @@ android {
androidTest.java.srcDirs = ['tests/src']

}

}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
android:versionCode="1"
android:versionName="1.0">

<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="17" />
<!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->

<application android:allowBackup="true"
android:label="@string/app_name"
Expand Down
22 changes: 22 additions & 0 deletions Application/src/main/res/values-v21/template-styles.xml
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include 'RepeatingAlarmSample'
include 'Application'

0 comments on commit d6a7d86

Please sign in to comment.