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

[android] Moved showcase menuitem to the last position.

Browse source 
(cherry picked from commit 1ab7b7b)
This commit is contained in:
Dmitry Yunitsky 2015-12-14 20:57:34 +03:00
parent 8e27d72dbd
commit 7271077c5e
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -1056,7 +1056,7 @@ extern "C"
jdouble finishLon)
{
frm()->BuildRoute(MercatorBounds::FromLatLon(startLat, startLon),
MercatorBounds::FromLatLon(finishLat, finishLon), 0 /* timeoutSec */);
MercatorBounds::FromLatLon(finishLat, finishLon), 0 /* timeoutSec */);
}
JNIEXPORT void JNICALL

14
android/res/layout/menu_content.xml
View file

@ -48,6 +48,13 @@
android:text="@string/settings"
tools:background="#20FF0000"/>
<TextView
android:id="@+id/share"
style="@style/MwmTheme.Menu.Content.ListItem"
android:drawableLeft="@drawable/ic_menu_share"
android:text="@string/share_my_location"
tools:background="#400FF000"/>
<TextView
android:id="@+id/showcase"
style="@style/MwmTheme.Menu.Content.ListItem"
@ -56,11 +63,4 @@
android:text="@string/showcase_more_apps"
tools:visibility="visible"
tools:background="#20FF0000"/>
<TextView
android:id="@+id/share"
style="@style/MwmTheme.Menu.Content.ListItem"
android:drawableLeft="@drawable/ic_menu_share"
android:text="@string/share_my_location"
tools:background="#400FF000"/>
</LinearLayout>

14
android/res/layout/menu_content_grid.xml
View file

@ -50,6 +50,13 @@
android:text="@string/settings"
tools:background="#200000FF"/>
<TextView
android:id="@+id/share"
style="@style/MwmTheme.Menu.Content.GridItem.Text"
android:drawableTop="@drawable/ic_menu_share"
android:text="@string/share_my_location"
tools:background="#200000FF"/>
<TextView
android:id="@+id/showcase"
style="@style/MwmTheme.Menu.Content.GridItem.Text"
@ -58,11 +65,4 @@
android:text="@string/showcase_more_apps"
tools:background="#200000FF"
tools:visibility="visible"/>
<TextView
android:id="@+id/share"
style="@style/MwmTheme.Menu.Content.GridItem.Text"
android:drawableTop="@drawable/ic_menu_share"
android:text="@string/share_my_location"
tools:background="#200000FF"/>
</LinearLayout>