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

Merge "Move Canvas compatibility settings into Compatibility class"

Browse Source
This commit is contained in:
Leon Scroggins
2020-05-04 18:01:42 +00:00
committed by Android (Google) Code Review
parent ded57e599f 9a49427384
commit fdc7ce1e72
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/java/android/graphics/Canvas.java
View File

@@ -51,10 +51,8 @@ import javax.microedition.khronos.opengles.GL;
*/
public class Canvas extends BaseCanvas {
private static int sCompatiblityVersion = 0;
/** @hide */
public static boolean sCompatibilityRestore = false;
/** @hide */
public static boolean sCompatibilitySetBitmap = false;
private static boolean sCompatibilityRestore = false;
private static boolean sCompatibilitySetBitmap = false;
/** @hide */
@UnsupportedAppUsage
@@ -1426,9 +1424,10 @@ public class Canvas extends BaseCanvas {
nFreeTextLayoutCaches();
}
/** @hide */
public static void setCompatibilityVersion(int apiLevel) {
/*package*/ static void setCompatibilityVersion(int apiLevel) {
sCompatiblityVersion = apiLevel;
sCompatibilityRestore = apiLevel < Build.VERSION_CODES.M;
sCompatibilitySetBitmap = apiLevel < Build.VERSION_CODES.O;
nSetCompatibilityVersion(apiLevel);
}

1
graphics/java/android/graphics/Compatibility.java
View File

@@ -37,6 +37,7 @@ public final class Compatibility {
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public static void setTargetSdkVersion(int targetSdkVersion) {
sTargetSdkVersion = targetSdkVersion;
Canvas.setCompatibilityVersion(targetSdkVersion);
}
/**