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

Commit 8174d585 authored by Flavio Fiszman's avatar Flavio Fiszman Committed by Android (Google) Code Review
Browse files

Merge "Add default value to People Space flags."

parents df1d9b98 46974b13

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

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class SystemUIApplication extends Application implements 
                    // TODO(b/170396074): Remove this when we don't need an icon anymore.

                    try {

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

                                Settings.Global.SHOW_PEOPLE_SPACE);

                                Settings.Global.SHOW_PEOPLE_SPACE, 0);

                        context.getPackageManager().setComponentEnabledSetting(

                                new ComponentName(context, PeopleSpaceActivity.class),

                                showPeopleSpace == 1
@@ -128,7 +128,7 @@ public class SystemUIApplication extends Application implements 
                    // TODO(b/170396074): Remove this when we don't need a widget anymore.

                    try {

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

                                Settings.Global.SHOW_PEOPLE_SPACE);

                                Settings.Global.SHOW_PEOPLE_SPACE, 0);

                        context.getPackageManager().setComponentEnabledSetting(

                                new ComponentName(context, PeopleSpaceWidgetProvider.class),

                                showPeopleSpace == 1

packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class PeopleSpaceUtils { 
            IPeopleManager peopleManager

    ) throws Exception {

        boolean showAllConversations = Settings.Global.getInt(context.getContentResolver(),

                Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE) == 0;

                Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE, 0) == 0;

        List<ConversationChannelWrapper> conversations =

                notificationManager.getConversations(

                        !showAllConversations /* priority only */).getList();