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

Commit d063cc00 authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

Merge "Dispatch insets from overlay drag layer." into udc-dev

parents 7a8cbd31 ecded08d
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,8 @@
    android:clipToOutline="true"
    android:clipToOutline="true"
    android:alpha="0"
    android:alpha="0"
    android:visibility="invisible"
    android:visibility="invisible"
    android:focusableInTouchMode="true">
    android:focusableInTouchMode="true"
    app:layout_ignoreInsets="true">


    <HorizontalScrollView
    <HorizontalScrollView
        android:id="@+id/scroll_view"
        android:id="@+id/scroll_view"
+0 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@
    android:layout_marginBottom="16dp"
    android:layout_marginBottom="16dp"
    android:clipChildren="false"
    android:clipChildren="false"
    android:clipToPadding="false"
    android:clipToPadding="false"
    android:fitsSystemWindows="true"
    android:focusable="true"
    android:focusable="true"
    android:importantForAccessibility="yes"
    android:importantForAccessibility="yes"
    android:gravity="center"
    android:gravity="center"
+0 −7
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.launcher3.taskbar.allapps;
import android.content.Context;
import android.content.Context;
import android.util.AttributeSet;
import android.util.AttributeSet;
import android.view.View;
import android.view.View;
import android.view.WindowInsets;


import com.android.launcher3.R;
import com.android.launcher3.R;
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
@@ -36,12 +35,6 @@ public class TaskbarAllAppsContainerView extends
        super(context, attrs, defStyleAttr);
        super(context, attrs, defStyleAttr);
    }
    }


    @Override
    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
        setInsets(insets.getInsets(WindowInsets.Type.systemBars()).toRect());
        return super.onApplyWindowInsets(insets);
    }

    @Override
    @Override
    protected View inflateSearchBox() {
    protected View inflateSearchBox() {
        // Remove top padding of header, since we do not have any search
        // Remove top padding of header, since we do not have any search
+3 −1
Original line number Original line Diff line number Diff line
@@ -120,7 +120,9 @@ public class TaskbarOverlayDragLayer extends


    @Override
    @Override
    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
        return updateInsetsDueToStashing(insets);
        insets = updateInsetsDueToStashing(insets);
        setInsets(insets.getInsets(WindowInsets.Type.systemBars()).toRect());
        return insets;
    }
    }


    @Override
    @Override