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

Commit 0786afd7 authored by John Hoford's avatar John Hoford
Browse files

fix draw part 2 

Change-Id: Ib508cf5fd75403e5a36168255bf3613526436428
parent 9071438b

res/layout/filtershow_brightness.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?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"

    android:id="@+id/top"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:visibility="visible" >



    <com.android.gallery3d.filtershow.colorpicker.ColorBrightnessView

            android:id="@+id/brightnessView"

            android:layout_width="match_parent"

            android:layout_height="90dp"

            android:layout_above="@+id/btnSelect" />



</LinearLayout>

res/layout/filtershow_hue.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?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"

    android:id="@+id/top"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:visibility="visible" >



    <com.android.gallery3d.filtershow.colorpicker.ColorHueView

            android:id="@+id/hueView"

            android:layout_width="match_parent"

            android:layout_height="90dp"

            android:layout_above="@+id/btnSelect" />



</LinearLayout>

res/layout/filtershow_opacity.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?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"

    android:id="@+id/top"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:visibility="visible" >



    <com.android.gallery3d.filtershow.colorpicker.ColorOpacityView

            android:id="@+id/opacityView"

            android:layout_width="match_parent"

            android:layout_height="90dp"

            android:layout_above="@+id/btnSelect" />



</LinearLayout>

res/layout/filtershow_saturation.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?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"

    android:id="@+id/top"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:visibility="visible" >



    <com.android.gallery3d.filtershow.colorpicker.ColorSaturationView

            android:id="@+id/saturationView"

            android:layout_width="match_parent"

            android:layout_height="90dp"

            android:layout_above="@+id/btnSelect" />



</LinearLayout>

src/com/android/gallery3d/filtershow/editors/EditorDraw.java

+2 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ public class EditorDraw extends ParametricEditor implements FilterView { 
            mImageDraw.setFilterDrawRepresentation(drawRep);

            drawRep.getParam(FilterDrawRepresentation.PARAM_STYLE).setFilterView(this);

            drawRep.setPramMode(FilterDrawRepresentation.PARAM_HUE);

            mParameterString = mContext.getString(R.string.draw_hue);

            control(drawRep.getCurrentParam(), mEditControl);

        }

    }
@@ -99,7 +100,7 @@ public class EditorDraw extends ParametricEditor implements FilterView { 
    @Override

    public void openUtilityPanel(final LinearLayout accessoryViewList) {

        Button view = (Button) accessoryViewList.findViewById(R.id.applyEffect);

        view.setText(mContext.getString(R.string.draw_style));

        view.setText(mContext.getString(R.string.draw_hue));

        view.setOnClickListener(new OnClickListener() {



            @Override