Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 598841bd authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi Committed by Android (Google) Code Review
Browse files

Merge "use SdkLevel fo version checking" into tm-dev

parents 1642e691 9a9fd7a1

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ java_defaults { 
        "apache-commons-compress",

        "com.google.android.material_material",

        "guava",

        "modules-utils-build_system",

    ],



    libs: [
@@ -126,6 +127,7 @@ android_library { 
    static_libs: [

        "androidx.appcompat_appcompat",

        "com.google.android.material_material",

        "modules-utils-build_system",

    ],



    resource_dirs: [

src/com/android/documentsui/ProfileTabs.java

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import androidx.annotation.RequiresApi; 
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 @@ public class ProfileTabs implements ProfileTabsAddons { 
        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 @@ public class ProfileTabs implements ProfileTabsAddons { 
    }



    private String getEnterpriseString(String updatableStringId, int defaultStringId) {

        if (VersionUtils.isAtLeastT()) {

        if (SdkLevel.isAtLeastT()) {

            return getUpdatableEnterpriseString(updatableStringId, defaultStringId);

        } else {

            return mTabsContainer.getContext().getString(defaultStringId);

src/com/android/documentsui/dirlist/DocumentHolder.java

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import androidx.recyclerview.widget.RecyclerView; 
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 @@ public abstract class DocumentHolder 
    }



    protected String getPreviewIconContentDescription(boolean isWorkProfile, String fileName) {

        if (VersionUtils.isAtLeastT()) {

        if (SdkLevel.isAtLeastT()) {

            return getUpdatablePreviewIconContentDescription(isWorkProfile, fileName);

        } else {

            return itemView.getResources().getString(

src/com/android/documentsui/dirlist/GridDirectoryHolder.java

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import com.android.documentsui.IconUtils; 
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 @@ final class GridDirectoryHolder extends DocumentHolder { 
        mIconMime.setImageDrawable(

                IconUtils.loadMimeIcon(context, DocumentsContract.Document.MIME_TYPE_DIR));



        if (VersionUtils.isAtLeastT()) {

        if (SdkLevel.isAtLeastT()) {

            setUpdatableWorkProfileIcon(context);

        }

    }

src/com/android/documentsui/dirlist/GridDocumentHolder.java

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.documentsui.base.Shared; 
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 @@ final class GridDocumentHolder extends DocumentHolder { 


        mIconHelper = iconHelper;



        if (VersionUtils.isAtLeastT()) {

        if (SdkLevel.isAtLeastT()) {

            setUpdatableWorkProfileIcon(context);

        }

    }