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

Commit 82629345 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Renaming setAsyncExecutor to setExecutor" into oc-dev

parents a8851447 0ddf6aa0

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7083,7 +7083,7 @@ package android.appwidget { 
    method protected android.view.View getErrorView();

    method protected void prepareView(android.view.View);

    method public void setAppWidget(int, android.appwidget.AppWidgetProviderInfo);

    method public void setAsyncExecutor(java.util.concurrent.Executor);

    method public void setExecutor(java.util.concurrent.Executor);

    method public void updateAppWidget(android.widget.RemoteViews);

    method public void updateAppWidgetOptions(android.os.Bundle);

    method public void updateAppWidgetSize(android.os.Bundle, int, int, int, int);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7549,7 +7549,7 @@ package android.appwidget { 
    method protected android.view.View getErrorView();

    method protected void prepareView(android.view.View);

    method public void setAppWidget(int, android.appwidget.AppWidgetProviderInfo);

    method public void setAsyncExecutor(java.util.concurrent.Executor);

    method public void setExecutor(java.util.concurrent.Executor);

    method public void updateAppWidget(android.widget.RemoteViews);

    method public void updateAppWidgetOptions(android.os.Bundle);

    method public void updateAppWidgetSize(android.os.Bundle, int, int, int, int);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7114,7 +7114,7 @@ package android.appwidget { 
    method protected android.view.View getErrorView();

    method protected void prepareView(android.view.View);

    method public void setAppWidget(int, android.appwidget.AppWidgetProviderInfo);

    method public void setAsyncExecutor(java.util.concurrent.Executor);

    method public void setExecutor(java.util.concurrent.Executor);

    method public void updateAppWidget(android.widget.RemoteViews);

    method public void updateAppWidgetOptions(android.os.Bundle);

    method public void updateAppWidgetSize(android.os.Bundle, int, int, int, int);

core/java/android/appwidget/AppWidgetHostView.java

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ public class AppWidgetHostView extends FrameLayout { 
     *

     * @param executor the executor to use or null.

     */

    public void setAsyncExecutor(Executor executor) {

    public void setExecutor(Executor executor) {

        if (mLastExecutionSignal != null) {

            mLastExecutionSignal.cancel();

            mLastExecutionSignal = null;

core/java/android/widget/RemoteViewsAdapter.java

+1 −6
Original line number Diff line number Diff line
@@ -47,11 +47,6 @@ import java.util.HashMap; 
import java.util.LinkedList;

import java.util.concurrent.Executor;



import java.lang.ref.WeakReference;

import java.util.Arrays;

import java.util.HashMap;

import java.util.LinkedList;



/**

 * An adapter to a RemoteViewsService which fetches and caches RemoteViews

 * to be later inflated as child views.
@@ -1114,7 +1109,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback 
                layout = (RemoteViewsFrameLayout) convertView;

            } else {

                layout = new RemoteViewsFrameLayout(parent.getContext(), mCache);

                layout.setAsyncExecutor(mAsyncViewLoadExecutor);

                layout.setExecutor(mAsyncViewLoadExecutor);

            }



            if (isInCache) {