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

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

Merge "Refactoring to support groups."

parents b0250c2c ffa2ec66

core/java/android/app/ActivityManager.java

+8 −0
Original line number Diff line number Diff line
@@ -676,6 +676,12 @@ public class ActivityManager { 
         */

        public int userId;



        /**

         * The first time this task was active.

         * @hide

         */

        public long firstActiveTime;



        /**

         * The last time this task was active.

         * @hide
@@ -719,6 +725,7 @@ public class ActivityManager { 
            }

            dest.writeInt(stackId);

            dest.writeInt(userId);

            dest.writeLong(firstActiveTime);

            dest.writeLong(lastActiveTime);

        }
@@ -732,6 +739,7 @@ public class ActivityManager { 
                    TaskDescription.CREATOR.createFromParcel(source) : null;

            stackId = source.readInt();

            userId = source.readInt();

            firstActiveTime = source.readLong();

            lastActiveTime = source.readLong();

        }

packages/SystemUI/AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -189,8 +189,6 @@ 
            </intent-filter>

        </activity>



        <service android:name=".recents.RecentsService" />



        <!-- started from UsbDeviceSettingsManager -->

        <activity android:name=".usb.UsbConfirmActivity"

            android:exported="true"

packages/SystemUI/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -204,9 +204,6 @@ 
    <!-- The translation in the Z index for each task above the last task. -->

    <dimen name="recents_task_view_z_increment">10dp</dimen>



    <!-- The amount of bottom inset in the shadow outline. -->

    <dimen name="recents_task_view_shadow_outline_bottom_inset">5dp</dimen>



    <!-- The amount to translate when animating the removal of a task. -->

    <dimen name="recents_task_view_remove_anim_translation_x">100dp</dimen>

packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java

+3 −2
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ import android.view.MotionEvent; 
import android.view.View;



import com.android.systemui.R;

import com.android.systemui.recents.Utilities;

import com.android.systemui.recents.misc.SystemServicesProxy;

import com.android.systemui.recents.misc.Utilities;

import com.android.systemui.statusbar.phone.PhoneStatusBar;



import java.util.ArrayList;
@@ -200,7 +201,7 @@ public class RecentTasksLoader implements View.OnTouchListener { 
        final ActivityManager am = (ActivityManager)

                mContext.getSystemService(Context.ACTIVITY_SERVICE);

        final PackageManager pm = mContext.getPackageManager();

        final Bitmap thumbnail = Utilities.getThumbnail(am, td.persistentTaskId);

        final Bitmap thumbnail = SystemServicesProxy.getThumbnail(am, td.persistentTaskId);

        Drawable icon = getFullResIcon(td.resolveInfo, pm);

        if (td.userId != UserHandle.myUserId()) {

            // Need to badge the icon

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

+123 −257

File changed.

Preview size limit exceeded, changes collapsed.