diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/drop_target_bar.xml | 37 | ||||
-rw-r--r-- | res/layout-port/drop_target_bar.xml | 39 | ||||
-rw-r--r-- | res/layout/qsb_bar.xml | 26 | ||||
-rw-r--r-- | res/values-land/styles.xml | 6 |
4 files changed, 82 insertions, 26 deletions
diff --git a/res/layout-land/drop_target_bar.xml b/res/layout-land/drop_target_bar.xml new file mode 100644 index 000000000..55d94218e --- /dev/null +++ b/res/layout-land/drop_target_bar.xml @@ -0,0 +1,37 @@ +<?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/info_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-port/drop_target_bar.xml new file mode 100644 index 000000000..5fcddc9a0 --- /dev/null +++ b/res/layout-port/drop_target_bar.xml @@ -0,0 +1,39 @@ +<?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:text="@string/delete_zone_label_workspace" + android:drawableLeft="@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:text="@string/info_target_label" + android:drawableLeft="@drawable/info_target_selector" /> + </FrameLayout> +</merge>
\ No newline at end of file diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index ad9027f9d..322dc006f 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -25,29 +25,9 @@ <!-- Drag specific targets container --> <LinearLayout style="@style/SearchDropTargetBar" - android:id="@+id/drag_target_bar" - android:visibility="gone"> + android:id="@+id/drag_target_bar"> - <FrameLayout - style="@style/DropTargetButtonContainer" - android:layout_weight="1"> - <!-- Delete target --> - <com.android.launcher2.DeleteDropTarget - style="@style/DropTargetButton" - android:id="@+id/delete_target_text" - android:text="@string/delete_zone_label_workspace" - android:drawableLeft="@drawable/remove_target_selector" /> - </FrameLayout> - - <FrameLayout - style="@style/DropTargetButtonContainer" - android:layout_weight="1"> - <!-- Info target --> - <com.android.launcher2.InfoDropTarget - style="@style/DropTargetButton" - android:id="@+id/info_target_text" - android:text="@string/info_target_label" - android:drawableLeft="@drawable/info_target_selector" /> - </FrameLayout> + <include + layout="@layout/drop_target_bar" /> </LinearLayout> </com.android.launcher2.SearchDropTargetBar> diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index f4519ab34..df3356ee2 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -47,10 +47,10 @@ <item name="android:layout_height">0dp</item> </style> <style name="DropTargetButton"> - <item name="android:layout_width">match_parent</item> + <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:layout_gravity">center_vertical</item> - <item name="android:gravity">center_horizontal</item> + <item name="android:layout_gravity">center</item> + <item name="android:gravity">center</item> <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item> <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item> <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item> |