norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge Pull Request #230 into master

Browse Source
This commit is contained in:
Adrian Ulrich 2015-11-01 13:05:56 +01:00
parent d847e44071
commit 93e9567830
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.1.0'
classpath 'com.android.tools.build:gradle:1.3.0'
}
}
@ -17,21 +17,15 @@ allprojects {
apply plugin: 'com.android.application'
android {
compileSdkVersion 22
compileSdkVersion 23
buildToolsVersion "22.0.1"
defaultConfig {
applicationId "ch.blinkenlights.android.vanilla"
minSdkVersion 15
targetSdkVersion 22
targetSdkVersion 23
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_5
targetCompatibility JavaVersion.VERSION_1_5
}
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'

2
src/ch/blinkenlights/android/vanilla/PermissionRequestActivity.java
View File

@ -19,6 +19,7 @@ package ch.blinkenlights.android.vanilla;
import android.Manifest;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.pm.PackageManager;
import android.content.Context;
@ -32,6 +33,7 @@ public class PermissionRequestActivity extends Activity {
// 'dangerous' permissions not granted by the manifest on versions >= M
private static final String[] NEEDED_PERMISSIONS = { Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE };
@TargetApi(Build.VERSION_CODES.M)
@Override
public void onCreate(Bundle savedInstanceState) {
ThemeHelper.setTheme(this, R.style.VanillaBase);