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

Commit fdde0003 authored by Michael Kolb's avatar Michael Kolb Committed by Android (Google) Code Review
Browse files

Merge "added scroll control support to WebView"

parents 928245d1 73980a94
Loading
Loading
Loading
Loading
+18 −7
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ import android.app.AlertDialog;
import android.content.ClipboardManager;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnCancelListener;
import android.content.Intent;
import android.database.DataSetObserver;
import android.database.DataSetObserver;
import android.graphics.Bitmap;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Canvas;
@@ -43,7 +43,6 @@ import android.net.http.SslCertificate;
import android.os.Bundle;
import android.os.Bundle;
import android.os.Handler;
import android.os.Handler;
import android.os.Message;
import android.os.Message;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.SystemClock;
import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech;
import android.text.Selection;
import android.text.Selection;
@@ -74,13 +73,15 @@ import android.webkit.WebViewCore.TouchHighlightData;
import android.widget.AbsoluteLayout;
import android.widget.AbsoluteLayout;
import android.widget.Adapter;
import android.widget.Adapter;
import android.widget.AdapterView;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.ArrayAdapter;
import android.widget.CheckedTextView;
import android.widget.CheckedTextView;
import android.widget.LinearLayout;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.ListView;
import android.widget.Scroller;
import android.widget.Scroller;
import android.widget.Toast;
import android.widget.Toast;
import android.widget.AdapterView.OnItemClickListener;

import junit.framework.Assert;


import java.io.File;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileInputStream;
@@ -95,8 +96,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map;
import java.util.Set;
import java.util.Set;


import junit.framework.Assert;

/**
/**
 * <p>A View that displays web pages. This class is the basis upon which you
 * <p>A View that displays web pages. This class is the basis upon which you
 * can roll your own web browser or simply display some online content within your Activity.
 * can roll your own web browser or simply display some online content within your Activity.
@@ -1057,8 +1056,10 @@ public class WebView extends AbsoluteLayout


    /*
    /*
     * Return the amount of the titlebarview (if any) that is visible
     * Return the amount of the titlebarview (if any) that is visible
     *
     * @hide
     */
     */
    int getVisibleTitleHeight() {
    public int getVisibleTitleHeight() {
        return Math.max(getTitleHeight() - mScrollY, 0);
        return Math.max(getTitleHeight() - mScrollY, 0);
    }
    }


@@ -2695,6 +2696,16 @@ public class WebView extends AbsoluteLayout
        mWebViewCore.sendMessage(EventHub.DOC_HAS_IMAGES, response);
        mWebViewCore.sendMessage(EventHub.DOC_HAS_IMAGES, response);
    }
    }


    /**
     * Request the scroller to abort any ongoing animation
     *
     * @hide
     */
    public void stopScroll() {
        mScroller.forceFinished(true);
        mLastVelocity = 0;
    }

    @Override
    @Override
    public void computeScroll() {
    public void computeScroll() {
        if (mScroller.computeScrollOffset()) {
        if (mScroller.computeScrollOffset()) {