summaryrefslogtreecommitdiffstats
path: root/res/layout/search_drop_target_bar.xml
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-10-23 11:38:15 -0700
committerSunny Goyal <sunnygoyal@google.com>2014-10-23 11:41:34 -0700
commit0e375f947b698ac6d5bd294968d0cda3003a6f28 (patch)
tree9da92dd4c6d50a6849115565194835bff4bdefd1 /res/layout/search_drop_target_bar.xml
parent24e0fc122186641adf862327d9266da774f3c25f (diff)
downloadandroid_packages_apps_Trebuchet-0e375f947b698ac6d5bd294968d0cda3003a6f28.tar.gz
android_packages_apps_Trebuchet-0e375f947b698ac6d5bd294968d0cda3003a6f28.tar.bz2
android_packages_apps_Trebuchet-0e375f947b698ac6d5bd294968d0cda3003a6f28.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/layout/search_drop_target_bar.xml')
-rw-r--r--res/layout/search_drop_target_bar.xml45
1 files changed, 35 insertions, 10 deletions
diff --git a/res/layout/search_drop_target_bar.xml b/res/layout/search_drop_target_bar.xml
index 2d51b93ab..af2d01634 100644
--- a/res/layout/search_drop_target_bar.xml
+++ b/res/layout/search_drop_target_bar.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!--
+ Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,21 +14,45 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher3.SearchDropTargetBar
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:focusable="false"
+<com.android.launcher3.SearchDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:focusable="false"
+ android:orientation="horizontal" >
<!-- Drag specific targets container -->
+
<LinearLayout
android:id="@+id/drag_target_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="center">
+ android:layout_gravity="center" >
+
+ <FrameLayout
+ style="@style/DropTargetButtonContainer"
+ android:layout_weight="1" >
+
+ <!-- Delete target -->
- <include
- layout="@layout/drop_target_bar" />
+ <com.android.launcher3.DeleteDropTarget
+ android:id="@+id/delete_target_text"
+ style="@style/DropTargetButton"
+ android:drawableStart="@drawable/remove_target_selector"
+ android:text="@string/delete_zone_label_workspace" />
+ </FrameLayout>
+
+ <FrameLayout
+ style="@style/DropTargetButtonContainer"
+ android:layout_weight="1" >
+
+ <!-- Info target -->
+
+ <com.android.launcher3.InfoDropTarget
+ android:id="@+id/info_target_text"
+ style="@style/DropTargetButton"
+ android:drawableStart="@drawable/info_target_selector"
+ android:text="@string/info_target_label" />
+ </FrameLayout>
</LinearLayout>
-</com.android.launcher3.SearchDropTargetBar>
+
+</com.android.launcher3.SearchDropTargetBar> \ No newline at end of file