Tablet/AllApps fixes.

- Fixing regression where the power button did not dismiss Apps/Customize
- Fixing regression in number of icons in portrain in AC, and removing legacy peek var for calculations (5122724)
- Fixing spacing in shop button on tablet
- Fixing bug where the apps pane was being changed as we were animating (5139543)

Change-Id: I3a3e5f224fd92e99072c830d13423d195179e7c7

2 files changed, 34 insertions, 18 deletions

diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index 788d4c335..05e7fc124 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -35,27 +35,12 @@
                 android:layout_gravity="left"
                 android:background="@drawable/tab_unselected_holo"
                 android:tabStripEnabled="false" />
-            <TextView
-                style="@style/MarketButton"
+            <include
                 android:id="@+id/market_button"
-                android:onClick="onClickAppMarketButton"
+                layout="@layout/market_button"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_gravity="right"
-                android:gravity="center"
-                android:paddingLeft="@dimen/toolbar_button_horizontal_padding"
-                android:paddingRight="@dimen/toolbar_button_horizontal_padding"
-                android:text="@string/market"
-                android:contentDescription="@string/market"
-                android:textColor="@color/workspace_all_apps_and_delete_zone_text_color"
-                android:textSize="18sp"
-                android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
-                android:shadowDx="0.0"
-                android:shadowDy="0.0"
-                android:shadowRadius="2.0"
-                android:background="@drawable/tab_widget_indicator_selector"
-                android:focusable="true"
-                android:clickable="true" />
+                android:layout_gravity="right" />
         </FrameLayout>
         <FrameLayout
             android:id="@android:id/tabcontent"
diff --git a/res/layout/market_button.xml b/res/layout/market_button.xml
new file mode 100644
index 000000000..2d840d731
--- /dev/null
+++ b/res/layout/market_button.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    style="@style/MarketButton"
+    android:onClick="onClickAppMarketButton"
+    android:gravity="center"
+    android:paddingLeft="@dimen/toolbar_button_horizontal_padding"
+    android:paddingRight="@dimen/toolbar_button_horizontal_padding"
+    android:contentDescription="@string/market"
+    android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
+    android:shadowDx="0.0"
+    android:shadowDy="0.0"
+    android:shadowRadius="2.0"
+    android:background="@drawable/tab_widget_indicator_selector"
+    android:focusable="true"
+    android:clickable="true" />