Merge "Removing unused big_clock_container" into sc-v2-dev (dbb3ce62) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/status_bar_expanded.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -25,12 +25,6 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@android:color/transparent">
		<FrameLayout
		android:id="@+id/big_clock_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone" />

		<ViewStub
		android:id="@+id/keyguard_qs_user_switch_stub"
		android:layout="@layout/keyguard_qs_user_switch"

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -305,7 +305,6 @@ public class NotificationPanelViewController extends PanelViewController {
		private KeyguardUserSwitcherController mKeyguardUserSwitcherController;
		private KeyguardStatusBarView mKeyguardStatusBar;
		private KeyguardStatusBarViewController mKeyguardStatusBarViewController;
		private ViewGroup mBigClockContainer;
		@VisibleForTesting QS mQs;
		private FrameLayout mQsFrame;
		private KeyguardStatusViewController mKeyguardStatusViewController;
		@@ -802,7 +801,6 @@ public class NotificationPanelViewController extends PanelViewController {
		private void onFinishInflate() {
		loadDimens();
		mKeyguardStatusBar = mView.findViewById(R.id.keyguard_header);
		mBigClockContainer = mView.findViewById(R.id.big_clock_container);

		FrameLayout userAvatarContainer = null;
		KeyguardUserSwitcherView keyguardUserSwitcherView = null;
		@@ -1085,7 +1083,6 @@ public class NotificationPanelViewController extends PanelViewController {
		R.layout.keyguard_user_switcher /* layoutId */,
		showKeyguardUserSwitcher /* enabled */);

		mBigClockContainer.removeAllViews();
		updateViewControllers(mView.findViewById(R.id.keyguard_status_view), userAvatarView,
		keyguardUserSwitcherView);

		@@ -2184,7 +2181,6 @@ public class NotificationPanelViewController extends PanelViewController {
		if (mBarState == StatusBarState.SHADE_LOCKED \|\| mBarState == KEYGUARD) {
		updateKeyguardBottomAreaAlpha();
		positionClockAndNotifications();
		updateBigClockAlpha();
		}

		if (mAccessibilityManager.isEnabled()) {
		@@ -2957,20 +2953,6 @@ public class NotificationPanelViewController extends PanelViewController {
		mLockIconViewController.setAlpha(alpha);
		}

		/**
		* Custom clock fades away when user drags up to unlock or pulls down quick settings.
		*
		* Updates alpha of custom clock to match the alpha of the KeyguardBottomArea. See
		* {@link #updateKeyguardBottomAreaAlpha}.
		*/
		private void updateBigClockAlpha() {
		float expansionAlpha = MathUtils.map(
		isUnlockHintRunning() ? 0 : KeyguardBouncer.ALPHA_EXPANSION_THRESHOLD, 1f, 0f, 1f,
		getExpandedFraction());
		float alpha = Math.min(expansionAlpha, 1 - computeQsExpansionFraction());
		mBigClockContainer.setAlpha(alpha);
		}

		@Override
		protected void onExpandingStarted() {
		super.onExpandingStarted();
		@@ -3328,7 +3310,6 @@ public class NotificationPanelViewController extends PanelViewController {
		}
		mNotificationStackScrollLayoutController.setExpandedHeight(expandedHeight);
		updateKeyguardBottomAreaAlpha();
		updateBigClockAlpha();
		updateStatusBarIcons();
		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -156,8 +156,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
		private KeyguardBottomAreaView mQsFrame;
		private KeyguardStatusView mKeyguardStatusView;
		@Mock
		private ViewGroup mBigClockContainer;
		@Mock
		private NotificationIconAreaController mNotificationAreaController;
		@Mock
		private HeadsUpManagerPhone mHeadsUpManager;
		@@ -347,7 +345,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
		when(mKeyguardBottomArea.getLeftView()).thenReturn(mock(KeyguardAffordanceView.class));
		when(mKeyguardBottomArea.getRightView()).thenReturn(mock(KeyguardAffordanceView.class));
		when(mKeyguardBottomArea.animate()).thenReturn(mock(ViewPropertyAnimator.class));
		when(mView.findViewById(R.id.big_clock_container)).thenReturn(mBigClockContainer);
		when(mView.findViewById(R.id.qs_frame)).thenReturn(mQsFrame);
		when(mView.findViewById(R.id.keyguard_status_view))
		.thenReturn(mock(KeyguardStatusView.class));