Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4eaa0e9 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Defining separate layouts for horizontal and vertical drop target bars... 

Merge "Defining separate layouts for horizontal and vertical drop target bars instead of chaning the layouts in DeviceProfile" into ub-launcher3-calgary
parents 676e29ce f37a2141

res/layout-land/launcher.xml

+2 −2
Original line number Diff line number Diff line
@@ -52,11 +52,11 @@ 


        <include

            android:id="@+id/app_info_drop_target_bar"

            layout="@layout/app_info_drop_target_bar" />

            layout="@layout/drop_target_bar_vert_info" />



        <include

            android:id="@+id/search_drop_target_bar"

            layout="@layout/search_drop_target_bar" />

            layout="@layout/drop_target_bar_vert_search" />



        <include layout="@layout/overview_panel"

            android:id="@+id/overview_panel"

res/layout-port/launcher.xml

+2 −2
Original line number Diff line number Diff line
@@ -66,11 +66,11 @@ 


        <include

            android:id="@+id/app_info_drop_target_bar"

            layout="@layout/app_info_drop_target_bar" />

            layout="@layout/drop_target_bar_horz_info" />



        <include

            android:id="@+id/search_drop_target_bar"

            layout="@layout/search_drop_target_bar" />

            layout="@layout/drop_target_bar_horz_search" />



        <include layout="@layout/widgets_view"

            android:id="@+id/widgets_view"

res/layout-sw720dp/launcher.xml

+2 −2
Original line number Diff line number Diff line
@@ -52,11 +52,11 @@ 


        <include

            android:id="@+id/app_info_drop_target_bar"

            layout="@layout/app_info_drop_target_bar" />

            layout="@layout/drop_target_bar_horz_info" />



        <include

            android:id="@+id/search_drop_target_bar"

            layout="@layout/search_drop_target_bar" />

            layout="@layout/drop_target_bar_horz_search" />



        <include layout="@layout/overview_panel"

            android:id="@+id/overview_panel"

res/layout/app_info_drop_target_bar.xml→res/layout/drop_target_bar_horz_info.xml

+17 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2011 The Android Open Source Project

     Copyright (C) 2016 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.
@@ -16,27 +16,24 @@ 
-->

<com.android.launcher3.AppInfoDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="48dp"

    android:layout_gravity="center_horizontal|bottom"

    android:focusable="false" >



    <!-- Drag specific targets container -->

    <LinearLayout

    <FrameLayout

        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" >

        android:layout_height="match_parent">



        <!-- Info target -->



        <com.android.launcher3.InfoDropTarget

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:gravity="center"

            android:id="@+id/info_target_text"

            style="@style/DropTargetButton"

            android:text="@string/app_info_drop_target_label" />

    </FrameLayout>

    </LinearLayout>



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

res/layout/search_drop_target_bar.xml→res/layout/drop_target_bar_horz_search.xml

+18 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2011 The Android Open Source Project

     Copyright (C) 2015 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.
@@ -15,8 +15,10 @@ 
     limitations under the License.

-->

<com.android.launcher3.SearchDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center_horizontal|top"

    android:focusable="false">



    <!-- Drag specific targets container -->
@@ -28,24 +30,36 @@ 
        android:layout_gravity="center" >



        <FrameLayout

            style="@style/DropTargetButtonContainer"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1" >



            <!-- Delete target -->



            <com.android.launcher3.DeleteDropTarget

                launcher:hideParentOnDisable="true"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_gravity="center"

                android:gravity="center"

                android:id="@+id/delete_target_text"

                style="@style/DropTargetButton"

                android:text="@string/remove_drop_target_label" />

        </FrameLayout>



        <FrameLayout

            style="@style/DropTargetButtonContainer"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1" >



            <!-- Uninstall target -->



            <com.android.launcher3.UninstallDropTarget

                launcher:hideParentOnDisable="true"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_gravity="center"

                android:gravity="center"

                android:id="@+id/uninstall_target_text"

                style="@style/DropTargetButton"

                android:text="@string/uninstall_drop_target_label" />