removed doze
Change-Id: I2d2bb9bd35571632bbc1319821ed8df10b1bae33
diff --git a/packages/SystemUI/res/layout/recents_task_view_header.xml b/packages/SystemUI/res/layout/recents_task_view_header.xml
index 477d9d7..e52c8db 100644
--- a/packages/SystemUI/res/layout/recents_task_view_header.xml
+++ b/packages/SystemUI/res/layout/recents_task_view_header.xml
@@ -61,6 +61,5 @@
android:layout_gravity="center_vertical|end"
android:padding="12dp"
android:background="@drawable/recents_button_bg"
- android:visibility="invisible"
android:src="@drawable/recents_dismiss_light" />
</com.android.systemui.recents.views.TaskViewHeader>
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
index 9e00b7aa..e0c58d3 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
@@ -574,11 +574,6 @@
}
@Override
- public void onUserInteraction() {
- mRecentsView.onUserInteraction();
- }
-
- @Override
public void onBackPressed() {
// Test mode where back does not do anything
if (mConfig.debugModeEnabled) return;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/DozeTrigger.java b/packages/SystemUI/src/com/android/systemui/recents/misc/DozeTrigger.java
deleted file mode 100644
index 735f79f..0000000
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/DozeTrigger.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.recents.misc;
-
-import android.os.Handler;
-
-/**
- * A dozer is a class that fires a trigger after it falls asleep. You can occasionally poke it to
- * wake it up, but it will fall asleep if left untouched.
- */
-public class DozeTrigger {
-
- Handler mHandler;
-
- boolean mIsDozing;
- boolean mHasTriggered;
- int mDozeDurationSeconds;
- Runnable mSleepRunnable;
-
- // Sleep-runnable
- Runnable mDozeRunnable = new Runnable() {
- @Override
- public void run() {
- mSleepRunnable.run();
- mIsDozing = false;
- mHasTriggered = true;
- }
- };
-
- public DozeTrigger(int dozeDurationSeconds, Runnable sleepRunnable) {
- mHandler = new Handler();
- mDozeDurationSeconds = dozeDurationSeconds;
- mSleepRunnable = sleepRunnable;
- }
-
- /** Starts dozing. This also resets the trigger flag. */
- public void startDozing() {
- forcePoke();
- mHasTriggered = false;
- }
-
- /** Stops dozing. */
- public void stopDozing() {
- mHandler.removeCallbacks(mDozeRunnable);
- mIsDozing = false;
- }
-
- /** Poke this dozer to wake it up for a little bit, if it is dozing. */
- public void poke() {
- if (mIsDozing) {
- forcePoke();
- }
- }
-
- /** Poke this dozer to wake it up for a little bit. */
- void forcePoke() {
- mHandler.removeCallbacks(mDozeRunnable);
- mHandler.postDelayed(mDozeRunnable, mDozeDurationSeconds * 1000);
- mIsDozing = true;
- }
-
- /** Returns whether we are dozing or not. */
- public boolean isDozing() {
- return mIsDozing;
- }
-
- /** Returns whether the trigger has fired at least once. */
- public boolean hasTriggered() {
- return mHasTriggered;
- }
-
- /** Resets the doze trigger state. */
- public void resetTrigger() {
- mHasTriggered = false;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
index 4214558..ae437b7 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
@@ -393,17 +393,6 @@
return insets.consumeSystemWindowInsets();
}
- /** Notifies each task view of the user interaction. */
- public void onUserInteraction() {
- // Get the first stack view
- List<TaskStackView> stackViews = getTaskStackViews();
- int stackCount = stackViews.size();
- for (int i = 0; i < stackCount; i++) {
- TaskStackView stackView = stackViews.get(i);
- stackView.onUserInteraction();
- }
- }
-
/** Focuses the next task in the first stack view */
public void focusNextTask(boolean forward) {
// Get the first stack view
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
index aa7d238..b4bdebe 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -34,7 +34,6 @@
import com.android.systemui.R;
import com.android.systemui.recents.Constants;
import com.android.systemui.recents.RecentsConfiguration;
-import com.android.systemui.recents.misc.DozeTrigger;
import com.android.systemui.recents.misc.SystemServicesProxy;
import com.android.systemui.recents.misc.Utilities;
import com.android.systemui.recents.model.RecentsPackageMonitor;
@@ -78,7 +77,6 @@
TaskStackViewCallbacks mCb;
ViewPool<TaskView, Task> mViewPool;
ArrayList<TaskViewTransform> mCurrentTaskTransforms = new ArrayList<TaskViewTransform>();
- DozeTrigger mUIDozeTrigger;
DebugOverlayView mDebugOverlay;
Rect mTaskStackBounds = new Rect();
DismissView mDismissAllButton;
@@ -125,18 +123,6 @@
mStackScroller = new TaskStackViewScroller(context, mConfig, mLayoutAlgorithm);
mStackScroller.setCallbacks(this);
mTouchHandler = new TaskStackViewTouchHandler(context, this, mConfig, mStackScroller);
- mUIDozeTrigger = new DozeTrigger(mConfig.taskBarDismissDozeDelaySeconds, new Runnable() {
- @Override
- public void run() {
- // Show the task bar dismiss buttons
- List<TaskView> taskViews = getTaskViews();
- int taskViewCount = taskViews.size();
- for (int i = 0; i < taskViewCount; i++) {
- TaskView tv = taskViews.get(i);
- tv.startNoUserInteractionAnimation();
- }
- }
- });
setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
}
@@ -213,10 +199,6 @@
mStackViewsClipDirty = true;
mAwaitingFirstLayout = true;
mPrevAccessibilityFocusedIndex = -1;
- if (mUIDozeTrigger != null) {
- mUIDozeTrigger.stopDozing();
- mUIDozeTrigger.resetTrigger();
- }
mStackScroller.reset();
mStartEnterAnimationCompleted = false;
@@ -890,11 +872,6 @@
focusTask(Math.max(0, mStack.getTaskCount() - 1), false);
}
}
-
- // Start dozing
- if (!mConfig.multiStackEnabled) {
- mUIDozeTrigger.startDozing();
- }
}
/** Requests this task stacks to start it's enter-recents animation */
@@ -940,8 +917,6 @@
@Override
public void run() {
mStartEnterAnimationCompleted = true;
- // Poke the dozer to restart the trigger after the animation completes
- mUIDozeTrigger.poke();
RecentsTaskLoader loader = RecentsTaskLoader.getInstance();
SystemServicesProxy ssp = loader.getSystemServicesProxy();
@@ -1102,12 +1077,6 @@
return isTransformedTouchPointInView(x, y, child, null);
}
- /** Pokes the dozer on user interaction. */
- void onUserInteraction() {
- // Poke the doze trigger if it is dozing
- mUIDozeTrigger.poke();
- }
-
@Override
protected void dispatchDraw(Canvas canvas) {
mLayersDisabled = false;
@@ -1315,12 +1284,6 @@
// Load the task data
RecentsTaskLoader.getInstance().loadTaskData(task);
- // If the doze trigger has already fired, then update the state for this task view
- if (mConfig.launchedWithAltTab ||
- mConfig.multiStackEnabled || mUIDozeTrigger.hasTriggered()) {
- tv.setNoUserInteractionState();
- }
-
// If we've finished the start animation, then ensure we always enable the focus animations
if (mStartEnterAnimationCompleted) {
tv.enableFocusAnimations();
@@ -1391,9 +1354,6 @@
@Override
public void onTaskViewClicked(TaskView tv, Task task, boolean lockToTask) {
- // Cancel any doze triggers
- mUIDozeTrigger.stopDozing();
-
if (mCb != null) {
mCb.onTaskViewClicked(this, tv, mStack, task, lockToTask);
}
@@ -1450,7 +1410,6 @@
@Override
public void onScrollChanged(float p) {
- mUIDozeTrigger.poke();
requestSynchronizeStackViewsWithModel();
postInvalidateOnAnimation();
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
index adbe035..ee429d8 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
@@ -155,7 +155,6 @@
/** Resets this TaskView for reuse. */
void reset() {
resetViewProperties();
- resetNoUserInteractionState();
setClipViewInStack(false);
setCallbacks(null);
disableFocusAnimations();
@@ -459,8 +458,6 @@
.setInterpolator(mConfig.fastOutLinearInInterpolator)
.start();
} else {
- // Hide the dismiss button
- mHeaderView.startLaunchTaskDismissAnimation();
// If this is another view in the task grouping and is in front of the launch task,
// animate it away first
if (occludesLaunchTarget) {
@@ -507,27 +504,6 @@
setOnClickListener(enabled ? this : null);
}
- /** Animates this task view if the user does not interact with the stack after a certain time. */
- void startNoUserInteractionAnimation() {
- mHeaderView.startNoUserInteractionAnimation();
- }
-
- /**
- * Mark this task view that the user does has not interacted with the stack after a certain
- * time.
- */
- void setNoUserInteractionState() {
- mHeaderView.setNoUserInteractionState();
- }
-
- /**
- * Resets the state tracking that the user has not interacted with the stack after a certain
- * time.
- */
- void resetNoUserInteractionState() {
- mHeaderView.resetNoUserInteractionState();
- }
-
/** Dismisses this task. */
void dismissTask() {
// Animate out the view and call the callback
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
index 4571984..ba85932 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
@@ -266,53 +266,6 @@
mApplicationIcon.setImageDrawable(null);
}
- /** Animates this task bar dismiss button when launching a task. */
- void startLaunchTaskDismissAnimation() {
- if (mDismissButton.getVisibility() == View.VISIBLE) {
- mDismissButton.animate().cancel();
- mDismissButton.animate()
- .alpha(0f)
- .setStartDelay(0)
- .setInterpolator(mConfig.fastOutSlowInInterpolator)
- .setDuration(mConfig.taskViewExitToAppDuration)
- .start();
- }
- }
-
- /** Animates this task bar if the user does not interact with the stack after a certain time. */
- void startNoUserInteractionAnimation() {
- if (mDismissButton.getVisibility() != View.VISIBLE) {
- mDismissButton.setVisibility(View.VISIBLE);
- mDismissButton.setAlpha(0f);
- mDismissButton.animate()
- .alpha(1f)
- .setStartDelay(0)
- .setInterpolator(mConfig.fastOutLinearInInterpolator)
- .setDuration(mConfig.taskViewEnterFromAppDuration)
- .start();
- }
- }
-
- /**
- * Mark this task view that the user does has not interacted with the stack after a certain
- * time.
- */
- void setNoUserInteractionState() {
- if (mDismissButton.getVisibility() != View.VISIBLE) {
- mDismissButton.animate().cancel();
- mDismissButton.setVisibility(View.VISIBLE);
- mDismissButton.setAlpha(1f);
- }
- }
-
- /**
- * Resets the state tracking that the user has not interacted with the stack after a certain
- * time.
- */
- void resetNoUserInteractionState() {
- mDismissButton.setVisibility(View.INVISIBLE);
- }
-
@Override
protected int[] onCreateDrawableState(int extraSpace) {
