From 70bf117ab09d964de945a78b029ff6ebf0e657be Mon Sep 17 00:00:00 2001 From: Dmitry Donskoy Date: Thu, 22 Nov 2018 18:25:52 +0300 Subject: [PATCH] [android] Change setTitle for Toolbar to setTitle ActionBar --- .../mapswithme/maps/widget/ToolbarController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/android/src/com/mapswithme/maps/widget/ToolbarController.java b/android/src/com/mapswithme/maps/widget/ToolbarController.java index 57a96ba276..56cba616ec 100644 --- a/android/src/com/mapswithme/maps/widget/ToolbarController.java +++ b/android/src/com/mapswithme/maps/widget/ToolbarController.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.support.annotation.IdRes; import android.support.annotation.NonNull; import android.support.annotation.StringRes; +import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.View; @@ -76,16 +77,24 @@ public class ToolbarController public ToolbarController setTitle(CharSequence title) { - getToolbar().setTitle(title); + getSupportActionBar().setTitle(title); return this; } public ToolbarController setTitle(@StringRes int title) { - getToolbar().setTitle(title); + getSupportActionBar().setTitle(title); return this; } + @SuppressWarnings("ConstantConditions") + @NonNull + private ActionBar getSupportActionBar() + { + AppCompatActivity appCompatActivity = (AppCompatActivity) mActivity; + return appCompatActivity.getSupportActionBar(); + } + public View findViewById(@IdRes int res) { return getToolbar().findViewById(res);