Prepare to add action bar to Credits screen
This commit is contained in:
parent
433e09d454
commit
4645ae4a6b
3 changed files with 11 additions and 4 deletions
|
@ -9,8 +9,8 @@ android {
|
|||
applicationId 'com.rubenvandeven.emotion_hero.kiosk'
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 24
|
||||
versionCode 9
|
||||
versionName '1.1'
|
||||
versionCode 10
|
||||
versionName '1.2'
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
|
||||
renderscriptTargetApi 16
|
||||
|
|
|
@ -7,6 +7,7 @@ import android.graphics.Typeface;
|
|||
import android.net.Uri;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.os.Bundle;
|
||||
import android.support.v7.widget.Toolbar;
|
||||
import android.view.View;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.LinearLayout;
|
||||
|
@ -21,6 +22,12 @@ public class CreditsActivity extends AppCompatActivity {
|
|||
if(getSupportActionBar() != null) {
|
||||
getSupportActionBar().hide();
|
||||
}
|
||||
// TODO: verander naar MET toolbar voor 'terug'
|
||||
// Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
||||
// setSupportActionBar(toolbar);
|
||||
// getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
// getSupportActionBar().setTitle("Credits");
|
||||
|
||||
setContentView(R.layout.activity_credits);
|
||||
|
||||
Typeface font = Typeface.createFromAsset(getAssets(), "unifont-9.0.02.ttf");
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
tools:context="com.rubenvandeven.emotionhero.CreditsActivity">
|
||||
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/creditsLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true">
|
||||
android:layout_centerHorizontal="true"
|
||||
>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
Loading…
Reference in a new issue