Merge "Check for header when restoring default clock." into qt-r1-dev am: a3ce8b5384 (76a34e24) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -222,8 +222,13 @@ public class KeyguardClockSwitch extends RelativeLayout {
		mClockPlugin = null;
		}
		if (plugin == null) {
		if (mShowingHeader) {
		mClockView.setVisibility(View.GONE);
		mClockViewBold.setVisibility(View.VISIBLE);
		} else {
		mClockView.setVisibility(View.VISIBLE);
		mClockViewBold.setVisibility(View.INVISIBLE);
		}
		mKeyguardStatusArea.setVisibility(View.VISIBLE);
		return;
		}
		@@ -401,10 +406,13 @@ public class KeyguardClockSwitch extends RelativeLayout {
		* these cases.
		*/
		void setKeyguardShowingHeader(boolean hasHeader) {
		if (mShowingHeader == hasHeader \|\| hasCustomClock()) {
		if (mShowingHeader == hasHeader) {
		return;
		}
		mShowingHeader = hasHeader;
		if (hasCustomClock()) {
		return;
		}

		float smallFontSize = mContext.getResources().getDimensionPixelSize(
		R.dimen.widget_small_font_size);