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

Commit ed738393 authored by Selim Gurun's avatar Selim Gurun Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Add some View methods overrides and WebViewDelegate... 

Merge "Revert "Revert "Add some View methods overrides and WebViewDelegate interfaces.""" into nyc-dev
parents aa8ba08c e319dada

api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -48852,7 +48852,9 @@ package android.webkit { 
















  public static abstract interface WebViewProvider.ViewDelegate {







  public static abstract interface WebViewProvider.ViewDelegate {











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







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














    method public abstract android.view.View findFocus(android.view.View);











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







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














    method public abstract android.os.Handler getHandler(android.os.Handler);











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







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











    method public abstract void onAttachedToWindow();







    method public abstract void onAttachedToWindow();











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







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

























core/java/android/webkit/WebView.java



+11
−0




























Original line number
Original line
Diff line number
Diff line








@@ -32,6 +32,7 @@ import android.net.http.SslCertificate;









import android.net.Uri;







import android.net.Uri;











import android.os.Build;







import android.os.Build;











import android.os.Bundle;







import android.os.Bundle;














import android.os.Handler;











import android.os.Looper;







import android.os.Looper;











import android.os.Message;







import android.os.Message;











import android.os.StrictMode;







import android.os.StrictMode;










@@ -2622,6 +2623,16 @@ public class WebView extends AbsoluteLayout









        mProvider.getViewDelegate().onFinishTemporaryDetach();







        mProvider.getViewDelegate().onFinishTemporaryDetach();











    }







    }


































    @Override














    public Handler getHandler() {














        return mProvider.getViewDelegate().getHandler(super.getHandler());














    }





























    @Override














    public View findFocus() {














        return mProvider.getViewDelegate().findFocus(super.findFocus());














    }


























    /**







    /**











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







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











     *







     *

































core/java/android/webkit/WebViewProvider.java



+5
−0




























Original line number
Original line
Diff line number
Diff line








@@ -28,6 +28,7 @@ import android.graphics.drawable.Drawable;









import android.net.http.SslCertificate;







import android.net.http.SslCertificate;











import android.net.Uri;







import android.net.Uri;











import android.os.Bundle;







import android.os.Bundle;














import android.os.Handler;











import android.os.Message;







import android.os.Message;











import android.print.PrintDocumentAdapter;







import android.print.PrintDocumentAdapter;











import android.view.DragEvent;







import android.view.DragEvent;










@@ -386,6 +387,10 @@ public interface WebViewProvider {









        public void onFinishTemporaryDetach();







        public void onFinishTemporaryDetach();































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







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





























        public Handler getHandler(Handler originalHandler);





























        public View findFocus(View originalFocusedView);











    }







    }































    interface ScrollDelegate {







    interface ScrollDelegate {