diff options
author | Tony Wickham <twickham@google.com> | 2015-09-11 09:27:58 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2015-09-15 11:37:58 -0700 |
commit | 34d2c915c4762a073b60bb676a9e905392e9679c (patch) | |
tree | db5e660fbec645b2f8bc0cad4d6543e134d57f0c /res | |
parent | b54c4a3d864110a222e12683d88e6d46c27bf7a1 (diff) | |
download | android_packages_apps_Trebuchet-34d2c915c4762a073b60bb676a9e905392e9679c.tar.gz android_packages_apps_Trebuchet-34d2c915c4762a073b60bb676a9e905392e9679c.tar.bz2 android_packages_apps_Trebuchet-34d2c915c4762a073b60bb676a9e905392e9679c.zip |
Added AppInfoDropTargetBar to spring loaded workspace.
Change-Id: Ieedc68eba9a5934ab30d6d546d8a837274491064
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 4 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 4 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 4 | ||||
-rw-r--r-- | res/layout/app_info_drop_target_bar.xml | 42 | ||||
-rw-r--r-- | res/layout/search_drop_target_bar.xml | 12 |
5 files changed, 54 insertions, 12 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index f431fb132..951a30ec7 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -50,6 +50,10 @@ android:layout_gravity="right" /> <include + android:id="@+id/app_info_drop_target_bar" + layout="@layout/app_info_drop_target_bar" /> + + <include android:id="@+id/search_drop_target_bar" layout="@layout/search_drop_target_bar" /> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index a7f851e76..4cb34e92e 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -64,6 +64,10 @@ android:layout_gravity="center_horizontal" /> <include + android:id="@+id/app_info_drop_target_bar" + layout="@layout/app_info_drop_target_bar" /> + + <include android:id="@+id/search_drop_target_bar" layout="@layout/search_drop_target_bar" /> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 319a49315..3228999ce 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -50,6 +50,10 @@ android:layout_height="match_parent" /> <include + android:id="@+id/app_info_drop_target_bar" + layout="@layout/app_info_drop_target_bar" /> + + <include android:id="@+id/search_drop_target_bar" layout="@layout/search_drop_target_bar" /> diff --git a/res/layout/app_info_drop_target_bar.xml b/res/layout/app_info_drop_target_bar.xml new file mode 100644 index 000000000..b8f30d0c8 --- /dev/null +++ b/res/layout/app_info_drop_target_bar.xml @@ -0,0 +1,42 @@ +<?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. +--> +<com.android.launcher3.AppInfoDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:focusable="false" > + + <!-- Drag specific targets container --> + <LinearLayout + android:id="@+id/drag_target_bar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center|bottom" > + + <FrameLayout + style="@style/DropTargetButtonContainer" + android:layout_weight="1" > + + <!-- Info target --> + + <com.android.launcher3.InfoDropTarget + android:id="@+id/info_target_text" + style="@style/DropTargetButton" + android:text="@string/info_target_label" /> + </FrameLayout> + </LinearLayout> + +</com.android.launcher3.AppInfoDropTargetBar>
\ No newline at end of file diff --git a/res/layout/search_drop_target_bar.xml b/res/layout/search_drop_target_bar.xml index 4737ee1bc..724eb943d 100644 --- a/res/layout/search_drop_target_bar.xml +++ b/res/layout/search_drop_target_bar.xml @@ -43,18 +43,6 @@ style="@style/DropTargetButtonContainer" android:layout_weight="1" > - <!-- Info target --> - - <com.android.launcher3.InfoDropTarget - android:id="@+id/info_target_text" - style="@style/DropTargetButton" - android:text="@string/info_target_label" /> - </FrameLayout> - - <FrameLayout - style="@style/DropTargetButtonContainer" - android:layout_weight="1" > - <!-- Uninstall target --> <com.android.launcher3.UninstallDropTarget |