Commit 39f03836 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 62a2bab5 3f723c6a
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<!--
Copyright (C) 2015 The Android Open Source Project
......
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<!--
Copyright (C) 2015 The Android Open Source Project
......
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<!--
Copyright (C) 2015 The Android Open Source Project
......
<?xml version="1.0" encoding="utf-8"?>
<!--
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.
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.
-->
<resources>
<string name="app_name">Àireamhair</string>
<string name="mode_rad">rèidean</string>
<string name="cleared">air fhalamhachadh</string>
<string name="desc_op_fact">factarail</string>
<string name="desc_op_pct">ceudad</string>
<string name="desc_op_sqrt">freumh ceàrnagach</string>
<string name="desc_del">sguab às</string>
<string name="error_nan">Chan eil seo ’na àireamh</string>
<string name="error_aborted">Sguireadh dheth</string>
<string name="menu_licenses">Ceadachasan Open Source</string>
</resources>
......@@ -20,6 +20,7 @@ import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.PointF;
import android.graphics.Rect;
import android.os.Bundle;
......@@ -32,6 +33,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -52,6 +54,7 @@ public class DragLayout extends ViewGroup {
private final Map<Integer, PointF> mLastMotionPoints = new HashMap<>();
private final Rect mHitRect = new Rect();
private final List<Rect> mExclusionRects = new ArrayList<>();
private int mVerticalRange;
private boolean mIsOpen;
......@@ -96,6 +99,16 @@ public class DragLayout extends ViewGroup {
}
child.layout(0, top, child.getMeasuredWidth(), top + child.getMeasuredHeight());
}
if (changed) {
updateExclusionRects();
}
}
@Override
public void onDraw(Canvas canvas) {
super.onDraw(canvas);
updateExclusionRects();
}
@Override
......@@ -249,6 +262,11 @@ public class DragLayout extends ViewGroup {
mDragCallbacks.remove(callback);
}
private void updateExclusionRects() {
mExclusionRects.add(0, mHitRect);
setSystemGestureExclusionRects(mExclusionRects);
}
/**
* Callback when the layout is closed.
* We use this to pop the HistoryFragment off the backstack.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment