summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorYuli Huang <yuli@google.com>2011-10-01 02:05:06 +0800
committerYuli Huang <yuli@google.com>2011-10-04 00:26:14 +0800
commit6b66d707c43c5657e90cc72a86e2fb20238632f1 (patch)
tree404f195faf9a523f16320768c8ade88e3b72e32a /res/layout
parent91a0c8aec900c7d6473cf45f7b52cae3477ef59c (diff)
downloadandroid_packages_apps_Snap-6b66d707c43c5657e90cc72a86e2fb20238632f1.tar.gz
android_packages_apps_Snap-6b66d707c43c5657e90cc72a86e2fb20238632f1.tar.bz2
android_packages_apps_Snap-6b66d707c43c5657e90cc72a86e2fb20238632f1.zip
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
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/photoeditor_actionbar.xml52
-rw-r--r--res/layout/photoeditor_main.xml33
2 files changed, 53 insertions, 32 deletions
diff --git a/res/layout/photoeditor_actionbar.xml b/res/layout/photoeditor_actionbar.xml
new file mode 100644
index 000000000..82ed41ffc
--- /dev/null
+++ b/res/layout/photoeditor_actionbar.xml
@@ -0,0 +1,52 @@
+<?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>
diff --git a/res/layout/photoeditor_main.xml b/res/layout/photoeditor_main.xml
index ed4841ab3..49597ed02 100644
--- a/res/layout/photoeditor_main.xml
+++ b/res/layout/photoeditor_main.xml
@@ -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>