Merge "Removes auto-switch from gesture nav when default home app changes" into qt-r1-dev (9cd84af2) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationModeController.java

+7 −145

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ import static com.android.systemui.shared.system.QuickStepContract.ACTION_ENABLE
		import static com.android.systemui.shared.system.QuickStepContract.ACTION_ENABLE_GESTURE_NAV_RESULT;
		import static com.android.systemui.shared.system.QuickStepContract.EXTRA_RESULT_INTENT;

		import android.app.Notification;
		import android.app.NotificationManager;
		import android.app.PendingIntent;
		import android.app.admin.DevicePolicyManager;
		import android.content.BroadcastReceiver;
		@@ -42,7 +40,6 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.om.IOverlayManager;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.res.ApkAssets;
		import android.os.PatternMatcher;
		@@ -52,16 +49,13 @@ import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.Settings;
		import android.provider.Settings.Secure;
		import android.text.TextUtils;
		import android.util.Log;
		import android.util.SparseBooleanArray;

		import com.android.systemui.Dumpable;
		import com.android.systemui.R;
		import com.android.systemui.UiOffloadThread;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.util.NotificationChannels;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -80,11 +74,6 @@ public class NavigationModeController implements Dumpable {
		private static final String TAG = NavigationModeController.class.getSimpleName();
		private static final boolean DEBUG = false;

		private static final int SYSTEM_APP_MASK =
		ApplicationInfo.FLAG_SYSTEM \| ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
		static final String SHARED_PREFERENCES_NAME = "navigation_mode_controller_preferences";
		static final String PREFS_SWITCHED_FROM_GESTURE_NAV_KEY = "switched_from_gesture_nav";

		public interface ModeChangedListener {
		void onNavigationModeChanged(int mode);
		}
		@@ -100,8 +89,6 @@ public class NavigationModeController implements Dumpable {
		private int mMode = NAV_BAR_MODE_3BUTTON;
		private ArrayList<ModeChangedListener> mListeners = new ArrayList<>();

		private String mLastDefaultLauncher;

		private BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		@@ -112,18 +99,6 @@ public class NavigationModeController implements Dumpable {
		}
		updateCurrentInteractionMode(true /* notify */);
		break;
		case ACTION_PREFERRED_ACTIVITY_CHANGED:
		if (DEBUG) {
		Log.d(TAG, "ACTION_PREFERRED_ACTIVITY_CHANGED");
		}
		final String launcher = getDefaultLauncherPackageName(mCurrentUserContext);
		// Check if it is a default launcher change
		if (!TextUtils.equals(mLastDefaultLauncher, launcher)) {
		switchFromGestureNavModeIfNotSupportedByDefaultLauncher();
		showNotificationIfDefaultLauncherSupportsGestureNav();
		mLastDefaultLauncher = launcher;
		}
		break;
		}
		}
		};
		@@ -159,7 +134,6 @@ public class NavigationModeController implements Dumpable {

		// Update the nav mode for the current user
		updateCurrentInteractionMode(true /* notify */);
		switchFromGestureNavModeIfNotSupportedByDefaultLauncher();

		// When switching users, defer enabling the gestural nav overlay until the user
		// is all set up
		@@ -190,11 +164,7 @@ public class NavigationModeController implements Dumpable {
		mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL, preferredActivityFilter, null,
		null);

		// We are only interested in launcher changes, so keeping track of the current default.
		mLastDefaultLauncher = getDefaultLauncherPackageName(mContext);

		updateCurrentInteractionMode(false /* notify */);
		switchFromGestureNavModeIfNotSupportedByDefaultLauncher();

		// Check if we need to defer enabling gestural nav
		deferGesturalNavOverlayIfNecessary();
		@@ -216,21 +186,13 @@ public class NavigationModeController implements Dumpable {
		// Already in gesture mode
		return true;
		}
		final Boolean supported = isGestureNavSupportedByDefaultLauncher(mCurrentUserContext);
		if (supported == null \|\| supported) {

		Log.d(TAG, "Switching system navigation to full-gesture mode:"
		+ " defaultLauncher="
		+ getDefaultLauncherPackageName(mCurrentUserContext)
		+ " contextUser="
		+ mCurrentUserContext.getUserId());

		setModeOverlay(NAV_BAR_MODE_GESTURAL_OVERLAY, USER_CURRENT);
		return true;
		} else {
		Log.e(TAG, "Gesture nav is not supported for defaultLauncher="
		+ getDefaultLauncherPackageName(mCurrentUserContext));
		return false;
		}
		}

		private boolean enableGestureNav(Intent intent) {
		@@ -430,100 +392,6 @@ public class NavigationModeController implements Dumpable {
		});
		}

		private void switchFromGestureNavModeIfNotSupportedByDefaultLauncher() {
		if (getCurrentInteractionMode(mCurrentUserContext) != NAV_BAR_MODE_GESTURAL) {
		return;
		}
		final Boolean supported = isGestureNavSupportedByDefaultLauncher(mCurrentUserContext);
		if (supported == null \|\| supported) {
		return;
		}

		Log.d(TAG, "Switching system navigation to 3-button mode:"
		+ " defaultLauncher=" + getDefaultLauncherPackageName(mCurrentUserContext)
		+ " contextUser=" + mCurrentUserContext.getUserId());

		setModeOverlay(NAV_BAR_MODE_3BUTTON_OVERLAY, USER_CURRENT);
		showNotification(mCurrentUserContext, R.string.notification_content_system_nav_changed);
		mCurrentUserContext.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE)
		.edit().putBoolean(PREFS_SWITCHED_FROM_GESTURE_NAV_KEY, true).apply();
		}

		private void showNotificationIfDefaultLauncherSupportsGestureNav() {
		boolean previouslySwitchedFromGestureNav = mCurrentUserContext
		.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE)
		.getBoolean(PREFS_SWITCHED_FROM_GESTURE_NAV_KEY, false);
		if (!previouslySwitchedFromGestureNav) {
		return;
		}
		if (getCurrentInteractionMode(mCurrentUserContext) == NAV_BAR_MODE_GESTURAL) {
		return;
		}
		final Boolean supported = isGestureNavSupportedByDefaultLauncher(mCurrentUserContext);
		if (supported == null \|\| !supported) {
		return;
		}

		showNotification(mCurrentUserContext, R.string.notification_content_gesture_nav_available);
		mCurrentUserContext.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE)
		.edit().putBoolean(PREFS_SWITCHED_FROM_GESTURE_NAV_KEY, false).apply();
		}

		/**
		* Returns null if there is no default launcher set for the current user. Returns true if the
		* current default launcher supports Gesture Navigation. Returns false otherwise.
		*/
		private Boolean isGestureNavSupportedByDefaultLauncher(Context context) {
		final String defaultLauncherPackageName = getDefaultLauncherPackageName(context);
		if (DEBUG) {
		Log.d(TAG, "isGestureNavSupportedByDefaultLauncher:"
		+ " defaultLauncher=" + defaultLauncherPackageName
		+ " contextUser=" + context.getUserId());
		}
		if (defaultLauncherPackageName == null) {
		return null;
		}
		if (isSystemApp(context, defaultLauncherPackageName)) {
		return true;
		}
		return false;
		}

		private String getDefaultLauncherPackageName(Context context) {
		final ComponentName cn = context.getPackageManager().getHomeActivities(new ArrayList<>());
		if (cn == null) {
		return null;
		}
		return cn.getPackageName();
		}

		/** Returns true if the app for the given package name is a system app for this device */
		private boolean isSystemApp(Context context, String packageName) {
		try {
		ApplicationInfo ai = context.getPackageManager().getApplicationInfo(packageName,
		PackageManager.GET_META_DATA);
		return ai != null && ((ai.flags & SYSTEM_APP_MASK) != 0);
		} catch (PackageManager.NameNotFoundException e) {
		return false;
		}
		}

		private void showNotification(Context context, int resId) {
		final CharSequence message = context.getResources().getString(resId);
		if (DEBUG) {
		Log.d(TAG, "showNotification: message=" + message);
		}

		final Notification.Builder builder =
		new Notification.Builder(mContext, NotificationChannels.ALERTS)
		.setContentText(message)
		.setStyle(new Notification.BigTextStyle())
		.setSmallIcon(R.drawable.ic_info)
		.setAutoCancel(true)
		.setContentIntent(PendingIntent.getActivity(context, 0, new Intent(), 0));
		context.getSystemService(NotificationManager.class).notify(TAG, 0, builder.build());
		}

		@Override
		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("NavigationModeController:");
		@@ -536,12 +404,6 @@ public class NavigationModeController implements Dumpable {
		}
		pw.println(" defaultOverlays=" + defaultOverlays);
		dumpAssetPaths(mCurrentUserContext);

		pw.println(" defaultLauncher=" + mLastDefaultLauncher);
		boolean previouslySwitchedFromGestureNav = mCurrentUserContext
		.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE)
		.getBoolean(PREFS_SWITCHED_FROM_GESTURE_NAV_KEY, false);
		pw.println(" previouslySwitchedFromGestureNav=" + previouslySwitchedFromGestureNav);
		}

		private void dumpAssetPaths(Context context) {