diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 3fb5a9c59b2d1..070c0210e0fe4 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -570,15 +570,10 @@ + android:theme="@android:style/Theme.Material.NoActionBar"> - - diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java index 4827aa635e557..036fcf3bec273 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java @@ -40,7 +40,6 @@ import com.android.systemui.dagger.ContextComponentHelper; import com.android.systemui.dagger.GlobalRootComponent; import com.android.systemui.dagger.SysUIComponent; import com.android.systemui.dump.DumpManager; -import com.android.systemui.people.PeopleSpaceActivity; import com.android.systemui.people.widget.PeopleSpaceWidgetProvider; import com.android.systemui.shared.system.ThreadedRendererCompat; import com.android.systemui.util.NotificationChannels; @@ -126,26 +125,12 @@ public class SystemUIApplication extends Application implements mServices[i].onBootCompleted(); } } - // If flag SHOW_PEOPLE_SPACE is true, enable People Space launcher icon. - // 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, 0); - context.getPackageManager().setComponentEnabledSetting( - new ComponentName(context, PeopleSpaceActivity.class), - showPeopleSpace == 1 - ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED - : PackageManager.COMPONENT_ENABLED_STATE_DISABLED, - PackageManager.DONT_KILL_APP); - } catch (Exception e) { - Log.w(TAG, "Error enabling People Space launch icon:", e); - } // If SHOW_PEOPLE_SPACE is true, enable People Space widget provider. // 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, 0); + Settings.Global.SHOW_PEOPLE_SPACE, 1); context.getPackageManager().setComponentEnabledSetting( new ComponentName(context, PeopleSpaceWidgetProvider.class), showPeopleSpace == 1