From e1f6cb431e3f37d33c35992a9cdbee8f57f6d5c6 Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Tue, 9 Mar 2021 04:53:14 -0800 Subject: [PATCH] Add CollapsingToolbarBaseFragment for implementing collapsing toolbar. In apps following the pattern to do all the things in fragments, and possibly loading different fragments for different form factors, their activity would need to remain a stub and can't contain phone-only layout, making CollapsingToolbarBaseActivity unsuitable for them. So add a CollapsingToolbarBaseFragment for integrating the same functionality in fragments. The layout files are also moved to be under the same name, but different content depending on the platform version, to simplify the logic loading them. Bug: 177638625 Test: manual Change-Id: Ie9e2a147dd4bd2c1ee3924b1afc4c10a6f735e59 --- .../CollapsingToolbarBaseActivity/Android.bp | 1 + .../collapsing_toolbar_base_layout.xml | 60 ++++++++++++++ .../layout/collapsing_toolbar_base_layout.xml | 50 ++++-------- .../res/layout/toolbar_base_layout.xml | 36 --------- .../CollapsingToolbarBaseActivity.java | 12 +-- .../CollapsingToolbarBaseFragment.java | 78 +++++++++++++++++++ 6 files changed, 154 insertions(+), 83 deletions(-) create mode 100644 packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml delete mode 100644 packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout/toolbar_base_layout.xml create mode 100644 packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp b/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp index 231babea97c21..dd9fc2c7c142d 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp @@ -23,5 +23,6 @@ android_library { apex_available: [ "//apex_available:platform", "com.android.cellbroadcast", + "com.android.permission", ], } diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml new file mode 100644 index 0000000000000..24d53ab846531 --- /dev/null +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout/collapsing_toolbar_base_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout/collapsing_toolbar_base_layout.xml index e376930645cec..c799b99628286 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout/collapsing_toolbar_base_layout.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout/collapsing_toolbar_base_layout.xml @@ -14,47 +14,23 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + - - - - - - - - + android:layout_height="wrap_content" + android:theme="?android:attr/actionBarTheme" /> - \ No newline at end of file + android:layout_height="match_parent"/> + diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout/toolbar_base_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout/toolbar_base_layout.xml deleted file mode 100644 index c799b99628286..0000000000000 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout/toolbar_base_layout.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java index ad94cd0318a77..957bac7427039 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java @@ -24,7 +24,6 @@ import android.view.ViewGroup; import android.widget.Toolbar; import androidx.annotation.Nullable; -import androidx.core.os.BuildCompat; import androidx.fragment.app.FragmentActivity; import com.google.android.material.appbar.CollapsingToolbarLayout; @@ -41,15 +40,8 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // TODO(b/181723278): Update the version check after SDK for S is finalized - // The collapsing toolbar is only supported if the android platform version is S or higher. - // Otherwise the regular action bar will be shown. - if (BuildCompat.isAtLeastS()) { - super.setContentView(R.layout.collapsing_toolbar_base_layout); - mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar); - } else { - super.setContentView(R.layout.toolbar_base_layout); - } + super.setContentView(R.layout.collapsing_toolbar_base_layout); + mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar); final Toolbar toolbar = findViewById(R.id.action_bar); setActionBar(toolbar); diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java new file mode 100644 index 0000000000000..c4c74ffc719bb --- /dev/null +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java @@ -0,0 +1,78 @@ +/* + * 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. + */ + +package com.android.settingslib.collapsingtoolbar; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.Toolbar; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import com.google.android.material.appbar.CollapsingToolbarLayout; + +/** + * A base fragment that has a collapsing toolbar layout for enabling the collapsing toolbar design. + */ +public abstract class CollapsingToolbarBaseFragment extends Fragment { + + @Nullable + private CollapsingToolbarLayout mCollapsingToolbarLayout; + @NonNull + private Toolbar mToolbar; + @NonNull + private FrameLayout mContentFrameLayout; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + final View view = inflater.inflate(R.layout.collapsing_toolbar_base_layout, container, + false); + mCollapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar); + mToolbar = view.findViewById(R.id.action_bar); + mContentFrameLayout = view.findViewById(R.id.content_frame); + return view; + } + + @Override + public void onActivityCreated(@Nullable Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + + requireActivity().setActionBar(mToolbar); + } + + /** + * Return the collapsing toolbar layout. + */ + @Nullable + public CollapsingToolbarLayout getCollapsingToolbarLayout() { + return mCollapsingToolbarLayout; + } + + /** + * Return the content frame layout. + */ + @NonNull + public FrameLayout getContentFrameLayout() { + return mContentFrameLayout; + } +}