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

Commit 84566e12 authored by Flavio Fiszman's avatar Flavio Fiszman
Browse files

Create People Space FeatureFlag 

Change-Id: I2d8d9b22b8cff1404b24eb59b81863c6fb9e3964
Test: manual
Bug: 170396074 178572986
parent 61281508

packages/SystemUI/res/values/flags.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -31,4 +31,7 @@ 
    <bool name="flag_keyguard_layout">false</bool>

    <bool name="flag_keyguard_layout">false</bool>





    <bool name="flag_brightness_slider">false</bool>

    <bool name="flag_brightness_slider">false</bool>



    <!-- People Tile flag -->

    <bool name="flag_conversations">false</bool>

</resources>
 
</resources>

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -127,7 +127,7 @@ public class SystemUIApplication extends Application implements 
                    }

                    }





                    // If SHOW_PEOPLE_SPACE is true, enable People Space widget provider.

                    // If SHOW_PEOPLE_SPACE is true, enable People Space widget provider.

                    // TODO(b/170396074): Remove this when we don't need a widget anymore.

                    // TODO(b/170396074): Migrate to new feature flag (go/silk-flags-howto)

                    try {

                    try {

                        int showPeopleSpace = Settings.Global.getInt(context.getContentResolver(),

                        int showPeopleSpace = Settings.Global.getInt(context.getContentResolver(),

                                Settings.Global.SHOW_PEOPLE_SPACE, 1);

                                Settings.Global.SHOW_PEOPLE_SPACE, 1);

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -66,4 +66,8 @@ public class FeatureFlags { 
    public boolean useNewBrightnessSlider() {

    public boolean useNewBrightnessSlider() {

        return mFlagReader.isEnabled(R.bool.flag_brightness_slider);

        return mFlagReader.isEnabled(R.bool.flag_brightness_slider);

    }

    }



    public boolean isPeopleTileEnabled() {

        return mFlagReader.isEnabled(R.bool.flag_conversations);

    }

}
 
}

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.util.Log; 
import com.android.systemui.Dumpable;

import com.android.systemui.Dumpable;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.people.widget.PeopleSpaceWidgetManager;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.notification.collection.NotifCollection;

import com.android.systemui.statusbar.notification.collection.NotifCollection;
@@ -50,7 +49,6 @@ public class NotifPipelineInitializer implements Dumpable { 
    private final ShadeListBuilder mListBuilder;

    private final ShadeListBuilder mListBuilder;

    private final NotifCoordinators mNotifPluggableCoordinators;

    private final NotifCoordinators mNotifPluggableCoordinators;

    private final NotifInflaterImpl mNotifInflater;

    private final NotifInflaterImpl mNotifInflater;

    private final PeopleSpaceWidgetManager mPeopleSpaceWidgetManager;

    private final DumpManager mDumpManager;

    private final DumpManager mDumpManager;

    private final ShadeViewManagerFactory mShadeViewManagerFactory;

    private final ShadeViewManagerFactory mShadeViewManagerFactory;

    private final FeatureFlags mFeatureFlags;

    private final FeatureFlags mFeatureFlags;
@@ -64,7 +62,6 @@ public class NotifPipelineInitializer implements Dumpable { 
            ShadeListBuilder listBuilder,

            ShadeListBuilder listBuilder,

            NotifCoordinators notifCoordinators,

            NotifCoordinators notifCoordinators,

            NotifInflaterImpl notifInflater,

            NotifInflaterImpl notifInflater,

            PeopleSpaceWidgetManager peopleSpaceWidgetManager,

            DumpManager dumpManager,

            DumpManager dumpManager,

            ShadeViewManagerFactory shadeViewManagerFactory,

            ShadeViewManagerFactory shadeViewManagerFactory,

            FeatureFlags featureFlags) {

            FeatureFlags featureFlags) {
@@ -75,7 +72,6 @@ public class NotifPipelineInitializer implements Dumpable { 
        mNotifPluggableCoordinators = notifCoordinators;

        mNotifPluggableCoordinators = notifCoordinators;

        mDumpManager = dumpManager;

        mDumpManager = dumpManager;

        mNotifInflater = notifInflater;

        mNotifInflater = notifInflater;

        mPeopleSpaceWidgetManager = peopleSpaceWidgetManager;

        mShadeViewManagerFactory = shadeViewManagerFactory;

        mShadeViewManagerFactory = shadeViewManagerFactory;

        mFeatureFlags = featureFlags;

        mFeatureFlags = featureFlags;

    }

    }
@@ -103,7 +99,6 @@ public class NotifPipelineInitializer implements Dumpable { 
        mListBuilder.attach(mNotifCollection);

        mListBuilder.attach(mNotifCollection);

        mNotifCollection.attach(mGroupCoalescer);

        mNotifCollection.attach(mGroupCoalescer);

        mGroupCoalescer.attach(notificationService);

        mGroupCoalescer.attach(notificationService);

        mPeopleSpaceWidgetManager.attach(notificationService);





        Log.d(TAG, "Notif pipeline initialized");

        Log.d(TAG, "Notif pipeline initialized");

    }

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt

+7 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.notification.init 




import android.service.notification.StatusBarNotification

import android.service.notification.StatusBarNotification

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.people.widget.PeopleSpaceWidgetManager

import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption

import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption

import com.android.systemui.statusbar.FeatureFlags

import com.android.systemui.statusbar.FeatureFlags

import com.android.systemui.statusbar.NotificationListener

import com.android.systemui.statusbar.NotificationListener
@@ -73,7 +74,8 @@ class NotificationsControllerImpl @Inject constructor( 
    private val headsUpController: HeadsUpController,

    private val headsUpController: HeadsUpController,

    private val headsUpViewBinder: HeadsUpViewBinder,

    private val headsUpViewBinder: HeadsUpViewBinder,

    private val clickerBuilder: NotificationClicker.Builder,

    private val clickerBuilder: NotificationClicker.Builder,

    private val animatedImageNotificationManager: AnimatedImageNotificationManager

    private val animatedImageNotificationManager: AnimatedImageNotificationManager,

    private val peopleSpaceWidgetManager: PeopleSpaceWidgetManager

) : NotificationsController {

) : NotificationsController {





    override fun initialize(

    override fun initialize(
@@ -126,6 +128,10 @@ class NotificationsControllerImpl @Inject constructor( 




            entryManager.attach(notificationListener)

            entryManager.attach(notificationListener)

        }

        }



        if (featureFlags.isPeopleTileEnabled) {

            peopleSpaceWidgetManager.attach(notificationListener)

        }

    }

    }





    override fun dump(

    override fun dump(