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

Merge "Set collapsing toolbar background color" into tm-dev am: bed53f0719

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

Change-Id: I99721a645a2b718428d300596ec9de16d6941e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-07 00:21:46 +00:00
committed by Automerger Merge Worker
parent fb59882753 bed53f0719
commit c88755c7db
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_content_layout.xml
View File

@@ -25,7 +25,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:outlineAmbientShadowColor="@android:color/transparent" android:outlineAmbientShadowColor="@android:color/transparent"
android:outlineSpotShadowColor="@android:color/transparent" android:outlineSpotShadowColor="@android:color/transparent"
android:background="?android:attr/colorPrimary" android:background="@android:color/transparent"
android:theme="@style/Theme.CollapsingToolbar.Settings"> android:theme="@style/Theme.CollapsingToolbar.Settings">
<com.google.android.material.appbar.CollapsingToolbarLayout <com.google.android.material.appbar.CollapsingToolbarLayout

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

@@ -20,6 +20,7 @@ import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
@@ -29,6 +30,7 @@ import android.widget.Toolbar;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout;
@@ -41,6 +43,7 @@ import com.google.android.material.appbar.CollapsingToolbarLayout;
* This widget is wrapping the collapsing toolbar and can be directly used by the * This widget is wrapping the collapsing toolbar and can be directly used by the
* {@link AppCompatActivity}. * {@link AppCompatActivity}.
*/ */
@RequiresApi(Build.VERSION_CODES.S)
public class CollapsingCoordinatorLayout extends CoordinatorLayout { public class CollapsingCoordinatorLayout extends CoordinatorLayout {
private static final String TAG = "CollapsingCoordinatorLayout"; private static final String TAG = "CollapsingCoordinatorLayout";
private static final float TOOLBAR_LINE_SPACING_MULTIPLIER = 1.1f; private static final float TOOLBAR_LINE_SPACING_MULTIPLIER = 1.1f;