diff options
author | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
---|---|---|
committer | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
commit | 826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec (patch) | |
tree | 1ba6f2151cba45b5e7d07cd61a44f6b59a3f828f /res/layout-sw720dp/launcher.xml | |
parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
parent | a3e22d6a362260d5b81feefbc91e4757e3d58958 (diff) | |
download | android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.gz android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.bz2 android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.zip |
resolved conflicts for merge of a3e22d6a to master
Change-Id: I8770574acf86e280a9d15d4309686111260e09d9
Diffstat (limited to 'res/layout-sw720dp/launcher.xml')
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml new file mode 100644 index 000000000..65149f29a --- /dev/null +++ b/res/layout-sw720dp/launcher.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<com.android.launcher2.DragLayer + xmlns:android="http://schemas.android.com/apk/res/android" + + android:id="@+id/drag_layer" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:focusable="false"> + + <include layout="@layout/workspace" + android:id="@+id/workspace" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <include layout="@layout/qsb_bar" + android:id="@+id/qsb_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/qsb_bar_height" + android:layout_gravity="top" /> + + <include layout="@layout/apps_customize_pane" + android:id="@+id/apps_customize_pane" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="invisible" /> + + <include layout="@layout/workspace_cling" + android:id="@+id/workspace_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + + <include layout="@layout/folder_cling" + android:id="@+id/folder_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> +</com.android.launcher2.DragLayer> |