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

Support regular toolbar

Browse Source 
To make Settings UI consistent, the different types of toolbar will be
applied according to what the android platform is. The collapsing
toolbar is only supported on S or higher and the general toolbar will be
shown on the other platforms.

Bug: 179380824
Test: visual verified
Change-Id: Ia59f9ec22010708c46ece55d69b47870ed16f021
This commit is contained in:
Mill Chen
2021-03-03 01:02:57 +08:00
parent af76755ff7
commit c0b90aef2d
2 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout/toolbar_base_layout.xml Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
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.
-->
<!-- The main content view -->
<LinearLayout
android:id="@+id/content_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:transitionGroup="true"
android:orientation="vertical">
<Toolbar
android:id="@+id/action_bar"
style="?android:attr/actionBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?android:attr/actionBarTheme" />
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>

20
packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java
View File

@@ -24,6 +24,7 @@ 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;
@@ -40,8 +41,15 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
super.setContentView(R.layout.collapsing_toolbar_base_layout);
mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar);
// 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);
}
final Toolbar toolbar = findViewById(R.id.action_bar);
setActionBar(toolbar);
@@ -90,6 +98,14 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {
super.setTitle(titleId);
}
@Override
public boolean onNavigateUp() {
if (!super.onNavigateUp()) {
finish();
}
return true;
}
/**
* Returns an instance of collapsing toolbar.
*/