Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev

Browse Source
This commit is contained in:
Bryce Lee
2017-07-13 18:28:09 +00:00
committed by Android (Google) Code Review
parent 84a60bf9e8 248fbb180d
commit fa62d79a02
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/content/pm/ActivityInfo.java
View File

@@ -765,6 +765,16 @@ public class ActivityInfo extends ComponentInfo
* constant starts at the high bits.
*/
public static final int CONFIG_FONT_SCALE = 0x40000000;
/**
* Bit in {@link #configChanges} that indicates that the activity
* can itself handle changes to the rotation. Set from the
* {@link android.R.attr#configChanges} attribute. This is
* not a core resource configuration, but a higher-level value, so its
* constant starts at the high bits.
* @hide We do not want apps to handle this. It will eventually be moved out of
* {@link Configuration}.
*/
public static final int CONFIG_ROTATION = 0x20000000;
/** @hide
* Unfortunately the constants for config changes in native code are

2
core/java/android/content/res/Configuration.java
View File

@@ -1395,7 +1395,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
}
if ((compareUndefined || delta.mRotation != ROTATION_UNDEFINED)
&& mRotation != delta.mRotation) {
changed |= ActivityInfo.CONFIG_ORIENTATION;
changed |= ActivityInfo.CONFIG_ROTATION;
}
if ((compareUndefined || getScreenLayoutNoDirection(delta.screenLayout) !=
(SCREENLAYOUT_SIZE_UNDEFINED | SCREENLAYOUT_LONG_UNDEFINED))

5
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -42,6 +42,7 @@ import static android.content.Intent.CATEGORY_LAUNCHER;
import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
import static android.content.Intent.FLAG_ACTIVITY_NO_HISTORY;
import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
import static android.content.pm.ActivityInfo.CONFIG_ROTATION;
import static android.content.pm.ActivityInfo.CONFIG_SCREEN_LAYOUT;
import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
import static android.content.pm.ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE;
@@ -2596,6 +2597,10 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
changes &= ~CONFIG_SMALLEST_SCREEN_SIZE;
}
}
// We don't want rotation to cause relaunches.
if ((changes & CONFIG_ROTATION) != 0) {
changes &= ~CONFIG_ROTATION;
}
return changes;
}