diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/drop_target_bar.xml | 39 | ||||
| -rw-r--r-- | res/layout/search_drop_target_bar.xml | 45 |
2 files changed, 35 insertions, 49 deletions
diff --git a/res/layout/drop_target_bar.xml b/res/layout/drop_target_bar.xml deleted file mode 100644 index f38a50014..000000000 --- a/res/layout/drop_target_bar.xml +++ /dev/null @@ -1,39 +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.launcher3.DeleteDropTarget - style="@style/DropTargetButton" - android:id="@+id/delete_target_text" - android:text="@string/delete_zone_label_workspace" - android:drawableStart="@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.launcher3.InfoDropTarget - style="@style/DropTargetButton" - android:id="@+id/info_target_text" - android:text="@string/info_target_label" - android:drawableStart="@drawable/info_target_selector" /> - </FrameLayout> -</merge> diff --git a/res/layout/search_drop_target_bar.xml b/res/layout/search_drop_target_bar.xml index 2d51b93ab..af2d01634 100644 --- a/res/layout/search_drop_target_bar.xml +++ b/res/layout/search_drop_target_bar.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + 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. @@ -13,21 +14,45 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.launcher3.SearchDropTargetBar - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:focusable="false" +<com.android.launcher3.SearchDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:focusable="false" + android:orientation="horizontal" > <!-- 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"> + android:layout_gravity="center" > + + <FrameLayout + style="@style/DropTargetButtonContainer" + android:layout_weight="1" > + + <!-- Delete target --> - <include - layout="@layout/drop_target_bar" /> + <com.android.launcher3.DeleteDropTarget + android:id="@+id/delete_target_text" + style="@style/DropTargetButton" + android:drawableStart="@drawable/remove_target_selector" + android:text="@string/delete_zone_label_workspace" /> + </FrameLayout> + + <FrameLayout + style="@style/DropTargetButtonContainer" + android:layout_weight="1" > + + <!-- Info target --> + + <com.android.launcher3.InfoDropTarget + android:id="@+id/info_target_text" + style="@style/DropTargetButton" + android:drawableStart="@drawable/info_target_selector" + android:text="@string/info_target_label" /> + </FrameLayout> </LinearLayout> -</com.android.launcher3.SearchDropTargetBar> + +</com.android.launcher3.SearchDropTargetBar>
\ No newline at end of file |