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

Commit b29e0db8 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix status bar visibility initialization"

parents b3544c15 60033fc0

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

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        mSystemIconArea = mStatusBar.findViewById(R.id.system_icon_area);

        mSignalClusterView = reinflateSignalCluster(mStatusBar);

        Dependency.get(DarkIconDispatcher.class).addDarkReceiver(mSignalClusterView);

        // Default to showing until we know otherwise.

        showSystemIconArea(false);

    }



    @Override
@@ -119,6 +121,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
                    .removeView(mNotificationIconAreaInner);

        }

        notificationIconArea.addView(mNotificationIconAreaInner);

        // Default to showing until we know otherwise.

        showNotificationIconArea(false);

    }



    @Override

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

+5 −2
Original line number Diff line number Diff line
@@ -987,16 +987,19 @@ public class StatusBar extends SystemUI implements DemoMode, 
        Dependency.get(DarkIconDispatcher.class).addDarkReceiver(mNotificationIconAreaController);

        FragmentHostManager.get(mStatusBarWindow)

                .addTagListener(CollapsedStatusBarFragment.TAG, (tag, fragment) -> {

                    CollapsedStatusBarFragment statusBarFragment = (CollapsedStatusBarFragment) fragment;

                    CollapsedStatusBarFragment statusBarFragment =

                            (CollapsedStatusBarFragment) fragment;

                    statusBarFragment.initNotificationIconArea(mNotificationIconAreaController);

                    mStatusBarView = (PhoneStatusBarView) fragment.getView();

                    mStatusBarView.setBar(this);

                    mStatusBarView.setPanel(mNotificationPanel);

                    mStatusBarView.setScrimController(mScrimController);

                    setAreThereNotifications();

                    checkBarModes();

                }).getFragmentManager()

                .beginTransaction()

                .replace(R.id.status_bar_container, new CollapsedStatusBarFragment(), CollapsedStatusBarFragment.TAG)

                .replace(R.id.status_bar_container, new CollapsedStatusBarFragment(),

                        CollapsedStatusBarFragment.TAG)

                .commit();

        Dependency.get(StatusBarIconController.class).addIconGroup(

                new IconManager((ViewGroup) mKeyguardStatusBar.findViewById(R.id.statusIcons)));

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

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ package com.android.systemui.statusbar.phone; 


import static org.junit.Assert.assertEquals;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;
@@ -104,6 +105,6 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { 


        fragment.disable(0, 0, false);



        Mockito.verify(mNotificationAreaInner).setVisibility(eq(View.VISIBLE));

        Mockito.verify(mNotificationAreaInner, atLeast(1)).setVisibility(eq(View.VISIBLE));

    }

}