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

Commit 3b8887d5 authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am fee5e3d3: am 50511096: am de9848c6: Merge "Initial changes to add callback... 

am fee5e3d3: am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev

* commit 'fee5e3d3':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
parents f50d111e fee5e3d3

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IActivityPendingResult.aidl \

	core/java/android/app/IAlarmManager.aidl \

	core/java/android/app/IAppTask.aidl \

	core/java/android/app/ITaskStackListener.aidl \

	core/java/android/app/IBackupAgent.aidl \

	core/java/android/app/IInstrumentationWatcher.aidl \

	core/java/android/app/INotificationManager.aidl \

core/java/android/app/ActivityManagerNative.java

+20 −0
Original line number Diff line number Diff line
@@ -774,6 +774,14 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case REGISTER_TASK_STACK_LISTENER_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();

            registerTaskStackListener(ITaskStackListener.Stub.asInterface(token));

            reply.writeNoException();

            return true;

        }



        case GET_TASK_FOR_ACTIVITY_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();
@@ -3266,6 +3274,18 @@ class ActivityManagerProxy implements IActivityManager 
        data.recycle();

        reply.recycle();

    }

    @Override

    public void registerTaskStackListener(ITaskStackListener listener) throws RemoteException

    {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(listener.asBinder());

        mRemote.transact(REGISTER_TASK_STACK_LISTENER_TRANSACTION, data, reply, IBinder.FLAG_ONEWAY);

        reply.readException();

        data.recycle();

        reply.recycle();

    }

    public int getTaskForActivity(IBinder token, boolean onlyRoot) throws RemoteException

    {

        Parcel data = Parcel.obtain();

core/java/android/app/IActivityManager.java

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ public interface IActivityManager extends IInterface { 
    public StackInfo getStackInfo(int stackId) throws RemoteException;

    public boolean isInHomeStack(int taskId) throws RemoteException;

    public void setFocusedStack(int stackId) throws RemoteException;

    public void registerTaskStackListener(ITaskStackListener listener) throws RemoteException;

    public int getTaskForActivity(IBinder token, boolean onlyRoot) throws RemoteException;

    public ContentProviderHolder getContentProvider(IApplicationThread caller,

            String name, int userId, boolean stable) throws RemoteException;
@@ -788,4 +789,5 @@ public interface IActivityManager extends IInterface { 
    int LAUNCH_ASSIST_INTENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+239;

    int START_IN_PLACE_ANIMATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+240;

    int CHECK_PERMISSION_WITH_TOKEN_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+241;

    int REGISTER_TASK_STACK_LISTENER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+242;

}

core/java/android/app/ITaskStackListener.aidl

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2014, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.app;



/** @hide */

oneway interface ITaskStackListener {

    void onTaskStackChanged();

}

packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java

+29 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.recents; 
import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.ITaskStackListener;

import android.appwidget.AppWidgetHost;

import android.appwidget.AppWidgetProviderInfo;

import android.content.ActivityNotFoundException;
@@ -56,6 +57,7 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.concurrent.atomic.AtomicBoolean;





/** A proxy implementation for the recents component */

public class AlternateRecentsComponent implements ActivityOptions.OnAnimationStartedListener {
@@ -79,6 +81,28 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta 
    final static String sRecentsPackage = "com.android.systemui";

    final static String sRecentsActivity = "com.android.systemui.recents.RecentsActivity";



    /**

     * An implementation of ITaskStackListener, that allows us to listen for changes to the system

     * task stacks and update recents accordingly.

     */

    class TaskStackListenerImpl extends ITaskStackListener.Stub {

        @Override

        public void onTaskStackChanged() {

            RecentsConfiguration config = RecentsConfiguration.getInstance();

            if (config.svelteLevel == RecentsConfiguration.SVELTE_NONE) {

                // Load the next task only if we aren't svelte

                RecentsTaskLoader loader = RecentsTaskLoader.getInstance();

                RecentsTaskLoadPlan plan = loader.createLoadPlan(mContext);

                loader.preloadTasks(plan, true /* isTopTaskHome */);

                RecentsTaskLoadPlan.Options launchOpts = new RecentsTaskLoadPlan.Options();

                launchOpts.numVisibleTasks = 1;

                launchOpts.numVisibleTaskThumbnails = 1;

                launchOpts.onlyLoadForCache = true;

                loader.loadTasks(mContext, plan, launchOpts);

            }

        }

    }



    static RecentsComponent.Callbacks sRecentsComponentCallbacks;

    static RecentsTaskLoadPlan sInstanceLoadPlan;
@@ -86,6 +110,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta 
    LayoutInflater mInflater;

    SystemServicesProxy mSystemServicesProxy;

    Handler mHandler;

    TaskStackListenerImpl mTaskStackListener;

    boolean mBootCompleted;

    boolean mStartAnimationTriggered;

    boolean mCanReuseTaskStackViews = true;
@@ -116,6 +141,10 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta 
        mSystemServicesProxy = new SystemServicesProxy(context);

        mHandler = new Handler();

        mTaskStackBounds = new Rect();



        // Register the task stack listener

        mTaskStackListener = new TaskStackListenerImpl();

        mSystemServicesProxy.registerTaskStackListener(mTaskStackListener);

    }



    public void onStart() {