From ac541bf5a085ac376a6f5a35173efba1a1c4a1ed Mon Sep 17 00:00:00 2001 From: George Muresan <georgecatalinmuresan@gmail.com> Date: Mon, 13 Aug 2018 11:59:19 +0100 Subject: [PATCH] Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/res/layout/activity_first_page_consent.xml --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5c88681..599d36f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion '27.0.3' defaultConfig { applicationId "com.example.admin.sleepbetter" - minSdkVersion 21 + minSdkVersion 16 targetSdkVersion 27 versionCode 1 versionName "1.0" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 569d9ef..d51232b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:allowBackup="true" android:icon="@drawable/pill" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@drawable/pill" android:supportsRtl="true" android:theme="@style/AppTheme"> <activity android:name=".FirstPage"> -- GitLab