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

Commit d86152ce authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Flags][SB] Remove NEW_STATUS_BAR_WIFI flags. 

There's likely some additional cleanup needed in StatusBarIconController
& associated classes once the mobile flags are also removed.

Fixes: 256614210
Fixes: 256613548
Test: smoke test of the wifi icon on phone, foldable, and tablet
Test: smoke test of wifi demo mode
Test: smoke test of Internet tile in QS
Test: atest StatusBarIconControllerTest NetworkControllerWifiTest
Change-Id: Ib20a3d664963ed289c27b8b6a432e554aad614d0
parent 95dc8877

packages/SystemUI/res/layout/status_bar_wifi_group.xml

deleted100644 → 0
+0 −28
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.StatusBarWifiView

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

    android:id="@+id/wifi_combo"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:gravity="center_vertical" >



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



</com.android.systemui.statusbar.StatusBarWifiView>
 
 No newline at end of file

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

+0 −7
Original line number Diff line number Diff line
@@ -367,17 +367,10 @@ object Flags { 
    // TODO(b/256614753): Tracking Bug

    val NEW_STATUS_BAR_MOBILE_ICONS = releasedFlag(606, "new_status_bar_mobile_icons")



    // TODO(b/256614210): Tracking Bug

    val NEW_STATUS_BAR_WIFI_ICON = releasedFlag(607, "new_status_bar_wifi_icon")



    // TODO(b/256614751): Tracking Bug

    val NEW_STATUS_BAR_MOBILE_ICONS_BACKEND =

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



    // TODO(b/256613548): Tracking Bug

    val NEW_STATUS_BAR_WIFI_ICON_BACKEND =

        unreleasedFlag(609, "new_status_bar_wifi_icon_backend", teamfood = true)



    // TODO(b/260881289): Tracking Bug

    val NEW_STATUS_BAR_ICONS_DEBUG_COLORING =

        unreleasedFlag(611, "new_status_bar_icons_debug_coloring")

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

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


/**

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

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

 * [ModernStatusBarWifiView], [ModernStatusBarMobileView]).

 * ([StatusBarMobileView]) 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.

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

deleted100644 → 0
+0 −249
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.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.systemui.R;

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

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



import java.util.ArrayList;



/**

 * Start small: StatusBarWifiView will be able to layout from a WifiIconState

 */

public class StatusBarWifiView extends BaseStatusBarFrameLayout implements DarkReceiver {

    private static final String TAG = "StatusBarWifiView";



    /// Used to show etc dots

    private StatusBarIconView mDotView;

    /// Contains the main icon layout

    private LinearLayout mWifiGroup;

    private ImageView mWifiIcon;

    private ImageView mIn;

    private ImageView mOut;

    private View mInoutContainer;

    private View mSignalSpacer;

    private View mAirplaneSpacer;

    private WifiIconState mState;

    private String mSlot;

    @StatusBarIconView.VisibleState

    private int mVisibleState = STATE_HIDDEN;



    public static StatusBarWifiView fromContext(Context context, String slot) {

        LayoutInflater inflater = LayoutInflater.from(context);

        StatusBarWifiView v = (StatusBarWifiView) inflater.inflate(R.layout.status_bar_wifi_group, null);

        v.setSlot(slot);

        v.init();

        v.setVisibleState(STATE_ICON);

        return v;

    }



    public StatusBarWifiView(Context context) {

        super(context);

    }



    public StatusBarWifiView(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



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

        super(context, attrs, defStyleAttr);

    }



    public void setSlot(String slot) {

        mSlot = slot;

    }



    @Override

    public void setStaticDrawableColor(int color) {

        ColorStateList list = ColorStateList.valueOf(color);

        mWifiIcon.setImageTintList(list);

        mIn.setImageTintList(list);

        mOut.setImageTintList(list);

        mDotView.setDecorColor(color);

    }



    @Override

    public void setDecorColor(int color) {

        mDotView.setDecorColor(color);

    }



    @Override

    public String getSlot() {

        return mSlot;

    }



    @Override

    public boolean isIconVisible() {

        return mState != null && mState.visible;

    }



    @Override

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

        if (state == mVisibleState) {

            return;

        }

        mVisibleState = state;



        switch (state) {

            case STATE_ICON:

                mWifiGroup.setVisibility(View.VISIBLE);

                mDotView.setVisibility(View.GONE);

                break;

            case STATE_DOT:

                mWifiGroup.setVisibility(View.GONE);

                mDotView.setVisibility(View.VISIBLE);

                break;

            case STATE_HIDDEN:

            default:

                mWifiGroup.setVisibility(View.GONE);

                mDotView.setVisibility(View.GONE);

                break;

        }

    }



    @Override

    @StatusBarIconView.VisibleState

    public int getVisibleState() {

        return mVisibleState;

    }



    @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() {

        mWifiGroup = findViewById(R.id.wifi_group);

        mWifiIcon = findViewById(R.id.wifi_signal);

        mIn = findViewById(R.id.wifi_in);

        mOut = findViewById(R.id.wifi_out);

        mSignalSpacer = findViewById(R.id.wifi_signal_spacer);

        mAirplaneSpacer = findViewById(R.id.wifi_airplane_spacer);

        mInoutContainer = findViewById(R.id.inout_container);



        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 applyWifiState(WifiIconState 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 boolean updateState(WifiIconState state) {

        setContentDescription(state.contentDescription);

        if (mState.resId != state.resId && state.resId >= 0) {

            mWifiIcon.setImageDrawable(mContext.getDrawable(state.resId));

        }



        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);

        mAirplaneSpacer.setVisibility(state.airplaneSpacerVisible ? View.VISIBLE : View.GONE);

        mSignalSpacer.setVisibility(state.signalSpacerVisible ? View.VISIBLE : View.GONE);



        boolean needsLayout = state.activityIn != mState.activityIn

                ||state.activityOut != mState.activityOut;



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

            needsLayout |= true;

            setVisibility(state.visible ? View.VISIBLE : View.GONE);

        }



        mState = state;

        return needsLayout;

    }



    private void initViewState() {

        setContentDescription(mState.contentDescription);

        if (mState.resId >= 0) {

            mWifiIcon.setImageDrawable(mContext.getDrawable(mState.resId));

        }



        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);

        mAirplaneSpacer.setVisibility(mState.airplaneSpacerVisible ? View.VISIBLE : View.GONE);

        mSignalSpacer.setVisibility(mState.signalSpacerVisible ? View.VISIBLE : View.GONE);

        setVisibility(mState.visible ? View.VISIBLE : View.GONE);

    }



    @Override

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

        int areaTint = getTint(areas, this, tint);

        ColorStateList color = ColorStateList.valueOf(areaTint);

        mWifiIcon.setImageTintList(color);

        mIn.setImageTintList(color);

        mOut.setImageTintList(color);

        mDotView.setDecorColor(areaTint);

        mDotView.setIconColor(areaTint, false);

    }





    @Override

    public String toString() {

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

    }

}

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

+0 −54
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ package com.android.systemui.statusbar.connectivity; 


import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;

import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_INOUT;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_OUT;

import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;



import android.annotation.Nullable;
@@ -557,10 +553,6 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        mBroadcastDispatcher.unregisterReceiver(this);

    }



    public int getConnectedWifiLevel() {

        return mWifiSignalController.getState().level;

    }



    @Override

    public AccessPointController getAccessPointController() {

        return mAccessPoints;
@@ -654,14 +646,6 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        return mWifiSignalController.isCarrierMergedWifi(subId);

    }



    boolean hasDefaultNetwork() {

        return !mNoDefaultNetwork;

    }



    boolean isNonCarrierWifiNetworkAvailable() {

        return !mNoNetworksAvailable;

    }



    boolean isEthernetDefault() {

        return mConnectedTransports.get(NetworkCapabilities.TRANSPORT_ETHERNET);

    }
@@ -1242,15 +1226,12 @@ public class NetworkControllerImpl extends BroadcastReceiver 
    }



    private boolean mDemoInetCondition;

    private WifiState mDemoWifiState;



    @Override

    public void onDemoModeStarted() {

        if (DEBUG) Log.d(TAG, "Entering demo mode");

        unregisterListeners();

        mDemoInetCondition = mInetCondition;

        mDemoWifiState = mWifiSignalController.getState();

        mDemoWifiState.ssid = "DemoMode";

    }



    @Override
@@ -1300,41 +1281,6 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                controller.updateConnectivity(connected, connected);

            }

        }

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

        if (wifi != null && !mStatusBarPipelineFlags.runNewWifiIconBackend()) {

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

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

            if (level != null) {

                mDemoWifiState.level = level.equals("null") ? -1

                        : Math.min(Integer.parseInt(level), WifiIcons.WIFI_LEVEL_COUNT - 1);

                mDemoWifiState.connected = mDemoWifiState.level >= 0;

            }

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

            if (activity != null) {

                switch (activity) {

                    case "inout":

                        mWifiSignalController.setActivity(DATA_ACTIVITY_INOUT);

                        break;

                    case "in":

                        mWifiSignalController.setActivity(DATA_ACTIVITY_IN);

                        break;

                    case "out":

                        mWifiSignalController.setActivity(DATA_ACTIVITY_OUT);

                        break;

                    default:

                        mWifiSignalController.setActivity(DATA_ACTIVITY_NONE);

                        break;

                }

            } else {

                mWifiSignalController.setActivity(DATA_ACTIVITY_NONE);

            }

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

            if (ssid != null) {

                mDemoWifiState.ssid = ssid;

            }

            mDemoWifiState.enabled = show;

            mWifiSignalController.notifyListeners();

        }

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

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

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