am 7c07c19e: Merge "Show "INV" button\'s selected state" into mnc-dev

* commit '7c07c19e9c81569362233dfd0b9aa12536c198cb':
  Show "INV" button's selected state

4 files changed, 56 insertions, 4 deletions

diff --git a/res/drawable/pad_button_inverse_background.xml b/res/drawable/pad_button_inverse_background.xml
new file mode 100644
index 0000000..ff0b2ae
--- /dev/null
+++ b/res/drawable/pad_button_inverse_background.xml
@@ -0,0 +1,38 @@
+<?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.
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/pad_button_advanced_ripple_color">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners android:radius="4dip" />
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item>
+        <selector
+            android:enterFadeDuration="@android:integer/config_longAnimTime"
+            android:exitFadeDuration="@android:integer/config_longAnimTime">
+            <item android:state_selected="true">
+                <shape android:shape="rectangle">
+                    <corners android:radius="4dip" />
+                    <solid android:color="@color/pad_button_advanced_ripple_color" />
+                </shape>
+            </item>
+        </selector>
+    </item>
+</ripple>
diff --git a/res/layout/pad_advanced.xml b/res/layout/pad_advanced.xml
index 0d6168a..e303133 100644
--- a/res/layout/pad_advanced.xml
+++ b/res/layout/pad_advanced.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2014 The Android Open Source Project
+  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.
@@ -28,6 +28,7 @@
         style="@style/PadButtonStyle.Advanced.Text"
         android:layout_row="0"
         android:layout_column="0"
+        android:background="@drawable/pad_button_inverse_background"
         android:contentDescription="@string/desc_inv_off"
         android:text="@string/inv" />
 
@@ -61,6 +62,7 @@
         android:layout_row="1"
         android:layout_column="0"
         android:contentDescription="@string/desc_fun_arcsin"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_arcsin"
         android:visibility="gone" />
 
@@ -78,6 +80,7 @@
         android:layout_row="1"
         android:layout_column="1"
         android:contentDescription="@string/desc_fun_arccos"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_arccos"
         android:visibility="gone" />
 
@@ -95,6 +98,7 @@
         android:layout_row="1"
         android:layout_column="2"
         android:contentDescription="@string/desc_fun_arctan"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_arctan"
         android:visibility="gone" />
 
@@ -112,6 +116,7 @@
         android:layout_row="2"
         android:layout_column="0"
         android:contentDescription="@string/desc_fun_exp"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_exp"
         android:visibility="gone" />
 
@@ -129,6 +134,7 @@
         android:layout_row="2"
         android:layout_column="1"
         android:contentDescription="@string/desc_fun_10pow"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_10pow"
         android:visibility="gone" />
 
@@ -194,6 +200,7 @@
         android:layout_row="4"
         android:layout_column="2"
         android:contentDescription="@string/desc_op_sqr"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/op_sqr"
         android:visibility="gone" />
 
diff --git a/res/layout/pad_advanced_tablet_port.xml b/res/layout/pad_advanced_tablet_port.xml
index bccc44c..b8de7fd 100644
--- a/res/layout/pad_advanced_tablet_port.xml
+++ b/res/layout/pad_advanced_tablet_port.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2014 The Android Open Source Project
+  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.
@@ -28,6 +28,7 @@
         style="@style/PadButtonStyle.Advanced.Text"
         android:layout_row="0"
         android:layout_column="0"
+        android:background="@drawable/pad_button_inverse_background"
         android:contentDescription="@string/desc_inv_off"
         android:text="@string/inv" />
 
@@ -53,6 +54,7 @@
         android:layout_row="0"
         android:layout_column="2"
         android:contentDescription="@string/desc_fun_arcsin"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_arcsin"
         android:visibility="gone" />
 
@@ -70,6 +72,7 @@
         android:layout_row="0"
         android:layout_column="3"
         android:contentDescription="@string/desc_fun_arccos"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_arccos"
         android:visibility="gone" />
 
@@ -87,6 +90,7 @@
         android:layout_row="0"
         android:layout_column="4"
         android:contentDescription="@string/desc_fun_arctan"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_arctan"
         android:visibility="gone" />
 
@@ -112,6 +116,7 @@
         android:layout_row="1"
         android:layout_column="1"
         android:contentDescription="@string/desc_fun_exp"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_exp"
         android:visibility="gone" />
 
@@ -129,6 +134,7 @@
         android:layout_row="1"
         android:layout_column="2"
         android:contentDescription="@string/desc_fun_10pow"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/fun_10pow"
         android:visibility="gone" />
 
@@ -194,6 +200,7 @@
         android:layout_row="2"
         android:layout_column="4"
         android:contentDescription="@string/desc_op_sqr"
+        android:fontFamily="sans-serif-medium"
         android:text="@string/op_sqr"
         android:visibility="gone" />
 
diff --git a/res/values/color.xml b/res/values/color.xml
index 384fd26..502d4e4 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2014 The Android Open Source Project
+  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.
@@ -48,7 +48,7 @@
     <color name="pad_button_text_color">#FFF</color>
 
     <!-- Text color for a button in the advanced pad. -->
-    <color name="pad_button_advanced_text_color">#91000000</color>
+    <color name="pad_button_advanced_text_color">#99000000</color>
 
     <!-- Ripple color when a button is pressed in a pad. -->
     <color name="pad_button_ripple_color">#33FFFFFF</color>