From 778675b4a61d4a7a329c424605e3d6306298f6cc Mon Sep 17 00:00:00 2001 From: George Muresan <georgecatalinmuresan@gmail.com> Date: Mon, 13 Aug 2018 14:07:56 +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 --- .idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes app/build.gradle | 2 +- .../main/res/layout/activity_second_page.xml | 2 +- app/src/main/res/layout/questionnaire.xml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 92c567170a52276cee7d4052058e2c82ec759cd5..43bedeaede5b48551698d7fc3af7f007b7da2b0d 100644 GIT binary patch delta 35 scmbQqGLvP(3>M?q`_>cZlncZ^WIp<rXI;^$!*WixHx!OcR%ZML01GG&i2wiq delta 35 scmbQqGLvP(3>K}2mbWL)DHjNpx?r+x)2qU0!!2@>a_=oBD>Hrr012ZG*#H0l 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 13e9980..2987a47 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 f4b1a86..2ae9f0d 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