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

Commit 5b75666e authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Automerger Merge Worker
Browse files

Change toolbar color dynamically based on scroll offset for S. am: 7849360e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15189985

Change-Id: I69cff1d61f094c6b819c8f7e9a65068b0611da2c
parents fccc512a 7849360e

res/values-v31/dimens.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<resources>

    <dimen name="action_bar_elevation">0dp</dimen>

    <dimen name="action_bar_margin">0dp</dimen>

</resources>

res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -52,4 +52,5 @@ 


    <color name="list_divider_color">#1f000000</color>

    <color name="list_item_selected_background_color">?android:colorSecondary</color>

    <color name="color_surface_header">@color/app_background_color</color>

</resources>

res/values/overlayable.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
            <!-- START COLOR -->

            <item type="color" name="primary"/>

            <item type="color" name="list_item_selected_background_color"/>

            <item type="color" name="color_surface_header"/>

            <!-- END COLOR -->



            <!-- START DIMEN -->

src/com/android/documentsui/BaseActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ public abstract class BaseActivity 


        mNavigator = new NavigationViewManager(this, mDrawer, mState, this, breadcrumb,

                profileTabsContainer, DocumentsApplication.getUserIdManager(this));

        AppBarLayout appBarLayout = findViewById(R.id.app_bar);

        if (appBarLayout != null) {

            appBarLayout.addOnOffsetChangedListener(mNavigator);

        }



        SearchManagerListener searchListener = new SearchManagerListener() {

            /**

             * Called when search results changed. Refreshes the content of the directory. It

src/com/android/documentsui/NavigationViewManager.java

+50 −1
Original line number Diff line number Diff line
@@ -19,20 +19,27 @@ package com.android.documentsui; 
import static com.android.documentsui.base.SharedMinimal.VERBOSE;



import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Outline;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.util.Log;

import android.view.View;

import android.view.ViewOutlineProvider;

import android.view.Window;

import android.view.WindowManager;

import android.widget.FrameLayout;



import androidx.annotation.ColorRes;

import androidx.annotation.Nullable;

import androidx.appcompat.widget.Toolbar;

import androidx.core.content.ContextCompat;



import com.android.documentsui.base.RootInfo;

import com.android.documentsui.base.State;

import com.android.documentsui.base.UserId;

import com.android.documentsui.dirlist.AnimationView;

import com.android.documentsui.util.VersionUtils;



import com.google.android.material.appbar.AppBarLayout;

import com.google.android.material.appbar.CollapsingToolbarLayout;
@@ -42,12 +49,13 @@ import java.util.function.IntConsumer; 
/**

 * A facade over the portions of the app and drawer toolbars.

 */

public class NavigationViewManager {

public class NavigationViewManager implements AppBarLayout.OnOffsetChangedListener {



    private static final String TAG = "NavigationViewManager";



    private final DrawerController mDrawer;

    private final Toolbar mToolbar;

    private final BaseActivity mActivity;

    private final View mHeader;

    private final State mState;

    private final NavigationViewManager.Environment mEnv;
@@ -61,6 +69,7 @@ public class NavigationViewManager { 
    private final boolean mShowSearchBar;



    private boolean mIsActionModeActivated = false;

    private @ColorRes int mDefaultStatusBarColorResId;



    public NavigationViewManager(

            BaseActivity activity,
@@ -71,6 +80,7 @@ public class NavigationViewManager { 
            View tabLayoutContainer,

            UserIdManager userIdManager) {



        mActivity = activity;

        mToolbar = activity.findViewById(R.id.toolbar);

        mHeader = activity.findViewById(R.id.directory_header);

        mDrawer = drawer;
@@ -93,6 +103,15 @@ public class NavigationViewManager { 
        mDefaultOutlineProvider = mToolbar.getOutlineProvider();

        mShowSearchBar = activity.getResources().getBoolean(R.bool.show_search_bar);



        final int[] styledAttrs = {android.R.attr.statusBarColor};

        TypedArray a = mActivity.obtainStyledAttributes(styledAttrs);

        mDefaultStatusBarColorResId = a.getResourceId(0, -1);

        if (mDefaultStatusBarColorResId == -1) {

            Log.w(TAG, "Retrieve statusBarColorResId from theme failed, assigned default");

            mDefaultStatusBarColorResId = R.color.app_background_color;

        }

        a.recycle();



        final Resources resources = mToolbar.getResources();

        final int radius = resources.getDimensionPixelSize(R.dimen.search_bar_radius);

        final int marginStart =
@@ -108,6 +127,36 @@ public class NavigationViewManager { 
        };

    }



    @Override

    public void onOffsetChanged(AppBarLayout appBarLayout, int offset) {

        if (!VersionUtils.isAtLeastS()) {

            return;

        }



        // For S+ Only. Change toolbar color dynamically based on scroll offset.

        // Usually this can be done in xml using app:contentScrim and app:statusBarScrim, however

        // in our case since we also put directory_header.xml inside the CollapsingToolbarLayout,

        // the scrim will also cover the directory header. Long term need to think about how to

        // move directory_header out of the AppBarLayout.



        Window window = mActivity.getWindow();

        View actionBar = window.getDecorView().findViewById(R.id.action_mode_bar);

        int dynamicHeaderColor = ContextCompat.getColor(mActivity,

                offset == 0 ? mDefaultStatusBarColorResId : R.color.color_surface_header);

        if (actionBar != null) {

            // Action bar needs to be updated separately for selection mode.

            actionBar.setBackgroundColor(dynamicHeaderColor);

        }



        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

        window.setStatusBarColor(dynamicHeaderColor);

        if (shouldShowSearchBar()) {

            // Do not change search bar background.

        } else {

            mToolbar.setBackground(new ColorDrawable(dynamicHeaderColor));

        }

    }



    public void setSearchBarClickListener(View.OnClickListener listener) {

        mSearchBarView.setOnClickListener(listener);

    }