kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #146 from enwokoma/intro-screen

Browse source 
Added Scroll to the Database Encryption fragment on Intro screen and forced portrait orientation
This commit is contained in:
Jakob Nixdorf 2018-03-02 10:53:45 +01:00 committed by GitHub
commit 5c71225496
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View file

@ -37,6 +37,7 @@
android:theme="@style/AppTheme.NoActionBar" /> android:theme="@style/AppTheme.NoActionBar" />
<activity <activity
android:name=".Activities.IntroScreenActivity" android:name=".Activities.IntroScreenActivity"
android:screenOrientation="portrait"
android:parentActivityName=".Activities.MainActivity" android:parentActivityName=".Activities.MainActivity"
android:theme="@style/Theme.Intro.Solid" /> android:theme="@style/Theme.Intro.Solid" />
<activity <activity

16
app/src/main/res/layout/component_intro_encryption.xml
View file

@ -1,11 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:clipToPadding="false">
android:gravity="center"
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:gravity="top"
android:padding="@dimen/activity_margin_large" > android:padding="@dimen/activity_margin_large" >
<TextView <TextView
@ -36,5 +41,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/activity_margin_large" android:layout_marginTop="@dimen/activity_margin_large"
android:text="@string/intro_slide2_desc_keystore"/> android:text="@string/intro_slide2_desc_keystore"/>
</LinearLayout>
</LinearLayout> </ScrollView>