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

Commit ecf408bb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix talkback issue on Subsettings" into sc-v2-dev am: 9928e585 am: ed0b68a7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16324223

Change-Id: Ia926bc8909ffcda7bb9cbbaa000cda296558b037
parents 3f3c199d ed0b68a7

src/com/android/settings/core/SettingsBaseActivity.java

+2 −4
Original line number Diff line number Diff line
@@ -187,19 +187,17 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa 


    @Override

    public void setTitle(CharSequence title) {

        super.setTitle(title);

        if (mCollapsingToolbarLayout != null) {

            mCollapsingToolbarLayout.setTitle(title);

        } else {

            super.setTitle(title);

        }

    }



    @Override

    public void setTitle(int titleId) {

        super.setTitle(getText(titleId));

        if (mCollapsingToolbarLayout != null) {

            mCollapsingToolbarLayout.setTitle(getText(titleId));

        } else {

            super.setTitle(titleId);

        }

    }