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

Do not show toolbar on small devices like watch.

Browse Source 
Test: Manual test on UI
Bug: 278789898
Bug: 263527039
Merged-In: I5c9f61aece28a4a07209f5e815630c6ad1ac167a
Change-Id: I5c9f61aece28a4a07209f5e815630c6ad1ac167a
(cherry picked from commit 98e04e4d70)
This commit is contained in:
qing
2023-01-11 00:36:05 +00:00
committed by Andriy Naborskyy
parent 2560a97e5f
commit 79d50ab081
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
package com.android.settingslib.collapsingtoolbar; package com.android.settingslib.collapsingtoolbar;
import android.app.ActionBar; import android.app.ActionBar;
import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -58,7 +59,8 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (mCustomizeLayoutResId > 0 && !BuildCompatUtils.isAtLeastS()) { // for backward compatibility on R devices or wearable devices due to small device size.
if (mCustomizeLayoutResId > 0 && (!BuildCompatUtils.isAtLeastS() || isWatch())) {
super.setContentView(mCustomizeLayoutResId); super.setContentView(mCustomizeLayoutResId);
return; return;
} }
@@ -138,6 +140,14 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {
return getToolbarDelegate().getAppBarLayout(); return getToolbarDelegate().getAppBarLayout();
} }
private boolean isWatch() {
PackageManager packageManager = getPackageManager();
if (packageManager == null) {
return false;
}
return packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH);
}
private CollapsingToolbarDelegate getToolbarDelegate() { private CollapsingToolbarDelegate getToolbarDelegate() {
if (mToolbardelegate == null) { if (mToolbardelegate == null) {
mToolbardelegate = new CollapsingToolbarDelegate(new DelegateCallback()); mToolbardelegate = new CollapsingToolbarDelegate(new DelegateCallback());