diff options
author | Steve Kondik <shade@chemlab.org> | 2012-11-05 12:14:58 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2012-11-05 12:14:58 -0800 |
commit | f5baac88b85efa794ae7909f784538f379dd36f2 (patch) | |
tree | c55b82edcaae558d71fc12f856bb93d9ae8ce8dc /res/layout-land/drop_target_bar.xml | |
parent | 5bf25aecb90bd49ca3a8affea877e570b75baed6 (diff) | |
parent | 4124016ae5c8174aa53433894b896604ffa52c67 (diff) | |
download | android_packages_apps_Trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.tar.gz android_packages_apps_Trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.tar.bz2 android_packages_apps_Trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.zip |
Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Launcher2 into aosp
Conflicts:
res/layout-land/drop_target_bar.xml
src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
src/com/cyanogenmod/trebuchet/Launcher.java
src/com/cyanogenmod/trebuchet/LauncherModel.java
Change-Id: I5aa702e333da27645b0d765b233f4d8a89991cb9
Diffstat (limited to 'res/layout-land/drop_target_bar.xml')
-rw-r--r-- | res/layout-land/drop_target_bar.xml | 37 |
1 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 f3fb4001a..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.cyanogenmod.trebuchet.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.cyanogenmod.trebuchet.InfoDropTarget - style="@style/DropTargetButton" - android:id="@+id/info_target_text" - android:drawableTop="@drawable/info_target_selector" /> - </FrameLayout> -</merge>
\ No newline at end of file |