Fixing some issues with AppsCustomize
- Tweaking the widget page to make it a little tighter
- Altering the way we generate widget previews to make them more consistent
- Making the Apps page two line titles
Change-Id: I7bce420466c1d41fb87b423f259472482803a406
diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml
index 57a9962..7cc4177 100644
--- a/res/layout/apps_customize_widget.xml
+++ b/res/layout/apps_customize_widget.xml
@@ -45,12 +45,8 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
- android:textColor="#FFBBBBBB"
- android:textSize="14sp"
- android:shadowColor="#FF000000"
- android:shadowDx="0.0"
- android:shadowDy="1.0"
- android:shadowRadius="1.0" />
+ android:textColor="#FFFFFFFF"
+ android:textSize="13sp" />
<!-- The original dimensions of the widget (can't be the same text as above due to different
style. -->
@@ -58,17 +54,13 @@
android:id="@+id/widget_dims"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
+ android:layout_gravity="center"
android:layout_marginLeft="5dp"
android:layout_weight="0"
android:gravity="left"
- android:textColor="#FF666666"
- android:textSize="12sp"
- android:shadowColor="#99000000"
- android:shadowDx="0.0"
- android:shadowDy="1.0"
- android:shadowRadius="1.0" />
+ android:textColor="#FF555555"
+ android:textSize="12sp" />
</LinearLayout>
<!-- The icon of the widget. -->
@@ -77,6 +69,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:adjustViewBounds="true"
- android:scaleType="fitStart" />
+ android:padding="8dp"
+ android:scaleType="matrix" />
</com.android.launcher2.PagedViewWidget>
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml
index 5aff6d9..83f2d60 100644
--- a/res/values-port/dimens.xml
+++ b/res/values-port/dimens.xml
@@ -24,6 +24,7 @@
<dimen name="workspace_bottom_padding">0dp</dimen>
<dimen name="workspace_page_spacing">-1dp</dimen>
+<!-- AppsCustomize -->
<integer name="apps_customize_cellCountX">4</integer>
<integer name="apps_customize_cellCountY">5</integer>
<dimen name="apps_customize_pageLayoutWidthGap">-1dp</dimen>
diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml
index 690facc..dd485e3 100644
--- a/res/values-sw340dp-port/dimens.xml
+++ b/res/values-sw340dp-port/dimens.xml
@@ -49,4 +49,12 @@
<dimen name="button_bar_width_left_padding">8dp</dimen>
<dimen name="button_bar_width_right_padding">8dp</dimen>
<dimen name="button_bar_height_plus_padding">80dp</dimen>
+
+<!-- AppsCustomize -->
+ <dimen name="apps_customize_pageLayoutPaddingTop">16dp</dimen>
+ <dimen name="apps_customize_pageLayoutPaddingBottom">20dp</dimen>
+ <dimen name="apps_customize_pageLayoutPaddingLeft">8dp</dimen>
+ <dimen name="apps_customize_pageLayoutPaddingRight">8dp</dimen>
+ <dimen name="apps_customize_cell_height">92dp</dimen>
+ <dimen name="apps_customize_widget_cell_height_gap">16dp</dimen>
</resources>
diff --git a/res/values-sw340dp-port/styles.xml b/res/values-sw340dp-port/styles.xml
index c006b85..2b1376d 100644
--- a/res/values-sw340dp-port/styles.xml
+++ b/res/values-sw340dp-port/styles.xml
@@ -32,4 +32,16 @@
<item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
<item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
</style>
+
+<!-- AppsCustomize -->
+ <style name="WorkspaceIcon.Portrait.AppsCustomize">
+ <item name="android:singleLine">false</item>
+ <item name="android:maxLines">2</item>
+ <item name="android:background">@null</item>
+ <item name="android:paddingTop">4dp</item>
+ <item name="android:paddingBottom">0dp</item>
+ <item name="android:paddingLeft">0dp</item>
+ <item name="android:paddingRight">0dp</item>
+ <item name="android:drawablePadding">6dp</item>
+ </style>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7973ca8..faad606 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -55,11 +55,11 @@
<dimen name="apps_customize_tab_bar_height">56dp</dimen>
<dimen name="app_icon_size">48dp</dimen>
<!-- The width can be 72dp because we don't have L/R padding -->
- <dimen name="apps_customize_cell_width">72dp</dimen>
- <dimen name="apps_customize_cell_height">80dp</dimen>
+ <dimen name="apps_customize_cell_width">74dp</dimen>
+ <dimen name="apps_customize_cell_height">82dp</dimen>
<dimen name="apps_customize_max_gap">18dp</dimen>
<dimen name="apps_customize_widget_cell_width_gap">10dp</dimen>
- <dimen name="apps_customize_widget_cell_height_gap">10dp</dimen>
+ <dimen name="apps_customize_widget_cell_height_gap">8dp</dimen>
<dimen name="title_texture_width">120px</dimen>
<!-- height of the bottom row of controls -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 05a83b2..8368388 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -95,12 +95,14 @@
</style>
<style name="WorkspaceIcon.Portrait.AppsCustomize">
+ <item name="android:singleLine">false</item>
+ <item name="android:maxLines">2</item>
<item name="android:background">@null</item>
- <item name="android:paddingTop">4dp</item>
+ <item name="android:paddingTop">0dp</item>
<item name="android:paddingBottom">0dp</item>
<item name="android:paddingLeft">0dp</item>
<item name="android:paddingRight">0dp</item>
- <item name="android:drawablePadding">8dp</item>
+ <item name="android:drawablePadding">2dp</item>
</style>
<style name="WorkspaceIcon.Landscape.AppsCustomize">
<item name="android:background">@null</item>