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

Commit ae70ae47 authored by Yuli Huang's avatar Yuli Huang
Browse files

Fix b/5317371 to make action-bar consistent with framework CAB. 

1. Refactor to decouple ActionBar from FilterStackListener and
ActionBarListener to avoid FilterStack/Toolbar depending on ActionBar.
2. Recreate the action-bar on configuration changes and restore button
status and behaviors from the old action-bar.
3. Use framework CAB styles/dimensions to have consistent look and feel.

Change-Id: Ib7be0e0b8135f5f86af65b320f09b3d691464f54
parent 7777ff57

res/drawable/photoeditor_arrow_back.png

deleted100644 → 0
−602 B
Loading image diff...

res/layout/photoeditor_actionbar.xml

0 → 100644
+52 −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.

-->



<com.android.gallery3d.photoeditor.ActionBar

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

    android:id="@+id/action_bar"

    style="@style/TopActionBar">



    <LinearLayout style="@style/ActionBarLinearLayout">



        <LinearLayout

            android:id="@+id/action_bar_back"

            style="@style/ActionBarBackLinearLayout">

            <ImageView style="@style/ActionBarArrow"/>

            <ImageView style="@style/ActionBarIcon"/>

        </LinearLayout>



        <TextView

            android:id="@+id/action_bar_title"

            style="@style/ActionBarTitle"

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

    </LinearLayout>



    <LinearLayout style="@style/ActionBarLinearLayout" android:layout_alignParentRight="true">



        <ImageButton

            android:id="@+id/undo_button"

            style="@style/ImageActionButton"

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

        <ImageButton

            android:id="@+id/redo_button"

            style="@style/ImageActionButton"

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

        <Button

            android:id="@+id/save_button"

            style="@style/TextActionButton"

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

    </LinearLayout>

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

res/layout/photoeditor_main.xml

+1 −32
Original line number Diff line number Diff line
@@ -52,37 +52,6 @@ 
        </LinearLayout>

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



    <com.android.gallery3d.photoeditor.ActionBar android:id="@+id/action_bar" style="@style/TopActionBar">

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



        <LinearLayout style="@style/ActionBarLinearLayout">



            <LinearLayout

                android:id="@+id/action_bar_back"

                style="@style/ActionBarBackLinearLayout">

                <ImageView style="@style/ActionBarArrow"/>

                <ImageView style="@style/ActionBarIcon"/>

            </LinearLayout>



            <TextView

                android:id="@+id/action_bar_title"

                style="@style/ActionBarText"

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

        </LinearLayout>



        <LinearLayout style="@style/ActionBarLinearLayout" android:layout_alignParentRight="true">



            <ImageButton

                android:id="@+id/undo_button"

                style="@style/ImageActionButton"

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

            <ImageButton

                android:id="@+id/redo_button"

                style="@style/ImageActionButton"

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

            <Button

                android:id="@+id/save_button"

                style="@style/TextActionButton"

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

        </LinearLayout>

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

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

res/values-sw320dp-land/photoeditor_dimens.xml

0 → 100755
+20 −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.

-->



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

    <dimen name="action_bar_icon_padding_vertical">4dp</dimen>

    <dimen name="action_button_padding_vertical">4dp</dimen>

</resources>

res/values-sw320dp-port/photoeditor_dimens.xml

0 → 100755
+20 −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.

-->



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

    <dimen name="action_bar_icon_padding_vertical">8dp</dimen>

    <dimen name="action_button_padding_vertical">8dp</dimen>

</resources>