Skip to content

Commit 23aca03

Browse files
pubiqqleticiarossi
authored andcommitted
[Internal] Remove pre-Lollipop checks
Resolves #4266 GIT_ORIGIN_REV_ID=1de7808e66dd6666c893217c76c7499afe2df6a3 PiperOrigin-RevId: 669688797
1 parent e40bc47 commit 23aca03

File tree

66 files changed

+315
-1022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+315
-1022
lines changed

catalog/java/io/material/catalog/card/DraggableCardFragment.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import io.material.catalog.R;
2020

2121
import android.animation.LayoutTransition;
22-
import android.os.Build;
23-
import android.os.Build.VERSION;
24-
import android.os.Build.VERSION_CODES;
2522
import android.os.Bundle;
2623
import android.view.Gravity;
2724
import android.view.LayoutInflater;
@@ -64,10 +61,6 @@ public View onCreateDemoView(
6461
card.setAccessibilityDelegate(cardDelegate);
6562
container.addDraggableChild(card);
6663

67-
if (VERSION.SDK_INT < VERSION_CODES.LOLLIPOP) {
68-
return view;
69-
}
70-
7164
container.setViewDragListener(
7265
new ViewDragListener() {
7366
@Override
@@ -88,9 +81,6 @@ public void onViewReleased(@NonNull View view, float v, float v1) {
8881
@Override
8982
public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
9083
super.onInitializeAccessibilityNodeInfo(host, info);
91-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
92-
return;
93-
}
9484

9585
CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams) card
9686
.getLayoutParams();

catalog/java/io/material/catalog/feature/DemoActivity.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import io.material.catalog.R;
2020

21-
import android.os.Build.VERSION;
22-
import android.os.Build.VERSION_CODES;
2321
import android.os.Bundle;
2422
import androidx.appcompat.app.ActionBar;
2523
import androidx.appcompat.widget.Toolbar;
@@ -28,7 +26,6 @@
2826
import android.view.View;
2927
import android.view.ViewGroup;
3028
import androidx.annotation.Nullable;
31-
import androidx.annotation.RequiresApi;
3229
import androidx.annotation.StringRes;
3330
import com.google.android.material.color.MaterialColors;
3431
import com.google.android.material.transition.platform.MaterialContainerTransform;
@@ -95,15 +92,13 @@ protected boolean shouldShowDefaultDemoActionBarCloseButton() {
9592
}
9693

9794
protected boolean shouldSetUpContainerTransform() {
98-
return VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP
99-
&& getIntent().getStringExtra(EXTRA_TRANSITION_NAME) != null;
95+
return getIntent().getStringExtra(EXTRA_TRANSITION_NAME) != null;
10096
}
10197

10298
protected boolean shouldApplyEdgeToEdgePreference() {
10399
return true;
104100
}
105101

106-
@RequiresApi(VERSION_CODES.LOLLIPOP)
107102
private MaterialContainerTransform buildContainerTransform(boolean entering) {
108103
MaterialContainerTransform transform = new MaterialContainerTransform(this, entering);
109104
transform.addTarget(android.R.id.content);

catalog/java/io/material/catalog/feature/DemoLandingFragment.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import android.content.Intent;
2424
import android.content.res.ColorStateList;
2525
import android.content.res.TypedArray;
26-
import android.os.Build.VERSION;
27-
import android.os.Build.VERSION_CODES;
2826
import android.os.Bundle;
2927
import androidx.fragment.app.Fragment;
3028
import androidx.fragment.app.FragmentActivity;
@@ -238,9 +236,7 @@ private void startDemoActivity(
238236
Intent intent, @Nullable View sharedElement, @Nullable String transitionName) {
239237
intent.putExtra(DemoActivity.EXTRA_DEMO_TITLE, getString(getTitleResId()));
240238

241-
if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP
242-
&& sharedElement != null
243-
&& transitionName != null) {
239+
if (sharedElement != null && transitionName != null) {
244240
intent.putExtra(DemoActivity.EXTRA_TRANSITION_NAME, transitionName);
245241

246242
// Set up shared element transition and disable overlay so views don't show above system bars

catalog/java/io/material/catalog/feature/FeatureDemoUtils.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
import android.content.Context;
2222
import android.content.SharedPreferences;
23-
import android.os.Build.VERSION;
24-
import android.os.Build.VERSION_CODES;
2523
import android.os.Bundle;
2624
import android.preference.PreferenceManager;
2725
import androidx.fragment.app.Fragment;
@@ -65,9 +63,7 @@ public static void startFragmentInternal(
6563
@Nullable String sharedElementName) {
6664
FragmentTransaction transaction = activity.getSupportFragmentManager().beginTransaction();
6765

68-
if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP
69-
&& sharedElement != null
70-
&& sharedElementName != null) {
66+
if (sharedElement != null && sharedElementName != null) {
7167
Fragment currentFragment = getCurrentFragment(activity);
7268

7369
Context context = currentFragment.requireContext();

catalog/java/io/material/catalog/preferences/EdgeToEdgePreference.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import io.material.catalog.R;
2020

2121
import android.content.Context;
22-
import android.os.Build.VERSION;
23-
import android.os.Build.VERSION_CODES;
24-
import androidx.annotation.ChecksSdkIntAtLeast;
2522
import androidx.annotation.NonNull;
2623
import androidx.annotation.Nullable;
2724
import com.google.common.collect.ImmutableList;
@@ -52,12 +49,6 @@ public EdgeToEdgePreference() {
5249
super(R.string.edge_to_edge_preference_description);
5350
}
5451

55-
@ChecksSdkIntAtLeast(api = VERSION_CODES.LOLLIPOP)
56-
@Override
57-
protected boolean isEnabled() {
58-
return VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP;
59-
}
60-
6152
@Override
6253
@NonNull
6354
protected ImmutableList<Option> getOptions() {

catalog/java/io/material/catalog/shapetheming/ShapeThemingDemoFragment.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import io.material.catalog.R;
2020

21-
import android.os.Build;
2221
import android.os.Bundle;
2322
import android.util.TypedValue;
2423
import android.view.LayoutInflater;
@@ -47,25 +46,22 @@ public View onCreateView(
4746
this.wrappedContext = new ContextThemeWrapper(getContext(), getShapeTheme());
4847
LayoutInflater layoutInflaterWithThemedContext =
4948
layoutInflater.cloneInContext(wrappedContext);
50-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
51-
Window window = getActivity().getWindow();
52-
statusBarColor = window.getStatusBarColor();
53-
final TypedValue value = new TypedValue();
54-
wrappedContext
55-
.getTheme()
56-
.resolveAttribute(R.attr.colorPrimaryDark, value, true);
57-
window.setStatusBarColor(value.data);
58-
}
49+
50+
Window window = getActivity().getWindow();
51+
statusBarColor = window.getStatusBarColor();
52+
final TypedValue value = new TypedValue();
53+
wrappedContext
54+
.getTheme()
55+
.resolveAttribute(R.attr.colorPrimaryDark, value, true);
56+
window.setStatusBarColor(value.data);
5957

6058
return super.onCreateView(layoutInflaterWithThemedContext, viewGroup, bundle);
6159
}
6260

6361
@Override
6462
public void onDestroyView() {
65-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
66-
Window window = getActivity().getWindow();
67-
window.setStatusBarColor(statusBarColor);
68-
}
63+
Window window = getActivity().getWindow();
64+
window.setStatusBarColor(statusBarColor);
6965
super.onDestroyView();
7066
}
7167

catalog/java/io/material/catalog/tableofcontents/TocFragment.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import io.material.catalog.R;
2020

21-
import android.os.Build.VERSION;
22-
import android.os.Build.VERSION_CODES;
2321
import android.os.Bundle;
2422
import androidx.fragment.app.Fragment;
2523
import androidx.appcompat.app.AppCompatActivity;
@@ -123,11 +121,7 @@ public View onCreateView(
123121
return insetsCompat;
124122
});
125123

126-
if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
127-
addGridTopDividerVisibilityListener();
128-
} else {
129-
gridTopDivider.setVisibility(View.VISIBLE);
130-
}
124+
addGridTopDividerVisibilityListener();
131125

132126
final int gridSpanCount = calculateGridSpanCount();
133127

catalog/java/io/material/catalog/transition/ContainerTransformConfigurationHelper.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import android.annotation.SuppressLint;
2222
import android.content.Context;
2323
import android.content.DialogInterface.OnDismissListener;
24-
import android.os.Build.VERSION_CODES;
2524
import android.text.Editable;
2625
import android.text.TextWatcher;
2726
import android.util.SparseIntArray;
@@ -38,7 +37,6 @@
3837
import android.widget.TextView;
3938
import androidx.annotation.IdRes;
4039
import androidx.annotation.Nullable;
41-
import androidx.annotation.RequiresApi;
4240
import androidx.core.view.animation.PathInterpolatorCompat;
4341
import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
4442
import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -108,7 +106,6 @@ void configure(MaterialContainerTransform transform, boolean entering) {
108106
}
109107

110108
/** Set up the platform transition according to the config helper's parameters. */
111-
@RequiresApi(VERSION_CODES.LOLLIPOP)
112109
void configure(
113110
com.google.android.material.transition.platform.MaterialContainerTransform transform,
114111
boolean entering) {

catalog/java/io/material/catalog/transition/TransitionContainerTransformEndDemoActivity.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@
2020

2121
import static io.material.catalog.transition.TransitionContainerTransformStartDemoActivity.configurationHelper;
2222

23-
import android.os.Build.VERSION_CODES;
2423
import android.os.Bundle;
2524
import android.view.LayoutInflater;
2625
import android.view.View;
2726
import android.view.ViewGroup;
2827
import android.view.Window;
2928
import androidx.annotation.Nullable;
30-
import androidx.annotation.RequiresApi;
3129
import com.google.android.material.color.MaterialColors;
3230
import com.google.android.material.transition.platform.MaterialContainerTransform;
3331
import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback;
@@ -36,7 +34,6 @@
3634
/**
3735
* An activity that displays the Container Transform activity transition demo for the Catalog app.
3836
*/
39-
@RequiresApi(VERSION_CODES.LOLLIPOP)
4037
public class TransitionContainerTransformEndDemoActivity extends DemoActivity {
4138

4239
@Override

catalog/java/io/material/catalog/transition/TransitionContainerTransformStartDemoActivity.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import android.app.ActivityOptions;
2222
import android.content.Intent;
23-
import android.os.Build.VERSION_CODES;
2423
import android.os.Bundle;
2524
import android.view.LayoutInflater;
2625
import android.view.Menu;
@@ -30,14 +29,12 @@
3029
import android.view.Window;
3130
import androidx.annotation.IdRes;
3231
import androidx.annotation.Nullable;
33-
import androidx.annotation.RequiresApi;
3432
import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback;
3533
import io.material.catalog.feature.DemoActivity;
3634

3735
/**
3836
* An activity that displays the Container Transform activity transition demo for the Catalog app.
3937
*/
40-
@RequiresApi(VERSION_CODES.LOLLIPOP)
4138
public class TransitionContainerTransformStartDemoActivity extends DemoActivity {
4239

4340
static ContainerTransformConfigurationHelper configurationHelper;

0 commit comments

Comments
 (0)