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

Commit 93fd5400 authored by Will Leshner's avatar Will Leshner
Browse files

Remove flag guarding widget picker size filter. 

Users will be able to choose to filter by size (or not) directly in the
widget picker. So we should always send size requirements to the picker
activity.

Bug: 345482907
Test: Manually by invoking the widget picker and choosing to filter by
size from the 3-dot drop down.
Flag: EXEMPT bugfix

Change-Id: I7f8611b1f89fe4e99dae2b93ce0a70b91132861e
parent 96fbd4bf

packages/SystemUI/aconfig/communal.aconfig

+0 −9
Original line number Diff line number Diff line
@@ -8,12 +8,3 @@ flag { 
    bug: "304584416"

}

flag {

    name: "enable_widget_picker_size_filter"

    namespace: "communal"

    description: "Enables passing a size filter to the widget picker"

    bug: "345482907"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}

packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt

+8 −11
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.res.Resources 
import android.util.Log

import androidx.activity.result.ActivityResultLauncher

import com.android.internal.logging.UiEventLogger

import com.android.systemui.Flags.enableWidgetPickerSizeFilter

import com.android.systemui.communal.data.model.CommunalWidgetCategories

import com.android.systemui.communal.domain.interactor.CommunalInteractor

import com.android.systemui.communal.domain.interactor.CommunalPrefsInteractor
@@ -176,7 +175,6 @@ constructor( 


        return Intent(Intent.ACTION_PICK).apply {

            setPackage(packageName)

            if (enableWidgetPickerSizeFilter()) {

            putExtra(

                EXTRA_DESIRED_WIDGET_WIDTH,

                resources.getDimensionPixelSize(R.dimen.communal_widget_picker_desired_width)
@@ -185,7 +183,6 @@ constructor( 
                EXTRA_DESIRED_WIDGET_HEIGHT,

                resources.getDimensionPixelSize(R.dimen.communal_widget_picker_desired_height)

            )

            }

            putExtra(

                AppWidgetManager.EXTRA_CATEGORY_FILTER,

                CommunalWidgetCategories.defaultCategories