diff options
| author | Winson Chung <winsonc@google.com> | 2011-07-27 15:18:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-27 15:18:16 -0700 |
| commit | 365055f289bc9c3c730f1dcf26c99afc6d8b31c5 (patch) | |
| tree | 6a0c9c12020f444dfb60d70fdeedf0641f3663e1 /res/layout | |
| parent | aed8c8302a7fe2ed121a96ad1801a7da39f5af40 (diff) | |
| parent | a6427b15c18d5b8f3078f553d78f8432de9f46e9 (diff) | |
| download | android_packages_apps_Trebuchet-365055f289bc9c3c730f1dcf26c99afc6d8b31c5.tar.gz android_packages_apps_Trebuchet-365055f289bc9c3c730f1dcf26c99afc6d8b31c5.tar.bz2 android_packages_apps_Trebuchet-365055f289bc9c3c730f1dcf26c99afc6d8b31c5.zip | |
Merge "Fixing minor bugs (5085316, 5082963, 5042828)"
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/qsb_bar.xml | 14 | ||||
| -rw-r--r-- | res/layout/workspace_divider.xml (renamed from res/layout/dock_divider.xml) | 8 |
2 files changed, 10 insertions, 12 deletions
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index abcc941f3..cad81f526 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -28,28 +28,26 @@ android:id="@+id/drag_target_bar" android:visibility="gone"> - <com.android.launcher2.DeleteDropTarget + <FrameLayout style="@style/DropTargetButtonContainer" - android:id="@+id/delete_target" android:layout_weight="1"> <!-- Delete target --> - <TextView + <com.android.launcher2.DeleteDropTarget style="@style/DropTargetButton" android:id="@+id/delete_target_text" android:text="@string/delete_zone_label_workspace" android:drawableLeft="@drawable/delete_target_selector" /> - </com.android.launcher2.DeleteDropTarget> + </FrameLayout> - <com.android.launcher2.InfoDropTarget + <FrameLayout style="@style/DropTargetButtonContainer" - android:id="@+id/info_target" android:layout_weight="1"> <!-- Info target --> - <TextView + <com.android.launcher2.InfoDropTarget style="@style/DropTargetButton" android:id="@+id/info_target_text" android:text="@string/info_target_label" android:drawableLeft="@drawable/info_target_selector" /> - </com.android.launcher2.InfoDropTarget> + </FrameLayout> </LinearLayout> </com.android.launcher2.SearchDropTargetBar> diff --git a/res/layout/dock_divider.xml b/res/layout/workspace_divider.xml index c3cac5276..257ea7c90 100644 --- a/res/layout/dock_divider.xml +++ b/res/layout/workspace_divider.xml @@ -16,9 +16,9 @@ <ImageView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - android:paddingLeft="@dimen/dock_divider_padding_left" - android:paddingRight="@dimen/dock_divider_padding_right" - android:paddingTop="@dimen/dock_divider_padding_top" - android:paddingBottom="@dimen/dock_divider_padding_bottom" + android:paddingLeft="@dimen/workspace_divider_padding_left" + android:paddingRight="@dimen/workspace_divider_padding_right" + android:paddingTop="@dimen/workspace_divider_padding_top" + android:paddingBottom="@dimen/workspace_divider_padding_bottom" android:scaleType="fitXY" android:src="@drawable/hotseat_track_holo" />
\ No newline at end of file |