diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-21 17:01:26 -0700 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2015-07-22 11:31:04 -0700 |
| commit | e612775922ec9f8cc4e5cb976bc62b3312a3de0e (patch) | |
| tree | 96beaf07307486f6491f022da63ebe381765d1a8 /res/layout/search_drop_target_bar.xml | |
| parent | a83129f0bc778fd1ccd799bd8cfa40270f632e1d (diff) | |
| download | android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.gz android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.bz2 android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.zip | |
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'res/layout/search_drop_target_bar.xml')
| -rw-r--r-- | res/layout/search_drop_target_bar.xml | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/res/layout/search_drop_target_bar.xml b/res/layout/search_drop_target_bar.xml index af2d01634..4737ee1bc 100644 --- a/res/layout/search_drop_target_bar.xml +++ b/res/layout/search_drop_target_bar.xml @@ -17,8 +17,7 @@ <com.android.launcher3.SearchDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:focusable="false" - android:orientation="horizontal" > + android:focusable="false" > <!-- Drag specific targets container --> @@ -37,8 +36,7 @@ <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" /> + android:text="@string/delete_target_label" /> </FrameLayout> <FrameLayout @@ -50,9 +48,20 @@ <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> + + <FrameLayout + style="@style/DropTargetButtonContainer" + android:layout_weight="1" > + + <!-- Uninstall target --> + + <com.android.launcher3.UninstallDropTarget + android:id="@+id/uninstall_target_text" + style="@style/DropTargetButton" + android:text="@string/delete_target_uninstall_label" /> + </FrameLayout> </LinearLayout> </com.android.launcher3.SearchDropTargetBar>
\ No newline at end of file |