summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-05-31 16:50:48 -0700
committerWinson Chung <winsonc@google.com>2011-06-01 17:28:23 -0700
commit4c98d9235d164680186180974719f551cf935d08 (patch)
tree43a64765edf35404256f7f52809ae114054e9436 /res/values
parent85b439c964a23f262f57c7333bfd2b3b838836f7 (diff)
downloadandroid_packages_apps_Trebuchet-4c98d9235d164680186180974719f551cf935d08.tar.gz
android_packages_apps_Trebuchet-4c98d9235d164680186180974719f551cf935d08.tar.bz2
android_packages_apps_Trebuchet-4c98d9235d164680186180974719f551cf935d08.zip
Adding drag target bar.
Change-Id: Ia00ed30264ea5f1d3c919111d15588ef441bfe20
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml7
-rw-r--r--res/values/strings.xml7
-rw-r--r--res/values/styles.xml16
3 files changed, 26 insertions, 4 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6c372e356..e14fbfe37 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,10 +18,14 @@
*/
-->
<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="window_background">#FF191919</color>
<color name="grid_dark_background">#EB191919</color>
<color name="bubble_dark_background">#20000000</color>
- <color name="delete_color_filter">#A5FF0000</color>
<color name="appwidget_error_color">#FCCC</color>
<color name="snag_callout_color">#F444</color>
@@ -29,7 +33,6 @@
<color name="gesture_color">#ff0563c1</color>
<color name="uncertain_gesture_color">#ff848484</color>
- <color name="app_info_filter">#A50000FE</color>
<color name="dimmed_view_color">#FF7F7F7F</color>
<color name="drag_outline_color">#6595f9</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 32e649d25..e59fd6ed6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -162,6 +162,13 @@
device. [CHAR_LIMIT=30]-->
<string name="delete_zone_label_all_apps">Uninstall</string>
+ <!-- Label for delete drop target. [CHAR_LIMIT=30] -->
+ <string name="delete_target_label">Remove</string>
+ <!-- Label for uninstall drop target. [CHAR_LIMIT=30]-->
+ <string name="delete_target_uninstall_label">Uninstall</string>
+ <!-- Label for the info icon. [CHAR_LIMIT=30] -->
+ <string name="info_target_label">Manage</string>
+
<!-- Accessibility: Search button -->
<string name="accessibility_search_button">Search</string>
<!-- Accessibility: Voice Search button -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c3e6ce97a..36a4be02c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -68,7 +68,7 @@
<item name="android:layout_marginRight">10dip</item>
</style>
- <style name="SearchBar">
+ <style name="SearchDropTargetBar">
<item name="android:orientation">horizontal</item>
</style>
<style name="SearchButton">
@@ -83,7 +83,19 @@
<item name="android:layout_height">match_parent</item>
<item name="android:layout_gravity">center_vertical</item>
</style>
-
+ <style name="DropTargetButtonContainer">
+ <item name="android:layout_width">0dp</item>
+ <item name="android:layout_height">match_parent</item>
+ </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: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>
+ </style>
<style name="TabIndicator">
<item name="android:layout_width">wrap_content</item>