From 3b7448d1c3309a00019527b667d8d1c940bdfdb1 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Sat, 31 Jan 2015 20:32:41 +0100
Subject: [PATCH] Menu xmls fixed

---
 .../src/main/res/menu/history_menu.xml        | 19 +++---
 android-app/src/main/res/menu/plot_menu.xml   | 59 ++++++++++---------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/android-app/src/main/res/menu/history_menu.xml b/android-app/src/main/res/menu/history_menu.xml
index bff8d8d7..2a439f41 100644
--- a/android-app/src/main/res/menu/history_menu.xml
+++ b/android-app/src/main/res/menu/history_menu.xml
@@ -22,18 +22,19 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<menu xmlns:a="http://schemas.android.com/apk/res/android">
+<menu xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<item
-			a:id="@+id/menu_history_fullscreen"
-			a:title="@string/cpp_fullscreen"
-			a:icon="@drawable/ab_expand"
-			a:showAsAction="always"/>
+		a:id="@+id/menu_history_fullscreen"
+		a:title="@string/cpp_fullscreen"
+		a:icon="@drawable/ab_expand"
+		app:showAsAction="ifRoom" />
 
 	<item
-			a:id="@+id/menu_history_toggle_datetime"
-			a:icon="@drawable/ic_access_time_grey600_48dp"
-			a:title="@string/c_toggle_datetime"
-			a:showAsAction="always"/>
+		a:id="@+id/menu_history_toggle_datetime"
+		a:icon="@drawable/ic_access_time_grey600_48dp"
+		a:title="@string/c_toggle_datetime"
+		app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file
diff --git a/android-app/src/main/res/menu/plot_menu.xml b/android-app/src/main/res/menu/plot_menu.xml
index b77fa594..7bb98464 100644
--- a/android-app/src/main/res/menu/plot_menu.xml
+++ b/android-app/src/main/res/menu/plot_menu.xml
@@ -22,48 +22,49 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<menu xmlns:a="http://schemas.android.com/apk/res/android">
+<menu xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<item
-			a:id="@+id/menu_plot_2d"
-			a:title="@string/cpp_plot_2d"
-			a:icon="@drawable/ab_stats"
-			a:showAsAction="always"/>
+		a:id="@+id/menu_plot_2d"
+		a:title="@string/cpp_plot_2d"
+		a:icon="@drawable/ab_stats"
+		app:showAsAction="ifRoom" />
 
 	<item
-			a:id="@+id/menu_plot_3d"
-			a:title="@string/cpp_plot_3d"
-			a:icon="@drawable/ab_stats_3d"
-			a:showAsAction="always"/>
+		a:id="@+id/menu_plot_3d"
+		a:title="@string/cpp_plot_3d"
+		a:icon="@drawable/ab_stats_3d"
+		app:showAsAction="ifRoom" />
 
 	<item
-			a:id="@+id/menu_plot_fullscreen"
-			a:title="@string/cpp_fullscreen"
-			a:icon="@drawable/ab_expand"
-			a:showAsAction="always"/>
+		a:id="@+id/menu_plot_fullscreen"
+		a:title="@string/cpp_fullscreen"
+		a:icon="@drawable/ab_expand"
+		app:showAsAction="ifRoom" />
 
 	<item
-			a:id="@+id/menu_plot_range"
-			a:title="@string/cpp_plot_range"
-			a:icon="@drawable/ab_range"
-			a:showAsAction="always"/>
+		a:id="@+id/menu_plot_range"
+		a:title="@string/cpp_plot_range"
+		a:icon="@drawable/ab_range"
+		app:showAsAction="ifRoom" />
 
 	<item
-			a:id="@+id/menu_plot_functions"
-			a:title="@string/cpp_plot_functions"
-			a:icon="@drawable/ab_menu"
-			a:showAsAction="always"/>
+		a:id="@+id/menu_plot_functions"
+		a:title="@string/cpp_plot_functions"
+		a:icon="@drawable/ab_menu"
+		app:showAsAction="ifRoom" />
 
 	<item
-			a:id="@+id/menu_plot_schreeshot"
-			a:title="@string/cpp_plot_screenshot"
-			a:icon="@drawable/ab_disk"
-			a:showAsAction="always"/>
+		a:id="@+id/menu_plot_schreeshot"
+		a:title="@string/cpp_plot_screenshot"
+		a:icon="@drawable/ab_disk"
+		app:showAsAction="ifRoom" />
 
 	<item
-			a:id="@+id/menu_plot_settings"
-			a:title="@string/c_settings"
-			a:icon="@drawable/ab_settings"
-			a:showAsAction="ifRoom"/>
+		a:id="@+id/menu_plot_settings"
+		a:title="@string/c_settings"
+		a:icon="@drawable/ab_settings"
+		app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file