Merge "Dispatch insets from overlay drag layer." into udc-dev am: d063cc0025
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22442062 Change-Id: I3fad73018e76c86d166ca619d52e20aa73bbdb25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -25,7 +25,8 @@
|
||||
android:clipToOutline="true"
|
||||
android:alpha="0"
|
||||
android:visibility="invisible"
|
||||
android:focusableInTouchMode="true">
|
||||
android:focusableInTouchMode="true"
|
||||
app:layout_ignoreInsets="true">
|
||||
|
||||
<HorizontalScrollView
|
||||
android:id="@+id/scroll_view"
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
android:layout_marginBottom="16dp"
|
||||
android:clipChildren="false"
|
||||
android:clipToPadding="false"
|
||||
android:fitsSystemWindows="true"
|
||||
android:focusable="true"
|
||||
android:importantForAccessibility="yes"
|
||||
android:gravity="center"
|
||||
|
||||
@@ -18,7 +18,6 @@ package com.android.launcher3.taskbar.allapps;
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.view.WindowInsets;
|
||||
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
|
||||
@@ -36,12 +35,6 @@ public class TaskbarAllAppsContainerView extends
|
||||
super(context, attrs, defStyleAttr);
|
||||
}
|
||||
|
||||
@Override
|
||||
public WindowInsets onApplyWindowInsets(WindowInsets insets) {
|
||||
setInsets(insets.getInsets(WindowInsets.Type.systemBars()).toRect());
|
||||
return super.onApplyWindowInsets(insets);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected View inflateSearchBox() {
|
||||
// Remove top padding of header, since we do not have any search
|
||||
|
||||
@@ -120,7 +120,9 @@ public class TaskbarOverlayDragLayer extends
|
||||
|
||||
@Override
|
||||
public WindowInsets onApplyWindowInsets(WindowInsets insets) {
|
||||
return updateInsetsDueToStashing(insets);
|
||||
insets = updateInsetsDueToStashing(insets);
|
||||
setInsets(insets.getInsets(WindowInsets.Type.systemBars()).toRect());
|
||||
return insets;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user