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

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

Merge changes from topic "ub-context-compat" into ub-launcher3-master 

* changes:
  SyncRtTransactionApplier -> SyncRtTransactionApplierCompat
  Track when plugins are disabled due to crashes.
  Updating shared lib for context wrapper.
parents e754bad9 37a089d7

quickstep/libs/sysui_shared.jar

+1.41 KiB (143 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -80,8 +80,8 @@ import com.android.systemui.shared.system.RemoteAnimationAdapterCompat; 
import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;

import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;

import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;

import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier.SurfaceParams;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;

import com.android.systemui.shared.system.WindowManagerWrapper;

import com.android.systemui.shared.system.WindowManagerWrapper;





/**

/**
@@ -591,8 +591,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 
                MODE_OPENING);

                MODE_OPENING);

        RemoteAnimationTargetSet closingTargets = new RemoteAnimationTargetSet(targets,

        RemoteAnimationTargetSet closingTargets = new RemoteAnimationTargetSet(targets,

                MODE_CLOSING);

                MODE_CLOSING);

        SyncRtSurfaceTransactionApplier surfaceApplier = new SyncRtSurfaceTransactionApplier(

        SyncRtSurfaceTransactionApplierCompat surfaceApplier =

                mFloatingView);

                new SyncRtSurfaceTransactionApplierCompat(mFloatingView);





        ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);

        ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);

        appAnimator.setDuration(APP_LAUNCH_DURATION);

        appAnimator.setDuration(APP_LAUNCH_DURATION);
@@ -751,8 +751,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 
     * Animator that controls the transformations of the windows the targets that are closing.

     * Animator that controls the transformations of the windows the targets that are closing.

     */

     */

    private Animator getClosingWindowAnimators(RemoteAnimationTargetCompat[] targets) {

    private Animator getClosingWindowAnimators(RemoteAnimationTargetCompat[] targets) {

        SyncRtSurfaceTransactionApplier surfaceApplier =

        SyncRtSurfaceTransactionApplierCompat surfaceApplier =

                new SyncRtSurfaceTransactionApplier(mDragLayer);

                new SyncRtSurfaceTransactionApplierCompat(mDragLayer);

        Matrix matrix = new Matrix();

        Matrix matrix = new Matrix();

        ValueAnimator closingAnimator = ValueAnimator.ofFloat(0, 1);

        ValueAnimator closingAnimator = ValueAnimator.ofFloat(0, 1);

        int duration = CLOSING_TRANSITION_DURATION_MS;

        int duration = CLOSING_TRANSITION_DURATION_MS;

quickstep/src/com/android/launcher3/uioverrides/plugins/PluginEnablerImpl.java

+15 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,16 @@ public class PluginEnablerImpl extends PreferenceDataStore implements PluginEnab 
    }

    }





    @Override

    @Override

    public void setEnabled(ComponentName component, boolean enabled) {

    public void setEnabled(ComponentName component) {

        setState(component, true);

    }



    @Override

    public void setDisabled(ComponentName component, int reason) {

        setState(component, reason == ENABLED);

    }



    private void setState(ComponentName component, boolean enabled) {

        putBoolean(pluginEnabledKey(component), enabled);

        putBoolean(pluginEnabledKey(component), enabled);

    }

    }
@@ -43,6 +52,11 @@ public class PluginEnablerImpl extends PreferenceDataStore implements PluginEnab 
        return getBoolean(pluginEnabledKey(component), true);

        return getBoolean(pluginEnabledKey(component), true);

    }

    }





    @Override

    public int getDisableReason(ComponentName componentName) {

        return isEnabled(componentName) ? ENABLED : DISABLED_MANUALLY;

    }



    @Override

    @Override

    public void putBoolean(String key, boolean value) {

    public void putBoolean(String key, boolean value) {

        mSharedPrefs.edit().putBoolean(key, value).apply();

        mSharedPrefs.edit().putBoolean(key, value).apply();

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; 
import com.android.systemui.shared.system.LatencyTrackerCompat;

import com.android.systemui.shared.system.LatencyTrackerCompat;

import com.android.systemui.shared.system.PackageManagerWrapper;

import com.android.systemui.shared.system.PackageManagerWrapper;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;

import com.android.systemui.shared.system.TransactionCompat;

import com.android.systemui.shared.system.TransactionCompat;





import java.util.ArrayList;

import java.util.ArrayList;
@@ -344,7 +344,7 @@ public class OverviewCommandHelper { 
            clipHelper.prepareAnimation(false /* isOpening */);

            clipHelper.prepareAnimation(false /* isOpening */);





            ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()

            ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()

                    .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplier(rootView));

                    .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplierCompat(rootView));

            ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1);

            ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1);

            valueAnimator.setDuration(RECENTS_LAUNCH_DURATION);

            valueAnimator.setDuration(RECENTS_LAUNCH_DURATION);

            valueAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

            valueAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

quickstep/src/com/android/quickstep/TaskUtils.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.quickstep.views.RecentsView; 
import com.android.quickstep.views.TaskView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.Task;

import com.android.systemui.shared.recents.model.Task;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;





import java.util.List;

import java.util.List;
@@ -146,7 +146,8 @@ public class TaskUtils { 
    public static ValueAnimator getRecentsWindowAnimator(TaskView v, boolean skipViewChanges,

    public static ValueAnimator getRecentsWindowAnimator(TaskView v, boolean skipViewChanges,

            RemoteAnimationTargetCompat[] targets, final ClipAnimationHelper inOutHelper) {

            RemoteAnimationTargetCompat[] targets, final ClipAnimationHelper inOutHelper) {

        ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()

        ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()

                .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplier(v));

                .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplierCompat(v));

        

        final ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);

        final ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);

        appAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

        appAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

        appAnimator.addUpdateListener(new MultiValueUpdateListener() {

        appAnimator.addUpdateListener(new MultiValueUpdateListener() {