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

Commit 9c30137e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "caitlinshk-wifi-flag" into udc-qpr-dev am: 9a06bac5 am: afcf2f88 

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



Change-Id: I299dddeb790ec828b6862857b7eea29f20c9d823
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 931fd46c afcf2f88

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/battery/BatteryMeterViewController.java

+3 −4
Original line number Diff line number Diff line
@@ -30,9 +30,8 @@ import android.view.View; 


import androidx.annotation.NonNull;



import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.settings.UserTracker;

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

import com.android.systemui.statusbar.phone.StatusBarLocation;
@@ -130,7 +129,6 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView> 
            TunerService tunerService,

            @Main Handler mainHandler,

            ContentResolver contentResolver,

            FeatureFlags featureFlags,

            BatteryController batteryController) {

        super(view);

        mLocation = location;
@@ -142,7 +140,8 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView> 
        mBatteryController = batteryController;



        mView.setBatteryEstimateFetcher(mBatteryController::getEstimatedTimeRemainingString);

        mView.setDisplayShieldEnabled(featureFlags.isEnabled(Flags.BATTERY_SHIELD_ICON));

        mView.setDisplayShieldEnabled(

                getContext().getResources().getBoolean(R.bool.flag_battery_shield_icon));



        mSlotBattery = getResources().getString(com.android.internal.R.string.status_bar_battery);

        mSettingObserver = new SettingObserver(mMainHandler);

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

+0 −12
Original line number Diff line number Diff line
@@ -372,22 +372,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/256623670): Tracking Bug

    @JvmField

    val BATTERY_SHIELD_ICON =

        resourceBooleanFlag(610, R.bool.flag_battery_shield_icon, "battery_shield_icon")



    // 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/shade/ShadeModule.kt

+0 −2
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ abstract class ShadeModule { 
            tunerService: TunerService,

            @Main mainHandler: Handler,

            contentResolver: ContentResolver,

            featureFlags: FeatureFlags,

            batteryController: BatteryController,

        ): BatteryMeterViewController {

            return BatteryMeterViewController(
@@ -275,7 +274,6 @@ abstract class ShadeModule { 
                tunerService,

                mainHandler,

                contentResolver,

                featureFlags,

                batteryController,

            )

        }

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.