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

Commit 89733a48 authored by Sam Mortimer's avatar Sam Mortimer Committed by Bruno Martins
Browse files

SystemUI: Network Traffic [1/3] 

*) Add lineage-sdk internal NetworkTraffic to the statusbar
   using the LineageStatusBarItemHolder helper.

Change-Id: Ib947832860970a3bccfac70d27a4761f6164d3d5
parent 898fa52a

packages/SystemUI/res/layout/status_bar.xml

+16 −0
Original line number Diff line number Diff line
@@ -110,6 +110,22 @@ 
            android:clipChildren="false"

            android:gravity="center_horizontal|center_vertical"/>



        <com.android.systemui.statusbar.LineageStatusBarItemHolder

            android:id="@+id/network_traffic_holder"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:gravity="start|center_vertical"

            >



            <org.lineageos.internal.statusbar.NetworkTraffic

                android:id="@+id/network_traffic"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:maxLines="2"

                android:gravity="center_vertical|start" />



        </com.android.systemui.statusbar.LineageStatusBarItemHolder>



        <com.android.keyguard.AlphaOptimizedLinearLayout android:id="@+id/system_icon_area"

            android:layout_width="0dp"

            android:layout_height="match_parent"

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

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    private NetworkController mNetworkController;

    private LinearLayout mSystemIconArea;

    private View mNotificationIconAreaInner;

    private View mNetworkTrafficHolder;

    private View mCenteredIconArea;

    private int mDisabled1;

    private StatusBar mStatusBarComponent;
@@ -106,6 +107,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        mDarkIconManager.setShouldLog(true);

        Dependency.get(StatusBarIconController.class).addIconGroup(mDarkIconManager);

        mSystemIconArea = mStatusBar.findViewById(R.id.system_icon_area);

        mNetworkTrafficHolder = mStatusBar.findViewById(R.id.network_traffic_holder);

        mClockController = new ClockController(mStatusBar);

        showSystemIconArea(false);

        showClock(false);
@@ -264,10 +266,12 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 


    public void hideSystemIconArea(boolean animate) {

        animateHide(mSystemIconArea, animate);

        animateHide(mNetworkTrafficHolder, animate);

    }



    public void showSystemIconArea(boolean animate) {

        animateShow(mSystemIconArea, animate);

        animateShow(mNetworkTrafficHolder, animate);

    }



    public void hideClock(boolean animate) {

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

+5 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
    private final PhoneStatusBarView mView;

    private final float mIconAlphaWhenOpaque;



    private View mLeftSide, mStatusIcons, mBattery, mClock;

    private View mLeftSide, mStatusIcons, mNetworkTraffic, mBattery, mClock;

    private Animator mCurrentAnimation;



    public PhoneStatusBarTransitions(PhoneStatusBarView view) {
@@ -45,6 +45,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
    public void init() {

        mLeftSide = mView.findViewById(R.id.status_bar_left_side);

        mStatusIcons = mView.findViewById(R.id.statusIcons);

        mNetworkTraffic = mView.findViewById(R.id.network_traffic);

        mBattery = mView.findViewById(R.id.battery);

        applyModeBackground(-1, getMode(), false /*animate*/);

        applyMode(getMode(), false /*animate*/);
@@ -88,6 +89,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
            anims.playTogether(

                    animateTransitionTo(mLeftSide, newAlpha),

                    animateTransitionTo(mStatusIcons, newAlpha),

                    animateTransitionTo(mNetworkTraffic, newAlpha),

                    animateTransitionTo(mBattery, newAlphaBC)

                    );

            if (isLightsOut(mode)) {
@@ -98,6 +100,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
        } else {

            mLeftSide.setAlpha(newAlpha);

            mStatusIcons.setAlpha(newAlpha);

            mNetworkTraffic.setAlpha(newAlpha);

            mBattery.setAlpha(newAlphaBC);

        }

    }