Skip to content

Commit 2336c23

Browse files
Material Design Teamhunterstich
Material Design Team
authored and
hunterstich
committed
[Build] Update to compileSdkVersion 34 and update catalog to use androidx.activity:activity:1.8.0-alpha05
PiperOrigin-RevId: 539031943
1 parent 7a3f30b commit 2336c23

File tree

5 files changed

+41
-32
lines changed

5 files changed

+41
-32
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ allprojects {
1717
}
1818

1919
ext {
20-
compileSdkVersion = 'android-UpsideDownCake'
20+
compileSdkVersion = 34
2121
minSdkVersion = 14
2222
targetSdkVersion = 33
2323

‎catalog/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
api 'androidx.constraintlayout:constraintlayout:2.1.0'
2020
api 'androidx.gridlayout:gridlayout:1.0.0'
2121
api "androidx.multidex:multidex:2.0.1"
22-
api "androidx.activity:activity:1.8.0-alpha02"
22+
api "androidx.activity:activity:1.8.0-alpha05"
2323
api "androidx.recyclerview:recyclerview:1.2.1"
2424
api 'androidx.window:window:1.0.0-beta04'
2525
api "androidx.window:window-java:1.0.0-beta04"

‎catalog/java/io/material/catalog/bottomappbar/BottomAppBarMainDemoFragment.java‎

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

1919
import io.material.catalog.R;
2020

21+
import android.os.Build.VERSION;
2122
import android.os.Build.VERSION_CODES;
2223
import android.os.Bundle;
2324
import androidx.appcompat.app.AppCompatActivity;
@@ -29,12 +30,11 @@
2930
import android.view.View;
3031
import android.view.ViewGroup;
3132
import android.view.accessibility.AccessibilityEvent;
32-
import android.window.BackEvent;
33+
import androidx.activity.BackEventCompat;
3334
import androidx.activity.OnBackPressedCallback;
3435
import androidx.annotation.LayoutRes;
3536
import androidx.annotation.NonNull;
3637
import androidx.annotation.Nullable;
37-
import androidx.annotation.RequiresApi;
3838
import androidx.coordinatorlayout.widget.CoordinatorLayout;
3939
import com.google.android.material.bottomappbar.BottomAppBar;
4040
import com.google.android.material.bottomappbar.BottomAppBarTopEdgeTreatment;
@@ -59,27 +59,30 @@ public class BottomAppBarMainDemoFragment extends DemoFragment {
5959

6060
private final OnBackPressedCallback bottomDrawerOnBackPressedCallback =
6161
new OnBackPressedCallback(/* enabled= */ false) {
62-
@RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
6362
@Override
64-
public void handleOnBackStarted(@NonNull BackEvent backEvent) {
65-
bottomDrawerBehavior.startBackProgress(backEvent);
63+
public void handleOnBackStarted(@NonNull BackEventCompat backEvent) {
64+
if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
65+
bottomDrawerBehavior.startBackProgress(backEvent.toBackEvent());
66+
}
6667
}
6768

68-
@RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
6969
@Override
70-
public void handleOnBackProgressed(@NonNull BackEvent backEvent) {
71-
bottomDrawerBehavior.updateBackProgress(backEvent);
70+
public void handleOnBackProgressed(@NonNull BackEventCompat backEvent) {
71+
if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
72+
bottomDrawerBehavior.updateBackProgress(backEvent.toBackEvent());
73+
}
7274
}
7375

7476
@Override
7577
public void handleOnBackPressed() {
7678
bottomDrawerBehavior.handleBackInvoked();
7779
}
7880

79-
@RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
8081
@Override
8182
public void handleOnBackCancelled() {
82-
bottomDrawerBehavior.cancelBackProgress();
83+
if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
84+
bottomDrawerBehavior.cancelBackProgress();
85+
}
8386
}
8487
};
8588

‎catalog/java/io/material/catalog/bottomsheet/BottomSheetMainDemoFragment.java‎

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

2121
import android.app.Activity;
22+
import android.os.Build.VERSION;
2223
import android.os.Build.VERSION_CODES;
2324
import android.os.Bundle;
2425
import android.util.DisplayMetrics;
@@ -29,12 +30,11 @@
2930
import android.widget.FrameLayout;
3031
import android.widget.TextView;
3132
import android.widget.Toast;
32-
import android.window.BackEvent;
33+
import androidx.activity.BackEventCompat;
3334
import androidx.activity.OnBackPressedCallback;
3435
import androidx.annotation.LayoutRes;
3536
import androidx.annotation.NonNull;
3637
import androidx.annotation.Nullable;
37-
import androidx.annotation.RequiresApi;
3838
import androidx.core.view.ViewCompat;
3939
import androidx.core.view.WindowInsetsCompat;
4040
import com.google.android.material.bottomsheet.BottomSheetBehavior;
@@ -50,27 +50,30 @@ public class BottomSheetMainDemoFragment extends DemoFragment {
5050
private final OnBackPressedCallback persistentBottomSheetBackCallback =
5151
new OnBackPressedCallback(/* enabled= */ false) {
5252

53-
@RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
5453
@Override
55-
public void handleOnBackStarted(@NonNull BackEvent backEvent) {
56-
persistentBottomSheetBehavior.startBackProgress(backEvent);
54+
public void handleOnBackStarted(@NonNull BackEventCompat backEvent) {
55+
if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
56+
persistentBottomSheetBehavior.startBackProgress(backEvent.toBackEvent());
57+
}
5758
}
5859

59-
@RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
6060
@Override
61-
public void handleOnBackProgressed(@NonNull BackEvent backEvent) {
62-
persistentBottomSheetBehavior.updateBackProgress(backEvent);
61+
public void handleOnBackProgressed(@NonNull BackEventCompat backEvent) {
62+
if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
63+
persistentBottomSheetBehavior.updateBackProgress(backEvent.toBackEvent());
64+
}
6365
}
6466

6567
@Override
6668
public void handleOnBackPressed() {
6769
persistentBottomSheetBehavior.handleBackInvoked();
6870
}
6971

70-
@RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
7172
@Override
7273
public void handleOnBackCancelled() {
73-
persistentBottomSheetBehavior.cancelBackProgress();
74+
if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
75+
persistentBottomSheetBehavior.cancelBackProgress();
76+
}
7477
}
7578
};
7679

‎catalog/java/io/material/catalog/sidesheet/SideSheetMainDemoFragment.java‎

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

2121
import static android.view.View.NO_ID;
2222

23+
import android.os.Build.VERSION;
2324
import android.os.Build.VERSION_CODES;
2425
import android.os.Bundle;
2526
import androidx.appcompat.app.AppCompatActivity;
@@ -31,14 +32,13 @@
3132
import android.view.ViewGroup;
3233
import android.widget.Button;
3334
import android.widget.TextView;
34-
import android.window.BackEvent;
35+
import androidx.activity.BackEventCompat;
3536
import androidx.activity.OnBackPressedCallback;
3637
import androidx.annotation.GravityInt;
3738
import androidx.annotation.IdRes;
3839
import androidx.annotation.LayoutRes;
3940
import androidx.annotation.NonNull;
4041
import androidx.annotation.Nullable;
41-
import androidx.annotation.RequiresApi;
4242
import androidx.annotation.StringRes;
4343
import androidx.annotation.StyleRes;
4444
import androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams;
@@ -405,27 +405,30 @@ public void onSlide(@NonNull View sheet, float slideOffset) {
405405
private OnBackPressedCallback createNonModalOnBackPressedCallback(
406406
SideSheetBehavior<View> behavior) {
407407
return new OnBackPressedCallback(/* enabled= */ false) {
408-
@RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
409408
@Override
410-
public void handleOnBackStarted(@NonNull BackEvent backEvent) {
411-
behavior.startBackProgress(backEvent);
409+
public void handleOnBackStarted(@NonNull BackEventCompat backEvent) {
410+
if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
411+
behavior.startBackProgress(backEvent.toBackEvent());
412+
}
412413
}
413414

414-
@RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
415415
@Override
416-
public void handleOnBackProgressed(@NonNull BackEvent backEvent) {
417-
behavior.updateBackProgress(backEvent);
416+
public void handleOnBackProgressed(@NonNull BackEventCompat backEvent) {
417+
if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
418+
behavior.updateBackProgress(backEvent.toBackEvent());
419+
}
418420
}
419421

420422
@Override
421423
public void handleOnBackPressed() {
422424
behavior.handleBackInvoked();
423425
}
424426

425-
@RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
426427
@Override
427428
public void handleOnBackCancelled() {
428-
behavior.cancelBackProgress();
429+
if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
430+
behavior.cancelBackProgress();
431+
}
429432
}
430433
};
431434
}

0 commit comments

Comments
 (0)