Merge "add flexable ui for parameters" into gb-ub-photos-bryce

<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2013 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    xmlns:app="http://schemas.android.com/apk/res/com.example.imagefilterharness"

    android:layout_width="match_parent"

    android:layout_height="150dp"

    android:orientation="horizontal" >

    <ImageButton

        android:id="@+id/actionButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:scaleType="centerInside"

        android:background="@drawable/filtershow_button_background"

        android:src="@drawable/filtershow_addpoint"

        android:paddingBottom="8dp"  />

    <SeekBar

        android:id="@+id/controlValueSeekBar"

        android:layout_width="match_parent"

         android:layout_height="wrap_content"

        android:layout_gravity="fill_horizontal"

        style="@style/FilterShowSlider" />

</LinearLayout>

<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2013 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    xmlns:app="http://schemas.android.com/apk/res/com.example.imagefilterharness"

    android:layout_width="match_parent"

    android:layout_height="150dp"

    android:columnCount="2"

    android:orientation="horizontal" >

    <TextView

        android:id="@+id/controlName"

        android:layout_gravity="left" />

    <TextView

        android:id="@+id/controlValue"

        android:layout_gravity="right" />

    <SeekBar

        android:id="@+id/controlValueSeekBar"

        android:layout_width="match_parent"

        android:layout_column="0"

        android:layout_columnSpan="2"

        android:layout_gravity="fill_horizontal"

        style="@style/FilterShowSlider" />

</GridLayout>