From 6b66d707c43c5657e90cc72a86e2fb20238632f1 Mon Sep 17 00:00:00 2001
From: Yuli Huang <yuli@google.com>
Date: Sat, 1 Oct 2011 02:05:06 +0800
Subject: 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
---
 res/values-sw600dp/photoeditor_dimens.xml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'res/values-sw600dp')

diff --git a/res/values-sw600dp/photoeditor_dimens.xml b/res/values-sw600dp/photoeditor_dimens.xml
index 413347d31..2b9cf6f9f 100755
--- a/res/values-sw600dp/photoeditor_dimens.xml
+++ b/res/values-sw600dp/photoeditor_dimens.xml
@@ -18,22 +18,15 @@
     <dimen name="effect_label_text_size">14sp</dimen>
     <dimen name="effect_label_width">120dp</dimen>
     <dimen name="effect_icon_size">90dp</dimen>
-    <dimen name="effect_padding_left_right">2dp</dimen>
+    <dimen name="effect_padding_horizontal">2dp</dimen>
     <dimen name="effects_container_padding">12dp</dimen>
-    <dimen name="action_bar_height">56dp</dimen>
-    <dimen name="action_bar_text_size">18sp</dimen>
-    <dimen name="action_bar_arrow_padding_top">20dp</dimen>
-    <dimen name="action_bar_arrow_padding_bottom">20dp</dimen>
-    <dimen name="action_bar_arrow_padding_left">4dp</dimen>
-    <dimen name="action_bar_arrow_padding_right">0dp</dimen>
-    <dimen name="action_bar_icon_padding_top">7dp</dimen>
-    <dimen name="action_bar_icon_padding_bottom">7dp</dimen>
+    <dimen name="action_bar_arrow_margin_left">3dp</dimen>
+    <dimen name="action_bar_arrow_margin_right">-3dp</dimen>
+    <dimen name="action_bar_icon_padding_vertical">4dp</dimen>
     <dimen name="action_bar_icon_padding_left">0dp</dimen>
-    <dimen name="action_bar_icon_padding_right">8dp</dimen>
-    <dimen name="action_button_padding_top">9dp</dimen>
-    <dimen name="action_button_padding_bottom">9dp</dimen>
-    <dimen name="action_button_padding_left">22dp</dimen>
-    <dimen name="action_button_padding_right">22dp</dimen>
+    <dimen name="action_bar_icon_padding_right">5dp</dimen>
+    <dimen name="action_button_padding_vertical">8dp</dimen>
+    <dimen name="action_button_padding_horizontal">22dp</dimen>
     <dimen name="effect_tool_panel_padding">16dp</dimen>
     <dimen name="seekbar_width">560dp</dimen>
     <dimen name="seekbar_height">33dp</dimen>
-- 
cgit v1.2.3