Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Marchuk <trashkalmar@users.noreply.github.com>2015-12-14 20:02:38 +0300
committerAlexander Marchuk <trashkalmar@users.noreply.github.com>2015-12-14 20:02:38 +0300
commit28f484222301e798b6b57331e1380aea8bfae0f5 (patch)
tree3dd0c6ed0a2df2eeddf334a6e4ea374354acb029
parent91528c143d36b2cadac7d6aecb23372420edbb72 (diff)
parent1ab7b7b9aadeabe500d075eb2d5d92b9d2165362 (diff)
Merge pull request #981 from yunikkk/mytarget-fixesandroid-release-522android-release-52
[android] Moved showcase menuitem to the last position.
-rw-r--r--android/res/layout/menu_content.xml14
-rw-r--r--android/res/layout/menu_content_grid.xml14
2 files changed, 14 insertions, 14 deletions
diff --git a/android/res/layout/menu_content.xml b/android/res/layout/menu_content.xml
index 5a94bb86c0..19dc5512b7 100644
--- a/android/res/layout/menu_content.xml
+++ b/android/res/layout/menu_content.xml
@@ -49,6 +49,13 @@
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"
android:drawableLeft="@drawable/ic_showcase"
@@ -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> \ No newline at end of file
diff --git a/android/res/layout/menu_content_grid.xml b/android/res/layout/menu_content_grid.xml
index 91dbb0a62a..620b2d18a2 100644
--- a/android/res/layout/menu_content_grid.xml
+++ b/android/res/layout/menu_content_grid.xml
@@ -51,6 +51,13 @@
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"
android:drawableTop="@drawable/ic_showcase"
@@ -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> \ No newline at end of file