Merge "Introduce better animation for incoming-call widget"
Daisuke Miyakawa [Fri, 2 Mar 2012 15:13:02 +0000 (07:13 -0800)]
res/drawable-hdpi/ic_active_state_dialer_holo_dark.png
res/drawable-mdpi/ic_active_state_dialer_holo_dark.png
res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png
res/layout/incall_touch_ui.xml
res/values-w360dp/dimens.xml [deleted file]
res/values/dimens.xml
res/values/styles.xml

index 341c630..f4a08be 100644 (file)
Binary files a/res/drawable-hdpi/ic_active_state_dialer_holo_dark.png and b/res/drawable-hdpi/ic_active_state_dialer_holo_dark.png differ
index 880cf34..6ff8e48 100644 (file)
Binary files a/res/drawable-mdpi/ic_active_state_dialer_holo_dark.png and b/res/drawable-mdpi/ic_active_state_dialer_holo_dark.png differ
index 64fd89e..0211d69 100644 (file)
Binary files a/res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png and b/res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png differ
index b8fe882..2fd3de8 100644 (file)
                      point exactly one of the pair is VISIBLE and the other is
                      GONE. -->
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                <!-- Separator between left padding and 1st button -->
+                <View style="@style/VerticalSeparator" />
 
                 <!-- "Dialpad" -->
                 <!-- This is a "compound button": it has checked and unchecked states. -->
                     android:contentDescription="@string/onscreenShowDialpadText"
                     />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
-
+                <!-- Separator between 1st and 2nd button -->
+                <View style="@style/VerticalSeparator" />
 
                 <!-- "Audio mode" -->
                 <!-- This is a multi-mode button that can behave either like a
                     android:contentDescription="@string/onscreenAudioText"
                     />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                <!-- Separator between 2nd and 3rd button -->
+                <View style="@style/VerticalSeparator" />
 
                 <!-- "Mute" -->
                 <!-- This is a "compound button": it has checked and unchecked states. -->
                     android:contentDescription="@string/onscreenMuteText"
                     />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                <!-- Separator between 3rd and 4th button -->
+                <View style="@style/VerticalSeparator" />
 
                 <!-- This slot is either "Hold" or "Swap", depending on
                      the state of the call.   One or the other of these
                     android:contentDescription="@string/onscreenSwapCallsText"
                     />
 
+                <!-- Separator between 4th and 5th button (if 5th exists) -->
                 <View android:id="@+id/holdSwapSpacer"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                      style="@style/VerticalSeparator" />
 
                 <!-- This slot is either "Add" or "Merge", depending on
                      the state of the call.  One or the other of these
                     android:contentDescription="@string/onscreenMergeCallsText"
                     />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                <!-- Separator between 4th (or 5th) button and right padding -->
+                <View style="@style/VerticalSeparator" />
 
             </LinearLayout>
 
diff --git a/res/values-w360dp/dimens.xml b/res/values-w360dp/dimens.xml
deleted file mode 100644 (file)
index 5b5aeef..0000000
+++ /dev/null
@@ -1,23 +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.
--->
-
-<!-- Dimensions for screen widths >= 360dp -->
-<resources>
-
-    <!-- Width of buttons in the main row of in-call buttons. -->
-    <dimen name="in_call_button_width">64dp</dimen>
-
-</resources>
index 1c68080..f324573 100644 (file)
     <!-- Height of the main row of in-call buttons. -->
     <dimen name="in_call_button_height">76dp</dimen>
 
-    <!-- Width of buttons in the main row of in-call buttons.
-         NOTE these buttons are wider on some devices; see values-w360dp/dimens.xml -->
-    <dimen name="in_call_button_width">56dp</dimen>
-
     <!-- Height of the in-call "End" button. -->
     <dimen name="in_call_end_button_height">74dp</dimen>
 
     <dimen name="button_cluster_side_padding">20dp</dimen>
 
 
-    <!-- Contact photo dimensions -->
-    <dimen name="contact_photo_inset_width">180dp</dimen>
-    <dimen name="contact_photo_inset_height">180dp</dimen>
-    <dimen name="contact_photo_inset_left_margin">0dp</dimen>
-
-
     <!-- Dimensions for OTA Call Card -->
     <dimen name="otaactivate_layout_marginTop">10dp</dimen>
     <dimen name="otalistenprogress_layout_marginTop">5dp</dimen>
index a409dc8..ed29b0a 100644 (file)
 
     <!-- Buttons in the main "button row" of the in-call onscreen touch UI. -->
     <style name="InCallButton">
-        <item name="android:layout_width">@dimen/in_call_button_width</item>
+        <item name="android:layout_width">0px</item>
         <item name="android:layout_height">@dimen/in_call_button_height</item>
+        <item name="android:layout_weight">1</item>
         <item name="android:background">?android:attr/selectableItemBackground</item>
     </style>
 
         <item name="android:textOff">@null</item>
     </style>
 
+    <style name="VerticalSeparator">
+        <item name="android:layout_width">2dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:background">@android:color/black</item>
+    </style>
+
     <!-- "End" button; similar to InCallButton. -->
     <style name="InCallEndButton">
         <item name="android:layout_width">0dip</item>