Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make CollapsingToolbarBaseActivity extend FragmentActivity" into sc-dev

Browse Source
This commit is contained in:
Yi-Ling Chuang
2021-06-28 14:14:12 +00:00
committed by Android (Google) Code Review
parent 5ce1b8c6ef acf451f9a7
commit 99a680a50f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java
View File

@@ -26,6 +26,7 @@ import android.widget.Toolbar;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.fragment.app.FragmentActivity;
import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout; 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 * A base Activity that has a collapsing toolbar layout is used for the activities intending to
* enable the collapsing toolbar function. * enable the collapsing toolbar function.
*/ */
public class CollapsingToolbarBaseActivity extends SettingsTransitionActivity implements public class CollapsingToolbarBaseActivity extends FragmentActivity implements
AppBarLayout.OnOffsetChangedListener { AppBarLayout.OnOffsetChangedListener {
private static final int TOOLBAR_MAX_LINE_NUMBER = 2; private static final int TOOLBAR_MAX_LINE_NUMBER = 2;