am 0207c099: Fixing a coupld lockscreen bugs (8d668b5a) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ public class KeyguardHostView extends KeyguardViewBase {
		// from AudioManager
		KeyguardHostView.this.addView(mTransportControl);
		mTransportControl.setVisibility(View.GONE);
		showAppropriateWidgetPage();
		}
		}

		@@ -178,6 +179,7 @@ public class KeyguardHostView extends KeyguardViewBase {
		mTransportControl.setVisibility(View.VISIBLE);
		// Once shown, leave it showing
		mSticky = true;
		showAppropriateWidgetPage();
		}
		}
		});
		@@ -736,6 +738,15 @@ public class KeyguardHostView extends KeyguardViewBase {
		addWidget(widgets[i]);
		}
		}
		showAppropriateWidgetPage();
		}

		private void showAppropriateWidgetPage() {
		int page = mAppWidgetContainer.indexOfChild(findViewById(R.id.keyguard_status_view));
		if (mAppWidgetContainer.indexOfChild(mTransportControl) != -1) {
		page = mAppWidgetContainer.indexOfChild(mTransportControl);
		}
		mAppWidgetContainer.setCurrentPage(page);
		}

		private void inflateAndAddUserSelectorWidgetIfNecessary() {

+16 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.internal.policy.impl.keyguard;
		import android.content.Context;
		import android.util.AttributeSet;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.LinearLayout;

		import com.android.internal.R;
		@@ -70,5 +71,20 @@ public class KeyguardWidgetRegion extends LinearLayout implements PageSwitchList
		@Override
		public void onPageSwitch(View newPage, int newPageIndex) {
		mPage = newPageIndex;

		// If we're showing the default system status widget, then we want to hide the clock
		boolean hideClock = false;
		if ((newPage instanceof ViewGroup)) {
		ViewGroup vg = (ViewGroup) newPage;
		if (vg.getChildAt(0) instanceof KeyguardStatusView) {
		hideClock = true;
		}
		}

		if (hideClock) {
		setSystemUiVisibility(getSystemUiVisibility() \| View.STATUS_BAR_DISABLE_CLOCK);
		} else {
		setSystemUiVisibility(getSystemUiVisibility() & ~View.STATUS_BAR_DISABLE_CLOCK);
		}
		}
		}