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

Commit 89a037db authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes I88baa0eb,Ic63ada05,I5e7eb52c,Ifd28e920 into tm-qpr-dev 

* changes:
  [SB Refactor] Add verbose logging about values received by the binder.
  [SB Refactor] Add logs for view creation and collection.
  [SB Refactor] Define a MobileViewLogger and move the UI logs there.
  [SB Refactor] Minor logging changes to StatusBarIconController etc.
parents 110c9c11 f1214c52

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+12 −1
Original line number Diff line number Diff line
@@ -93,6 +93,16 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi 
    @IntDef({STATE_ICON, STATE_DOT, STATE_HIDDEN})

    public @interface VisibleState { }



    /** Returns a human-readable string of {@link VisibleState}. */

    public static String getVisibleStateString(@VisibleState int state) {

        switch(state) {

            case STATE_ICON: return "ICON";

            case STATE_DOT: return "DOT";

            case STATE_HIDDEN: return "HIDDEN";

            default: return "UNKNOWN";

        }

    }



    private static final String TAG = "StatusBarIconView";

    private static final Property<StatusBarIconView, Float> ICON_APPEAR_AMOUNT

            = new FloatProperty<StatusBarIconView>("iconAppearAmount") {
@@ -561,7 +571,8 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi 
    @Override

    public String toString() {

        return "StatusBarIconView("

                + "slot='" + mSlot + " alpha=" + getAlpha() + " icon=" + mIcon

                + "slot='" + mSlot + "' alpha=" + getAlpha() + " icon=" + mIcon

                + " visibleState=" + getVisibleStateString(getVisibleState())

                + " iconColor=#" + Integer.toHexString(mIconColor)

                + " notification=" + mNotification + ')';

    }

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

+6 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.systemui.statusbar.StatusIconDisplayable; 
import com.android.systemui.statusbar.connectivity.ui.MobileContextProvider;

import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState;

import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState;

import com.android.systemui.statusbar.pipeline.mobile.ui.MobileViewLogger;

import com.android.systemui.statusbar.pipeline.mobile.ui.view.ModernStatusBarMobileView;

import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.MobileIconsViewModel;

import com.android.systemui.statusbar.pipeline.wifi.ui.view.ModernStatusBarWifiView;
@@ -288,10 +289,14 @@ public class DemoStatusIcons extends StatusIconContainer implements DemoMode, Da 
     * @param mobileContext possibly mcc/mnc overridden mobile context

     * @param subId the subscriptionId for this mobile view

     */

    public void addModernMobileView(Context mobileContext, int subId) {

    public void addModernMobileView(

            Context mobileContext,

            MobileViewLogger mobileViewLogger,

            int subId) {

        Log.d(TAG, "addModernMobileView (subId=" + subId + ")");

        ModernStatusBarMobileView view = ModernStatusBarMobileView.constructAndBind(

                mobileContext,

                mobileViewLogger,

                "mobile",

                mMobileIconsViewModel.viewModelForSub(subId, mLocation)

        );

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

+5 −1
Original line number Diff line number Diff line
@@ -569,7 +569,10 @@ public interface StatusBarIconController { 
            mGroup.addView(view, index, onCreateLayoutParams());



            if (mIsInDemoMode) {

                mDemoStatusIcons.addModernMobileView(mContext, subId);

                mDemoStatusIcons.addModernMobileView(

                        mContext,

                        mMobileIconsViewModel.getLogger(),

                        subId);

            }



            return view;
@@ -601,6 +604,7 @@ public interface StatusBarIconController { 
            return ModernStatusBarMobileView

                    .constructAndBind(

                            mobileContext,

                            mMobileIconsViewModel.getLogger(),

                            slot,

                            mMobileIconsViewModel.viewModelForSub(subId, mLocation)

                        );

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

+19 −0
Original line number Diff line number Diff line
@@ -79,6 +79,18 @@ public class StatusBarIconHolder { 
    private @IconType int mType = TYPE_ICON;

    private int mTag = 0;



    /** Returns a human-readable string representing the given type. */

    public static String getTypeString(@IconType int type) {

        switch(type) {

            case TYPE_ICON: return "ICON";

            case TYPE_WIFI: return "WIFI_OLD";

            case TYPE_MOBILE: return "MOBILE_OLD";

            case TYPE_MOBILE_NEW: return "MOBILE_NEW";

            case TYPE_WIFI_NEW: return "WIFI_NEW";

            default: return "UNKNOWN";

        }

    }



    private StatusBarIconHolder() {

    }
@@ -230,4 +242,11 @@ public class StatusBarIconHolder { 
    public int getTag() {

        return mTag;

    }



    @Override

    public String toString() {

        return "StatusBarIconHolder(type=" + getTypeString(mType)

                + " tag=" + getTag()

                + " visible=" + isVisible() + ")";

    }

}

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

+6 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import java.io.PrintWriter; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.stream.Collectors;



/** A class holding the list of all the system icons that could be shown in the status bar. */

public class StatusBarIconList {
@@ -302,7 +303,7 @@ public class StatusBarIconList { 


        @Override

        public String toString() {

            return String.format("(%s) %s", mName, subSlotsString());

            return String.format("(%s) holder=%s %s", mName, mHolder, subSlotsString());

        }



        private String subSlotsString() {
@@ -310,7 +311,10 @@ public class StatusBarIconList { 
                return "";

            }



            return "" + mSubSlots.size() + " subSlots";

            return "| " + mSubSlots.size() + " subSlots: "

                    + mSubSlots.stream()

                    .map(StatusBarIconHolder::toString)

                    .collect(Collectors.joining("|"));

        }

    }

}