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

Commit 9a22f7b7 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz
Browse files

Remove ui_rich_ongoing_aod_skeleton_bg_inflation 

Fixes: 435021637
Flag: EXEMPT Flag Removal
Old Flag: com.android.systemui.ui_rich_ongoing_aod_skeleton_bg_inflation
Test: Presubmit

Change-Id: I0a363e228c7a56d9cc8c7270a89b1a77a5966345
parent 906feec8

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1976,16 +1976,6 @@ flag { 
    bug: "411746510"

}



flag {

   name: "ui_rich_ongoing_aod_skeleton_bg_inflation"

   namespace: "systemui"

   description: "Offload AOD Skeleton inflation to the background thread"

   bug: "416714129"

   metadata {

     purpose: PURPOSE_BUGFIX

   }

}



flag {

    name: "ongoing_activity_chips_on_dream"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/AODPromotedNotification.kt

+12 −33
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.graphics.Typeface 
import android.graphics.drawable.Drawable

import android.util.Log

import android.util.Size

import android.view.LayoutInflater

import android.view.NotificationHeaderView

import android.view.NotificationTopLineView

import android.view.View
@@ -99,7 +98,6 @@ fun AODPromotedNotification( 
    val content = viewModel.content ?: return

    val audiblyAlertedIconVisible = viewModel.audiblyAlertedIconVisible



    if (com.android.systemui.Flags.uiRichOngoingAodSkeletonBgInflation()) {

    val notificationView = content.notificationView

    if (notificationView == null) {

        Log.w(TAG, "not displaying promoted notif with ineligible style on AOD")
@@ -113,25 +111,6 @@ fun AODPromotedNotification( 
            modifier = modifier,

        )

    }

    } else {

        val layoutResource = content.layoutResource

        if (layoutResource == null) {

            Log.w(TAG, "not displaying promoted notif with ineligible style on AOD")

            return

        }

        key(content.identity) {

            AODPromotedNotificationView(

                notificationViewFactory = { context ->

                    traceSection("$TAG.inflate") {

                        LayoutInflater.from(context).inflate(layoutResource, /* root= */ null)

                    }

                },

                content = content,

                audiblyAlertedIconVisible = audiblyAlertedIconVisible,

                modifier = modifier,

            )

        }

    }

}



@Composable

packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt

+0 −2
Original line number Diff line number Diff line
@@ -266,8 +266,6 @@ constructor( 
        contentBuilder: PromotedNotificationContentModel.Builder,

        systemUiContext: Context,

    ) {

        if (!Flags.uiRichOngoingAodSkeletonBgInflation()) return



        val style = contentBuilder.style ?: return



        val res = getLayoutSource(style) ?: return