Merge "Using same layout for drop-target bar in landscape and portrait" into ub-launcher3-master (d8a3f3c2) · Commits · e / os / BlissLauncher3

res/drawable/tooltip_frame.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2018 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.
		-->
		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle">
		<solid android:color="?android:attr/colorBackground" />
		<corners android:radius="2dp" />
		</shape>
		No newline at end of file

res/layout-land/launcher.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@

		<include
		android:id="@+id/drop_target_bar"
		layout="@layout/drop_target_bar_vert" />
		layout="@layout/drop_target_bar" />

		<include layout="@layout/all_apps"
		android:id="@+id/apps_view"

res/layout-port/launcher.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@

		<include
		android:id="@+id/drop_target_bar"
		layout="@layout/drop_target_bar_horz" />
		layout="@layout/drop_target_bar" />

		<include layout="@layout/all_apps"
		android:id="@+id/apps_view"

res/layout-sw720dp/launcher.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@

		<include
		android:id="@+id/drop_target_bar"
		layout="@layout/drop_target_bar_horz" />
		layout="@layout/drop_target_bar" />

		<!-- Keep these behind the workspace so that they are not visible when
		we go into AllApps -->

res/layout/drop_target_bar_vert.xml→res/layout/drop_target_bar.xml

+55 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2016 The Android Open Source Project
		<?xml version="1.0" encoding="utf-8"?><!--
		Copyright (C) 2018 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.
		@@ -14,49 +13,43 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<com.android.launcher3.DropTargetBar
		android:theme="@style/HomeScreenElementTheme"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="@dimen/dynamic_grid_drop_target_size"
		android:orientation="vertical"
		android:layout_height="match_parent"
		android:layout_gravity="left"
		android:visibility="invisible"
		<com.android.launcher3.DropTargetBar xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="@dimen/dynamic_grid_drop_target_size"
		android:layout_gravity="center_horizontal\|top"
		android:focusable="false"
		android:paddingTop="@dimen/vert_drop_target_vertical_gap" >
		android:alpha="0"
		android:theme="@style/HomeScreenElementTheme"
		android:visibility="invisible">

		<!-- Delete target -->
		<com.android.launcher3.DeleteDropTarget
		android:layout_width="match_parent"
		android:layout_height="@dimen/dynamic_grid_drop_target_size"
		android:id="@+id/delete_target_text"
		style="@style/DropTargetButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:gravity="center"
		android:text="@string/remove_drop_target_label" />

		<!-- App Info -->
		<com.android.launcher3.InfoDropTarget
		android:id="@+id/info_target_text"
		style="@style/DropTargetButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:gravity="center"
		android:paddingLeft="@dimen/vert_drop_target_horizontal_gap"
		android:paddingRight="@dimen/vert_drop_target_horizontal_gap"
		android:id="@+id/delete_target_text" />
		android:text="@string/app_info_drop_target_label" />

		<!-- Uninstall target -->
		<com.android.launcher3.UninstallDropTarget
		android:layout_width="match_parent"
		android:layout_height="@dimen/dynamic_grid_drop_target_size"
		android:gravity="center"
		android:paddingLeft="@dimen/vert_drop_target_horizontal_gap"
		android:paddingRight="@dimen/vert_drop_target_horizontal_gap"
		android:id="@+id/uninstall_target_text"
		android:layout_marginTop="@dimen/vert_drop_target_vertical_gap"/>

		<Space
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<!-- App Info -->
		<com.android.launcher3.InfoDropTarget
		android:layout_width="match_parent"
		android:layout_height="@dimen/dynamic_grid_drop_target_size"
		style="@style/DropTargetButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:gravity="center"
		android:paddingLeft="@dimen/vert_drop_target_horizontal_gap"
		android:paddingRight="@dimen/vert_drop_target_horizontal_gap"
		android:id="@+id/info_target_text"
		android:layout_marginBottom="64dp"/>
		android:text="@string/uninstall_drop_target_label" />

		</com.android.launcher3.DropTargetBar>
		No newline at end of file