diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-20 23:59:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-20 23:59:32 +0000 |
commit | 78f585bae69dad7fb7d606ccead1c6c39e134a23 (patch) | |
tree | 36cfe930a9217644dac845518a1efea73e7ed742 /res | |
parent | bafdf3654bc11ddaf361600c309a27461427d92c (diff) | |
parent | db092a331ceb9b6cc72fd9b1a593cd77068bb66a (diff) | |
download | android_packages_apps_Trebuchet-78f585bae69dad7fb7d606ccead1c6c39e134a23.tar.gz android_packages_apps_Trebuchet-78f585bae69dad7fb7d606ccead1c6c39e134a23.tar.bz2 android_packages_apps_Trebuchet-78f585bae69dad7fb7d606ccead1c6c39e134a23.zip |
am db092a33: Merge "Setting drawable to droptarget in the code to avoid multiple drawable inflation" into ub-launcher3-burnaby
* commit 'db092a331ceb9b6cc72fd9b1a593cd77068bb66a':
Setting drawable to droptarget in the code to avoid multiple drawable inflation
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/search_drop_target_bar.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/res/layout/search_drop_target_bar.xml b/res/layout/search_drop_target_bar.xml index b0435aa0e..4737ee1bc 100644 --- a/res/layout/search_drop_target_bar.xml +++ b/res/layout/search_drop_target_bar.xml @@ -36,8 +36,6 @@ <com.android.launcher3.DeleteDropTarget android:id="@+id/delete_target_text" style="@style/DropTargetButton" - android:drawableLeft="@drawable/remove_target_selector" - android:drawableStart="@drawable/remove_target_selector" android:text="@string/delete_target_label" /> </FrameLayout> @@ -50,8 +48,6 @@ <com.android.launcher3.InfoDropTarget android:id="@+id/info_target_text" style="@style/DropTargetButton" - android:drawableLeft="@drawable/info_target_selector" - android:drawableStart="@drawable/info_target_selector" android:text="@string/info_target_label" /> </FrameLayout> @@ -64,8 +60,6 @@ <com.android.launcher3.UninstallDropTarget android:id="@+id/uninstall_target_text" style="@style/DropTargetButton" - android:drawableLeft="@drawable/uninstall_target_selector" - android:drawableStart="@drawable/uninstall_target_selector" android:text="@string/delete_target_uninstall_label" /> </FrameLayout> </LinearLayout> |