summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-07-11 14:40:53 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-11 14:40:53 (GMT)
commit039f9d38edac327b39215582b85ef75dbe6ef006 (patch)
tree79cada0c73db631f2433759c17448357136efec7
parente2ad335cc2bac806aa22544c1b3b109b0bbec746 (diff)
parent827a55807303c31ee289b352fb300f97562dfa43 (diff)
downloadandroid_packages_apps_Trebuchet-039f9d38edac327b39215582b85ef75dbe6ef006.zip
android_packages_apps_Trebuchet-039f9d38edac327b39215582b85ef75dbe6ef006.tar.gz
android_packages_apps_Trebuchet-039f9d38edac327b39215582b85ef75dbe6ef006.tar.bz2
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)
-rw-r--r--res/layout-land/drop_target_bar.xml37
-rw-r--r--res/layout/drop_target_bar.xml (renamed from res/layout-port/drop_target_bar.xml)0
2 files changed, 0 insertions, 37 deletions
diff --git a/res/layout-land/drop_target_bar.xml b/res/layout-land/drop_target_bar.xml
deleted file mode 100644
index 794a79e..0000000
--- a/res/layout-land/drop_target_bar.xml
+++ /dev/null
@@ -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> \ No newline at end of file
diff --git a/res/layout-port/drop_target_bar.xml b/res/layout/drop_target_bar.xml
index 5fcddc9..5fcddc9 100644
--- a/res/layout-port/drop_target_bar.xml
+++ b/res/layout/drop_target_bar.xml