diff options
author | Michael Jurka <mikejurka@google.com> | 2010-12-16 11:39:26 -0800 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2010-12-17 19:31:18 -0800 |
commit | 800242b5b7a066c3d0ddcc0e0aee32fb4d64d611 (patch) | |
tree | 09c16bfb44ddb1ee2fc3858f4fcbfe97230d821c /res/layout-xlarge-land | |
parent | 1d9c213a7f9c8066c5f2ef8fd0b93408c4869321 (diff) | |
download | android_packages_apps_Trebuchet-800242b5b7a066c3d0ddcc0e0aee32fb4d64d611.tar.gz android_packages_apps_Trebuchet-800242b5b7a066c3d0ddcc0e0aee32fb4d64d611.tar.bz2 android_packages_apps_Trebuchet-800242b5b7a066c3d0ddcc0e0aee32fb4d64d611.zip |
updating assets for configure/all apps
- fixed the dead zone between configure/all apps
Diffstat (limited to 'res/layout-xlarge-land')
-rw-r--r-- | res/layout-xlarge-land/all_apps_tabbed.xml | 2 | ||||
-rw-r--r-- | res/layout-xlarge-land/launcher.xml | 65 |
2 files changed, 53 insertions, 14 deletions
diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml index bb30c11a0..e1a37ff14 100644 --- a/res/layout-xlarge-land/all_apps_tabbed.xml +++ b/res/layout-xlarge-land/all_apps_tabbed.xml @@ -39,7 +39,7 @@ android:layout_centerVertical="true"> <com.android.launcher2.ApplicationInfoDropTarget android:id="@+id/all_apps_info_target" - android:src="@drawable/info_button" + android:src="@drawable/ic_home_info_holo_dark" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml index e421e0793..5c58a69aa 100644 --- a/res/layout-xlarge-land/launcher.xml +++ b/res/layout-xlarge-land/launcher.xml @@ -105,26 +105,47 @@ <ImageView android:id="@+id/configure_button" - android:src="@drawable/configure_button" + android:src="@drawable/ic_home_add_holo_dark" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" android:layout_alignParentRight="true" - android:layout_marginLeft="@dimen/toolbar_button_spacing" - android:layout_marginRight="@dimen/toolbar_button_spacing" + android:paddingLeft="@dimen/toolbar_button_horizontal_padding" + android:paddingRight="@dimen/toolbar_button_horizontal_padding" + android:paddingTop="@dimen/toolbar_button_vertical_padding" + android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:background="@drawable/button_bg" android:onClick="onClickConfigureButton" android:focusable="true" android:clickable="true" /> + <ImageView + android:id="@+id/divider" + android:src="@drawable/divider_launcher_holo" + android:layout_width="wrap_content" + android:layout_height="@dimen/toolbar_divider_height" + android:layout_toLeftOf="@id/configure_button" + android:paddingTop="@dimen/toolbar_button_vertical_padding" + android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:onClick="onClickAllAppsButton" + android:focusable="true" + android:clickable="true" /> <TextView android:id="@+id/all_apps_button" android:text="@string/all_apps_button_label" - android:background="@drawable/all_apps_button" + android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawableLeft="@drawable/ic_home_all_apps_holo_dark" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/configure_button" - android:layout_marginLeft="@dimen/toolbar_button_spacing" - android:layout_marginRight="@dimen/toolbar_button_spacing" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/divider" + android:paddingLeft="@dimen/toolbar_button_horizontal_padding" + android:paddingRight="@dimen/toolbar_button_horizontal_padding" + android:paddingTop="@dimen/toolbar_button_vertical_padding" + android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:background="@drawable/button_bg" + + android:gravity="center_horizontal|center_vertical" android:textColor="#CCFFFFFF" android:textSize="18sp" @@ -136,23 +157,41 @@ android:onClick="onClickAllAppsButton" android:focusable="true" android:clickable="true" /> - + <ImageView + android:id="@+id/divider_during_drag" + android:src="@drawable/divider_launcher_holo" + android:layout_width="wrap_content" + android:layout_height="@dimen/toolbar_divider_height" + android:layout_toLeftOf="@id/configure_button" + android:paddingTop="@dimen/toolbar_button_vertical_padding" + android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:visibility="gone"/> <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" android:src="@drawable/delete_zone_selector" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_alignRight="@id/all_apps_button" + android:paddingLeft="@dimen/toolbar_button_horizontal_padding" + android:paddingRight="@dimen/toolbar_button_horizontal_padding" + android:paddingTop="@dimen/toolbar_button_vertical_padding" + android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:background="@drawable/button_bg" android:visibility="gone" launcher:direction="horizontal" /> <com.android.launcher2.ApplicationInfoDropTarget android:id="@+id/info_button" - android:src="@drawable/info_button" + android:src="@drawable/ic_home_info_holo_dark" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_alignLeft="@id/configure_button" + android:paddingLeft="@dimen/toolbar_button_horizontal_padding" + android:paddingRight="@dimen/toolbar_button_horizontal_padding" + android:paddingTop="@dimen/toolbar_button_vertical_padding" + android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:background="@drawable/button_bg" android:visibility="gone" android:focusable="true" |