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

Commit 4bb727ff authored by Sam Mortimer's avatar Sam Mortimer Committed by Wolfram Liebchen
Browse files

SystemUI: Network Traffic [1/3] 

*) Backport to cm-14.1

*) Add cmsdk internal NetworkTraffic to the statusbar
   using the CMStatusBarItemHolder helper.

Change-Id: Iba82b622099a415da5fe6d4ae923e3139b6dca52
parent 0ed80d62

packages/SystemUI/res/layout/status_bar.xml

+15 −0
Original line number Diff line number Diff line
@@ -62,6 +62,21 @@ 
            android:orientation="horizontal"

            >



            <com.android.systemui.statusbar.CMStatusBarItemHolder

                android:id="@+id/network_traffic_holder"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                >



                <org.cyanogenmod.internal.statusbar.NetworkTraffic

                    android:id="@+id/network_traffic"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:maxLines="2"

                    android:gravity="end|center_vertical"/>



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



            <include layout="@layout/system_icons" />



            <com.android.systemui.BatteryLevelTextView android:id="@+id/battery_level"

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

+4 −1
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, mSignalCluster, mBattery, mClock;

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

    private Animator mCurrentAnimation;



    public PhoneStatusBarTransitions(PhoneStatusBarView view) {
@@ -48,6 +48,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
        mSignalCluster = mView.findViewById(R.id.signal_cluster);

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

        mClock = mView.findViewById(R.id.clock);

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

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

        applyMode(getMode(), false /*animate*/);

    }
@@ -91,6 +92,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
                    animateTransitionTo(mLeftSide, newAlpha),

                    animateTransitionTo(mStatusIcons, newAlpha),

                    animateTransitionTo(mSignalCluster, newAlpha),

                    animateTransitionTo(mNetworkTraffic, newAlpha),

                    animateTransitionTo(mBattery, newAlphaBC),

                    animateTransitionTo(mClock, newAlphaBC)

                    );
@@ -103,6 +105,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { 
            mLeftSide.setAlpha(newAlpha);

            mStatusIcons.setAlpha(newAlpha);

            mSignalCluster.setAlpha(newAlpha);

            mNetworkTraffic.setAlpha(newAlpha);

            mBattery.setAlpha(newAlphaBC);

            mClock.setAlpha(newAlphaBC);

        }

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

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ import com.android.systemui.tuner.TunerService.Tunable; 
import java.io.PrintWriter;

import java.util.ArrayList;



import org.cyanogenmod.internal.statusbar.NetworkTraffic;



/**

 * Controls everything regarding the icons in the status bar and on Keyguard, including, but not

 * limited to: notification icons, signal cluster, additional status icons, and clock in the status
@@ -80,6 +82,7 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl 
    private BatteryMeterView mBatteryMeterViewKeyguard;

    private ClockController mClockController;

    private View mCenterClockLayout;

    private NetworkTraffic mNetworkTraffic;



    private int mIconSize;

    private int mIconHPadding;
@@ -139,6 +142,7 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl 
        mBatteryMeterViewKeyguard = (BatteryMeterView) keyguardStatusBar.findViewById(R.id.battery);

        scaleBatteryMeterViews(context);



        mNetworkTraffic = (NetworkTraffic) statusBar.findViewById(R.id.network_traffic);

        mDarkModeIconColorSingleTone = context.getColor(R.color.dark_mode_icon_color_single_tone);

        mLightModeIconColorSingleTone = context.getColor(R.color.light_mode_icon_color_single_tone);

        mHandler = new Handler();
@@ -549,6 +553,8 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl 
                isInArea(mTintArea, mBatteryMeterView) ? mDarkIntensity : 0);

        mClockController.setTextColor(mTintArea, mIconTint);

        mBatteryLevelView.setTextColor(getTint(mTintArea, mBatteryLevelView, mIconTint));

        mNetworkTraffic.setDarkIntensity(mDarkIntensity,

                mLightModeIconColorSingleTone, mDarkModeIconColorSingleTone);

    }



    public void appTransitionPending() {