Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wale Ogunwale
2015-03-23 21:10:41 +00:00
committed by Android (Google) Code Review
parent a6baa77482 e0cc2f652b
commit 8ed9946a8b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
View File

@@ -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

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

@@ -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 */