Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b96320c2 authored by Alex Sakhartchouk's avatar Alex Sakhartchouk Committed by Android (Google) Code Review
Browse files

Merge "sped up the ui in image processing test app"

parents 34d76acc abf2b931

tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.rs.image">



    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />    

    <uses-sdk android:minSdkVersion="11" />

    <application android:label="Image Processing">

    <application android:label="Image Processing"

                 android:hardwareAccelerated="true">

        <activity android:name="ImageProcessingActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

tests/RenderScriptTests/ImageProcessing/res/drawable-hdpi/data.jpg

deleted100644 → 0
−74.6 KiB
Loading image diff...

tests/RenderScriptTests/ImageProcessing/res/drawable/city.png

0 → 100644
+597 KiB
Loading image diff...

tests/RenderScriptTests/ImageProcessing/res/drawable/data.jpg

deleted100644 → 0
−74.6 KiB
Loading image diff...

tests/RenderScriptTests/ImageProcessing/res/layout/main.xml

+22 −21
Original line number Diff line number Diff line
@@ -17,15 +17,23 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

            android:orientation="vertical"

            android:layout_width="fill_parent"

            android:layout_height="fill_parent">

            android:layout_height="fill_parent"

            android:id="@+id/toplevel">

    <SurfaceView

        android:id="@+id/surface"

        android:layout_width="1dip"

        android:layout_height="1dip" />

    <ScrollView

        android:layout_width="fill_parent"

        android:layout_height="fill_parent">

            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

                android:orientation="vertical"

                android:layout_width="fill_parent"

                android:layout_height="fill_parent">

            <ImageView

                android:id="@+id/display"

        android:layout_width="320dip"

        android:layout_height="266dip" />

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

                android:orientation="horizontal"

                android:layout_width="fill_parent"
@@ -42,13 +50,6 @@ 
                        android:textSize="8pt"

                        android:text="@string/saturation"/>

            </LinearLayout>

    <ScrollView

        android:layout_width="fill_parent"

        android:layout_height="fill_parent">

            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

                android:orientation="vertical"

                android:layout_width="fill_parent"

                android:layout_height="fill_parent">

            <TextView

                android:id="@+id/inSaturationText"

                android:layout_width="match_parent"