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

Commit 8ed9946a authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Changed recent multi-window UI to use persist.sys.debug.multi_window"

parents a6baa774 e0cc2f65

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

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ public class RecentsConfiguration { 
                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED) != 0;

        lockToAppEnabled = ssp.getSystemSetting(context,

                Settings.System.LOCK_TO_APP_ENABLED) != 0;

        multiStackEnabled = "1".equals(ssp.getSystemProperty("overview.enableMultiStack"));

        multiStackEnabled = "true".equals(ssp.getSystemProperty("persist.sys.debug.multi_window"));

    }



    /** Called when the configuration has changed, and we want to reset any configuration specific

packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java

+1 −3
Original line number Diff line number Diff line
@@ -124,9 +124,6 @@ public class TaskViewHeader extends FrameLayout { 
        mActivityDescription = (TextView) findViewById(R.id.activity_description);

        mDismissButton = (ImageView) findViewById(R.id.dismiss_task);

        mMoveTaskButton = (ImageView) findViewById(R.id.move_task);

        if (mConfig.multiStackEnabled) {

            mMoveTaskButton.setVisibility(View.VISIBLE);

        }



        // Hide the backgrounds if they are ripple drawables

        if (!Constants.DebugFlags.App.EnableTaskFiltering) {
@@ -209,6 +206,7 @@ public class TaskViewHeader extends FrameLayout { 
                mLightDismissDrawable : mDarkDismissDrawable);

        mDismissButton.setContentDescription(String.format(mDismissContentDescription,

                t.activityLabel));

        mMoveTaskButton.setVisibility((mConfig.multiStackEnabled) ? View.VISIBLE : View.INVISIBLE);

    }



    /** Unbinds the bar view from the task */