diff options
author | Winson Chung <winsonc@google.com> | 2011-06-12 15:15:29 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-06-13 11:51:18 -0700 |
commit | 61fa4197c4316bb0f9b05fcefb676f86197a2273 (patch) | |
tree | f65b772ab5f47288734edab35fdb5d8f0fabf7b9 /res/layout/qsb_bar.xml | |
parent | f0ea4d3378be7b962c8e0bce2392df5e82491fb8 (diff) | |
download | android_packages_apps_Trebuchet-61fa4197c4316bb0f9b05fcefb676f86197a2273.tar.gz android_packages_apps_Trebuchet-61fa4197c4316bb0f9b05fcefb676f86197a2273.tar.bz2 android_packages_apps_Trebuchet-61fa4197c4316bb0f9b05fcefb676f86197a2273.zip |
Fixing drop target area, and adding bg color indicators.
- Merging wallpaper fix and PagedViewIconCache key fix
Change-Id: I2a65bc4b642f020dfc4d2223a36d3ebcf41de5f5
Diffstat (limited to 'res/layout/qsb_bar.xml')
-rw-r--r-- | res/layout/qsb_bar.xml | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index 6e1d98c38..68ee8b6d5 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -67,32 +67,28 @@ android:layout_height="match_parent" android:alpha="0"> - <FrameLayout + <com.android.launcher2.DeleteDropTarget style="@style/DropTargetButtonContainer" + android:id="@+id/delete_target" android:layout_weight="1"> <!-- Delete target --> - <com.android.launcher2.DeleteDropTarget + <TextView style="@style/DropTargetButton" - android:id="@+id/delete_target" + android:id="@+id/delete_target_text" android:text="@string/delete_zone_label_workspace" - android:drawableLeft="@drawable/delete_zone_selector" - launcher:strokeColor="#991e3157" - launcher:strokeTextColor="#DDFFFFFF" - launcher:strokeWidth="2.5" /> - </FrameLayout> + android:drawableLeft="@drawable/delete_zone_selector" /> + </com.android.launcher2.DeleteDropTarget> - <FrameLayout + <com.android.launcher2.InfoDropTarget style="@style/DropTargetButtonContainer" + android:id="@+id/info_target" android:layout_weight="1"> <!-- Info target --> - <com.android.launcher2.InfoDropTarget + <TextView style="@style/DropTargetButton" - android:id="@+id/info_target" + android:id="@+id/info_target_text" android:text="@string/info_target_label" - android:drawableLeft="@drawable/ic_home_info_holo_dark" - launcher:strokeColor="#991e3157" - launcher:strokeTextColor="#DDFFFFFF" - launcher:strokeWidth="2.5" /> - </FrameLayout> + android:drawableLeft="@drawable/ic_home_info_holo_dark" /> + </com.android.launcher2.InfoDropTarget> </LinearLayout> </com.android.launcher2.SearchDropTargetBar> |