summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yi-Ling Chuang <emilychuang@google.com> 2021-06-28 18:08:11 +0800
committer Yi-Ling Chuang <emilychuang@google.com> 2021-06-28 18:08:11 +0800
commitacf451f9a779e526eeff3d883ec9ba813b98e21f (patch)
tree732cec4ea2fa8a26a06f4e20d8296390b98368c7
parent58854f38cc4a1a0db492c1353731afa84e3b704f (diff)
Make CollapsingToolbarBaseActivity extend FragmentActivity
Since SettingsTransitionActivity is reverted, make CollapsingToolbarBaseActivity extend FragmentActivity directly. Bug: 191335572 Test: rebuild Change-Id: I6eda699ec97f11f5a89a4bce7be041960c5d6e32
-rw-r--r--packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java3
1 files changed, 2 insertions, 1 deletions
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 dbcecf1fe5b9..fa4806d28561 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;