Replacing AllApps/Customize in tablet UI with Apps/Customize.
Change-Id: I11a296b25472e4bf298a468865b0dff29f500aaa
diff --git a/res/drawable-large-nodpi/all_apps_bg_gradient.9.png b/res/drawable-hdpi/all_apps_bg_gradient.9.png
similarity index 100%
copy from res/drawable-large-nodpi/all_apps_bg_gradient.9.png
copy to res/drawable-hdpi/all_apps_bg_gradient.9.png
Binary files differ
diff --git a/res/drawable-hdpi/all_apps_bg_gradient.png b/res/drawable-hdpi/all_apps_bg_gradient.png
deleted file mode 100644
index c420ca5..0000000
--- a/res/drawable-hdpi/all_apps_bg_gradient.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-large-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png
similarity index 100%
rename from res/drawable-large-hdpi/ic_home_all_apps_holo_dark.png
rename to res/drawable-hdpi/ic_home_all_apps_holo_dark.png
Binary files differ
diff --git a/res/drawable-large/delete_zone_selector.xml b/res/drawable-large/delete_zone_selector.xml
deleted file mode 100644
index e2b37f4..0000000
--- a/res/drawable-large/delete_zone_selector.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, 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.
-*/
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_home_delete_holo_dark" />
- <item android:drawable="@drawable/ic_home_delete_hover_holo_dark" />
-</transition>
diff --git a/res/drawable-large-nodpi/all_apps_bg_gradient.9.png b/res/drawable-mdpi/all_apps_bg_gradient.9.png
similarity index 100%
copy from res/drawable-large-nodpi/all_apps_bg_gradient.9.png
copy to res/drawable-mdpi/all_apps_bg_gradient.9.png
Binary files differ
diff --git a/res/drawable-mdpi/all_apps_bg_gradient.png b/res/drawable-mdpi/all_apps_bg_gradient.png
deleted file mode 100644
index c420ca5..0000000
--- a/res/drawable-mdpi/all_apps_bg_gradient.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-large-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png
similarity index 100%
rename from res/drawable-large-mdpi/ic_home_all_apps_holo_dark.png
rename to res/drawable-mdpi/ic_home_all_apps_holo_dark.png
Binary files differ
diff --git a/res/drawable-large-nodpi/all_apps_bg_gradient.9.png b/res/drawable-nodpi/all_apps_bg_gradient.9.png
similarity index 100%
rename from res/drawable-large-nodpi/all_apps_bg_gradient.9.png
rename to res/drawable-nodpi/all_apps_bg_gradient.9.png
Binary files differ
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 7073661..b076f52 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -38,7 +38,6 @@
<include android:id="@+id/cell3" layout="@layout/workspace_screen" />
<include android:id="@+id/cell4" layout="@layout/workspace_screen" />
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-
</com.android.launcher2.Workspace>
<include layout="@layout/qsb_bar"
diff --git a/res/layout-large/launcher.xml b/res/layout-large/launcher.xml
index 2d14137..cb84b5a 100644
--- a/res/layout-large/launcher.xml
+++ b/res/layout-large/launcher.xml
@@ -28,23 +28,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
- <include layout="@layout/button_bar"
- android:id="@+id/all_apps_button_cluster"
- android:layout_width="fill_parent"
- android:layout_height="?android:attr/actionBarSize"
+ <include layout="@layout/qsb_bar"
+ android:id="@+id/qsb_bar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/qsb_bar_height"
android:layout_gravity="top" />
- <include layout="@layout/all_apps_tabbed"
- android:id="@+id/all_apps_view"
+ <include layout="@layout/apps_customize_pane"
+ android:id="@+id/apps_customize_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="top"
- android:visibility="invisible" />
-
- <include layout="@layout/customization_drawer"
- android:id="@+id/customization_drawer"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
android:visibility="invisible" />
</com.android.launcher2.DragLayer>
diff --git a/res/layout-large/qsb_bar.xml b/res/layout-large/qsb_bar.xml
new file mode 100644
index 0000000..57e4eeb
--- /dev/null
+++ b/res/layout-large/qsb_bar.xml
@@ -0,0 +1,135 @@
+<?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.
+-->
+<com.android.launcher2.SearchDropTargetBar
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ android:focusable="false">
+
+ <!-- Search buttons container -->
+ <RelativeLayout
+ style="@style/SearchDropTargetBar"
+ android:id="@+id/qsb_search_bar"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <!-- Global search icon -->
+ <ImageView
+ style="@style/SearchButton"
+ android:id="@+id/search_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:src="@drawable/ic_generic_search"
+ android:background="@drawable/button_bg"
+ android:onClick="onClickSearchButton"
+ android:focusable="true"
+ android:clickable="true"
+ android:contentDescription="@string/accessibility_search_button" />
+
+ <ImageView
+ style="@style/SearchButtonDivider"
+ android:id="@+id/search_divider"
+ android:layout_toRightOf="@+id/search_button"
+ android:src="@drawable/divider_launcher_holo"
+ android:onClick="onClickSearchButton"
+ android:focusable="false"
+ android:clickable="true" />
+
+ <!-- Voice search icon -->
+ <ImageView
+ style="@style/SearchButton"
+ android:id="@+id/voice_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@+id/search_divider"
+ android:src="@drawable/ic_voice_search"
+ android:background="@drawable/button_bg"
+ android:onClick="onClickVoiceButton"
+ android:focusable="true"
+ android:clickable="true"
+ android:contentDescription="@string/accessibility_voice_search_button" />
+
+ <!-- AppsCustomize icon -->
+ <com.android.launcher2.StrokedTextView
+ android:id="@+id/all_apps_button"
+ android:onClick="onClickAllAppsButton"
+ android:drawableLeft="@drawable/ic_home_all_apps_holo_dark"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:layout_toLeftOf="@+id/all_apps_divider"
+ android:paddingLeft="@dimen/toolbar_button_horizontal_padding"
+ android:paddingRight="@dimen/toolbar_button_horizontal_padding"
+ android:paddingTop="@dimen/all_apps_button_vertical_padding"
+ android:paddingBottom="@dimen/all_apps_button_vertical_padding"
+ android:background="@drawable/button_bg"
+
+ android:gravity="center"
+ android:textColor="#CCFFFFFF"
+ android:textSize="18sp"
+
+ launcher:strokeColor="#991e3157"
+ launcher:strokeTextColor="#DDFFFFFF"
+ launcher:strokeWidth="2.5"
+
+ android:shadowColor="#DA000000"
+ android:shadowDx="0.0"
+ android:shadowDy="0.0"
+ android:shadowRadius="2.5"
+
+ android:focusable="true"
+ android:clickable="true"
+ android:contentDescription="@string/accessibility_all_apps_button" />
+ </RelativeLayout>
+
+ <!-- Drag specific targets container -->
+ <LinearLayout
+ style="@style/SearchDropTargetBar"
+ android:id="@+id/drag_target_bar"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:alpha="0">
+
+ <FrameLayout
+ style="@style/DropTargetButtonContainer"
+ android:layout_weight="1">
+ <!-- Delete target -->
+ <com.android.launcher2.DeleteDropTarget
+ style="@style/DropTargetButton"
+ android:id="@+id/delete_target"
+ android:text="@string/delete_zone_label_workspace"
+ android:drawableLeft="@drawable/delete_zone_selector"
+ launcher:strokeColor="#991e3157"
+ launcher:strokeTextColor="#DDFFFFFF"
+ launcher:strokeWidth="2.5" />
+ </FrameLayout>
+
+ <FrameLayout
+ style="@style/DropTargetButtonContainer"
+ android:layout_weight="1">
+ <!-- Info target -->
+ <com.android.launcher2.InfoDropTarget
+ style="@style/DropTargetButton"
+ android:id="@+id/info_target"
+ android:text="@string/info_target_label"
+ android:drawableLeft="@drawable/ic_home_info_holo_dark"
+ launcher:strokeColor="#991e3157"
+ launcher:strokeTextColor="#DDFFFFFF"
+ launcher:strokeWidth="2.5" />
+ </FrameLayout>
+ </LinearLayout>
+</com.android.launcher2.SearchDropTargetBar>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 2d5a34f..5ee2833 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -40,7 +40,7 @@
<include layout="@layout/qsb_bar"
android:id="@+id/qsb_bar"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="@dimen/qsb_bar_height"
android:layout_gravity="top" />
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index f3ecb48..55cba99 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -16,10 +16,6 @@
<com.android.launcher2.AppsCustomizeTabHost
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
- <com.android.launcher2.AllAppsBackground
- android:id="@+id/all_apps_background"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
@@ -28,57 +24,33 @@
with the text in the tabs in AppsCustomizeTabHost. -->
<FrameLayout
android:layout_width="wrap_content"
- android:layout_height="@dimen/apps_customize_tab_bar_height"
+ android:layout_height="@dimen/qsb_bar_height"
android:layout_gravity="center_horizontal">
<com.android.launcher2.FocusOnlyTabWidget
android:id="@android:id/tabs"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="left"
android:background="@drawable/tab_unselected_holo"
android:tabStripEnabled="false" />
- <FrameLayout
+ <TextView
+ style="@style/MarketButton"
+ android:id="@+id/market_button"
+ android:onClick="onClickAppMarketButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_gravity="right">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:visibility="gone">
- <com.android.launcher2.ApplicationInfoDropTarget
- android:id="@+id/all_apps_info_target"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:gravity="center"
- android:drawableLeft="@drawable/ic_home_info_holo_dark"
- android:background="@drawable/focusable_view_bg"
- android:focusable="true"
- android:visibility="gone" />
- <com.android.launcher2.DeleteZone
- style="@style/DeleteZone"
- android:id="@+id/all_apps_delete_zone"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:gravity="center"
- android:background="@drawable/focusable_view_bg"
- android:focusable="true"
- android:visibility="gone"
- launcher:direction="horizontal" />
- </LinearLayout>
- <TextView
- style="@style/MarketButton"
- android:id="@+id/market_button"
- android:onClick="onClickAppMarketButton"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:gravity="center"
- android:background="@drawable/tab_widget_indicator_selector"
- android:focusable="true"
- android:clickable="true" />
- </FrameLayout>
+ android:layout_gravity="right"
+ android:gravity="center"
+ android:text="@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" />
</FrameLayout>
<FrameLayout
android:id="@android:id/tabcontent"
@@ -87,7 +59,7 @@
<com.android.launcher2.AppsCustomizePagedView
android:id="@+id/apps_customize_pane_content"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
launcher:cellCountX="@integer/all_apps_view_cellCountX"
launcher:cellCountY="@integer/all_apps_view_cellCountY"
launcher:pageLayoutWidthGap="@dimen/all_apps_view_pageLayoutWidthGap"
diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml
index 9d0764c..53643b4 100644
--- a/res/layout/apps_customize_widget.xml
+++ b/res/layout/apps_customize_widget.xml
@@ -38,6 +38,17 @@
android:adjustViewBounds="true"
android:scaleType="fitStart" />
+ <!-- The divider image. -->
+ <ImageView
+ style="WidgetDivider"
+ android:id="@+id/divider"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
+ android:src="@drawable/widget_divider" />
+
<!-- The name of the widget. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget_name"
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml
index 820fae6..6e1d98c 100644
--- a/res/layout/qsb_bar.xml
+++ b/res/layout/qsb_bar.xml
@@ -75,7 +75,10 @@
style="@style/DropTargetButton"
android:id="@+id/delete_target"
android:text="@string/delete_zone_label_workspace"
- android:drawableLeft="@drawable/delete_zone_selector" />
+ android:drawableLeft="@drawable/delete_zone_selector"
+ launcher:strokeColor="#991e3157"
+ launcher:strokeTextColor="#DDFFFFFF"
+ launcher:strokeWidth="2.5" />
</FrameLayout>
<FrameLayout
@@ -86,7 +89,10 @@
style="@style/DropTargetButton"
android:id="@+id/info_target"
android:text="@string/info_target_label"
- android:drawableLeft="@drawable/ic_home_info_holo_dark" />
+ android:drawableLeft="@drawable/ic_home_info_holo_dark"
+ launcher:strokeColor="#991e3157"
+ launcher:strokeTextColor="#DDFFFFFF"
+ launcher:strokeWidth="2.5" />
</FrameLayout>
</LinearLayout>
</com.android.launcher2.SearchDropTargetBar>
diff --git a/res/values-large-port/dimens.xml b/res/values-large-port/dimens.xml
index 89f8605..86bd03d 100644
--- a/res/values-large-port/dimens.xml
+++ b/res/values-large-port/dimens.xml
@@ -15,11 +15,18 @@
-->
<resources>
+ <dimen name="apps_customize_cell_width">96dp</dimen>
+ <dimen name="apps_customize_cell_height">96dp</dimen>
+ <!-- The amount of space to account for the next/prev pages when
+ calculating the number of columns to fit a page.
+ In portrait/large we use apps_customize_cell_width / 8. -->
+ <dimen name="apps_customize_peek_width">12dp</dimen>
+
<!-- the area at the edge of the screen that makes the workspace go left
or right while you're dragging. -->
<dimen name="scroll_zone">40dp</dimen>
- <dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen>
+ <dimen name="all_apps_view_pageLayoutWidthGap">24dp</dimen>
<dimen name="all_apps_view_pageLayoutHeightGap">36dp</dimen>
<dimen name="all_apps_view_pageLayoutPaddingTop">25dp</dimen>
<dimen name="all_apps_view_pageLayoutPaddingBottom">10dp</dimen>
diff --git a/res/values-large/config.xml b/res/values-large/config.xml
index dca8282..2a52664 100644
--- a/res/values-large/config.xml
+++ b/res/values-large/config.xml
@@ -7,7 +7,7 @@
<integer name="config_customizeZoomScaleFactor">7</integer>
<integer name="config_customizeFadeInTime">800</integer>
<!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
- <integer name="config_workspaceSpringLoadShrinkPercentage">70</integer>
+ <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer>
<!-- The slope, in percent, of the drag movement needed to drag an item out of
Customize (y / x * 100%) -->
diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml
index 970a200..924832a 100644
--- a/res/values-large/dimens.xml
+++ b/res/values-large/dimens.xml
@@ -15,8 +15,18 @@
-->
<resources>
+<!-- Workspace -->
+ <dimen name="qsb_bar_height">56dp</dimen>
+
<dimen name="apps_customize_cell_width">96dp</dimen>
<dimen name="apps_customize_cell_height">96dp</dimen>
+ <!-- The amount of space to account for the next/prev pages when
+ calculating the number of columns to fit a page.
+ In landscape/large we use apps_customize_cell_width / 4. -->
+ <dimen name="apps_customize_peek_width">48dp</dimen>
+ <dimen name="apps_customize_widget_cell_width_gap">36dp</dimen>
+ <dimen name="apps_customize_widget_cell_height_gap">36dp</dimen>
+
<dimen name="workspace_cell_width">96dip</dimen>
<dimen name="workspace_cell_height">96dip</dimen>
diff --git a/res/values-large/strings.xml b/res/values-large/strings.xml
index 75a22a2..97024fa 100644
--- a/res/values-large/strings.xml
+++ b/res/values-large/strings.xml
@@ -26,4 +26,14 @@
<!-- Negative button text for the wallpaper selection dialog [CHAR_LIMIT=40]-->
<string name="wallpaper_cancel">Cancel</string>
+
+ <!-- Label for delete drop target. [CHAR_LIMIT=30] -->
+ <string name="delete_target_label">Remove</string>
+ <!-- Label for uninstall drop target. [CHAR_LIMIT=30]-->
+ <string name="delete_target_uninstall_label">Uninstall</string>
+ <!-- Label for the info icon. [CHAR_LIMIT=30] -->
+ <string name="info_target_label">Manage</string>
+
+ <!-- Market button text [CHAR LIMIT=32] -->
+ <string name="market">Shop</string>
</resources>
\ No newline at end of file
diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml
index 054d967..42b85f6 100644
--- a/res/values-large/styles.xml
+++ b/res/values-large/styles.xml
@@ -42,10 +42,14 @@
<item name="android:includeFontPadding">false</item>
</style>
+ <style name="WidgetDivider">
+ <item name="android:visibility">visible</item>
+ </style>
+
<style name="TabIndicator.Wide">
<item name="android:paddingLeft">40dp</item>
<item name="android:paddingRight">40dp</item>
- <item name="android:paddingTop">15dp</item>
+ <item name="android:paddingTop">10dp</item>
<item name="android:paddingBottom">20dp</item>
<item name="android:textSize">20sp</item>
</style>
@@ -53,6 +57,37 @@
<style name="CustomizeTabIndicator.Wide" parent="TabIndicator.Wide">
</style>
+
+ <!-- QSB Search / Drop Target bar -->
+ <style name="SearchDropTargetBar">
+ <item name="android:orientation">horizontal</item>
+ </style>
+ <style name="SearchButton">
+ <item name="android:layout_gravity">center_vertical</item>
+ <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
+ <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
+ <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item>
+ <item name="android:paddingRight">@dimen/toolbar_button_horizontal_padding</item>
+ </style>
+ <style name="SearchButtonDivider">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:layout_gravity">center_vertical</item>
+ </style>
+ <style name="DropTargetButtonContainer">
+ <item name="android:layout_width">0dp</item>
+ <item name="android:layout_height">match_parent</item>
+ </style>
+ <style name="DropTargetButton">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:layout_gravity">center_horizontal</item>
+ <item name="android:gravity">center_vertical</item>
+ <item name="android:drawablePadding">7.5dp</item>
+ <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
+ <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
+ </style>
+
<style name="config_orientation">
<item name="@android:screenOrientation">unspecified</item>
</style>
diff --git a/res/values-xlarge-port/dimens.xml b/res/values-xlarge-port/dimens.xml
new file mode 100644
index 0000000..31db0b3
--- /dev/null
+++ b/res/values-xlarge-port/dimens.xml
@@ -0,0 +1,26 @@
+<?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>
+ <!-- The amount of space to account for the next/prev pages when
+ calculating the number of columns to fit a page.
+ In portrait/xlarge we use apps_customize_cell_width / 4. -->
+ <dimen name="apps_customize_peek_width">48dp</dimen>
+
+ <!-- We can also afford to have a slightly wider portrait layout in
+ xlarge -->
+ <dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index ae1b7f7..ee48aa7 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -104,7 +104,6 @@
<attr name="pageLayoutPaddingBottom" format="dimension" />
<attr name="pageLayoutPaddingLeft" format="dimension" />
<attr name="pageLayoutPaddingRight" format="dimension" />
- <attr name="pageLayoutMaxHeight" format="dimension" />
<!-- The space between adjacent pages of the PagedView. -->
<attr name="pageSpacing" format="dimension" />
</declare-styleable>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f51f8b1..15dbc3a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,6 +27,10 @@
<dimen name="app_icon_size">50dp</dimen>
<dimen name="apps_customize_cell_width">68dp</dimen>
<dimen name="apps_customize_cell_height">68dp</dimen>
+ <!-- In portrat/normal, we peek only 1/8th the app cell width -->
+ <dimen name="apps_customize_peek_width">9dp</dimen>
+ <dimen name="apps_customize_widget_cell_width_gap">10dp</dimen>
+ <dimen name="apps_customize_widget_cell_height_gap">10dp</dimen>
<dimen name="title_texture_width">120px</dimen>
<!-- height of the tab bar in AppsCustomize -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5ecfdd6..b3c6000 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -83,8 +83,8 @@
<string name="all_apps_no_games">No games found.</string>
<!-- Message to show when there are no downloaded apps [CHAR_LIMIT=50] -->
<string name="all_apps_no_downloads">You have no downloaded applications.</string>
- <!-- Market button text [CHAR LIMIT=32] -->
- <string name="market">Shop</string>
+ <!-- Market button text. The market button has no text in the Phone UI. [CHAR LIMIT=32] -->
+ <string name="market"></string>
<!-- Customization Drawer -->
<!-- The format string for the dimensions of a widget in the drawer -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f2c07f7..176bab5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -68,6 +68,10 @@
<item name="android:layout_marginRight">10dip</item>
</style>
+ <style name="WidgetDivider">
+ <item name="android:visibility">gone</item>
+ </style>
+
<style name="SearchDropTargetBar">
<item name="android:orientation">horizontal</item>
</style>
