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

Commit a12d8f96 authored by Roman Birg's avatar Roman Birg Committed by Gerrit Code Review
Browse files

Revert "SystemUI: allow devices to disable recents-to-home anim" 

This is not the right fix

This reverts commit 43ed1aa7.

Ref: CYNGNOS-1136
Change-Id: I8901ee95667c732b11f53eafd24ce30da44990ad
(cherry picked from commit f4e309a6)
parent 4efbc9b4

packages/SystemUI/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -323,8 +323,5 @@ 
    <bool name="config_enableDataSwitch">false</bool>

    <!-- Enable the default volume dialog -->

    <bool name="enable_volume_ui">true</bool>



    <!-- Whether to disable exit-to-home animations for this device -->

    <bool name="config_disableRecentsToHomeAnimation">false</bool>

</resources>

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

+3 −6
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.SystemClock;

import android.os.UserHandle;
@@ -38,6 +39,7 @@ import android.view.ViewStub; 
import android.widget.Toast;



import com.android.systemui.R;

import com.android.systemui.recents.RecentsConfiguration;

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

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

import com.android.systemui.recents.misc.SystemServicesProxy;
@@ -86,8 +88,6 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 


    private PhoneStatusBar mStatusBar;



    private boolean mAnimateHome;



    /**

     * A common Runnable to finish Recents either by calling finish() (with a custom animation) or

     * launching Home with some ActivityOptions.  Generally we always launch home when we exit
@@ -357,7 +357,7 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 


    /** Dismisses Recents directly to Home. */

    void dismissRecentsToHomeRaw(boolean animated) {

        if (animated && mAnimateHome) {

        if (animated) {

            ReferenceCountedTrigger exitTrigger = new ReferenceCountedTrigger(this,

                    null, mFinishLaunchHomeRunnable, null);

            mRecentsView.startExitToHomeAnimation(
@@ -382,9 +382,6 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 
    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        mAnimateHome = !getResources().getBoolean(R.bool.config_disableRecentsToHomeAnimation);



        // For the non-primary user, ensure that the SystemServicesProxy and configuration is

        // initialized

        RecentsTaskLoader.initialize(this);