[androidkit] add navigation spinner to demo
-add navigation ui element to demo layout -simplify demo layout, inflates faster Change-Id: I232bbc553cd0143893fc20e3c218fa5a6c4006ce Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411311 Commit-Queue: Jorge Betancourt <jmbetancourt@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
This commit is contained in:
parent
7f17d36c2c
commit
4453c9add2
@ -1,93 +1,96 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<android.support.constraint.ConstraintLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".MainActivity">
|
tools:context=".MainActivity">
|
||||||
|
<ScrollView
|
||||||
<LinearLayout
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="0dp"
|
||||||
<ScrollView
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toTopOf="@+id/navigator">
|
||||||
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="wrap_content"
|
||||||
<LinearLayout
|
android:orientation="vertical"
|
||||||
|
android:id="@+id/skottie_container">
|
||||||
|
|
||||||
|
<android.support.constraint.ConstraintLayout
|
||||||
|
android:layout_marginTop="50px"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:orientation="vertical"
|
<ImageView
|
||||||
android:id="@+id/skottie_container">
|
android:id="@+id/bitmapImage"
|
||||||
|
android:layout_width="400px"
|
||||||
|
android:layout_height="400px"
|
||||||
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
</ImageView>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="50px"
|
||||||
|
app:layout_constraintLeft_toRightOf="@+id/bitmapImage"
|
||||||
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
android:text="ImageView populated by bitmap">
|
||||||
|
</TextView>
|
||||||
|
</android.support.constraint.ConstraintLayout>
|
||||||
|
|
||||||
<android.support.constraint.ConstraintLayout
|
<android.support.constraint.ConstraintLayout
|
||||||
android:layout_marginTop="50px"
|
android:layout_marginTop="50px"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
<ImageView
|
<SurfaceView
|
||||||
android:id="@+id/bitmapImage"
|
android:id="@+id/threadedSurface"
|
||||||
android:layout_width="400px"
|
android:layout_width="400px"
|
||||||
android:layout_height="400px"
|
android:layout_height="400px"
|
||||||
app:layout_constraintLeft_toLeftOf="parent"
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
</ImageView>
|
</SurfaceView>
|
||||||
<TextView
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="50px"
|
|
||||||
app:layout_constraintLeft_toRightOf="@+id/bitmapImage"
|
|
||||||
app:layout_constraintRight_toRightOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
android:text="ImageView populated by bitmap">
|
|
||||||
</TextView>
|
|
||||||
</android.support.constraint.ConstraintLayout>
|
|
||||||
|
|
||||||
<android.support.constraint.ConstraintLayout
|
<TextView
|
||||||
android:layout_marginTop="50px"
|
android:layout_width="0dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content">
|
android:layout_marginLeft="50px"
|
||||||
<SurfaceView
|
android:text="SurfaceView drawn on a thread managed by AndroidKit's native code"
|
||||||
android:id="@+id/threadedSurface"
|
app:layout_constraintLeft_toRightOf="@+id/threadedSurface"
|
||||||
android:layout_width="400px"
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
android:layout_height="400px"
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
app:layout_constraintLeft_toLeftOf="parent"
|
</TextView>
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
</android.support.constraint.ConstraintLayout>
|
||||||
</SurfaceView>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="50px"
|
|
||||||
android:text="SurfaceView drawn on a thread managed by AndroidKit's native code"
|
|
||||||
app:layout_constraintLeft_toRightOf="@+id/threadedSurface"
|
|
||||||
app:layout_constraintRight_toRightOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
|
||||||
</TextView>
|
|
||||||
</android.support.constraint.ConstraintLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<android.support.constraint.ConstraintLayout
|
<android.support.constraint.ConstraintLayout
|
||||||
android:layout_marginTop="50px"
|
android:layout_marginTop="50px"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
<SurfaceView
|
<SurfaceView
|
||||||
android:id="@+id/runtimeEffect"
|
android:id="@+id/runtimeEffect"
|
||||||
android:layout_width="400px"
|
android:layout_width="400px"
|
||||||
android:layout_height="400px"
|
android:layout_height="400px"
|
||||||
app:layout_constraintLeft_toLeftOf="parent"
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
</SurfaceView>
|
</SurfaceView>
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="50px"
|
android:layout_marginLeft="50px"
|
||||||
app:layout_constraintLeft_toRightOf="@+id/runtimeEffect"
|
app:layout_constraintLeft_toRightOf="@+id/runtimeEffect"
|
||||||
app:layout_constraintRight_toRightOf="parent"
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
android:text="Runtime effect drawn on a AndroidKit's\nutil thread. GL on Surface View.">
|
android:text="Runtime effect drawn on a AndroidKit's\nutil thread. GL on Surface View.">
|
||||||
</TextView>
|
</TextView>
|
||||||
|
|
||||||
</android.support.constraint.ConstraintLayout>
|
</android.support.constraint.ConstraintLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
</LinearLayout>
|
<org.skia.androidkitdemo1.NavigationSpinner
|
||||||
|
android:id="@+id/navigator"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent">
|
||||||
|
</org.skia.androidkitdemo1.NavigationSpinner>
|
||||||
</android.support.constraint.ConstraintLayout>
|
</android.support.constraint.ConstraintLayout>
|
Loading…
Reference in New Issue
Block a user