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

Commit f119c520 authored by Hui Shu's avatar Hui Shu
Browse files

Allow WebView to startActivity and receive results 

This CL makes webview override View#onActivityResult and gives webview
itnernals the access to View#startActivityForResult.

BUG: 24416313
Change-Id: Ia49db1348a1f5ee0c648a8b16551d9becc7caddd
parent 26003d26

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -41884,6 +41884,7 @@ package android.webkit { 
    method public void super_scrollTo(int, int);

    method public boolean super_setFrame(int, int, int, int);

    method public void super_setLayoutParams(android.view.ViewGroup.LayoutParams);

    method public void super_startActivityForResult(android.content.Intent, int);

  }















  public static abstract class WebView.VisualStateCallback {










@@ -42118,6 +42119,7 @@ package android.webkit {













  public static abstract interface WebViewProvider.ViewDelegate {















    method public abstract boolean dispatchKeyEvent(android.view.KeyEvent);















    method public abstract android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider();













    method public abstract void onActivityResult(int, int, android.content.Intent);















    method public abstract void onAttachedToWindow();















    method public abstract void onConfigurationChanged(android.content.res.Configuration);















    method public abstract android.view.inputmethod.InputConnection onCreateInputConnection(android.view.inputmethod.EditorInfo);

























core/java/android/webkit/WebView.java



+22
−0




























Original line number
Diff line number
Diff line








@@ -20,6 +20,7 @@ import android.annotation.NonNull;













import android.annotation.SystemApi;















import android.annotation.Widget;















import android.content.Context;













import android.content.Intent;















import android.content.res.Configuration;















import android.graphics.Bitmap;















import android.graphics.Canvas;










@@ -2157,6 +2158,10 @@ public class WebView extends AbsoluteLayout













            WebView.super.setLayoutParams(params);















        }





























        public void super_startActivityForResult(Intent intent, int requestCode) {













            WebView.super.startActivityForResult(intent, requestCode);













        }





























        // ---- Access to non-public methods ----















        public void overScrollBy(int deltaX, int deltaY,















                int scrollX, int scrollY,










@@ -2594,6 +2599,23 @@ public class WebView extends AbsoluteLayout













        mProvider.getViewDelegate().onFinishTemporaryDetach();















    }





























    /**













     * Receive the result from a previous call to {@link #startActivityForResult(Intent, int)}.













     *













     * @param requestCode The integer request code originally supplied to













     *                    startActivityForResult(), allowing you to identify who this













     *                    result came from.













     * @param resultCode The integer result code returned by the child activity













     *                   through its setResult().













     * @param data An Intent, which can return result data to the caller













     *               (various data can be attached to Intent "extras").













     * @hide













     */













    @Override













    public void onActivityResult(int requestCode, int resultCode, Intent data) {













        mProvider.getViewDelegate().onActivityResult(requestCode, resultCode, data);













    }





























    /** @hide */















    @Override















    protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) {

































core/java/android/webkit/WebViewProvider.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.webkit;





























import android.annotation.SystemApi;















import android.content.res.Configuration;













import android.content.Intent;















import android.graphics.Bitmap;















import android.graphics.Canvas;















import android.graphics.Paint;










@@ -380,6 +381,8 @@ public interface WebViewProvider {













        public void onStartTemporaryDetach();































        public void onFinishTemporaryDetach();



























        public void onActivityResult(int requestCode, int resultCode, Intent data);















    }































    interface ScrollDelegate {