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

Commit 7717eff8 authored by Andriy Naborskyy's avatar Andriy Naborskyy Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-6a2334b9a5a446209ba2814ae37bccda" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22864819



Change-Id: Ic80b73a8ef7cdcd18d62d706cf24fbf667325d12
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07178001 18436ee5

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java

+11 −1
Original line number Diff line number Diff line
@@ -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());