Cleanup options menu and licenses UI

Bug: 20503109

- Open source licenses are now displayed as a standalone Licenses
  activity.
- Show/hide result options instead of enabling/disabling them.

Change-Id: I7e1e43ac83d2417b2f59f90e6a1fc3e491c6ddc7

4 files changed, 47 insertions, 50 deletions

diff --git a/res/menu/activity_calculator.xml b/res/menu/activity_calculator.xml
new file mode 100644
index 0000000..8d086d1
--- /dev/null
+++ b/res/menu/activity_calculator.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2015 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_leading"
+        android:title="@string/menu_leading" />
+
+    <item android:id="@+id/menu_fraction"
+        android:title="@string/menu_fraction" />
+
+    <item android:id="@+id/menu_licenses"
+        android:title="@string/menu_licenses" />
+
+</menu>
diff --git a/res/menu/overflow.xml b/res/menu/overflow.xml
deleted file mode 100644
index d35832d..0000000
--- a/res/menu/overflow.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2011, 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_leading"
-        android:title="@string/leading"/>
-
-    <item android:id="@+id/menu_fraction"
-        android:title="@string/fraction"/>
-
-    <item android:id="@+id/menu_help"
-        android:title="@string/help"/>
-
-    <item android:id="@+id/menu_about"
-        android:title="@string/about"/>
-
-</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2c58db5..26161a2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -154,23 +154,16 @@
     <string name="timeout">That\'s too hard! Undefined or infinite value?</string>
     <!-- Button label for "remove timeout" button. -->
     <string name="ok_remove_timeout">OK, but longer timeouts, please!</string>
-    <!-- Help menu entry for context menu. -->
-    <string name="help">Help</string>
-    <!-- Content description for overflow menu button. -->
-    <string name="overflow_menu_description">overflow menu</string>
-    <!-- The help message that's displayed in response to pushing the above button. -->
-    <string name="help_message">Use the keys to enter a standard arithmetic expression. It\'s fine to omit multiplication symbols and trailing parentheses.  Long press delete key to clear. Drag the display to see more digits.\n\nComputations involving infinite values may take forever.  Wait for the timeout or touch a button to terminate computation.</string>
-    <!-- Help message addendum for pager. -->
-    <string name="help_pager">\n\nSwipe the operator pad to the left to see additional functions.</string>
-    <!-- About menu entry; leads mostly to (English language!) copyright notice.  -->
-    <string name="about">About &amp; Copyright</string>
-    <!-- Overflow menu entry to display result including leading digits. -->
-    <string name="leading">Answer with leading digits</string>
-    <!-- Overflow menu entry to display result as fraction. -->
-    <string name="fraction">Answer as fraction</string>
     <!-- Appended indicator (for "leading" display) that result is exact. -->
     <string name="exact">(exact)</string>
     <!-- Indicator (for "leading" display) that result is inexact. -->
     <string name="approximate">(±1 in last digit)</string>
 
+    <!-- Menu option to display result including leading digits. [CHAR_LIMIT=16] -->
+    <string name="menu_leading">Answer with leading digits</string>
+    <!-- Menu option to display result as fraction. [CHAR_LIMIT=16] -->
+    <string name="menu_fraction">Answer as fraction</string>
+    <!-- Menu option to view the app's open source licenses. [CHAR_LIMIT=16] -->
+    <string name="menu_licenses">Open source licenses</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 69a537a..c88391e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,12 +17,21 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="CalculatorTheme" parent="@android:style/Theme.Material.Light.NoActionBar">
+    <style name="Theme" parent="@android:style/Theme.Material.Light.DarkActionBar">
         <item name="android:colorPrimary">@color/calculator_accent_color</item>
-        <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:statusBarColor">@color/calculator_accent_color</item>
+        <item name="android:windowSoftInputMode">stateAlwaysHidden</item>
+    </style>
+
+    <style name="Theme.Calculator">
+        <item name="android:windowActionBar">false</item>
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.Licenses">
+        <item name="android:title">@string/menu_licenses</item>
     </style>
 
     <style name="DisplayTextStyle" parent="@android:style/Widget.Material.Light.TextView">