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

Commit 4937db69 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge changes I040f8c30,Ifea61ce5,Idb0fc71f,Ia121ea81,I10921ebf, ... into... 

Merge changes I040f8c30,Ifea61ce5,Idb0fc71f,Ia121ea81,I10921ebf, ... into udc-qpr-dev am: 156b1f91

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



Change-Id: Ieefe993d1f6c90499ffe90f9f2f6dea679704d86
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97bfd2f9 156b1f91

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -370,6 +370,9 @@ object Flags { 
    @JvmField val INCOMPATIBLE_CHARGING_BATTERY_ICON =

    @JvmField val INCOMPATIBLE_CHARGING_BATTERY_ICON =

        unreleasedFlag(614, "incompatible_charging_battery_icon")

        unreleasedFlag(614, "incompatible_charging_battery_icon")





    // TODO(b/293585143): Tracking Bug

    val INSTANT_TETHER = unreleasedFlag(615, "instant_tether")



    // 700 - dialer/calls

    // 700 - dialer/calls

    // TODO(b/254512734): Tracking Bug

    // TODO(b/254512734): Tracking Bug

    val ONGOING_CALL_STATUS_BAR_CHIP = releasedFlag(700, "ongoing_call_status_bar_chip")

    val ONGOING_CALL_STATUS_BAR_CHIP = releasedFlag(700, "ongoing_call_status_bar_chip")

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt

+3 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,9 @@ interface WifiRepository { 
        const val COL_NAME_IS_ENABLED = "isEnabled"

        const val COL_NAME_IS_ENABLED = "isEnabled"

        /** Column name to use for [isWifiDefault] for table logging. */

        /** Column name to use for [isWifiDefault] for table logging. */

        const val COL_NAME_IS_DEFAULT = "isDefault"

        const val COL_NAME_IS_DEFAULT = "isDefault"



        const val CARRIER_MERGED_INVALID_SUB_ID_REASON =

            "Wifi network was carrier merged but had invalid sub ID"

    }

    }

}

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoModeWifiDataSource.kt

+17 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.systemui.demomode.DemoMode.COMMAND_NETWORK 
import com.android.systemui.demomode.DemoModeController

import com.android.systemui.demomode.DemoModeController

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS

import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model.FakeWifiEventModel

import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model.FakeWifiEventModel

import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel

import javax.inject.Inject

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.SharingStarted
@@ -56,12 +57,14 @@ constructor( 
        val activity = getString("activity").toActivity()

        val activity = getString("activity").toActivity()

        val ssid = getString("ssid")

        val ssid = getString("ssid")

        val validated = getString("fully").toBoolean()

        val validated = getString("fully").toBoolean()

        val hotspotDeviceType = getString("hotspot").toHotspotDeviceType()





        return FakeWifiEventModel.Wifi(

        return FakeWifiEventModel.Wifi(

            level = level,

            level = level,

            activity = activity,

            activity = activity,

            ssid = ssid,

            ssid = ssid,

            validated = validated,

            validated = validated,

            hotspotDeviceType,

        )

        )

    }

    }
@@ -82,6 +85,20 @@ constructor( 
            else -> WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE

            else -> WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE

        }

        }





    private fun String?.toHotspotDeviceType(): WifiNetworkModel.HotspotDeviceType {

        return when (this) {

            null,

            "none" -> WifiNetworkModel.HotspotDeviceType.NONE

            "unknown" -> WifiNetworkModel.HotspotDeviceType.UNKNOWN

            "phone" -> WifiNetworkModel.HotspotDeviceType.PHONE

            "tablet" -> WifiNetworkModel.HotspotDeviceType.TABLET

            "laptop" -> WifiNetworkModel.HotspotDeviceType.LAPTOP

            "watch" -> WifiNetworkModel.HotspotDeviceType.WATCH

            "auto" -> WifiNetworkModel.HotspotDeviceType.AUTO

            else -> WifiNetworkModel.HotspotDeviceType.INVALID

        }

    }



    companion object {

    companion object {

        const val DEFAULT_CARRIER_MERGED_SUB_ID = 10

        const val DEFAULT_CARRIER_MERGED_SUB_ID = 10

    }

    }

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ constructor( 
            isValidated = validated ?: true,

            isValidated = validated ?: true,

            level = level ?: 0,

            level = level ?: 0,

            ssid = ssid ?: DEMO_NET_SSID,

            ssid = ssid ?: DEMO_NET_SSID,

            hotspotDeviceType = hotspotDeviceType,





            // These fields below aren't supported in demo mode, since they aren't needed to satisfy

            // These fields below aren't supported in demo mode, since they aren't needed to satisfy

            // the interface.

            // the interface.

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/model/FakeWifiEventModel.kt

+3 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model

package com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model





import android.telephony.Annotation

import android.telephony.Annotation

import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel





/**

/**

 * Model for demo wifi commands, ported from [NetworkControllerImpl]

 * Model for demo wifi commands, ported from [NetworkControllerImpl]
@@ -29,6 +30,8 @@ sealed interface FakeWifiEventModel { 
        @Annotation.DataActivityType val activity: Int,

        @Annotation.DataActivityType val activity: Int,

        val ssid: String?,

        val ssid: String?,

        val validated: Boolean?,

        val validated: Boolean?,

        val hotspotDeviceType: WifiNetworkModel.HotspotDeviceType =

            WifiNetworkModel.HotspotDeviceType.NONE,

    ) : FakeWifiEventModel

    ) : FakeWifiEventModel





    data class CarrierMerged(

    data class CarrierMerged(