Merge "Relace BuildCompat.isAtLeastS to check Build.VERSION.SDK_INT" into sc-dev am: c43f4deb1d (547a9ef0) · Commits · e / os / android_frameworks_base

packages/SettingsLib/ActionButtonsPreference/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ android_library {

		static_libs: [
		"androidx.preference_preference",
		"SettingsLibUtils",
		],

		sdk_version: "system_current",

+3 −2

Original line number	Diff line number	Diff line
		@@ -27,10 +27,11 @@ import android.widget.Button;

		import androidx.annotation.DrawableRes;
		import androidx.annotation.StringRes;
		import androidx.core.os.BuildCompat;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceViewHolder;

		import com.android.settingslib.utils.BuildCompatUtils;

		import java.util.ArrayList;
		import java.util.List;

		@@ -94,7 +95,7 @@ public class ActionButtonsPreference extends Preference {
		public void onBindViewHolder(PreferenceViewHolder holder) {
		super.onBindViewHolder(holder);

		final boolean allowedDivider = !BuildCompat.isAtLeastS();
		final boolean allowedDivider = !BuildCompatUtils.isAtLeastS();
		holder.setDividerAllowedAbove(allowedDivider);
		holder.setDividerAllowedBelow(allowedDivider);

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ android_library {
		static_libs: [
		"androidx.preference_preference",
		"SettingsLibSettingsTheme",
		"SettingsLibUtils",
		],

		sdk_version: "system_current",

+3 −2

Original line number	Diff line number	Diff line
		@@ -35,10 +35,11 @@ import androidx.annotation.ColorInt;
		import androidx.annotation.ColorRes;
		import androidx.annotation.RequiresApi;
		import androidx.annotation.StringRes;
		import androidx.core.os.BuildCompat;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceViewHolder;

		import com.android.settingslib.utils.BuildCompatUtils;

		/**
		* Banner message is a banner displaying important information (permission request, page error etc),
		* and provide actions for user to address. It requires a user action to be dismissed.
		@@ -83,7 +84,7 @@ public class BannerMessagePreference extends Preference {
		}

		private static final String TAG = "BannerPreference";
		private static final boolean IS_AT_LEAST_S = BuildCompat.isAtLeastS();
		private static final boolean IS_AT_LEAST_S = BuildCompatUtils.isAtLeastS();

		private final BannerMessagePreference.ButtonInfo mPositiveButtonInfo =
		new BannerMessagePreference.ButtonInfo();

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,8 +16,9 @@ android_library {
		static_libs: [
		"androidx.preference_preference",
		"SettingsLibSettingsTheme",
		"SettingsLibUtils",
		],

		sdk_version: "system_current",
		min_sdk_version: "21",
		min_sdk_version: "28",
		}