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

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

Merge "Remove not-used code."

parents ba7aad20 c42f8b83

core/java/android/webkit/WebSettings.java

+0 −9
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ public class WebSettings { 
    private boolean         mUseDoubleTree = false;

    private boolean         mUseWideViewport = false;

    private boolean         mUseFixedViewport = false;

    private int             mMaxFixedViewportWidth = WebView.DEFAULT_VIEWPORT_WIDTH;

    private boolean         mSupportMultipleWindows = false;

    private boolean         mShrinksStandaloneImagesToFit = false;

    private long            mMaximumDecodedImageSize = 0; // 0 means default
@@ -378,7 +377,6 @@ public class WebSettings { 
        final int minTabletWidth = context.getResources().getDimensionPixelSize(

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

        mUseFixedViewport = (metrics.density == 1.0f && landscapeWidth >= minTabletWidth);

        mMaxFixedViewportWidth = (int) (landscapeWidth * 1.25);



        if (sLockForLocaleSettings == null) {

            sLockForLocaleSettings = new Object();
@@ -1569,13 +1567,6 @@ public class WebSettings { 
        return mUseFixedViewport;

    }



    /**

     * Returns maximum fixed viewport width.

     */

    /* package */ int getMaxFixedViewportWidth() {

        return mMaxFixedViewportWidth;

    }



    /**

     * Returns whether private browsing is enabled.

     */

core/res/res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
    <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 -->

core/java/android/webkit/ZoomManager.java

+1 −1

File changed.

Contains only whitespace changes.