pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Set toolbar as action bar

Browse source
This commit is contained in:
Dmitry Donskoy 2018-11-14 18:19:36 +03:00 • committed by Aleksandr Zatsepin
parent 6bb6aa7a61
commit 2a177a3235
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
View file

@ -541,10 +541,10 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryName(
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryDesc(JNIEnv * env,
jobject thiz,
jlong catId,
jstring desc)
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryDescription(JNIEnv * env,
jobject thiz,
jlong catId,
jstring desc)
{
frm()->GetBookmarkManager().GetEditSession().SetCategoryDescription(
static_cast<kml::MarkGroupId>(catId), jni::ToNativeString(env, desc));

1
android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java
View file

@ -122,6 +122,7 @@ public class UgcRouteEditSettingsFragment extends BaseMwmToolbarFragment
if (item.getItemId() == R.id.done)
{
onEditDoneClicked();
getActivity().finish();
return true;
}
return super.onOptionsItemSelected(item);

8
android/src/com/mapswithme/maps/widget/ToolbarController.java
View file

@ -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.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
@ -34,6 +35,13 @@ public class ToolbarController
if (useExtendedToolbar())
UiUtils.extendViewWithStatusBar(getToolbar());
setupNavigationListener();
setSupportActionBar();
}
private void setSupportActionBar()
{
AppCompatActivity appCompatActivity = (AppCompatActivity) mActivity;
appCompatActivity.setSupportActionBar(mToolbar);
}
protected boolean useExtendedToolbar()