PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Expressive design] Apply expressive design to Settings" into main

Browse Source
This commit is contained in:
Edgar Wang
2024-11-04 18:40:52 +00:00
committed by Android (Google) Code Review
parent f0e88a2b85 b2ada5df65
commit 214015eb04
4 changed files with 138 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -46,6 +46,7 @@ import com.android.settings.Utils;
import com.android.settings.core.CategoryMixin.CategoryHandler;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
import com.android.settingslib.transition.SettingsTransitionHelper.TransitionType;
import com.android.settingslib.widget.SettingsThemeHelper;
import com.android.window.flags.Flags;
import com.google.android.material.appbar.AppBarLayout;
@@ -68,6 +69,12 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
private static final int DEFAULT_REQUEST = -1;
private static final float TOOLBAR_LINE_SPACING_MULTIPLIER = 1.1f;
private static final int EXPRESSIVE_LAYOUT_ID =
com.android.settingslib.collapsingtoolbar.R.layout.settingslib_expressive_collapsing_toolbar_base_layout;
private static final int COLLAPSING_LAYOUT_ID =
com.android.settingslib.collapsingtoolbar.R.layout.collapsing_toolbar_base_layout;
protected CategoryMixin mCategoryMixin;
protected CollapsingToolbarLayout mCollapsingToolbarLayout;
protected AppBarLayout mAppBarLayout;
@@ -116,8 +123,9 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
}
if (isToolbarEnabled() && !isAnySetupWizard) {
super.setContentView(
com.android.settingslib.collapsingtoolbar.R.layout.collapsing_toolbar_base_layout);
int resId = SettingsThemeHelper.isExpressiveTheme(getApplicationContext())
? EXPRESSIVE_LAYOUT_ID : COLLAPSING_LAYOUT_ID;
super.setContentView(resId);
mCollapsingToolbarLayout =
findViewById(com.android.settingslib.collapsingtoolbar.R.id.collapsing_toolbar);
mAppBarLayout = findViewById(R.id.app_bar);