diff options
| author | Winson Chung <winsonc@google.com> | 2012-07-11 07:43:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-11 07:43:29 -0700 |
| commit | f58231c59a980fae81bf994e75fbe6c3bb410751 (patch) | |
| tree | 4b42b8d44e98aa2734d874402b55dd849eeb50e0 /res | |
| parent | 8d4fa3935545b46d835dbcdc614ff5e353f30216 (diff) | |
| parent | 039f9d38edac327b39215582b85ef75dbe6ef006 (diff) | |
| download | android_packages_apps_Trebuchet-f58231c59a980fae81bf994e75fbe6c3bb410751.tar.gz android_packages_apps_Trebuchet-f58231c59a980fae81bf994e75fbe6c3bb410751.tar.bz2 android_packages_apps_Trebuchet-f58231c59a980fae81bf994e75fbe6c3bb410751.zip | |
am 039f9d38: am 827a5580: Fixing issue where drop target text was not showing in tablet ui. (Bug 6789399)
* commit '039f9d38edac327b39215582b85ef75dbe6ef006':
Fixing issue where drop target text was not showing in tablet ui. (Bug 6789399)
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/drop_target_bar.xml | 37 | ||||
| -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 794a79edb..000000000 --- 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 5fcddc9a0..5fcddc9a0 100644 --- a/res/layout-port/drop_target_bar.xml +++ b/res/layout/drop_target_bar.xml |