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

Commit a26fb782 authored by Winson Chung's avatar Winson Chung
Browse files

Fixing issues with dim not animating, adding dismiss button delay, tweaking...

Fixing issues with dim not animating, adding dismiss button delay, tweaking empty recents text. (Bug 15431590, 15573497)

Change-Id: I9c11e04cd52f9e000d8ba3e443f2500c9aa7edbb
parent 9214eff5
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@
    android:gravity="center"
    android:textSize="20sp"
    android:textColor="#ffffffff"
    android:textStyle="italic"
    android:text="@string/recents_empty_message"
    android:fontFamily="sans-serif-light"
    android:visibility="gone" />
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@
            android:layout_marginEnd="4dp"
            android:layout_gravity="center_vertical|end"
            android:padding="18dp"
            android:visibility="invisible"
            android:src="@drawable/recents_dismiss_light" />
    </com.android.systemui.recents.views.TaskBarView>
</com.android.systemui.recents.views.TaskView>
+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@
    <!-- milliseconds before the heads up notification accepts touches. -->
    <integer name="heads_up_sensitivity_delay">700</integer>

    <!-- The duration in seconds to wait before the dismiss buttons are shown. -->
    <integer name="recents_task_bar_dismiss_delay_seconds">3</integer>
    <!-- The min animation duration for animating views that are currently visible. -->
    <integer name="recents_filter_animate_current_views_min_duration">175</integer>
    <!-- The min animation duration for animating views that are newly visible. -->
+72 −0
Original line number Diff line number Diff line
/*
 * 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;

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() {
        poke();
        mHasTriggered = false;
    }

    /** Poke this dozer to wake it up for a little bit. */
    public void poke() {
        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;
    }
}
+5 −0
Original line number Diff line number Diff line
@@ -526,6 +526,11 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
        return super.onKeyDown(keyCode, event);
    }

    @Override
    public void onUserInteraction() {
        mRecentsView.onUserInteraction();
    }

    @Override
    public void onBackPressed() {
        // If we are mid-animation into Recents, then reverse it and finish
Loading