am 827a5580: Fixing issue where drop target text was not showing in tablet ui. (Bug 6789399)

* commit '827a55807303c31ee289b352fb300f97562dfa43':
  Fixing issue where drop target text was not showing in tablet ui. (Bug 6789399)
This commit is contained in:
Winson Chung authored and Android Git Automerger committed 2012-07-11 07:40:53 -07:00
commit 039f9d38ed
2 files changed
-37

No files matched your search

-37
View File
@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/DropTargetButtonContainer"
android:layout_weight="1">
<!-- Delete target -->
<com.android.launcher2.DeleteDropTarget
style="@style/DropTargetButton"
android:id="@+id/delete_target_text"
android:drawableTop="@drawable/remove_target_selector" />
</FrameLayout>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/DropTargetButtonContainer"
android:layout_weight="1">
<!-- Info target -->
<com.android.launcher2.InfoDropTarget
style="@style/DropTargetButton"
android:id="@+id/info_target_text"
android:drawableTop="@drawable/info_target_selector" />
</FrameLayout>
</merge>
File renamed without changes.