summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/activity_calculator.xml4
-rw-r--r--res/menu/fragment_history.xml23
-rw-r--r--res/menu/menu_formula.xml (renamed from res/menu/paste.xml)5
-rw-r--r--res/menu/menu_result.xml (renamed from res/menu/copy.xml)19
4 files changed, 47 insertions, 4 deletions
diff --git a/res/menu/activity_calculator.xml b/res/menu/activity_calculator.xml
index 8d086d1..d0c5659 100644
--- a/res/menu/activity_calculator.xml
+++ b/res/menu/activity_calculator.xml
@@ -17,6 +17,10 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/menu_history"
+ android:title="@string/menu_history" />
+
<item android:id="@+id/menu_leading"
android:title="@string/menu_leading" />
diff --git a/res/menu/fragment_history.xml b/res/menu/fragment_history.xml
new file mode 100644
index 0000000..8c9f1d6
--- /dev/null
+++ b/res/menu/fragment_history.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@+id/menu_clear_history"
+ android:title="@string/menu_clear_history" />
+
+</menu> \ No newline at end of file
diff --git a/res/menu/paste.xml b/res/menu/menu_formula.xml
index 964be0d..8882c8a 100644
--- a/res/menu/paste.xml
+++ b/res/menu/menu_formula.xml
@@ -19,7 +19,10 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/memory_recall"
+ android:title="@string/memory_recall"/>
+
<item android:id="@+id/menu_paste"
- android:title="@android:string/paste"/>
+ android:title="@android:string/paste"/>
</menu>
diff --git a/res/menu/copy.xml b/res/menu/menu_result.xml
index 5897f88..15e76cd 100644
--- a/res/menu/copy.xml
+++ b/res/menu/menu_result.xml
@@ -19,7 +19,20 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/menu_copy"
- android:title="@android:string/copy"/>
+ <item
+ android:id="@+id/memory_store"
+ android:title="@string/memory_store" />
-</menu>
+ <item
+ android:id="@+id/memory_add"
+ android:title="@string/memory_add" />
+
+ <item
+ android:id="@+id/memory_subtract"
+ android:title="@string/memory_subtract" />
+
+ <item
+ android:id="@+id/menu_copy"
+ android:title="@android:string/copy" />
+
+</menu> \ No newline at end of file