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

Commit 398946c4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Removing unused big_clock_container" into sc-v2-dev am: dbb3ce62 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15949242

Change-Id: Ib10bd468c0e585bd9bc1d055fa89970347655f98
parents c9e8de5b dbb3ce62

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;
@@ -799,7 +798,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;
@@ -1082,7 +1080,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);
@@ -2181,7 +2178,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        if (mBarState == StatusBarState.SHADE_LOCKED || mBarState == KEYGUARD) {

            updateKeyguardBottomAreaAlpha();

            positionClockAndNotifications();

            updateBigClockAlpha();

        }



        if (mAccessibilityManager.isEnabled()) {
@@ -2951,20 +2947,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();
@@ -3322,7 +3304,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));