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 | |
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')
-rw-r--r-- | res/layout-large/qsb_bar.xml | 28 | ||||
-rw-r--r-- | res/layout/qsb_bar.xml | 28 | ||||
-rw-r--r-- | res/values-large/styles.xml | 8 | ||||
-rw-r--r-- | res/values/colors.xml | 4 | ||||
-rw-r--r-- | res/values/config.xml | 3 | ||||
-rw-r--r-- | res/values/styles.xml | 8 |
6 files changed, 37 insertions, 42 deletions
diff --git a/res/layout-large/qsb_bar.xml b/res/layout-large/qsb_bar.xml index 57e4eeb14..421ace2e1 100644 --- a/res/layout-large/qsb_bar.xml +++ b/res/layout-large/qsb_bar.xml @@ -104,32 +104,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> 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> diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml index 42b85f652..9c1532aa0 100644 --- a/res/values-large/styles.xml +++ b/res/values-large/styles.xml @@ -80,12 +80,12 @@ </style> <style name="DropTargetButton"> <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">center_horizontal</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_gravity">center</item> <item name="android:gravity">center_vertical</item> <item name="android:drawablePadding">7.5dp</item> - <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item> - <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item> + <item name="android:textColor">#FFFFFFFF</item> + <item name="android:textSize">16sp</item> </style> <style name="config_orientation"> diff --git a/res/values/colors.xml b/res/values/colors.xml index e14fbfe37..fd7b21c35 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,8 +20,8 @@ <resources> <!-- The color tints to apply to the text and drag view when hovering over the delete target or the info target --> - <color name="delete_target_hover_tint">#A5FF0000</color> - <color name="info_target_hover_tint">#A50000FE</color> + <color name="delete_target_hover_tint">#D4FF3600</color> + <color name="info_target_hover_tint">#D40078FF</color> <color name="window_background">#FF191919</color> <color name="grid_dark_background">#EB191919</color> diff --git a/res/values/config.xml b/res/values/config.xml index 394ff8afa..06e8fdad8 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -43,6 +43,9 @@ <integer name="config_allAppsBatchSize">0</integer> <!-- Workspace --> + <!-- The transition duration for the background of the drop targets --> + <integer name="config_dropTargetBgTransitionDuration">100</integer> + <integer name="config_crosshairsFadeInTime">600</integer> <!-- When dragging an item on the workspace, how much bigger (in pixels) the dragged view diff --git a/res/values/styles.xml b/res/values/styles.xml index 176bab572..5c458b408 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -93,12 +93,12 @@ </style> <style name="DropTargetButton"> <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">center_horizontal</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_gravity">center</item> <item name="android:gravity">center_vertical</item> <item name="android:drawablePadding">7.5dp</item> - <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item> - <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item> + <item name="android:textColor">#FFFFFFFF</item> + <item name="android:textSize">16sp</item> </style> <style name="TabIndicator"> |