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

Merge changes from topic "presubmit-am-6a2334b9a5a446209ba2814ae37bccda" into udc-dev

Browse Source 
* changes:
  [automerge] Do not show toolbar on small devices like watch. 2p: 79d50ab081
  Do not show toolbar on small devices like watch.
This commit is contained in:
Andriy Naborskyy
2023-04-27 21:05:45 +00:00
committed by Android (Google) Code Review
parent d29fa3e051 06d78e939c
commit 18436ee508
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;
import android.app.ActionBar;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -59,7 +60,8 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {
@Override
protected void onCreate(@Nullable Bundle 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);
return;
}
@@ -157,6 +159,14 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {
return getToolbarDelegate().getAppBarLayout();
}
private boolean isWatch() {
PackageManager packageManager = getPackageManager();
if (packageManager == null) {
return false;
}
return packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH);
}
private CollapsingToolbarDelegate getToolbarDelegate() {
if (mToolbardelegate == null) {
mToolbardelegate = new CollapsingToolbarDelegate(new DelegateCallback());