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

Commit 7204500d authored by Yuli Huang's avatar Yuli Huang Committed by Android Git Automerger
Browse files

am 07a3b570: Merge "Fix b/5403449." into ics-mr0 

* commit '07a3b570':
  Fix b/5403449.
parents 74148092 07a3b570

res/drawable/photoeditor_toggle_button_background.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->



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

    android:exitFadeDuration="@android:integer/config_mediumAnimTime">

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

    <!-- Non focused states -->

    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@android:color/transparent" />

    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/photoeditor_tab_selected_holo" />

res/layout/photoeditor_actionbar.xml

+4 −4
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 
     limitations under the License.

-->



<com.android.gallery3d.photoeditor.ActionBar

<RelativeLayout

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

    android:id="@+id/action_bar"

    style="@style/TopActionBar">

    style="@style/ActionBarInner"

    android:background="@drawable/photoeditor_actionbar_translucent">



    <LinearLayout style="@style/ActionBarLinearLayout">
@@ -62,4 +62,4 @@ 
        </ViewSwitcher>



    </LinearLayout>

</com.android.gallery3d.photoeditor.ActionBar>
 
</RelativeLayout>

res/layout/photoeditor_effects_menu.xml

0 → 100644
+44 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 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.

-->



<FrameLayout

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

    style="@style/ActionBarInner"

    android:background="@drawable/photoeditor_actionbar_translucent_bottom">



    <LinearLayout

        android:id="@+id/toggles"

        style="@style/EffectsMenuContainer">



        <ImageButton

            android:id="@+id/exposure_button"

            style="@style/EffectsMenuActionButton"

            android:src="@drawable/photoeditor_exposure"/>

        <ImageButton

            android:id="@+id/artistic_button"

            style="@style/EffectsMenuActionButton"

            android:src="@drawable/photoeditor_artistic"/>

        <ImageButton

            android:id="@+id/color_button"

            style="@style/EffectsMenuActionButton"

            android:src="@drawable/photoeditor_color"/>

        <ImageButton

            android:id="@+id/fix_button"

            style="@style/EffectsMenuActionButton"

            android:src="@drawable/photoeditor_fix"/>

    </LinearLayout>



</FrameLayout>

res/layout/photoeditor_main.xml

+12 −26
Original line number Diff line number Diff line
@@ -25,33 +25,19 @@ 
        android:layout_width="fill_parent"

        android:layout_height="fill_parent"/>



    <com.android.gallery3d.photoeditor.EffectsBar android:id="@+id/effects_bar" style="@style/EffectsBar">



        <LinearLayout style="@style/BottomActionBar" android:gravity="center_horizontal">



            <LinearLayout android:id="@+id/effects_menu" style="@style/ActionBarLinearLayout">



                <ImageButton

                    android:id="@+id/exposure_button"

                    style="@style/EffectsMenuActionButton"

                    android:src="@drawable/photoeditor_exposure"/>

                <ImageButton

                    android:id="@+id/artistic_button"

                    style="@style/EffectsMenuActionButton"

                    android:src="@drawable/photoeditor_artistic"/>

                <ImageButton

                    android:id="@+id/color_button"

                    style="@style/EffectsMenuActionButton"

                    android:src="@drawable/photoeditor_color"/>

                <ImageButton

                    android:id="@+id/fix_button"

                    style="@style/EffectsMenuActionButton"

                    android:src="@drawable/photoeditor_fix"/>

            </LinearLayout>



        </LinearLayout>

    <com.android.gallery3d.photoeditor.EffectsBar

        android:id="@+id/effects_bar"

        style="@style/EffectsBar">



        <com.android.gallery3d.photoeditor.EffectsMenu

            android:id="@+id/effects_menu"

            style="@style/ActionBarOuter"/>



    </com.android.gallery3d.photoeditor.EffectsBar>



    <include layout="@layout/photoeditor_actionbar"/>

    <com.android.gallery3d.photoeditor.ActionBar

        android:id="@+id/action_bar"

        style="@style/ActionBarOuter"

        android:layout_alignParentTop="true"/>



</com.android.gallery3d.photoeditor.Toolbar>

res/values-sw320dp/photoeditor_dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
    <dimen name="action_bar_icon_padding_left">0dp</dimen>

    <dimen name="action_bar_icon_padding_right">5dp</dimen>

    <dimen name="action_button_padding_horizontal">13dp</dimen>

    <dimen name="effects_menu_container_width">320dp</dimen>

    <dimen name="effect_tool_panel_padding">10dp</dimen>

    <dimen name="seekbar_width">290dp</dimen>

    <dimen name="seekbar_height">27dp</dimen>