Merge "Remove People Tile flag and clean up" into sc-dev (b4a4b46b) · Commits · e / os / android_frameworks_base

packages/SystemUI/AndroidManifest.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -605,11 +605,6 @@
		<receiver android:name=".people.widget.PeopleSpaceWidgetPinnedReceiver"
		android:enabled="true"/>

		<!-- Widget service -->
		<service android:name=".people.widget.PeopleSpaceWidgetService"
		android:permission="android.permission.BIND_REMOTEVIEWS"
		android:exported="false" />

		<!-- ContentProvider that returns a People Tile preview for a given shortcut -->
		<provider
		android:name="com.android.systemui.people.PeopleProvider"

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

+0 −25

Original line number	Diff line number	Diff line
		@@ -19,18 +19,15 @@ package com.android.systemui;
		import android.app.ActivityThread;
		import android.app.Application;
		import android.content.BroadcastReceiver;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.res.Configuration;
		import android.os.Process;
		import android.os.SystemProperties;
		import android.os.Trace;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.util.Log;
		import android.util.TimingsTraceLog;
		import android.view.SurfaceControl;
		@@ -40,8 +37,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 +121,6 @@ public class SystemUIApplication extends Application implements
		mServices[i].onBootCompleted();
		}
		}
		// If SHOW_PEOPLE_SPACE is true, enable People Space widget provider.
		// TODO(b/170396074): Migrate to new feature flag (go/silk-flags-howto)
		try {
		int showPeopleSpace = Settings.Global.getInt(context.getContentResolver(),
		Settings.Global.SHOW_PEOPLE_SPACE, 1);
		context.getPackageManager().setComponentEnabledSetting(
		new ComponentName(context, PeopleSpaceWidgetProvider.class),
		showPeopleSpace == 1
		? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
		: PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
		PackageManager.DONT_KILL_APP);
		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 widget:", e);
		}
		}
		}, bootCompletedFilter);

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import android.content.pm.LauncherApps;
		import android.content.pm.PackageManager;
		import android.os.Bundle;
		import android.os.ServiceManager;
		import android.provider.Settings;
		import android.util.Log;
		import android.view.ViewGroup;

		@@ -58,7 +57,6 @@ public class PeopleSpaceActivity extends Activity {
		private Context mContext;
		private NotificationEntryManager mNotificationEntryManager;
		private int mAppWidgetId;
		private boolean mShowSingleConversation;

		@Inject
		public PeopleSpaceActivity(NotificationEntryManager notificationEntryManager,
		@@ -84,15 +82,7 @@ public class PeopleSpaceActivity extends Activity {
		setTileViewsWithPriorityConversations();
		mAppWidgetId = getIntent().getIntExtra(EXTRA_APPWIDGET_ID,
		INVALID_APPWIDGET_ID);
		mShowSingleConversation = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE, 0) == 0;
		setResult(RESULT_CANCELED);
		// Finish the configuration activity immediately if a widget is added for multiple
		// conversations. If the mAppWidgetId is INVALID, then the activity wasn't launched as a
		// widget configuration activity.
		if (!mShowSingleConversation && mAppWidgetId != INVALID_APPWIDGET_ID) {
		finishActivity();
		}
		}

		/**

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

+17 −22

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ import android.os.Parcelable;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.provider.ContactsContract;
		import android.provider.Settings;
		import android.service.notification.ConversationChannelWrapper;
		import android.service.notification.StatusBarNotification;
		import android.text.TextUtils;
		@@ -170,8 +169,6 @@ public class PeopleSpaceUtils {
		Context context, INotificationManager notificationManager, IPeopleManager peopleManager,
		LauncherApps launcherApps, NotificationEntryManager notificationEntryManager)
		throws Exception {
		boolean showOnlyPriority = Settings.Global.getInt(context.getContentResolver(),
		Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE, 0) == 1;
		List<ConversationChannelWrapper> conversations =
		notificationManager.getConversations(
		false).getList();
		@@ -184,7 +181,6 @@ public class PeopleSpaceUtils {
		priorityConversations);

		// Sort and then add recent and non priority conversations to tiles list.
		if (!showOnlyPriority) {
		if (DEBUG) Log.d(TAG, "Add recent conversations");
		Stream<ShortcutInfo> nonPriorityConversations = conversations.stream()
		.filter(c -> c.getNotificationChannel() == null
		@@ -202,7 +198,6 @@ public class PeopleSpaceUtils {
		List<PeopleSpaceTile> recentTiles =
		getSortedTiles(peopleManager, launcherApps, mergedStream);
		tiles.addAll(recentTiles);
		}

		tiles = augmentTilesFromVisibleNotifications(context, tiles, notificationEntryManager);
		return tiles;

packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java

+2 −12

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import android.os.Bundle;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.preference.PreferenceManager;
		import android.provider.Settings;
		import android.service.notification.NotificationListenerService;
		import android.service.notification.StatusBarNotification;
		import android.util.Log;
		@@ -129,13 +128,9 @@ public class PeopleSpaceWidgetManager {
		}

		if (DEBUG) Log.d(TAG, "updating " + widgetIds.length + " widgets");
		boolean showSingleConversation = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE, 0) == 0;
		if (showSingleConversation) {
		synchronized (mLock) {
		updateSingleConversationWidgets(widgetIds);
		}
		}
		} catch (Exception e) {
		Log.e(TAG, "Exception: " + e);
		}
		@@ -227,11 +222,6 @@ public class PeopleSpaceWidgetManager {
		public void updateWidgetsWithNotificationChanged(StatusBarNotification sbn,
		PeopleSpaceUtils.NotificationAction notificationAction) {
		if (DEBUG) Log.d(TAG, "updateWidgetsWithNotificationChanged called");
		boolean showSingleConversation = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE, 0) == 0;
		if (!showSingleConversation) {
		return;
		}
		try {
		String sbnShortcutId = sbn.getShortcutId();
		if (sbnShortcutId == null) {