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

Commit 29eea402 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes Id963434f,I103ccc69,I770cd430 

* changes:
  Remove events bus code from task loading code.
  Pull out TaskStackListener into its own class.
  Remove unused recents fast-toggle/paging code.
parents 04281fe3 0f5120f3

core/java/android/app/ActivityManager.java

+0 −16
Original line number Diff line number Diff line
@@ -1828,22 +1828,6 @@ public class ActivityManager { 
        }

    }



    /**

     * Completely remove the given task.

     *

     * @param taskId Identifier of the task to be removed.

     * @return Returns true if the given task was found and removed.

     *

     * @hide

     */

    public boolean removeTask(int taskId) throws SecurityException {

        try {

            return getService().removeTask(taskId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Sets the windowing mode for a specific task. Only works on tasks of type

     * {@link WindowConfiguration#ACTIVITY_TYPE_STANDARD}

core/java/android/app/TaskStackListener.java

+3 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    }



    @Override

    public void onTaskRemovalStarted(int taskId) {

    public void onTaskRemovalStarted(int taskId) throws RemoteException {

    }



    @Override
@@ -91,11 +91,10 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    }



    @Override

    public void onTaskProfileLocked(int taskId, int userId) {

    public void onTaskProfileLocked(int taskId, int userId) throws RemoteException {

    }



    @Override

    public void onTaskSnapshotChanged(int taskId, TaskSnapshot snapshot)

            throws RemoteException {

    public void onTaskSnapshotChanged(int taskId, TaskSnapshot snapshot) throws RemoteException {

    }

}

packages/SystemUI/res/drawable/recents_dismiss_all_history.xml

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
<!--

Copyright (C) 2016 The Android Open Source Project



   Licensed under the Apache License, Version 2 (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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:height="16dp"

    android:width="28dp"

    android:viewportHeight="48"

    android:viewportWidth="72" >

    <group

        android:name="dismiss_all"

        android:translateX="48"

        android:translateY="6" >

        <group

            android:name="3"

            android:translateX="-24"

            android:translateY="36" >

            <path

                android:name="rectangle_path_1_2"

                android:pathData="M -24.0,-6.0 l 48.0,0 l 0,12.0 l -48.0,0 Z"

                android:fillColor="#FFFFFFFF"

                android:fillAlpha="1" />

        </group>

        <group

            android:name="2"

            android:translateX="-12"

            android:translateY="18" >

            <path

                android:name="rectangle_path_1_1"

                android:pathData="M -24.0,-6.0 l 48.0,0 l 0,12.0 l -48.0,0 Z"

                android:fillColor="#FFFFFFFF"

                android:fillAlpha="1" />

        </group>

        <group

            android:name="1" >

            <path

                android:name="rectangle_path_1"

                android:pathData="M -24.0,-6.0 l 48.0,0 l 0,12.0 l -48.0,0 Z"

                android:fillColor="#FFFFFFFF"

                android:fillAlpha="1" />

        </group>

    </group>

</vector>

packages/SystemUI/res/layout/recents_task_view_header.xml

+0 −8
Original line number Diff line number Diff line
@@ -66,14 +66,6 @@ 
        android:alpha="0"

        android:visibility="gone" />



    <!-- The progress indicator shows if auto-paging is enabled -->

    <ViewStub android:id="@+id/focus_timer_indicator_stub"

               android:inflatedId="@+id/focus_timer_indicator"

               android:layout="@layout/recents_task_view_header_progress_bar"

               android:layout_width="match_parent"

               android:layout_height="5dp"

               android:layout_gravity="bottom" />



    <!-- The app overlay shows as the user long-presses on the app icon -->

    <ViewStub android:id="@+id/app_overlay_stub"

               android:inflatedId="@+id/app_overlay"

packages/SystemUI/res/values/config.xml

+0 −6
Original line number Diff line number Diff line
@@ -167,12 +167,6 @@ 
    <!-- The animation duration for scrolling the stack to a particular item. -->

    <integer name="recents_animate_task_stack_scroll_duration">200</integer>



    <!-- The animation duration for scrolling the stack to a particular item. -->

    <integer name="recents_auto_advance_duration">750</integer>



    <!-- The animation duration for subsequent scrolling the stack to a particular item. -->

    <integer name="recents_subsequent_auto_advance_duration">1000</integer>



    <!-- The delay to enforce between each alt-tab key press. -->

    <integer name="recents_alt_tab_key_delay">200</integer>