Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01c65d86 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Merge "Removing unused big_clock_container"

parents 52f8cca0 b288916a

packages/SystemUI/res/layout/status_bar_expanded.xml

+0 −6
Original line number Diff line number Diff line
@@ -29,12 +29,6 @@ 
    <include layout="@layout/communal_host_view"

             android:visibility="gone"/>



    <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
@@ -323,7 +323,6 @@ public class NotificationPanelViewController extends PanelViewController { 
    private KeyguardUserSwitcherController mKeyguardUserSwitcherController;

    private KeyguardStatusBarView mKeyguardStatusBar;

    private KeyguardStatusBarViewController mKeyguardStatusBarViewController;

    private ViewGroup mBigClockContainer;

    @VisibleForTesting QS mQs;

    private FrameLayout mQsFrame;

    @Nullable
@@ -886,7 +885,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);

        mCommunalView = mView.findViewById(R.id.communal_host);



        FrameLayout userAvatarContainer = null;
@@ -1193,7 +1191,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, mView.findViewById(R.id.idle_host_view), mCommunalView);
@@ -2326,7 +2323,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        if (mBarState == StatusBarState.SHADE_LOCKED || mBarState == KEYGUARD) {

            updateKeyguardBottomAreaAlpha();

            positionClockAndNotifications();

            updateBigClockAlpha();

        }



        if (mAccessibilityManager.isEnabled()) {
@@ -3108,20 +3104,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();
@@ -3479,7 +3461,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
@@ -170,8 +170,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    private KeyguardBottomAreaView mQsFrame;

    private KeyguardStatusView mKeyguardStatusView;

    @Mock

    private ViewGroup mBigClockContainer;

    @Mock

    private NotificationIconAreaController mNotificationAreaController;

    @Mock

    private HeadsUpManagerPhone mHeadsUpManager;
@@ -393,7 +391,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));