Merge "Remove BuildCompatUtils" into main (229137d1) · Commits · e / os / android_frameworks_base

packages/SettingsLib/ActionButtonsPreference/Android.bp

+0 −1

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

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

		sdk_version: "system_current",

+4 −4

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.content.Context;
		import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.graphics.drawable.Drawable;
		import android.os.Build;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.util.Log;
		@@ -31,12 +32,11 @@ import androidx.annotation.StringRes;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceViewHolder;

		import com.android.settingslib.utils.BuildCompatUtils;
		import com.android.settingslib.widget.preference.actionbuttons.R;

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

		import com.android.settingslib.widget.preference.actionbuttons.R;

		/**
		* This preference provides a four buttons layout with Settings style.
		* It looks like below
		@@ -56,7 +56,7 @@ import com.android.settingslib.widget.preference.actionbuttons.R;
		public class ActionButtonsPreference extends Preference {

		private static final String TAG = "ActionButtonPreference";
		private static final boolean mIsAtLeastS = BuildCompatUtils.isAtLeastS();
		private static final boolean mIsAtLeastS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S;
		private static final int SINGLE_BUTTON_STYLE = 1;
		private static final int TWO_BUTTONS_STYLE = 2;
		private static final int THREE_BUTTONS_STYLE = 3;

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ android_library {
		"androidx.annotation_annotation",
		"androidx.core_core",
		"androidx.window_window",
		"SettingsLibUtils",
		],
		sdk_version: "system_current",
		min_sdk_version: "21",

+3 −5

Original line number	Diff line number	Diff line
		@@ -20,13 +20,11 @@ import android.app.Activity;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.os.Build;
		import android.util.Log;

		import androidx.core.os.BuildCompat;
		import androidx.window.embedding.ActivityEmbeddingController;

		import com.android.settingslib.utils.BuildCompatUtils;

		/**
		* An util class collecting all common methods for the embedding activity features.
		*/
		@@ -70,7 +68,7 @@ public final class ActivityEmbeddingUtils {
		* enabled (unsupported devices).
		*/
		private static ComponentName getEmbeddingActivityComponent(Context context) {
		if (!BuildCompatUtils.isAtLeastSV2()) {
		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S_V2) {
		return null;
		}
		final Intent intent = new Intent(ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY);
		@@ -95,7 +93,7 @@ public final class ActivityEmbeddingUtils {
		* Settings app
		*/
		public static boolean shouldHideNavigateUpButton(Activity activity, boolean isSecondLayerPage) {
		if (!BuildCompat.isAtLeastT()) {
		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
		return false;
		}

+0 −1

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

		sdk_version: "system_current",