diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-10-23 11:38:15 -0700 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2015-09-27 18:55:56 -0700 |
| commit | 6cc6efbf2352a591755d6993c381b08502b0a634 (patch) | |
| tree | 9526c11c32560ef953114e2cce4562fce03856be /res/values | |
| parent | e95e8184f30a749167aa415bfabe706509159467 (diff) | |
| download | android_packages_apps_Trebuchet-6cc6efbf2352a591755d6993c381b08502b0a634.tar.gz android_packages_apps_Trebuchet-6cc6efbf2352a591755d6993c381b08502b0a634.tar.bz2 android_packages_apps_Trebuchet-6cc6efbf2352a591755d6993c381b08502b0a634.zip | |
Some resource fixes for drop target
> Making it singleline with ellipsis everywhere
> Decreasing the text size on smaller devices
> Decreasing char limit for various labels
Bug: 17563793
Bug: 17938450
Change-Id: I8ad1a156de0601d07419b2cc6418389bc2e24a4e
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 24 |
3 files changed, 18 insertions, 13 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 97a12abdc..e324f6355 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -70,6 +70,7 @@ <!-- Drag padding to add to the bottom of drop targets --> <dimen name="drop_target_drag_padding">14dp</dimen> + <dimen name="drop_target_text_size">14sp</dimen> <dimen name="infomation_count_height">14dp</dimen> <dimen name="infomation_count_min_width">14dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 42feb09f7..581e9aa80 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -125,11 +125,11 @@ s --> device. [CHAR_LIMIT=30]--> <string name="delete_zone_label_all_apps">Uninstall</string> - <!-- Label for delete drop target. [CHAR_LIMIT=30] --> + <!-- Label for delete drop target. [CHAR_LIMIT=20] --> <string name="delete_target_label">Remove</string> - <!-- Label for uninstall drop target. [CHAR_LIMIT=30]--> + <!-- Label for uninstall drop target. [CHAR_LIMIT=20]--> <string name="delete_target_uninstall_label">Uninstall</string> - <!-- Label for the info icon. [CHAR_LIMIT=30] --> + <!-- Label for the info icon. [CHAR_LIMIT=20] --> <string name="info_target_label">App info</string> <!-- Accessibility: Search button --> diff --git a/res/values/styles.xml b/res/values/styles.xml index b0e1cb325..2ffb0b901 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -32,10 +32,9 @@ <item name="android:fontFamily">sans-serif-condensed</item> </style> - <style name="WorkspaceIcon.Portrait"> - </style> - <style name="WorkspaceIcon.Landscape"> - </style> + <style name="WorkspaceIcon.Portrait"></style> + + <style name="WorkspaceIcon.Landscape"></style> <style name="WorkspaceIcon.AppsCustomize"> <item name="android:background">@null</item> @@ -52,15 +51,16 @@ <item name="customShadows">false</item> </style> - <style name="SearchDropTargetBar"> - </style> - <style name="SearchButton"> - </style> + <style name="SearchDropTargetBar"></style> + + <style name="SearchButton"></style> + <style name="DropTargetButtonContainer"> <item name="android:layout_width">0dp</item> <item name="android:layout_height">match_parent</item> </style> - <style name="DropTargetButton"> + + <style name="DropTargetButton.Base"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center</item> @@ -69,7 +69,7 @@ <item name="android:paddingLeft">25dp</item> <item name="android:paddingRight">25dp</item> <item name="android:textColor">#FFFFFFFF</item> - <item name="android:textSize">16sp</item> + <item name="android:textSize">@dimen/drop_target_text_size</item> <item name="android:singleLine">true</item> <item name="android:ellipsize">end</item> <item name="android:shadowColor">#FF000000</item> @@ -90,6 +90,8 @@ <item name="android:maxLines">2</item> </style> + <style name="DropTargetButton" parent="DropTargetButton.Base"></style> + <style name="PreloadIcon"> <item name="background">@drawable/virtual_preload</item> <item name="indicatorSize">4dp</item> @@ -106,7 +108,9 @@ <style name="PagedViewWidgetImageView"> <item name="android:paddingLeft">@dimen/app_widget_preview_padding_left</item> </style> + <style name="SearchButton.WithPaddingStart"> <item name="android:paddingLeft">8dp</item> </style> + </resources> |