Merge "Check for header when restoring default clock." into qt-r1-dev (a3ce8b53) · Commits · e / os / android_frameworks_base

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

+11 −3

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

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