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

Merge "Only show historical tasks in history."

Browse Source
This commit is contained in:
Winson Chung
2015-12-15 14:27:25 +00:00
committed by Android (Google) Code Review
parent 1a9053366c de750de531
commit db35f84f74
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/values/strings.xml
View File

@@ -713,8 +713,8 @@
<string name="recents_launch_error_message">Could not start <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>
<!-- Recents: Show history string. [CHAR LIMIT=NONE] -->
<string name="recents_show_history_button_label">More</string>
<!-- Recents: The history of recents. [CHAR LIMIT=NONE] -->
<string name="recents_history_label">History</string>
<!-- Recents: A format string to set the number of availabe historical tasks in recents. [CHAR LIMIT=NONE] -->
<string name="recents_history_label_format"><xliff:g id="number">%d</xliff:g> More</string>
<!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
<string name="recents_multistack_add_stack_dialog_split_horizontal">Split Horizontal</string>

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

@@ -101,7 +101,7 @@ public class RecentsHistoryView extends LinearLayout {
.start();
}
});
mAdapter.updateTasks(getContext(), stack.computeAllTasksList());
mAdapter.updateTasks(getContext(), stack.getHistoricalTasks());
mIsVisible = true;
}

10
packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
View File

@@ -32,8 +32,8 @@ import android.view.WindowInsets;
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import android.widget.FrameLayout;
import com.android.internal.logging.MetricsLogger;
import android.widget.TextView;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivity;
@@ -81,7 +81,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
private TaskStack mStack;
private TaskStackView mTaskStackView;
private RecentsAppWidgetHostView mSearchBar;
private View mHistoryButton;
private TextView mHistoryButton;
private View mEmptyView;
private boolean mAwaitingFirstLayout = true;
private boolean mLastTaskLaunchedWasFreeform;
@@ -126,7 +126,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
mFlingAnimationUtils = new FlingAnimationUtils(context, 0.3f);
LayoutInflater inflater = LayoutInflater.from(context);
mHistoryButton = inflater.inflate(R.layout.recents_history_button, this, false);
mHistoryButton = (TextView) inflater.inflate(R.layout.recents_history_button, this, false);
mHistoryButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -609,6 +609,8 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
RecentsDebugFlags debugFlags = Recents.getDebugFlags();
if (!debugFlags.isHistoryEnabled()) {
hideHistoryButton(100);
} else {
showHistoryButton(100);
}
}
@@ -631,6 +633,8 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
mHistoryButton.setVisibility(View.VISIBLE);
mHistoryButton.setAlpha(0f);
mHistoryButton.setText(getContext().getString(R.string.recents_history_label_format,
mStack.getHistoricalTasks().size()));
postHideHistoryAnimationTrigger.addLastDecrementRunnable(new Runnable() {
@Override
public void run() {

15
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
View File

@@ -1065,8 +1065,11 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
}
// Update the history button visibility
if (mStackScroller.getStackScroll() < SHOW_HISTORY_BUTTON_SCROLL_THRESHOLD) {
if (shouldShowHistoryButton() &&
mStackScroller.getStackScroll() < SHOW_HISTORY_BUTTON_SCROLL_THRESHOLD) {
EventBus.getDefault().send(new ShowHistoryButtonEvent());
} else {
EventBus.getDefault().send(new HideHistoryButtonEvent());
}
// Start dozing
@@ -1395,7 +1398,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
requestSynchronizeStackViewsWithModel();
postInvalidateOnAnimation();
if (prevScroll > SHOW_HISTORY_BUTTON_SCROLL_THRESHOLD &&
if (shouldShowHistoryButton() &&
prevScroll > SHOW_HISTORY_BUTTON_SCROLL_THRESHOLD &&
curScroll <= SHOW_HISTORY_BUTTON_SCROLL_THRESHOLD) {
EventBus.getDefault().send(new ShowHistoryButtonEvent());
} else if (prevScroll < HIDE_HISTORY_BUTTON_SCROLL_THRESHOLD &&
@@ -1666,4 +1670,11 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
}
return -1;
}
/**
* @return whether the history button should be visible
*/
private boolean shouldShowHistoryButton() {
return !mStack.getHistoricalTasks().isEmpty();
}
}