From acf451f9a779e526eeff3d883ec9ba813b98e21f Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Mon, 28 Jun 2021 18:08:11 +0800 Subject: [PATCH] Make CollapsingToolbarBaseActivity extend FragmentActivity Since SettingsTransitionActivity is reverted, make CollapsingToolbarBaseActivity extend FragmentActivity directly. Bug: 191335572 Test: rebuild Change-Id: I6eda699ec97f11f5a89a4bce7be041960c5d6e32 --- .../collapsingtoolbar/CollapsingToolbarBaseActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java index dbcecf1fe5b9c..fa4806d28561c 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java @@ -26,6 +26,7 @@ import android.widget.Toolbar; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.fragment.app.FragmentActivity; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout; @@ -35,7 +36,7 @@ import com.google.android.material.resources.TextAppearanceConfig; * A base Activity that has a collapsing toolbar layout is used for the activities intending to * enable the collapsing toolbar function. */ -public class CollapsingToolbarBaseActivity extends SettingsTransitionActivity implements +public class CollapsingToolbarBaseActivity extends FragmentActivity implements AppBarLayout.OnOffsetChangedListener { private static final int TOOLBAR_MAX_LINE_NUMBER = 2;