From 2c57ee4c9dc652a8eaa83e22c552267c2176b981 Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Mon, 13 Aug 2018 14:09:07 +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/res/layout/activity_second_page.xml | 2 +-
app/src/main/res/layout/questionnaire.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 599d36f..15dfe94 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 16
+ minSdkVersion 18
targetSdkVersion 27
versionCode 1
versionName "1.0"
diff --git a/app/src/main/res/layout/activity_second_page.xml b/app/src/main/res/layout/activity_second_page.xml
index 509040a..10c863e 100644
--- a/app/src/main/res/layout/activity_second_page.xml
+++ b/app/src/main/res/layout/activity_second_page.xml
@@ -144,7 +144,7 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:singleLine="false"
android:text="@string/nightTerrorUsually"
android:textSize="12sp"
diff --git a/app/src/main/res/layout/questionnaire.xml b/app/src/main/res/layout/questionnaire.xml
index 0c0e12d..32d72b0 100644
--- a/app/src/main/res/layout/questionnaire.xml
+++ b/app/src/main/res/layout/questionnaire.xml
@@ -190,7 +190,7 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:singleLine="false"
- android:inputType="textPersonName"
+ android:inputType="textMultiLine"
android:text="@string/offnightTerrorUsually"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
--
GitLab