am e8378476: Merge "Allow content rect to overshoot the bottom view bounds by 20dp." into mnc-dev
* commit 'e8378476b52b215536f0b7c52d2eb611a893685f': Allow content rect to overshoot the bottom view bounds by 20dp.
This commit is contained in:
@@ -25,6 +25,7 @@ import android.view.MenuItem;
|
|||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewConfiguration;
|
import android.view.ViewConfiguration;
|
||||||
|
|
||||||
|
import com.android.internal.R;
|
||||||
import com.android.internal.util.Preconditions;
|
import com.android.internal.util.Preconditions;
|
||||||
import com.android.internal.view.menu.MenuBuilder;
|
import com.android.internal.view.menu.MenuBuilder;
|
||||||
import com.android.internal.widget.FloatingToolbar;
|
import com.android.internal.widget.FloatingToolbar;
|
||||||
@@ -44,6 +45,7 @@ public class FloatingActionMode extends ActionMode {
|
|||||||
private final Rect mViewRect;
|
private final Rect mViewRect;
|
||||||
private final Rect mScreenRect;
|
private final Rect mScreenRect;
|
||||||
private final View mOriginatingView;
|
private final View mOriginatingView;
|
||||||
|
private final int mBottomAllowance;
|
||||||
|
|
||||||
private final Runnable mMovingOff = new Runnable() {
|
private final Runnable mMovingOff = new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
@@ -77,6 +79,10 @@ public class FloatingActionMode extends ActionMode {
|
|||||||
mScreenRect = new Rect();
|
mScreenRect = new Rect();
|
||||||
mOriginatingView = Preconditions.checkNotNull(originatingView);
|
mOriginatingView = Preconditions.checkNotNull(originatingView);
|
||||||
mOriginatingView.getLocationInWindow(mViewPosition);
|
mOriginatingView.getLocationInWindow(mViewPosition);
|
||||||
|
// Allow the content rect to overshoot a little bit beyond the
|
||||||
|
// bottom view bound if necessary.
|
||||||
|
mBottomAllowance = context.getResources()
|
||||||
|
.getDimensionPixelSize(R.dimen.content_rect_bottom_clip_allowance);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setFloatingToolbar(FloatingToolbar floatingToolbar) {
|
public void setFloatingToolbar(FloatingToolbar floatingToolbar) {
|
||||||
@@ -141,7 +147,7 @@ public class FloatingActionMode extends ActionMode {
|
|||||||
Math.max(mContentRectOnWindow.left, mViewRect.left),
|
Math.max(mContentRectOnWindow.left, mViewRect.left),
|
||||||
Math.max(mContentRectOnWindow.top, mViewRect.top),
|
Math.max(mContentRectOnWindow.top, mViewRect.top),
|
||||||
Math.min(mContentRectOnWindow.right, mViewRect.right),
|
Math.min(mContentRectOnWindow.right, mViewRect.right),
|
||||||
Math.min(mContentRectOnWindow.bottom, mViewRect.bottom));
|
Math.min(mContentRectOnWindow.bottom, mViewRect.bottom + mBottomAllowance));
|
||||||
|
|
||||||
if (!mContentRectOnWindow.equals(mPreviousContentRectOnWindow)) {
|
if (!mContentRectOnWindow.equals(mPreviousContentRectOnWindow)) {
|
||||||
// Content rect is moving.
|
// Content rect is moving.
|
||||||
|
|||||||
@@ -399,6 +399,7 @@
|
|||||||
<dimen name="floating_toolbar_maximum_overflow_height">192dp</dimen>
|
<dimen name="floating_toolbar_maximum_overflow_height">192dp</dimen>
|
||||||
<dimen name="floating_toolbar_horizontal_margin">16dp</dimen>
|
<dimen name="floating_toolbar_horizontal_margin">16dp</dimen>
|
||||||
<dimen name="floating_toolbar_vertical_margin">8dp</dimen>
|
<dimen name="floating_toolbar_vertical_margin">8dp</dimen>
|
||||||
|
<dimen name="content_rect_bottom_clip_allowance">20dp</dimen>
|
||||||
|
|
||||||
<dimen name="chooser_grid_padding">0dp</dimen>
|
<dimen name="chooser_grid_padding">0dp</dimen>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -2274,6 +2274,7 @@
|
|||||||
<java-symbol type="dimen" name="floating_toolbar_maximum_overflow_height" />
|
<java-symbol type="dimen" name="floating_toolbar_maximum_overflow_height" />
|
||||||
<java-symbol type="dimen" name="floating_toolbar_horizontal_margin" />
|
<java-symbol type="dimen" name="floating_toolbar_horizontal_margin" />
|
||||||
<java-symbol type="dimen" name="floating_toolbar_vertical_margin" />
|
<java-symbol type="dimen" name="floating_toolbar_vertical_margin" />
|
||||||
|
<java-symbol type="dimen" name="content_rect_bottom_clip_allowance" />
|
||||||
|
|
||||||
<java-symbol type="string" name="date_picker_prev_month_button" />
|
<java-symbol type="string" name="date_picker_prev_month_button" />
|
||||||
<java-symbol type="string" name="date_picker_next_month_button" />
|
<java-symbol type="string" name="date_picker_next_month_button" />
|
||||||
|
|||||||
Reference in New Issue
Block a user