Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev (57eea0f7) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -2495,6 +2495,12 @@ public final class Settings {
		*/
		public static final String POINTER_SPEED = "pointer_speed";

		/**
		* Whether lock-to-app will be triggered by long-press on recents.
		* @hide
		*/
		public static final String LOCK_TO_APP_ENABLED = "lock_to_app_enabled";

		/**
		* Whether lock-to-app will lock the keyguard when exiting.
		* @hide

packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta
		mContext = context;
		mSystemServicesProxy = new SystemServicesProxy(context);
		mHandler = new Handler();
		mConfig = RecentsConfiguration.reinitialize(context);
		mConfig = RecentsConfiguration.reinitialize(context, mSystemServicesProxy);
		mWindowRect = mSystemServicesProxy.getWindowRect();
		mTaskStackBounds = new Rect();
		mConfig.getTaskStackBounds(mWindowRect.width(), mWindowRect.height(), mTaskStackBounds);
		@@ -147,7 +147,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta
		}

		public void onConfigurationChanged(Configuration newConfig) {
		mConfig = RecentsConfiguration.reinitialize(mContext);
		mConfig = RecentsConfiguration.reinitialize(mContext, mSystemServicesProxy);
		mConfig.updateOnConfigurationChange();
		mWindowRect = mSystemServicesProxy.getWindowRect();
		mConfig.getTaskStackBounds(mWindowRect.width(), mWindowRect.height(), mTaskStackBounds);

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -340,7 +340,8 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView

		// Initialize the loader and the configuration
		RecentsTaskLoader.initialize(this);
		mConfig = RecentsConfiguration.reinitialize(this);
		mConfig = RecentsConfiguration.reinitialize(this,
		RecentsTaskLoader.getInstance().getSystemServicesProxy());

		// Create the home intent runnable
		Intent homeIntent = new Intent(Intent.ACTION_MAIN, null);
		@@ -405,7 +406,8 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView

		void onConfigurationChange() {
		// Update RecentsConfiguration
		mConfig = RecentsConfiguration.reinitialize(this);
		mConfig = RecentsConfiguration.reinitialize(this,
		RecentsTaskLoader.getInstance().getSystemServicesProxy());

		// Try and start the enter animation (or restart it on configuration changed)
		ReferenceCountedTrigger t = new ReferenceCountedTrigger(this, null, null, null);

packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java

+14 −7

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.view.animation.AnimationUtils;
		import android.view.animation.Interpolator;
		import com.android.systemui.R;
		import com.android.systemui.recents.misc.Console;
		import com.android.systemui.recents.misc.SystemServicesProxy;


		/** A static Recents configuration for the current context
		@@ -109,7 +110,8 @@ public class RecentsConfiguration {
		public boolean launchedFromHome;
		public int launchedToTaskId;

		/** Dev options */
		/** Dev options and global settings */
		public boolean lockToAppEnabled;
		public boolean developerOptionsEnabled;
		public boolean debugModeEnabled;

		@@ -127,15 +129,10 @@ public class RecentsConfiguration {
		com.android.internal.R.interpolator.linear_out_slow_in);
		quintOutInterpolator = AnimationUtils.loadInterpolator(context,
		com.android.internal.R.interpolator.decelerate_quint);

		// Check if the developer options are enabled
		ContentResolver cr = context.getContentResolver();
		developerOptionsEnabled = Settings.Global.getInt(cr,
		Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
		}

		/** Updates the configuration to the current context */
		public static RecentsConfiguration reinitialize(Context context) {
		public static RecentsConfiguration reinitialize(Context context, SystemServicesProxy ssp) {
		if (sInstance == null) {
		sInstance = new RecentsConfiguration(context);
		}
		@@ -144,6 +141,7 @@ public class RecentsConfiguration {
		sInstance.update(context);
		sPrevConfigurationHashCode = configHashCode;
		}
		sInstance.updateOnReinitialize(context, ssp);
		return sInstance;
		}

		@@ -260,6 +258,15 @@ public class RecentsConfiguration {
		appWidgetId).apply();
		}

		/** Updates the states that need to be re-read whenever we re-initialize. */
		void updateOnReinitialize(Context context, SystemServicesProxy ssp) {
		// Check if the developer options are enabled
		developerOptionsEnabled = ssp.getGlobalSetting(context,
		Settings.Global.DEVELOPMENT_SETTINGS_ENABLED) != 0;
		lockToAppEnabled = ssp.getSystemSetting(context,
		Settings.System.LOCK_TO_APP_ENABLED) != 0;
		}

		/** Called when the configuration has changed, and we want to reset any configuration specific
		* members. */
		public void updateOnConfigurationChange() {

packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.appwidget.AppWidgetHost;
		import android.appwidget.AppWidgetManager;
		import android.appwidget.AppWidgetProviderInfo;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ActivityInfo;
		@@ -47,6 +48,7 @@ import android.os.ParcelFileDescriptor;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.Settings;
		import android.util.Log;
		import android.util.Pair;
		import android.view.Display;
		@@ -412,6 +414,22 @@ public class SystemServicesProxy {
		host.deleteAppWidgetId(appWidgetId);
		}

		/**
		* Returns a global setting.
		*/
		public int getGlobalSetting(Context context, String setting) {
		ContentResolver cr = context.getContentResolver();
		return Settings.Global.getInt(cr, setting, 0);
		}

		/**
		* Returns a system setting.
		*/
		public int getSystemSetting(Context context, String setting) {
		ContentResolver cr = context.getContentResolver();
		return Settings.System.getInt(cr, setting, 0);
		}

		/**
		* Returns the window rect.
		*/