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

Commit 016eaeea authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Change all apps caret target bounding box 

b/30400751

1) This also fixes the issue of apps drawer sliding up when page is swiped
horizontally immediately above the hotseat area.

2) Disclaimer: this should be cp'ed to calgary.
Hence, I tried to keep the diff small. Ideally, CaretDrawable animation
handling should move to AllAppsHandleImageView via refactoring in
follow up CL.

Change-Id: I4d808ee2eeca53b40c0b4e4e0e364fef056e26c3
parent 61bcfba3

res/layout-port/launcher.xml

+2 −4
Original line number Diff line number Diff line
@@ -56,10 +56,8 @@ 


        <!-- Keep these behind the workspace so that they are not visible when

             we go into AllApps -->

        <com.android.launcher3.pageindicators.PageIndicatorLineCaret

            android:id="@+id/page_indicator"

            android:layout_width="match_parent"

            android:layout_height="@dimen/dynamic_grid_page_indicator_height" />

        <include layout="@layout/page_indicator"

            android:id="@+id/page_indicator" />



        <include

            android:id="@+id/drop_target_bar"

res/layout-sw720dp/launcher.xml

+2 −4
Original line number Diff line number Diff line
@@ -59,10 +59,8 @@ 


        <!-- Keep these behind the workspace so that they are not visible when

             we go into AllApps -->

        <com.android.launcher3.pageindicators.PageIndicatorLineCaret

            android:id="@+id/page_indicator"

            android:layout_width="match_parent"

            android:layout_height="@dimen/dynamic_grid_page_indicator_height" />

        <include layout="@layout/page_indicator"

                 android:id="@+id/page_indicator" />



        <include

            layout="@layout/qsb_container"

res/layout/page_indicator.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

     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.pageindicators.PageIndicatorLineCaret

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/dynamic_grid_page_indicator_height">

        <ImageView

            android:id="@+id/all_apps_handle"

            android:layout_width="48dp"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:scaleType="centerInside"/>

</com.android.launcher3.pageindicators.PageIndicatorLineCaret>

res/values/dimens.xml

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    <dimen name="dynamic_grid_edge_margin">8dp</dimen>

    <dimen name="dynamic_grid_page_indicator_height">28dp</dimen>

    <dimen name="dynamic_grid_page_indicator_line_height">1dp</dimen>

    <dimen name="dynamic_grid_page_indicator_extra_touch_height">12dp</dimen>

    <dimen name="dynamic_grid_page_indicator_gutter_width_left_nav_bar">38dp</dimen>

    <dimen name="dynamic_grid_page_indicator_gutter_width_right_nav_bar">48dp</dimen>

    <dimen name="dynamic_grid_icon_drawable_padding">8dp</dimen>

src/com/android/launcher3/DeviceProfile.java

+0 −1
Original line number Diff line number Diff line
@@ -533,7 +533,6 @@ public class DeviceProfile { 
            } else {

                // Put the page indicators above the hotseat

                lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;

                lp.width = LayoutParams.WRAP_CONTENT;

                lp.height = pageIndicatorHeightPx;

                lp.bottomMargin = hotseatBarHeightPx + mInsets.bottom;

            }