Removing unused big_clock_container
I couldn't find any other reference to it and removing code from NotificationPanelViewControler is always nice. It ain't much, but it's honest work. Bug: 201639277 Test: Presubmit Change-Id: I0232c419cfac76efb135e69db7eb7f98b905fefa
This commit is contained in:
@@ -29,12 +29,6 @@
|
|||||||
<include layout="@layout/communal_host_view"
|
<include layout="@layout/communal_host_view"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:id="@+id/big_clock_container"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<ViewStub
|
<ViewStub
|
||||||
android:id="@+id/keyguard_qs_user_switch_stub"
|
android:id="@+id/keyguard_qs_user_switch_stub"
|
||||||
android:layout="@layout/keyguard_qs_user_switch"
|
android:layout="@layout/keyguard_qs_user_switch"
|
||||||
|
|||||||
@@ -323,7 +323,6 @@ public class NotificationPanelViewController extends PanelViewController {
|
|||||||
private KeyguardUserSwitcherController mKeyguardUserSwitcherController;
|
private KeyguardUserSwitcherController mKeyguardUserSwitcherController;
|
||||||
private KeyguardStatusBarView mKeyguardStatusBar;
|
private KeyguardStatusBarView mKeyguardStatusBar;
|
||||||
private KeyguardStatusBarViewController mKeyguardStatusBarViewController;
|
private KeyguardStatusBarViewController mKeyguardStatusBarViewController;
|
||||||
private ViewGroup mBigClockContainer;
|
|
||||||
@VisibleForTesting QS mQs;
|
@VisibleForTesting QS mQs;
|
||||||
private FrameLayout mQsFrame;
|
private FrameLayout mQsFrame;
|
||||||
@Nullable
|
@Nullable
|
||||||
@@ -885,7 +884,6 @@ public class NotificationPanelViewController extends PanelViewController {
|
|||||||
private void onFinishInflate() {
|
private void onFinishInflate() {
|
||||||
loadDimens();
|
loadDimens();
|
||||||
mKeyguardStatusBar = mView.findViewById(R.id.keyguard_header);
|
mKeyguardStatusBar = mView.findViewById(R.id.keyguard_header);
|
||||||
mBigClockContainer = mView.findViewById(R.id.big_clock_container);
|
|
||||||
mCommunalView = mView.findViewById(R.id.communal_host);
|
mCommunalView = mView.findViewById(R.id.communal_host);
|
||||||
|
|
||||||
FrameLayout userAvatarContainer = null;
|
FrameLayout userAvatarContainer = null;
|
||||||
@@ -1192,7 +1190,6 @@ public class NotificationPanelViewController extends PanelViewController {
|
|||||||
R.layout.keyguard_user_switcher /* layoutId */,
|
R.layout.keyguard_user_switcher /* layoutId */,
|
||||||
showKeyguardUserSwitcher /* enabled */);
|
showKeyguardUserSwitcher /* enabled */);
|
||||||
|
|
||||||
mBigClockContainer.removeAllViews();
|
|
||||||
updateViewControllers(mView.findViewById(R.id.keyguard_status_view), userAvatarView,
|
updateViewControllers(mView.findViewById(R.id.keyguard_status_view), userAvatarView,
|
||||||
keyguardUserSwitcherView, mView.findViewById(R.id.idle_host_view), mCommunalView);
|
keyguardUserSwitcherView, mView.findViewById(R.id.idle_host_view), mCommunalView);
|
||||||
|
|
||||||
@@ -2325,7 +2322,6 @@ public class NotificationPanelViewController extends PanelViewController {
|
|||||||
if (mBarState == StatusBarState.SHADE_LOCKED || mBarState == KEYGUARD) {
|
if (mBarState == StatusBarState.SHADE_LOCKED || mBarState == KEYGUARD) {
|
||||||
updateKeyguardBottomAreaAlpha();
|
updateKeyguardBottomAreaAlpha();
|
||||||
positionClockAndNotifications();
|
positionClockAndNotifications();
|
||||||
updateBigClockAlpha();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mAccessibilityManager.isEnabled()) {
|
if (mAccessibilityManager.isEnabled()) {
|
||||||
@@ -3107,20 +3103,6 @@ public class NotificationPanelViewController extends PanelViewController {
|
|||||||
mLockIconViewController.setAlpha(alpha);
|
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
|
@Override
|
||||||
protected void onExpandingStarted() {
|
protected void onExpandingStarted() {
|
||||||
super.onExpandingStarted();
|
super.onExpandingStarted();
|
||||||
@@ -3470,7 +3452,6 @@ public class NotificationPanelViewController extends PanelViewController {
|
|||||||
}
|
}
|
||||||
mNotificationStackScrollLayoutController.setExpandedHeight(expandedHeight);
|
mNotificationStackScrollLayoutController.setExpandedHeight(expandedHeight);
|
||||||
updateKeyguardBottomAreaAlpha();
|
updateKeyguardBottomAreaAlpha();
|
||||||
updateBigClockAlpha();
|
|
||||||
updateStatusBarIcons();
|
updateStatusBarIcons();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -170,8 +170,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
|
|||||||
private KeyguardBottomAreaView mQsFrame;
|
private KeyguardBottomAreaView mQsFrame;
|
||||||
private KeyguardStatusView mKeyguardStatusView;
|
private KeyguardStatusView mKeyguardStatusView;
|
||||||
@Mock
|
@Mock
|
||||||
private ViewGroup mBigClockContainer;
|
|
||||||
@Mock
|
|
||||||
private NotificationIconAreaController mNotificationAreaController;
|
private NotificationIconAreaController mNotificationAreaController;
|
||||||
@Mock
|
@Mock
|
||||||
private HeadsUpManagerPhone mHeadsUpManager;
|
private HeadsUpManagerPhone mHeadsUpManager;
|
||||||
@@ -393,7 +391,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
|
|||||||
when(mKeyguardBottomArea.getLeftView()).thenReturn(mock(KeyguardAffordanceView.class));
|
when(mKeyguardBottomArea.getLeftView()).thenReturn(mock(KeyguardAffordanceView.class));
|
||||||
when(mKeyguardBottomArea.getRightView()).thenReturn(mock(KeyguardAffordanceView.class));
|
when(mKeyguardBottomArea.getRightView()).thenReturn(mock(KeyguardAffordanceView.class));
|
||||||
when(mKeyguardBottomArea.animate()).thenReturn(mock(ViewPropertyAnimator.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.qs_frame)).thenReturn(mQsFrame);
|
||||||
when(mView.findViewById(R.id.keyguard_status_view))
|
when(mView.findViewById(R.id.keyguard_status_view))
|
||||||
.thenReturn(mock(KeyguardStatusView.class));
|
.thenReturn(mock(KeyguardStatusView.class));
|
||||||
|
|||||||
Reference in New Issue
Block a user