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

Commit f1fd1d71 authored by David Liu's avatar David Liu Committed by Android (Google) Code Review
Browse files

Merge "[CollapsingToolbar] Upstream G3 changes" into main

parents d38e4620 3626e708

packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/non_collapsing_toolbar_base_layout.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
    android:id="@+id/content_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">

    android:fitsSystemWindows="true"

    android:filterTouchesWhenObscured="false">



    <include layout="@layout/non_collapsing_toolbar_content_layout"/>

</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ public class CollapsingToolbarDelegate { 


    private boolean mIsExpressiveTheme;



    public CollapsingToolbarDelegate(@NonNull HostCallback hostCallback) {

        this(hostCallback, /* useCollapsingToolbar= */ true);

    }



    public CollapsingToolbarDelegate(@NonNull HostCallback hostCallback,

            boolean useCollapsingToolbar) {

        mHostCallback = hostCallback;

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

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ public class CollapsingCoordinatorLayout extends CoordinatorLayout { 
        return true;

    }



    @SuppressWarnings("RestrictTo")

    private void init() {

        int resId = SettingsThemeHelper.isExpressiveTheme(getContext())

                ? R.layout.settingslib_expressive_collapsing_toolbar_content_layout