From 3bc73487311994c8a96d6616398793057f936c2b Mon Sep 17 00:00:00 2001 From: google-automerger Date: Wed, 3 Dec 2014 01:41:49 -0800 Subject: [PATCH] Auto-update --- .google/packaging.yaml | 16 +++ Application/build.gradle | 10 +- .../src/main/res/values-v21/base-colors.xml | 20 ++++ .../res/values-v21/base-template-styles.xml | 23 ++++ .../main/res/values-v21/template-styles.xml | 22 ---- CONTRIB.md => CONTRIBUTING.md | 4 +- README.md | 101 ++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- screenshots/main.png | Bin 0 -> 108165 bytes 9 files changed, 170 insertions(+), 28 deletions(-) create mode 100644 .google/packaging.yaml create mode 100644 Application/src/main/res/values-v21/base-colors.xml create mode 100644 Application/src/main/res/values-v21/base-template-styles.xml delete mode 100644 Application/src/main/res/values-v21/template-styles.xml rename CONTRIB.md => CONTRIBUTING.md (92%) create mode 100644 README.md create mode 100644 screenshots/main.png diff --git a/.google/packaging.yaml b/.google/packaging.yaml new file mode 100644 index 0000000..6fe8b62 --- /dev/null +++ b/.google/packaging.yaml @@ -0,0 +1,16 @@ +# 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: [Device Admin] +languages: [Java] +solutions: [Mobile] +github: android-AppRestrictionSchema +level: ADVANCED +icon: Application/main/big_icon.png +api_refs: + - android:android.content.RestrictionsManager +license: apache2 diff --git a/Application/build.gradle b/Application/build.gradle index a12b884..0f2f2d9 100644 --- a/Application/build.gradle +++ b/Application/build.gradle @@ -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 { @@ -29,7 +33,7 @@ List dirs = [ android { compileSdkVersion 21 - buildToolsVersion "21.0.0" + buildToolsVersion "21.1.1" defaultConfig { minSdkVersion 21 diff --git a/Application/src/main/res/values-v21/base-colors.xml b/Application/src/main/res/values-v21/base-colors.xml new file mode 100644 index 0000000..34c9cd1 --- /dev/null +++ b/Application/src/main/res/values-v21/base-colors.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/Application/src/main/res/values-v21/base-template-styles.xml b/Application/src/main/res/values-v21/base-template-styles.xml new file mode 100644 index 0000000..0b2948f --- /dev/null +++ b/Application/src/main/res/values-v21/base-template-styles.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/Application/src/main/res/values-v21/template-styles.xml b/Application/src/main/res/values-v21/template-styles.xml deleted file mode 100644 index 134fcd9..0000000 --- a/Application/src/main/res/values-v21/template-styles.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - -