Merge "Always show "Swipe up to open" on tapping empty space on LS" into sc-dev (cc62a808) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -811,15 +811,10 @@ public class KeyguardIndicationController {
	mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);		mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);
	}		}
	} else if (mKeyguardUpdateMonitor.isScreenOn()) {		} else if (mKeyguardUpdateMonitor.isScreenOn()) {
	if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {
	showTransientIndication(mContext.getString(R.string.keyguard_unlock_press),
	false /* isError /, true / hideOnScreenOff */);
	} else {
	showTransientIndication(mContext.getString(R.string.keyguard_unlock),		showTransientIndication(mContext.getString(R.string.keyguard_unlock),
	false /* isError /, true / hideOnScreenOff */);		false /* isError /, true / hideOnScreenOff */);
	}		}
	}		}
	}

	private void showTryFingerprintMsg() {		private void showTryFingerprintMsg() {
	if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {		if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {