summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/layout/settings_pane.xml60
-rw-r--r--res/layout/settings_pane_list_item.xml15
-rw-r--r--res/values-sw320dp/dimens.xml2
-rw-r--r--res/values-sw340dp/dimens.xml2
-rw-r--r--res/values-sw600dp/dimens.xml6
-rw-r--r--res/values-sw720dp/dimens.xml2
-rw-r--r--res/values/dimens.xml1
7 files changed, 41 insertions, 47 deletions
diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml
index 26ee8fc26..495d0997d 100644
--- a/res/layout/settings_pane.xml
+++ b/res/layout/settings_pane.xml
@@ -20,86 +20,74 @@
<ImageView
android:id="@+id/settings_drag_arrow"
- android:layout_width="@dimen/overview_panel_button_spacing"
- android:layout_height="@dimen/overview_panel_button_spacing"
+ android:layout_width="@dimen/overview_panel_handle_size"
+ android:layout_height="@dimen/overview_panel_handle_size"
android:layout_gravity="center_horizontal"
android:adjustViewBounds="true"
android:background="@drawable/launcheranimatedarrow_00000"/>
- <LinearLayout
- android:layout_width="match_parent"
+ <RelativeLayout
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
android:orientation="horizontal"
+ android:layout_gravity="center_horizontal|bottom"
android:paddingBottom="@dimen/overview_panel_bottom_padding"
- android:paddingTop="@dimen/overview_panel_list_padding" >
-
- <Space
- android:layout_width="0dip"
- android:layout_height="1dp"
- android:layout_weight="1" />
+ android:paddingTop="@dimen/overview_panel_list_padding"
+ android:layout_marginLeft="@dimen/overview_panel_button_spacing"
+ android:layout_marginRight="@dimen/overview_panel_button_spacing">
<TextView
android:id="@+id/wallpaper_button"
- android:layout_width="0dip"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:drawableTop="@drawable/wallpaper_button"
android:fontFamily="sans-serif-condensed"
android:gravity="center_horizontal"
- android:layout_weight="2"
+ android:paddingLeft="@dimen/overview_panel_button_spacing"
+ android:paddingRight="@dimen/overview_panel_button_spacing"
android:text="@string/wallpaper_button_text"
android:textAllCaps="true"
android:textSize="12sp"
android:textColor="@android:color/white"
- android:maxLines="2" />
-
- <Space
- android:layout_width="0dip"
- android:layout_height="1dp"
- android:layout_weight="1" />
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"/>
<TextView
android:id="@+id/widget_button"
- android:layout_width="0dip"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:drawableTop="@drawable/widget_button"
android:fontFamily="sans-serif-condensed"
android:gravity="center_horizontal"
- android:layout_weight="2"
+ android:paddingLeft="@dimen/overview_panel_button_spacing"
+ android:paddingRight="@dimen/overview_panel_button_spacing"
android:text="@string/widget_button_text"
android:textAllCaps="true"
android:textSize="12sp"
android:textColor="@android:color/white"
- android:maxLines="2" />
-
- <Space
- android:layout_width="0dip"
- android:layout_height="1dp"
- android:layout_weight="1" />
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true" />
<TextView
android:id="@+id/themes_button"
- android:layout_width="0dip"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:drawableTop="@drawable/themes_button"
android:fontFamily="sans-serif-condensed"
android:gravity="center_horizontal"
- android:layout_weight="2"
+ android:paddingLeft="@dimen/overview_panel_button_spacing"
+ android:paddingRight="@dimen/overview_panel_button_spacing"
android:text="@string/themes_button_text"
android:textAllCaps="true"
android:textSize="12sp"
android:textColor="@android:color/white"
- android:maxLines="2" />
-
- <Space
- android:layout_width="0dip"
- android:layout_height="1dp"
- android:layout_weight="1" />
+ android:layout_alignParentTop="true"
+ android:layout_alignParentRight="true" />
- </LinearLayout>
+ </RelativeLayout>
</LinearLayout>
<view
diff --git a/res/layout/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml
index 2a9d31b95..6e6825fce 100644
--- a/res/layout/settings_pane_list_item.xml
+++ b/res/layout/settings_pane_list_item.xml
@@ -1,4 +1,4 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
@@ -9,7 +9,7 @@
<TextView
android:id="@+id/item_name"
- android:layout_width="wrap_content"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:fontFamily="sans-serif-condensed"
@@ -17,13 +17,13 @@
android:paddingBottom="@dimen/overview_panel_list_padding"
android:paddingTop="@dimen/overview_panel_list_padding"
android:textSize="20sp"
- android:textColor="@color/listitem_text"/>
+ android:textColor="@color/listitem_text"
+ android:layout_weight="3" />
<TextView
android:id="@+id/item_state"
- android:layout_width="wrap_content"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
android:drawablePadding="4dp"
android:fontFamily="sans-serif-condensed"
android:gravity="right"
@@ -31,6 +31,7 @@
android:paddingTop="@dimen/overview_panel_list_padding"
android:textSize="20sp"
android:textAllCaps="true"
- android:textColor="@color/listitem_text" />
+ android:textColor="@color/listitem_text"
+ android:layout_weight="1" />
-</RelativeLayout> \ No newline at end of file
+</LinearLayout> \ No newline at end of file
diff --git a/res/values-sw320dp/dimens.xml b/res/values-sw320dp/dimens.xml
index 9958136ab..93fb82130 100644
--- a/res/values-sw320dp/dimens.xml
+++ b/res/values-sw320dp/dimens.xml
@@ -17,7 +17,7 @@
<resources>
<!-- Workspace -->
<dimen name="overview_panel_bottom_padding">50dp</dimen>
- <dimen name="overview_panel_button_spacing">32dp</dimen>
+ <dimen name="overview_panel_button_spacing">17dp</dimen>
<dimen name="overview_panel_side_padding">28dp</dimen>
<dimen name="overview_panel_list_padding">16dp</dimen>
</resources>
diff --git a/res/values-sw340dp/dimens.xml b/res/values-sw340dp/dimens.xml
index 69d6e58a3..56b9a3b04 100644
--- a/res/values-sw340dp/dimens.xml
+++ b/res/values-sw340dp/dimens.xml
@@ -17,4 +17,6 @@
<resources>
<!-- Drag padding to add to the bottom of drop targets -->
<dimen name="drop_target_drag_padding">20dp</dimen>
+
+ <dimen name="overview_panel_button_spacing">22dp</dimen>
</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index cba5ac799..929b325e3 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -17,13 +17,13 @@
<resources>
<dimen name="app_icon_size">64dp</dimen>
-<!-- Workspace -->
- <dimen name="overview_panel_button_spacing">22dp</dimen>
-
<!-- AppsCustomize -->
<dimen name="apps_customize_tab_bar_height">60dp</dimen>
<dimen name="apps_customize_tab_bar_margin_top">8dp</dimen>
<dimen name="app_widget_preview_label_margin_top">8dp</dimen>
<dimen name="app_widget_preview_label_margin_left">@dimen/app_widget_preview_padding_left</dimen>
<dimen name="app_widget_preview_label_margin_right">@dimen/app_widget_preview_padding_right</dimen>
+
+ <dimen name="sliding_panel_padding">180dp</dimen>
+ <dimen name="overview_panel_button_spacing">32dp</dimen>
</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 9ae155b3c..6a57e4374 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -25,4 +25,6 @@
the drag view should be offset from the position of the original view. -->
<dimen name="dragViewOffsetX">0dp</dimen>
<dimen name="dragViewOffsetY">0dp</dimen>
+
+ <dimen name="overview_panel_button_spacing">35dp</dimen>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6017b8eb6..65726056b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,6 +51,7 @@
<dimen name="overview_panel_top_padding">20dp</dimen>
<dimen name="overview_panel_bottom_padding">50dp</dimen>
<dimen name="overview_panel_button_spacing">30dp</dimen>
+ <dimen name="overview_panel_handle_size">30dp</dimen>
<dimen name="overview_mode_page_offset">60dp</dimen>
<dimen name="sliding_panel_padding">175dp</dimen>
<dimen name="overview_scaling_padding">50dp</dimen>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:31:11 +0000