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

Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev

Browse Source 
am: 512e5d1b9b

Change-Id: I2853f3545e7250d2d6f0a17399e4073c83d431a7
This commit is contained in:
Bryce Lee
2017-07-26 14:26:18 +00:00
committed by android-build-merger
parent 6b46beea25 512e5d1b9b
commit a9ba9c3ed6
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,8 +28,6 @@ import android.util.Printer;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_ROTATE;
/**
* Information you can retrieve about a particular application
* activity or receiver. This corresponds to information collected
@@ -775,6 +773,16 @@ public class ActivityInfo extends ComponentInfo
* {@link Configuration}.
*/
public static final int CONFIG_ROTATION = 0x20000000;
/**
* Bit in {@link #configChanges} that indicates that the activity
* can itself handle changes to the app bounds. 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_APP_BOUNDS = 0x10000000;
/** @hide
* Unfortunately the constants for config changes in native code are

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

@@ -1445,7 +1445,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
if ((compareUndefined || delta.appBounds != null)
&& appBounds != delta.appBounds
&& (appBounds == null || !appBounds.equals(delta.appBounds))) {
changed |= ActivityInfo.CONFIG_SCREEN_SIZE;
changed |= ActivityInfo.CONFIG_APP_BOUNDS;
}
return changed;

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

@@ -41,6 +41,7 @@ import static android.content.Intent.CATEGORY_HOME;
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_APP_BOUNDS;
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;
@@ -2601,6 +2602,12 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
if ((changes & CONFIG_ROTATION) != 0) {
changes &= ~CONFIG_ROTATION;
}
// We don't want app bound changes to cause relaunches.
if ((changes & CONFIG_APP_BOUNDS) != 0) {
changes &= ~CONFIG_APP_BOUNDS;
}
return changes;
}

14
services/tests/servicestests/src/com/android/server/wm/AppBoundsTests.java
View File

@@ -17,6 +17,7 @@
package com.android.server.wm;
import android.app.ActivityManager;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.view.DisplayInfo;
@@ -48,6 +49,19 @@ public class AppBoundsTests extends WindowTestsBase {
mParentBounds = new Rect(10 /*left*/, 30 /*top*/, 80 /*right*/, 60 /*bottom*/);
}
/**
* Ensures that appBounds causes {@link android.content.pm.ActivityInfo.CONFIG_APP_BOUNDS} diff.
*/
@Test
public void testAppBoundsConfigurationDiff() {
final Configuration config = new Configuration();
final Configuration config2 = new Configuration();
config.appBounds = new Rect(0, 1, 1, 0);
config2.appBounds = new Rect(0, 2, 2, 0);
assertEquals(ActivityInfo.CONFIG_APP_BOUNDS, config.diff(config2));
}
/**
* Ensures the configuration app bounds at the root level match the app dimensions.
*/