diff options
| author | Winson Chung <winsonc@google.com> | 2011-06-01 17:28:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-01 17:28:46 -0700 |
| commit | e934f87c6adc29c84ea96c608db4e4e5dd6b4046 (patch) | |
| tree | c3918da892700e5aba0effde439400e370c46a31 /res/values | |
| parent | 7446fee6cb1796efad265bee00b9bb51690d3af8 (diff) | |
| parent | 4c98d9235d164680186180974719f551cf935d08 (diff) | |
| download | android_packages_apps_Trebuchet-e934f87c6adc29c84ea96c608db4e4e5dd6b4046.tar.gz android_packages_apps_Trebuchet-e934f87c6adc29c84ea96c608db4e4e5dd6b4046.tar.bz2 android_packages_apps_Trebuchet-e934f87c6adc29c84ea96c608db4e4e5dd6b4046.zip | |
Merge "Adding drag target bar."
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | res/values/styles.xml | 16 |
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 eb6558208..5ecfdd6fe 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 196b48ba3..f2c07f767 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> |