diff options
author | Winson Chung <winsonc@google.com> | 2010-10-20 17:49:27 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2010-10-20 18:39:54 -0700 |
commit | df4b83dd9d6380ab963c62d1f9d1312efc87cb0f (patch) | |
tree | e8fd6a182f7af67fc7779207b4e2fed696f56ce5 /res | |
parent | bae3d061cc16ad005302b5eec404c4c0bc3a7421 (diff) | |
download | android_packages_apps_Trebuchet-df4b83dd9d6380ab963c62d1f9d1312efc87cb0f.tar.gz android_packages_apps_Trebuchet-df4b83dd9d6380ab963c62d1f9d1312efc87cb0f.tar.bz2 android_packages_apps_Trebuchet-df4b83dd9d6380ab963c62d1f9d1312efc87cb0f.zip |
More spacing changes for AllApps.
- Also testing a simple scale of existing icons in lieu of high res icons.
Change-Id: Ib9758064536cd1b1704344ea885bccdc93dd3466
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-xlarge-land/all_apps_tabbed.xml | 16 | ||||
-rw-r--r-- | res/layout-xlarge-land/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-xlarge-port/all_apps_tabbed.xml | 11 | ||||
-rw-r--r-- | res/layout-xlarge-port/customization_drawer.xml | 4 | ||||
-rw-r--r-- | res/layout-xlarge-port/launcher.xml | 2 | ||||
-rw-r--r-- | res/layout-xlarge/all_apps_paged_view_application.xml | 3 | ||||
-rw-r--r-- | res/values-xlarge/dimens.xml | 3 | ||||
-rw-r--r-- | res/values/attrs.xml | 5 |
8 files changed, 27 insertions, 19 deletions
diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml index 3a07b9543..fd9d9cbf6 100644 --- a/res/layout-xlarge-land/all_apps_tabbed.xml +++ b/res/layout-xlarge-land/all_apps_tabbed.xml @@ -15,8 +15,7 @@ --> <com.android.launcher2.AllAppsTabbed xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - android:paddingTop="?android:attr/actionBarSize"> + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"> <LinearLayout android:orientation="vertical" android:layout_width="match_parent" @@ -26,8 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:tabStripEnabled="false" - android:paddingBottom="10dp" /> + android:tabStripEnabled="false" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" @@ -37,11 +35,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" launcher:cellCountX="7" - launcher:cellCountY="4" - launcher:pageLayoutPaddingTop="10dp" + launcher:cellCountY="5" + launcher:pageLayoutWidthGap="36dp" + launcher:pageLayoutHeightGap="6dp" + launcher:pageLayoutPaddingTop="0dp" launcher:pageLayoutPaddingBottom="15dp" - launcher:pageLayoutPaddingLeft="20dp" - launcher:pageLayoutPaddingRight="20dp"> + launcher:pageLayoutPaddingLeft="40dp" + launcher:pageLayoutPaddingRight="40dp"> </com.android.launcher2.AllAppsPagedView> </FrameLayout> </LinearLayout> diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml index 65f29df00..0ef946f9a 100644 --- a/res/layout-xlarge-land/launcher.xml +++ b/res/layout-xlarge-land/launcher.xml @@ -26,7 +26,7 @@ layout="@layout/all_apps_tabbed" android:id="@+id/all_apps_view" android:layout_width="match_parent" - android:layout_height="550dip" + android:layout_height="600dip" android:layout_gravity="top"/> <!-- The workspace contains 5 screens of cells --> diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml index 6675adc55..d61c979de 100644 --- a/res/layout-xlarge-port/all_apps_tabbed.xml +++ b/res/layout-xlarge-port/all_apps_tabbed.xml @@ -26,8 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:tabStripEnabled="false" - android:paddingBottom="10dp" /> + android:tabStripEnabled="false" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" @@ -38,10 +37,12 @@ android:layout_height="match_parent" launcher:cellCountX="5" launcher:cellCountY="7" - launcher:pageLayoutPaddingTop="10dp" + launcher:pageLayoutWidthGap="36dp" + launcher:pageLayoutHeightGap="36dp" + launcher:pageLayoutPaddingTop="0dp" launcher:pageLayoutPaddingBottom="10dp" - launcher:pageLayoutPaddingLeft="0dp" - launcher:pageLayoutPaddingRight="0dp"> + launcher:pageLayoutPaddingLeft="20dp" + launcher:pageLayoutPaddingRight="20dp"> </com.android.launcher2.AllAppsPagedView> </FrameLayout> </LinearLayout> diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml index 20c207f42..53d1f6f88 100644 --- a/res/layout-xlarge-port/customization_drawer.xml +++ b/res/layout-xlarge-port/customization_drawer.xml @@ -24,5 +24,5 @@ launcher:cellCountY="4" launcher:pageLayoutPaddingTop="15dp" launcher:pageLayoutPaddingBottom="25dp" - launcher:pageLayoutPaddingLeft="0dp" - launcher:pageLayoutPaddingRight="0dp" />
\ No newline at end of file + launcher:pageLayoutPaddingLeft="15dp" + launcher:pageLayoutPaddingRight="15dp" /> diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml index a418b36aa..df7abc161 100644 --- a/res/layout-xlarge-port/launcher.xml +++ b/res/layout-xlarge-port/launcher.xml @@ -26,7 +26,7 @@ layout="@layout/all_apps_tabbed" android:id="@+id/all_apps_view" android:layout_width="match_parent" - android:layout_height="1000dip" + android:layout_height="1040dip" android:layout_gravity="top"/> <!-- The workspace contains 5 screens of cells --> diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml index 8e53e0656..f68773998 100644 --- a/res/layout-xlarge/all_apps_paged_view_application.xml +++ b/res/layout-xlarge/all_apps_paged_view_application.xml @@ -22,6 +22,7 @@ launcher:outlineColor="#FF8CD2FF" launcher:checkedBlurColor="#FFBBE83C" launcher:checkedOutlineColor="#FF8CD2FF" + launcher:scaledIconSize="64dp" android:id="@+id/application_icon" android:layout_width="match_parent" @@ -30,7 +31,7 @@ android:paddingTop="2dip" android:textColor="#FFFFFFFF" - android:textSize="14sp" + android:textSize="13sp" android:shadowColor="#FF000000" android:shadowDx="0.0" android:shadowDy="1.0" diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index 4662aad9f..ecc6f3a65 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -23,7 +23,8 @@ <dimen name="smallScreenExtraSpacing">0dip</dimen> <!-- vertical spacing between edge of screen and mini screen thumbnails --> - <dimen name="smallScreenVerticalMargin">60dip</dimen> + <dimen name="smallScreenVerticalMarginLandscape">30dip</dimen> + <dimen name="smallScreenVerticalMarginPortrait">60dip</dimen> <dimen name="toolbar_padding">10dip</dimen> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 14a5e98ac..a0e2706e0 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -66,6 +66,8 @@ <attr name="checkedBlurColor" format="color" /> <!-- The checked outline color of the holographic outline --> <attr name="checkedOutlineColor" format="color" /> + <!-- The scaled icon dimension --> + <attr name="scaledIconSize" format="dimension" /> </declare-styleable> <!-- PagedViewWidgetIcon specific attributes. These attributes are used to @@ -84,6 +86,9 @@ <attr name="cellCountX" /> <!-- The number of vertical cells in a page --> <attr name="cellCountY" /> + <!-- A spacing override for the icons within a page --> + <attr name="pageLayoutWidthGap" format="dimension" /> + <attr name="pageLayoutHeightGap" format="dimension" /> <!-- The padding of the pages that are dynamically created per page --> <attr name="pageLayoutPaddingTop" format="dimension" /> <attr name="pageLayoutPaddingBottom" format="dimension" /> |