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

Commit 2867be88 authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang Committed by Android (Google) Code Review
Browse files

Merge "Add a fixed viewport margin since website content width changes."

parents bc8a886c 64336a40

core/java/android/webkit/WebViewCore.java

+3 −1
Original line number Diff line number Diff line
@@ -1829,9 +1829,11 @@ final class WebViewCore { 
                draw.mViewState = mInitialViewState;

                if (mViewportWidth == -1 && mSettings.getUseFixedViewport() &&

                    mSettings.getUseWideViewPort()) {

                    final int fixedViewportMargin = mContext.getResources().getDimensionPixelSize(

                      com.android.internal.R.dimen.fixed_viewport_margin);

                    // Use website's initial preferred width as the fixed viewport width.

                    mViewportWidth = Math.min(mSettings.getMaxFixedViewportWidth(),

                        Math.max(draw.mWidthHeight.x, draw.mMinPrefWidth));

                        draw.mMinPrefWidth + 2 * fixedViewportMargin);

                    draw.mViewState.mViewportWidth = mViewportWidth;

                }

                mInitialViewState = null;

core/res/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
    <dimen name="fastscroll_thumb_height">52dp</dimen>

    <!-- Min width for a tablet device -->

    <dimen name="min_xlarge_screen_width">800dp</dimen>

    <!-- Fixed viewport margin for website content width change -->

    <dimen name="fixed_viewport_margin">7dp</dimen>

    <!-- Default height of a key in the password keyboard for alpha -->

    <dimen name="password_keyboard_key_height_alpha">56dip</dimen>

    <!-- Default height of a key in the password keyboard for numeric -->