use SdkLevel fo version checking
Bug: 228962407
Test: N/A
Change-Id: I34f3337edb381fab765b64d51cc986050d8209ab
diff --git a/Android.bp b/Android.bp
index 25f3d5f..6cda441 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,7 @@
"apache-commons-compress",
"com.google.android.material_material",
"guava",
+ "modules-utils-build_system",
],
libs: [
@@ -126,6 +127,7 @@
static_libs: [
"androidx.appcompat_appcompat",
"com.google.android.material_material",
+ "modules-utils-build_system",
],
resource_dirs: [
diff --git a/src/com/android/documentsui/ProfileTabs.java b/src/com/android/documentsui/ProfileTabs.java
index a3dac4c..59a94e6 100644
--- a/src/com/android/documentsui/ProfileTabs.java
+++ b/src/com/android/documentsui/ProfileTabs.java
@@ -32,7 +32,7 @@
import com.android.documentsui.base.RootInfo;
import com.android.documentsui.base.State;
import com.android.documentsui.base.UserId;
-import com.android.documentsui.util.VersionUtils;
+import com.android.modules.utils.build.SdkLevel;
import com.google.android.material.tabs.TabLayout;
import com.google.common.base.Objects;
@@ -108,7 +108,7 @@
mTabsContainer.setVisibility(shouldShow() ? View.VISIBLE : View.GONE);
// Material next changes apply only for version S or greater
- if(VersionUtils.isAtLeastS()) {
+ if (SdkLevel.isAtLeastS()) {
mTabSeparator.setVisibility(View.GONE);
int tabContainerHeightInDp = (int)mTabsContainer.getContext().getResources().
getDimension(R.dimen.tab_container_height);
@@ -165,7 +165,7 @@
}
private String getEnterpriseString(String updatableStringId, int defaultStringId) {
- if (VersionUtils.isAtLeastT()) {
+ if (SdkLevel.isAtLeastT()) {
return getUpdatableEnterpriseString(updatableStringId, defaultStringId);
} else {
return mTabsContainer.getContext().getString(defaultStringId);
diff --git a/src/com/android/documentsui/dirlist/DocumentHolder.java b/src/com/android/documentsui/dirlist/DocumentHolder.java
index afa7560..5e38b48 100644
--- a/src/com/android/documentsui/dirlist/DocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/DocumentHolder.java
@@ -39,7 +39,7 @@
import com.android.documentsui.R;
import com.android.documentsui.base.Shared;
import com.android.documentsui.base.State;
-import com.android.documentsui.util.VersionUtils;
+import com.android.modules.utils.build.SdkLevel;
import java.util.function.Function;
@@ -180,7 +180,7 @@
}
protected String getPreviewIconContentDescription(boolean isWorkProfile, String fileName) {
- if (VersionUtils.isAtLeastT()) {
+ if (SdkLevel.isAtLeastT()) {
return getUpdatablePreviewIconContentDescription(isWorkProfile, fileName);
} else {
return itemView.getResources().getString(
diff --git a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
index 9bc2ce9..744b0c9 100644
--- a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
+++ b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
@@ -39,7 +39,7 @@
import com.android.documentsui.R;
import com.android.documentsui.base.State;
import com.android.documentsui.ui.Views;
-import com.android.documentsui.util.VersionUtils;
+import com.android.modules.utils.build.SdkLevel;
final class GridDirectoryHolder extends DocumentHolder {
@@ -61,7 +61,7 @@
mIconMime.setImageDrawable(
IconUtils.loadMimeIcon(context, DocumentsContract.Document.MIME_TYPE_DIR));
- if (VersionUtils.isAtLeastT()) {
+ if (SdkLevel.isAtLeastT()) {
setUpdatableWorkProfileIcon(context);
}
}
diff --git a/src/com/android/documentsui/dirlist/GridDocumentHolder.java b/src/com/android/documentsui/dirlist/GridDocumentHolder.java
index 535ae95..2da5382 100644
--- a/src/com/android/documentsui/dirlist/GridDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/GridDocumentHolder.java
@@ -43,7 +43,7 @@
import com.android.documentsui.base.UserId;
import com.android.documentsui.roots.RootCursorWrapper;
import com.android.documentsui.ui.Views;
-import com.android.documentsui.util.VersionUtils;
+import com.android.modules.utils.build.SdkLevel;
import java.util.function.Function;
@@ -80,7 +80,7 @@
mIconHelper = iconHelper;
- if (VersionUtils.isAtLeastT()) {
+ if (SdkLevel.isAtLeastT()) {
setUpdatableWorkProfileIcon(context);
}
}
diff --git a/src/com/android/documentsui/dirlist/GridPhotoHolder.java b/src/com/android/documentsui/dirlist/GridPhotoHolder.java
index dac6a31..0618506 100644
--- a/src/com/android/documentsui/dirlist/GridPhotoHolder.java
+++ b/src/com/android/documentsui/dirlist/GridPhotoHolder.java
@@ -42,7 +42,7 @@
import com.android.documentsui.base.UserId;
import com.android.documentsui.roots.RootCursorWrapper;
import com.android.documentsui.ui.Views;
-import com.android.documentsui.util.VersionUtils;
+import com.android.modules.utils.build.SdkLevel;
import java.util.function.Function;
@@ -69,7 +69,7 @@
mIconHelper = iconHelper;
- if (VersionUtils.isAtLeastT()) {
+ if (SdkLevel.isAtLeastT()) {
setUpdatableWorkProfileIcon(context);
}
}
diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
index ad8eac7..96c49e0 100644
--- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
@@ -48,7 +48,7 @@
import com.android.documentsui.base.UserId;
import com.android.documentsui.roots.RootCursorWrapper;
import com.android.documentsui.ui.Views;
-import com.android.documentsui.util.VersionUtils;
+import com.android.modules.utils.build.SdkLevel;
import java.util.ArrayList;
import java.util.function.Function;
@@ -98,7 +98,7 @@
mFileTypeLookup = fileTypeLookup;
mDoc = new DocumentInfo();
- if (VersionUtils.isAtLeastT()) {
+ if (SdkLevel.isAtLeastT()) {
setUpdatableWorkProfileIcon(context);
}
}
diff --git a/src/com/android/documentsui/dirlist/Message.java b/src/com/android/documentsui/dirlist/Message.java
index 6ba5ea3..ccdad46 100644
--- a/src/com/android/documentsui/dirlist/Message.java
+++ b/src/com/android/documentsui/dirlist/Message.java
@@ -52,7 +52,7 @@
import com.android.documentsui.base.State;
import com.android.documentsui.base.UserId;
import com.android.documentsui.dirlist.DocumentsAdapter.Environment;
-import com.android.documentsui.util.VersionUtils;
+import com.android.modules.utils.build.SdkLevel;
/**
* Data object used by {@link InflateMessageDocumentHolder} and {@link HeaderMessageDocumentHolder}.
@@ -333,7 +333,7 @@
}
private String getEnterpriseString(String updatableStringId, int defaultStringId) {
- if (VersionUtils.isAtLeastT()) {
+ if (SdkLevel.isAtLeastT()) {
return getUpdatableEnterpriseString(updatableStringId, defaultStringId);
} else {
return mEnv.getContext().getString(defaultStringId);
@@ -349,7 +349,7 @@
}
private Drawable getWorkProfileOffIcon() {
- if (VersionUtils.isAtLeastT()) {
+ if (SdkLevel.isAtLeastT()) {
return getUpdatableWorkProfileIcon();
} else {
return mEnv.getContext().getDrawable(R.drawable.work_off);
diff --git a/src/com/android/documentsui/sidebar/UserItemsCombiner.java b/src/com/android/documentsui/sidebar/UserItemsCombiner.java
index d8c0dc7..1a68ca7 100644
--- a/src/com/android/documentsui/sidebar/UserItemsCombiner.java
+++ b/src/com/android/documentsui/sidebar/UserItemsCombiner.java
@@ -32,7 +32,7 @@
import com.android.documentsui.R;
import com.android.documentsui.base.State;
import com.android.documentsui.base.UserId;
-import com.android.documentsui.util.VersionUtils;
+import com.android.modules.utils.build.SdkLevel;
import java.util.ArrayList;
import java.util.List;
@@ -110,7 +110,7 @@
}
private String getEnterpriseString(String updatableStringId, int defaultStringId) {
- if (VersionUtils.isAtLeastT()) {
+ if (SdkLevel.isAtLeastT()) {
return getUpdatableEnterpriseString(updatableStringId, defaultStringId);
} else {
return mResources.getString(defaultStringId);
diff --git a/src/com/android/documentsui/util/VersionUtils.java b/src/com/android/documentsui/util/VersionUtils.java
index 2e3aa60..c7926ad 100644
--- a/src/com/android/documentsui/util/VersionUtils.java
+++ b/src/com/android/documentsui/util/VersionUtils.java
@@ -16,7 +16,7 @@
package com.android.documentsui.util;
-import android.os.Build;
+import com.android.modules.utils.build.SdkLevel;
/**
* A utility class for checking Android version.
@@ -31,23 +31,13 @@
*/
public static boolean isAtLeastR() {
return isAtLeastS() // Keep reference to isAtLeastS() so it's not stripped from test apk
- || Build.VERSION.CODENAME.equals("R")
- || Build.VERSION.SDK_INT >= 30;
+ || SdkLevel.isAtLeastR();
}
/**
* Returns whether the device is running on Android S or newer.
*/
public static boolean isAtLeastS() {
- return Build.VERSION.CODENAME.equals("S")
- || Build.VERSION.SDK_INT >= 31;
- }
-
- /**
- * Returns whether the device is running on Android T or newer.
- */
- public static boolean isAtLeastT() {
- return Build.VERSION.CODENAME.startsWith("T")
- || Build.VERSION.SDK_INT >= 33;
+ return SdkLevel.isAtLeastS();
}
}
