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

Commit 76415ee5 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Allow apps to set launch bounds for activities."

parents d93d481e 7a8fa609

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -3773,6 +3773,8 @@ package android.app { 
  }















  public class ActivityOptions {













    method public android.graphics.Rect getLaunchBounds();













    method public boolean hasLaunchBounds();















    method public static android.app.ActivityOptions makeBasic();















    method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);















    method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);









@@ -3782,6 +3784,7 @@ package android.app {













    method public static android.app.ActivityOptions makeTaskLaunchBehind();















    method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int);















    method public void requestUsageTimeReport(android.app.PendingIntent);













    method public android.app.ActivityOptions setLaunchBounds(android.graphics.Rect);















    method public android.os.Bundle toBundle();















    method public void update(android.app.ActivityOptions);















    field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";

























api/system-current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -3882,6 +3882,8 @@ package android.app {













  }





























  public class ActivityOptions {













    method public android.graphics.Rect getLaunchBounds();













    method public boolean hasLaunchBounds();















    method public static android.app.ActivityOptions makeBasic();















    method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);















    method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);









@@ -3891,6 +3893,7 @@ package android.app {













    method public static android.app.ActivityOptions makeTaskLaunchBehind();















    method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int);















    method public void requestUsageTimeReport(android.app.PendingIntent);













    method public android.app.ActivityOptions setLaunchBounds(android.graphics.Rect);















    method public android.os.Bundle toBundle();















    method public void update(android.app.ActivityOptions);















    field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";

























core/java/android/app/ActivityOptions.java



+25
−20




























Original line number
Diff line number
Diff line








@@ -64,11 +64,13 @@ public class ActivityOptions {













    public static final String KEY_PACKAGE_NAME = "android:activity.packageName";































    /**













     * The bounds that the activity should be started in. Set to null explicitly













     * for full screen. If the key is not found, previous bounds will be preserved.













     * The bounds (window size) that the activity should be launched in. Set to null explicitly for













     * full screen. If the key is not found, previous bounds will be preserved.













     * NOTE: This value is ignored on devices that don't have













     * {@link android.content.pm.PackageManager#FEATURE_FREEFORM_WINDOW_MANAGEMENT} enabled.















     * @hide















     */













    public static final String KEY_BOUNDS = "android:activity.bounds";













    public static final String KEY_LAUNCH_BOUNDS = "android:activity.launchBounds";































    /**















     * Type of animation that arguments specify.










@@ -193,8 +195,8 @@ public class ActivityOptions {













    public static final int ANIM_CLIP_REVEAL = 11;































    private String mPackageName;













    private boolean mHasBounds;













    private Rect mBounds;













    private boolean mHasLaunchBounds;













    private Rect mLaunchBounds;















    private int mAnimationType = ANIM_NONE;















    private int mCustomEnterResId;















    private int mCustomExitResId;










@@ -705,9 +707,9 @@ public class ActivityOptions {













        } catch (RuntimeException e) {















            Slog.w(TAG, e);















        }













        mHasBounds = opts.containsKey(KEY_BOUNDS);













        if (mHasBounds) {













            mBounds = opts.getParcelable(KEY_BOUNDS);













        mHasLaunchBounds = opts.containsKey(KEY_LAUNCH_BOUNDS);













        if (mHasLaunchBounds) {













            mLaunchBounds = opts.getParcelable(KEY_LAUNCH_BOUNDS);















        }















        mAnimationType = opts.getInt(KEY_ANIM_TYPE);















        switch (mAnimationType) {










@@ -766,10 +768,15 @@ public class ActivityOptions {













        }















    }





























    /** @hide */













    public ActivityOptions setBounds(Rect bounds) {













        mHasBounds = true;













        mBounds = bounds;













    /**













     * Sets the bounds (window size) that the activity should be launched in. Set to null explicitly













     * for full screen.













     * NOTE: This value is ignored on devices that don't have













     * {@link android.content.pm.PackageManager#FEATURE_FREEFORM_WINDOW_MANAGEMENT} enabled.













     */













    public ActivityOptions setLaunchBounds(Rect launchBounds) {













        mHasLaunchBounds = true;













        mLaunchBounds = launchBounds;















        return this;















    }

























@@ -778,14 +785,12 @@ public class ActivityOptions {













        return mPackageName;















    }





























    /** @hide */













    public boolean hasBounds() {













        return mHasBounds;













    public boolean hasLaunchBounds() {













        return mHasLaunchBounds;















    }





























    /** @hide */













    public Rect getBounds(){













        return mBounds;













    public Rect getLaunchBounds(){













        return mLaunchBounds;















    }































    /** @hide */










@@ -997,8 +1002,8 @@ public class ActivityOptions {













        if (mPackageName != null) {















            b.putString(KEY_PACKAGE_NAME, mPackageName);















        }













        if (mHasBounds) {













            b.putParcelable(KEY_BOUNDS, mBounds);













        if (mHasLaunchBounds) {













            b.putParcelable(KEY_LAUNCH_BOUNDS, mLaunchBounds);















        }















        b.putInt(KEY_ANIM_TYPE, mAnimationType);















        if (mUsageTimeReport != null) {

































packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -31,7 +31,6 @@ import android.view.AppTransitionAnimationSpec;













import android.view.IAppTransitionAnimationSpecsFuture;















import android.view.WindowManagerGlobal;















import com.android.internal.annotations.GuardedBy;













import com.android.systemui.recents.Constants;















import com.android.systemui.recents.ExitRecentsWindowFirstAnimationFrameEvent;















import com.android.systemui.recents.Recents;















import com.android.systemui.recents.RecentsDebugFlags;










@@ -93,7 +92,7 @@ public class RecentsTransitionHelper {













            final boolean lockToTask, final Rect bounds, int destinationStack) {















        final ActivityOptions opts = ActivityOptions.makeBasic();















        if (bounds != null) {













            opts.setBounds(bounds.isEmpty() ? null : bounds);













            opts.setLaunchBounds(bounds.isEmpty() ? null : bounds);















        }































        final ActivityOptions.OnAnimationStartedListener animStartedListener;

































services/core/java/com/android/server/am/ActivityManagerService.java



+153
−92




























Original line number
Diff line number
Diff line








@@ -16,72 +16,8 @@



























package com.android.server.am;



























import static android.Manifest.permission.INTERACT_ACROSS_USERS;













import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;













import static android.Manifest.permission.START_TASKS_FROM_RECENTS;













import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;













import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;













import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;













import static android.app.ActivityManager.StackId.HOME_STACK_ID;













import static android.app.ActivityManager.StackId.INVALID_STACK_ID;













import static android.app.ActivityManager.RESIZE_MODE_PRESERVE_WINDOW;













import static android.content.pm.PackageManager.PERMISSION_GRANTED;













import static com.android.internal.util.XmlUtils.readBooleanAttribute;













import static com.android.internal.util.XmlUtils.readIntAttribute;













import static com.android.internal.util.XmlUtils.readLongAttribute;













import static com.android.internal.util.XmlUtils.writeBooleanAttribute;













import static com.android.internal.util.XmlUtils.writeIntAttribute;













import static com.android.internal.util.XmlUtils.writeLongAttribute;













import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST;













import static com.android.server.am.ActivityManagerDebugConfig.*;













import static com.android.server.am.ActivityStackSupervisor.FORCE_FOCUS;













import static com.android.server.am.ActivityStackSupervisor.ON_TOP;













import static com.android.server.am.ActivityStackSupervisor.RESTORE_FROM_RECENTS;













import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS;













import static com.android.server.am.TaskRecord.INVALID_TASK_ID;













import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_DONT_LOCK;













import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE_PRIV;













import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_PINNABLE;













import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;













import static org.xmlpull.v1.XmlPullParser.START_TAG;

























import android.Manifest;













import android.app.ActivityManager.StackId;













import android.app.AppOpsManager;













import android.app.ApplicationThreadNative;













import android.app.BroadcastOptions;













import android.app.IActivityContainer;













import android.app.IActivityContainerCallback;













import android.app.IAppTask;













import android.app.ITaskStackListener;













import android.app.ProfilerInfo;













import android.app.assist.AssistContent;













import android.app.assist.AssistStructure;













import android.app.usage.UsageEvents;













import android.app.usage.UsageStatsManagerInternal;













import android.appwidget.AppWidgetManager;













import android.content.pm.PermissionInfo;













import android.content.res.Resources;













import android.graphics.Bitmap;













import android.graphics.Point;













import android.graphics.Rect;













import android.os.BatteryStats;













import android.os.PersistableBundle;













import android.os.PowerManager;













import android.os.ResultReceiver;













import android.os.Trace;













import android.os.TransactionTooLargeException;













import android.os.WorkSource;













import android.os.storage.IMountService;













import android.os.storage.MountServiceInternal;













import android.os.storage.StorageManager;













import android.provider.Settings.Global;













import android.service.voice.IVoiceInteractionSession;













import android.service.voice.VoiceInteractionSession;













import android.util.ArrayMap;













import android.util.ArraySet;













import android.util.DebugUtils;













import android.view.Display;













import com.google.android.collect.Lists;













import com.google.android.collect.Maps;





























import com.android.internal.R;















import com.android.internal.annotations.GuardedBy;










@@ -118,19 +54,16 @@ import com.android.server.pm.Installer;













import com.android.server.statusbar.StatusBarManagerInternal;















import com.android.server.wm.AppTransition;















import com.android.server.wm.WindowManagerService;













import com.google.android.collect.Lists;













import com.google.android.collect.Maps;

























import libcore.io.IoUtils;













import libcore.util.EmptyArray;





























import org.xmlpull.v1.XmlPullParser;















import org.xmlpull.v1.XmlPullParserException;















import org.xmlpull.v1.XmlSerializer;



























import android.Manifest;















import android.app.Activity;















import android.app.ActivityManager;















import android.app.ActivityManager.RunningTaskInfo;













import android.app.ActivityManager.StackId;















import android.app.ActivityManager.StackInfo;















import android.app.ActivityManager.TaskThumbnailInfo;















import android.app.ActivityManagerInternal;









@@ -140,24 +73,37 @@ import android.app.ActivityOptions;













import android.app.ActivityThread;















import android.app.AlertDialog;















import android.app.AppGlobals;













import android.app.AppOpsManager;















import android.app.ApplicationErrorReport;













import android.app.ApplicationThreadNative;













import android.app.BroadcastOptions;















import android.app.Dialog;













import android.app.IActivityContainer;













import android.app.IActivityContainerCallback;















import android.app.IActivityController;













import android.app.IAppTask;















import android.app.IApplicationThread;















import android.app.IInstrumentationWatcher;















import android.app.INotificationManager;















import android.app.IProcessObserver;















import android.app.IServiceConnection;















import android.app.IStopUserCallback;













import android.app.IUidObserver;













import android.app.ITaskStackListener;















import android.app.IUiAutomationConnection;













import android.app.IUidObserver;















import android.app.IUserSwitchObserver;















import android.app.Instrumentation;















import android.app.Notification;















import android.app.NotificationManager;















import android.app.PendingIntent;













import android.app.backup.IBackupManager;













import android.app.ProfilerInfo;















import android.app.admin.DevicePolicyManager;













import android.app.assist.AssistContent;













import android.app.assist.AssistStructure;













import android.app.backup.IBackupManager;













import android.app.usage.UsageEvents;













import android.app.usage.UsageStatsManagerInternal;













import android.appwidget.AppWidgetManager;















import android.content.ActivityNotFoundException;















import android.content.BroadcastReceiver;















import android.content.ClipData;









@@ -181,18 +127,24 @@ import android.content.pm.IPackageManager;













import android.content.pm.InstrumentationInfo;















import android.content.pm.PackageInfo;















import android.content.pm.PackageManager;













import android.content.pm.ParceledListSlice;













import android.content.pm.UserInfo;















import android.content.pm.PackageManager.NameNotFoundException;













import android.content.pm.ParceledListSlice;















import android.content.pm.PathPermission;













import android.content.pm.PermissionInfo;















import android.content.pm.ProviderInfo;















import android.content.pm.ResolveInfo;















import android.content.pm.ServiceInfo;













import android.content.pm.UserInfo;















import android.content.res.CompatibilityInfo;















import android.content.res.Configuration;













import android.content.res.Resources;













import android.graphics.Bitmap;













import android.graphics.Point;













import android.graphics.Rect;















import android.net.Proxy;















import android.net.ProxyInfo;















import android.net.Uri;













import android.os.BatteryStats;















import android.os.Binder;















import android.os.Build;















import android.os.Bundle;









@@ -210,21 +162,35 @@ import android.os.Looper;













import android.os.Message;















import android.os.Parcel;















import android.os.ParcelFileDescriptor;













import android.os.PersistableBundle;













import android.os.PowerManager;















import android.os.PowerManagerInternal;















import android.os.Process;















import android.os.RemoteCallbackList;















import android.os.RemoteException;













import android.os.ResultReceiver;















import android.os.ServiceManager;















import android.os.StrictMode;















import android.os.SystemClock;















import android.os.SystemProperties;













import android.os.Trace;













import android.os.TransactionTooLargeException;















import android.os.UpdateLock;















import android.os.UserHandle;















import android.os.UserManager;













import android.os.WorkSource;













import android.os.storage.IMountService;













import android.os.storage.MountServiceInternal;













import android.os.storage.StorageManager;















import android.provider.Settings;













import android.service.voice.IVoiceInteractionSession;













import android.service.voice.VoiceInteractionSession;















import android.text.format.DateUtils;















import android.text.format.Time;













import android.util.ArrayMap;













import android.util.ArraySet;















import android.util.AtomicFile;













import android.util.DebugUtils;















import android.util.EventLog;















import android.util.Log;















import android.util.Pair;









@@ -233,13 +199,12 @@ import android.util.Slog;













import android.util.SparseArray;















import android.util.TimeUtils;















import android.util.Xml;













import android.view.Display;















import android.view.Gravity;















import android.view.LayoutInflater;















import android.view.View;















import android.view.WindowManager;



























import dalvik.system.VMRuntime;



























import java.io.BufferedInputStream;















import java.io.BufferedOutputStream;















import java.io.DataInputStream;










@@ -269,6 +234,100 @@ import java.util.Set;













import java.util.concurrent.atomic.AtomicBoolean;















import java.util.concurrent.atomic.AtomicLong;



























import dalvik.system.VMRuntime;













import libcore.io.IoUtils;













import libcore.util.EmptyArray;

























import static android.Manifest.permission.INTERACT_ACROSS_USERS;













import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;













import static android.Manifest.permission.START_TASKS_FROM_RECENTS;













import static android.app.ActivityManager.RESIZE_MODE_PRESERVE_WINDOW;













import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;













import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;













import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;













import static android.app.ActivityManager.StackId.HOME_STACK_ID;













import static android.app.ActivityManager.StackId.INVALID_STACK_ID;













import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;













import static android.content.pm.PackageManager.PERMISSION_GRANTED;













import static android.provider.Settings.Global.ALWAYS_FINISH_ACTIVITIES;













import static android.provider.Settings.Global.DEBUG_APP;













import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES;













import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RTL;













import static android.provider.Settings.Global.WAIT_FOR_DEBUGGER;













import static com.android.internal.util.XmlUtils.readBooleanAttribute;













import static com.android.internal.util.XmlUtils.readIntAttribute;













import static com.android.internal.util.XmlUtils.readLongAttribute;













import static com.android.internal.util.XmlUtils.writeBooleanAttribute;













import static com.android.internal.util.XmlUtils.writeIntAttribute;













import static com.android.internal.util.XmlUtils.writeLongAttribute;













import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKUP;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST_BACKGROUND;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST_LIGHT;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_CLEANUP;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_CONFIGURATION;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_FOCUS;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_IMMERSIVE;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKSCREEN;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKTASK;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LRU;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_MU;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_OOM_ADJ;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_POWER;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_POWER_QUICK;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESSES;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESS_OBSERVERS;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROVIDER;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PSS;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_RECENTS;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_SERVICE;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_STACK;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_SWITCH;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_TASKS;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_UID_OBSERVERS;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_URI_PERMISSION;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_USAGE_STATS;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_VISIBILITY;













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_VISIBLE_BEHIND;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_BACKUP;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_BROADCAST;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_CLEANUP;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_CONFIGURATION;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_FOCUS;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_IMMERSIVE;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LOCKSCREEN;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LOCKTASK;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LRU;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_MU;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_OOM_ADJ;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_POWER;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PROCESSES;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PROCESS_OBSERVERS;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PROVIDER;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PSS;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_RECENTS;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_SERVICE;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_STACK;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_SWITCH;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_UID_OBSERVERS;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_URI_PERMISSION;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_VISIBILITY;













import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_VISIBLE_BEHIND;













import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;













import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;













import static com.android.server.am.ActivityStackSupervisor.FORCE_FOCUS;













import static com.android.server.am.ActivityStackSupervisor.ON_TOP;













import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS;













import static com.android.server.am.ActivityStackSupervisor.RESTORE_FROM_RECENTS;













import static com.android.server.am.TaskRecord.INVALID_TASK_ID;













import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_DONT_LOCK;













import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE_PRIV;













import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_PINNABLE;













import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;













import static org.xmlpull.v1.XmlPullParser.START_TAG;



























public final class ActivityManagerService extends ActivityManagerNative















        implements Watchdog.Monitor, BatteryStatsImpl.BatteryCallback {
























@@ -1211,7 +1270,8 @@ public final class ActivityManagerService extends ActivityManagerNative













    String mOrigDebugApp = null;















    boolean mOrigWaitForDebugger = false;















    boolean mAlwaysFinishActivities = false;













    boolean mForceResizableActivites;













    boolean mForceResizableActivities;













    boolean mSupportsFreeformWindowManagement;















    IActivityController mController = null;















    String mProfileApp = null;















    ProcessRecord mProfileProc = null;










@@ -11812,21 +11872,21 @@ public final class ActivityManagerService extends ActivityManagerNative



























    private void retrieveSettings() {















        final ContentResolver resolver = mContext.getContentResolver();













        String debugApp = Settings.Global.getString(resolver, Settings.Global.DEBUG_APP);













        boolean waitForDebugger = Settings.Global.getInt(













            resolver, Settings.Global.WAIT_FOR_DEBUGGER, 0) != 0;













        boolean alwaysFinishActivities = Settings.Global.getInt(













            resolver, Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0;













        boolean forceRtl = Settings.Global.getInt(













                resolver, Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0;













        int defaultForceResizable = Build.IS_DEBUGGABLE ? 1 : 0;













        boolean forceResizable = Settings.Global.getInt(













                resolver, Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,













                defaultForceResizable) != 0;













        final boolean freeformWindowManagement =













                mContext.getPackageManager().hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT);

























        final String debugApp = Settings.Global.getString(resolver, DEBUG_APP);













        final boolean waitForDebugger = Settings.Global.getInt(resolver, WAIT_FOR_DEBUGGER, 0) != 0;













        final boolean alwaysFinishActivities =













                Settings.Global.getInt(resolver, ALWAYS_FINISH_ACTIVITIES, 0) != 0;













        final boolean forceRtl = Settings.Global.getInt(resolver, DEVELOPMENT_FORCE_RTL, 0) != 0;













        final int defaultForceResizable = Build.IS_DEBUGGABLE ? 1 : 0;













        final boolean forceResizable = Settings.Global.getInt(













                resolver, DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, defaultForceResizable) != 0;















        // Transfer any global setting for forcing RTL layout, into a System Property













        SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, forceRtl ? "1":"0");













        SystemProperties.set(DEVELOPMENT_FORCE_RTL, forceRtl ? "1":"0");



























        Configuration configuration = new Configuration();













        final Configuration configuration = new Configuration();















        Settings.System.getConfiguration(resolver, configuration);















        if (forceRtl) {















            // This will take care of setting the correct layout direction flags









@@ -11837,7 +11897,8 @@ public final class ActivityManagerService extends ActivityManagerNative













            mDebugApp = mOrigDebugApp = debugApp;















            mWaitForDebugger = mOrigWaitForDebugger = waitForDebugger;















            mAlwaysFinishActivities = alwaysFinishActivities;













            mForceResizableActivites = forceResizable;













            mForceResizableActivities = forceResizable;













            mSupportsFreeformWindowManagement = freeformWindowManagement || forceResizable;















            // This happens before any activities are started, so we can















            // change mConfiguration in-place.















            updateConfigurationLocked(configuration, null, true);