Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e49012 authored by Yi-Ling Chuang's avatar Yi-Ling Chuang Committed by Automerger Merge Worker
Browse files

Merge "Make CollapsingToolbarBaseActivity extend FragmentActivity" into sc-dev... 

Merge "Make CollapsingToolbarBaseActivity extend FragmentActivity" into sc-dev am: 99a680a5 am: 4a24ff9c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15124973

Change-Id: I57828ac6ac10f91905b045594545fd722e77b9e8
parents 9ddce452 4a24ff9c

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -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;