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

Commit 3bc5e964 authored by Evan Laird's avatar Evan Laird Committed by Automerger Merge Worker
Browse files

Merge changes from topic "remove-debug-color" into udc-qpr-dev am: d72c947b 

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



Change-Id: Ie5b1ab6f0fe2de8995d2a8084e00212db6b96e28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b152ea4c d72c947b

packages/SystemUI/res/layout/status_bar_mobile_signal_group.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2018, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<com.android.systemui.statusbar.StatusBarMobileView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/mobile_combo"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:gravity="center_vertical" >



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



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

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −10
Original line number Diff line number Diff line
@@ -367,16 +367,6 @@ object Flags { 


    // 600- status bar



    // TODO(b/256614753): Tracking Bug

    val NEW_STATUS_BAR_MOBILE_ICONS = releasedFlag(606, "new_status_bar_mobile_icons")



    // TODO(b/256614751): Tracking Bug

    val NEW_STATUS_BAR_MOBILE_ICONS_BACKEND =

        unreleasedFlag(608, "new_status_bar_mobile_icons_backend", teamfood = true)



    // TODO(b/260881289): Tracking Bug

    val NEW_STATUS_BAR_ICONS_DEBUG_COLORING =

        unreleasedFlag(611, "new_status_bar_icons_debug_coloring")



    // TODO(b/265892345): Tracking Bug

    val PLUG_IN_STATUS_BAR_CHIP = releasedFlag(265892345, "plug_in_status_bar_chip")

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBarFrameLayout.kt

+3 −2
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ import android.widget.FrameLayout 


/**

 * A temporary base class that's shared between our old status bar connectivity view implementations

 * ([StatusBarMobileView]) and our new status bar implementations ([ModernStatusBarWifiView],

 * [ModernStatusBarMobileView]).

 * and our new status bar implementations ([ModernStatusBarWifiView], [ModernStatusBarMobileView]).

 *

 * Once our refactor is over, we should be able to delete this go-between class and the old view

 * class.

 *

 * NOTE: the old classes are now deleted, and this class can be removed.

 */

abstract class BaseStatusBarFrameLayout

@JvmOverloads

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

deleted100644 → 0
+0 −327
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar;



import static com.android.systemui.plugins.DarkIconDispatcher.getTint;

import static com.android.systemui.plugins.DarkIconDispatcher.isInAreas;

import static com.android.systemui.statusbar.StatusBarIconView.STATE_DOT;

import static com.android.systemui.statusbar.StatusBarIconView.STATE_HIDDEN;

import static com.android.systemui.statusbar.StatusBarIconView.STATE_ICON;



import android.content.Context;

import android.content.res.ColorStateList;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.ImageView;

import android.widget.LinearLayout;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settingslib.graph.SignalDrawable;

import com.android.systemui.DualToneHandler;

import com.android.systemui.R;

import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;

import com.android.systemui.statusbar.phone.StatusBarIconController;

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



import java.util.ArrayList;



/**

 * View group for the mobile icon in the status bar

 */

public class StatusBarMobileView extends BaseStatusBarFrameLayout implements DarkReceiver,

        StatusIconDisplayable {

    private static final String TAG = "StatusBarMobileView";



    /// Used to show etc dots

    private StatusBarIconView mDotView;

    /// The main icon view

    private LinearLayout mMobileGroup;

    private String mSlot;

    private MobileIconState mState;

    private SignalDrawable mMobileDrawable;

    private View mInoutContainer;

    private ImageView mIn;

    private ImageView mOut;

    private ImageView mMobile, mMobileType, mMobileRoaming;

    private View mMobileRoamingSpace;

    @StatusBarIconView.VisibleState

    private int mVisibleState = STATE_HIDDEN;

    private DualToneHandler mDualToneHandler;

    private boolean mForceHidden;



    /**

     * Designated constructor

     *

     * This view is special, in that it is the only view in SystemUI that allows for a configuration

     * override on a MCC/MNC-basis. This means that for every mobile view inflated, we have to

     * construct a context with that override, since the resource system doesn't have a way to

     * handle this for us.

     *

     * @param context A context with resources configured by MCC/MNC

     * @param slot The string key defining which slot this icon refers to. Always "mobile" for the

     *             mobile icon

     */

    public static StatusBarMobileView fromContext(

            Context context,

            String slot

    ) {

        LayoutInflater inflater = LayoutInflater.from(context);

        StatusBarMobileView v = (StatusBarMobileView)

                inflater.inflate(R.layout.status_bar_mobile_signal_group, null);

        v.setSlot(slot);

        v.init();

        v.setVisibleState(STATE_ICON);

        return v;

    }



    public StatusBarMobileView(Context context) {

        super(context);

    }



    public StatusBarMobileView(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    public StatusBarMobileView(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

    }



    @Override

    public void getDrawingRect(Rect outRect) {

        super.getDrawingRect(outRect);

        float translationX = getTranslationX();

        float translationY = getTranslationY();

        outRect.left += translationX;

        outRect.right += translationX;

        outRect.top += translationY;

        outRect.bottom += translationY;

    }



    private void init() {

        mDualToneHandler = new DualToneHandler(getContext());

        mMobileGroup = findViewById(R.id.mobile_group);

        mMobile = findViewById(R.id.mobile_signal);

        mMobileType = findViewById(R.id.mobile_type);

        mMobileRoaming = findViewById(R.id.mobile_roaming);

        mMobileRoamingSpace = findViewById(R.id.mobile_roaming_space);

        mIn = findViewById(R.id.mobile_in);

        mOut = findViewById(R.id.mobile_out);

        mInoutContainer = findViewById(R.id.inout_container);



        mMobileDrawable = new SignalDrawable(getContext());

        mMobile.setImageDrawable(mMobileDrawable);



        initDotView();

    }



    private void initDotView() {

        mDotView = new StatusBarIconView(mContext, mSlot, null);

        mDotView.setVisibleState(STATE_DOT);



        int width = mContext.getResources().getDimensionPixelSize(R.dimen.status_bar_icon_size_sp);

        LayoutParams lp = new LayoutParams(width, width);

        lp.gravity = Gravity.CENTER_VERTICAL | Gravity.START;

        addView(mDotView, lp);

    }



    public void applyMobileState(MobileIconState state) {

        boolean requestLayout = false;

        if (state == null) {

            requestLayout = getVisibility() != View.GONE;

            setVisibility(View.GONE);

            mState = null;

        } else if (mState == null) {

            requestLayout = true;

            mState = state.copy();

            initViewState();

        } else if (!mState.equals(state)) {

            requestLayout = updateState(state.copy());

        }



        if (requestLayout) {

            requestLayout();

        }

    }



    private void initViewState() {

        setContentDescription(mState.contentDescription);

        if (!mState.visible || mForceHidden) {

            mMobileGroup.setVisibility(View.GONE);

        } else {

            mMobileGroup.setVisibility(View.VISIBLE);

        }

        mMobileDrawable.setLevel(mState.strengthId);

        if (mState.typeId > 0) {

            mMobileType.setContentDescription(mState.typeContentDescription);

            mMobileType.setImageResource(mState.typeId);

            mMobileType.setVisibility(View.VISIBLE);

        } else {

            mMobileType.setVisibility(View.GONE);

        }

        mMobile.setVisibility(mState.showTriangle ? View.VISIBLE : View.GONE);

        mMobileRoaming.setVisibility(mState.roaming ? View.VISIBLE : View.GONE);

        mMobileRoamingSpace.setVisibility(mState.roaming ? View.VISIBLE : View.GONE);

        mIn.setVisibility(mState.activityIn ? View.VISIBLE : View.GONE);

        mOut.setVisibility(mState.activityOut ? View.VISIBLE : View.GONE);

        mInoutContainer.setVisibility((mState.activityIn || mState.activityOut)

                ? View.VISIBLE : View.GONE);

    }



    private boolean updateState(MobileIconState state) {

        boolean needsLayout = false;



        setContentDescription(state.contentDescription);

        int newVisibility = state.visible && !mForceHidden ? View.VISIBLE : View.GONE;

        if (newVisibility != mMobileGroup.getVisibility() && STATE_ICON == mVisibleState) {

            mMobileGroup.setVisibility(newVisibility);

            needsLayout = true;

        }

        if (mState.strengthId != state.strengthId) {

            mMobileDrawable.setLevel(state.strengthId);

        }

        if (mState.typeId != state.typeId) {

            needsLayout |= state.typeId == 0 || mState.typeId == 0;

            if (state.typeId != 0) {

                mMobileType.setContentDescription(state.typeContentDescription);

                mMobileType.setImageResource(state.typeId);

                mMobileType.setVisibility(View.VISIBLE);

            } else {

                mMobileType.setVisibility(View.GONE);

            }

        }



        mMobile.setVisibility(state.showTriangle ? View.VISIBLE : View.GONE);

        mMobileRoaming.setVisibility(state.roaming ? View.VISIBLE : View.GONE);

        mMobileRoamingSpace.setVisibility(state.roaming ? View.VISIBLE : View.GONE);

        mIn.setVisibility(state.activityIn ? View.VISIBLE : View.GONE);

        mOut.setVisibility(state.activityOut ? View.VISIBLE : View.GONE);

        mInoutContainer.setVisibility((state.activityIn || state.activityOut)

                ? View.VISIBLE : View.GONE);



        needsLayout |= state.roaming != mState.roaming

                || state.activityIn != mState.activityIn

                || state.activityOut != mState.activityOut

                || state.showTriangle != mState.showTriangle;



        mState = state;

        return needsLayout;

    }



    @Override

    public void onDarkChanged(ArrayList<Rect> areas, float darkIntensity, int tint) {

        float intensity = isInAreas(areas, this) ? darkIntensity : 0;

        mMobileDrawable.setTintList(

                ColorStateList.valueOf(mDualToneHandler.getSingleColor(intensity)));

        ColorStateList color = ColorStateList.valueOf(getTint(areas, this, tint));

        mIn.setImageTintList(color);

        mOut.setImageTintList(color);

        mMobileType.setImageTintList(color);

        mMobileRoaming.setImageTintList(color);

        mDotView.setDecorColor(tint);

        mDotView.setIconColor(tint, false);

    }



    @Override

    public String getSlot() {

        return mSlot;

    }



    public void setSlot(String slot) {

        mSlot = slot;

    }



    @Override

    public void setStaticDrawableColor(int color) {

        ColorStateList list = ColorStateList.valueOf(color);

        mMobileDrawable.setTintList(list);

        mIn.setImageTintList(list);

        mOut.setImageTintList(list);

        mMobileType.setImageTintList(list);

        mMobileRoaming.setImageTintList(list);

        mDotView.setDecorColor(color);

    }



    @Override

    public void setDecorColor(int color) {

        mDotView.setDecorColor(color);

    }



    @Override

    public boolean isIconVisible() {

        return mState.visible && !mForceHidden;

    }



    @Override

    public void setVisibleState(@StatusBarIconView.VisibleState int state, boolean animate) {

        if (state == mVisibleState) {

            return;

        }



        mVisibleState = state;

        switch (state) {

            case STATE_ICON:

                mMobileGroup.setVisibility(View.VISIBLE);

                mDotView.setVisibility(View.GONE);

                break;

            case STATE_DOT:

                mMobileGroup.setVisibility(View.INVISIBLE);

                mDotView.setVisibility(View.VISIBLE);

                break;

            case STATE_HIDDEN:

            default:

                mMobileGroup.setVisibility(View.INVISIBLE);

                mDotView.setVisibility(View.INVISIBLE);

                break;

        }

    }



    /**

     * Forces the state to be hidden (views will be GONE) and if necessary updates the layout.

     *

     * Makes sure that the {@link StatusBarIconController} cannot make it visible while this flag

     * is enabled.

     * @param forceHidden {@code true} if the icon should be GONE in its view regardless of its

     *                                state.

     *               {@code false} if the icon should show as determined by its controller.

     */

    public void forceHidden(boolean forceHidden) {

        if (mForceHidden != forceHidden) {

            mForceHidden = forceHidden;

            updateState(mState);

            requestLayout();

        }

    }



    @Override

    @StatusBarIconView.VisibleState

    public int getVisibleState() {

        return mVisibleState;

    }



    @VisibleForTesting

    public MobileIconState getState() {

        return mState;

    }



    @Override

    public String toString() {

        return "StatusBarMobileView(slot=" + mSlot + " state=" + mState + ")";

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -1282,7 +1282,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            }

        }

        String sims = args.getString("sims");

        if (sims != null && !mStatusBarPipelineFlags.useNewMobileIcons()) {

        if (sims != null) {

            int num = MathUtils.constrain(Integer.parseInt(sims), 1, 8);

            List<SubscriptionInfo> subs = new ArrayList<>();

            if (num != mMobileSignalControllers.size()) {
@@ -1305,7 +1305,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            mCallbackHandler.setNoSims(mHasNoSubs, mSimDetected);

        }

        String mobile = args.getString("mobile");

        if (mobile != null && !mStatusBarPipelineFlags.useNewMobileIcons()) {

        if (mobile != null) {

            boolean show = mobile.equals("show");

            String datatype = args.getString("datatype");

            String slotString = args.getString("slot");
@@ -1390,7 +1390,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            controller.notifyListeners();

        }

        String carrierNetworkChange = args.getString("carriernetworkchange");

        if (carrierNetworkChange != null && !mStatusBarPipelineFlags.useNewMobileIcons()) {

        if (carrierNetworkChange != null) {

            boolean show = carrierNetworkChange.equals("show");

            for (int i = 0; i < mMobileSignalControllers.size(); i++) {

                MobileSignalController controller = mMobileSignalControllers.valueAt(i);