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

Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev

Browse Source 
am: 331a287656

Change-Id: Ie00665beb58cfb797cfdc85c20adfb28988055b2
This commit is contained in:
Geoffrey Pitsch
2017-07-18 10:29:23 +00:00
committed by android-build-merger
parent 0d126ceddb 331a287656
commit 3c778dc07a
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -24,6 +24,8 @@ import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.os.Handler;
import android.os.Looper;
import android.os.UserHandle; import android.os.UserHandle;
import android.support.v4.graphics.ColorUtils; import android.support.v4.graphics.ColorUtils;
import android.text.TextUtils; import android.text.TextUtils;
@@ -48,6 +50,7 @@ import java.util.Locale;
public class KeyguardStatusView extends GridLayout { public class KeyguardStatusView extends GridLayout {
private static final boolean DEBUG = KeyguardConstants.DEBUG; private static final boolean DEBUG = KeyguardConstants.DEBUG;
private static final String TAG = "KeyguardStatusView"; private static final String TAG = "KeyguardStatusView";
private static final int MARQUEE_DELAY_MS = 2000;
private final LockPatternUtils mLockPatternUtils; private final LockPatternUtils mLockPatternUtils;
private final AlarmManager mAlarmManager; private final AlarmManager mAlarmManager;
@@ -59,6 +62,8 @@ public class KeyguardStatusView extends GridLayout {
private ViewGroup mClockContainer; private ViewGroup mClockContainer;
private ChargingView mBatteryDoze; private ChargingView mBatteryDoze;
private View mKeyguardStatusArea; private View mKeyguardStatusArea;
private Runnable mPendingMarqueeStart;
private Handler mHandler;
private View[] mVisibleInDoze; private View[] mVisibleInDoze;
private boolean mPulsing; private boolean mPulsing;
@@ -112,9 +117,29 @@ public class KeyguardStatusView extends GridLayout {
super(context, attrs, defStyle); super(context, attrs, defStyle);
mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
mLockPatternUtils = new LockPatternUtils(getContext()); mLockPatternUtils = new LockPatternUtils(getContext());
mHandler = new Handler(Looper.myLooper());
} }
private void setEnableMarquee(boolean enabled) { private void setEnableMarquee(boolean enabled) {
if (DEBUG) Log.v(TAG, "Schedule setEnableMarquee: " + (enabled ? "Enable" : "Disable"));
if (enabled) {
if (mPendingMarqueeStart == null) {
mPendingMarqueeStart = () -> {
setEnableMarqueeImpl(true);
mPendingMarqueeStart = null;
};
mHandler.postDelayed(mPendingMarqueeStart, MARQUEE_DELAY_MS);
}
} else {
if (mPendingMarqueeStart != null) {
mHandler.removeCallbacks(mPendingMarqueeStart);
mPendingMarqueeStart = null;
}
setEnableMarqueeImpl(false);
}
}
private void setEnableMarqueeImpl(boolean enabled) {
if (DEBUG) Log.v(TAG, (enabled ? "Enable" : "Disable") + " transport text marquee"); if (DEBUG) Log.v(TAG, (enabled ? "Enable" : "Disable") + " transport text marquee");
if (mAlarmStatusView != null) mAlarmStatusView.setSelected(enabled); if (mAlarmStatusView != null) mAlarmStatusView.setSelected(enabled);
if (mOwnerInfo != null) mOwnerInfo.setSelected(enabled); if (mOwnerInfo != null) mOwnerInfo.setSelected(enabled);