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

Merge "Fix rotation animation selection." into oc-dr1-dev

Browse Source 
am: cee8098178

Change-Id: I1f742419b6f25d74a8b2d895155796f0e718da59
This commit is contained in:
Rob Carr
2017-07-18 19:39:46 +00:00
committed by android-build-merger
parent 0a0f7cea05 cee8098178
commit 228571391e
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/pm/PackageParser.java
View File

@@ -40,7 +40,7 @@ import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFIC
import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION;
import static android.os.Build.VERSION_CODES.O;
import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER;
import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_ROTATE;
import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_UNSPECIFIED;
import android.annotation.IntRange;
import android.annotation.NonNull;
@@ -4283,7 +4283,7 @@ public class PackageParser {
sa.getString(R.styleable.AndroidManifestActivity_enableVrMode);
a.info.rotationAnimation =
sa.getInt(R.styleable.AndroidManifestActivity_rotationAnimation, ROTATION_ANIMATION_ROTATE);
sa.getInt(R.styleable.AndroidManifestActivity_rotationAnimation, ROTATION_ANIMATION_UNSPECIFIED);
a.info.colorMode = sa.getInt(R.styleable.AndroidManifestActivity_colorMode,
ActivityInfo.COLOR_MODE_DEFAULT);

7
core/java/android/view/WindowManager.java
View File

@@ -1742,6 +1742,13 @@ public interface WindowManager extends ViewManager {
*/
public float buttonBrightness = BRIGHTNESS_OVERRIDE_NONE;
/**
* Unspecified value for {@link #rotationAnimation} indicating
* a lack of preference.
* @hide
*/
public static final int ROTATION_ANIMATION_UNSPECIFIED = -1;
/**
* Value for {@link #rotationAnimation} which specifies that this
* window will visually rotate in or out following a rotation.