Merge branch 'qcril' of git://github.com/CyanogenMod/android_packages_apps_InCallUI into cm-11.0

5 files changed, 22 insertions, 22 deletions

diff --git a/res/drawable-hdpi/stat_sys_vp_phone_call.png b/res/drawable-hdpi/stat_sys_vp_phone_call.png
new file mode 100644
index 00000000..69b98171
--- /dev/null
+++ b/res/drawable-hdpi/stat_sys_vp_phone_call.png
diff --git a/res/drawable-hdpi/stat_sys_vp_phone_call_on_hold.png b/res/drawable-hdpi/stat_sys_vp_phone_call_on_hold.png
new file mode 100644
index 00000000..f4074c10
--- /dev/null
+++ b/res/drawable-hdpi/stat_sys_vp_phone_call_on_hold.png
diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml
index 548311f0..a67ff0f8 100644
--- a/res/layout/call_button_fragment.xml
+++ b/res/layout/call_button_fragment.xml
@@ -168,19 +168,6 @@
                      android:contentDescription="@string/onscreenMergeCallsText"
                      android:visibility="gone"
                 />
-
-        <!-- Separator between 3rd (or 4th) and 4th (or 6th) button -->
-        <View android:id="@+id/blacklistSpacer"
-              style="@style/VerticalSeparator" />
-
-        <!-- "Blacklist" -->
-        <!-- The button used for toggling blackist. -->
-        <ImageButton android:id="@+id/addBlacklistButton"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_block_contact_holo_dark"
-                    android:contentDescription="@string/onscreenBlacklistText"
-                />
-
         <!-- Separator between 5th (or 6th) button and right padding -->
         <View style="@style/VerticalSeparator" />
 
@@ -190,8 +177,6 @@
                      android:contentDescription="@string/onscreenAddParticipant"
                 />
 
-
-        <!-- Separator between 5th (or 6th) button and right padding -->
         <View style="@style/VerticalSeparator" />
 
         <ImageButton android:id="@+id/modifyCallButton"
@@ -200,6 +185,18 @@
                      android:contentDescription="@string/onscreenModifyCallText"
                 />
 
+        <!-- Separator between 3rd (or 4th) and 4th (or 6th) button -->
+        <View android:id="@+id/blacklistSpacer"
+              style="@style/VerticalSeparator" />
+
+        <!-- "Blacklist" -->
+        <!-- The button used for toggling blackist. -->
+        <ImageButton android:id="@+id/addBlacklistButton"
+                    style="@style/InCallButton"
+                    android:src="@drawable/ic_block_contact_holo_dark"
+                    android:contentDescription="@string/onscreenBlacklistText"
+                />
+
         <!-- Separator between 4th (or 5th) button and right padding -->
         <View style="@style/VerticalSeparator" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3581bd5c..4e340e78 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -75,6 +75,10 @@
     <string name="callFailed_dialToDial">DIAL request modified to DIAL with different number.</string>
     <!-- In-call screen: call failure reason (call denied because call barring is on) -->
     <string name="callFailed_cb_enabled">You can\'t make outgoing calls while call barring is on.</string>
+    <!-- In-call screen: call failure reason (call denied because call barring is ON on MT side ) -->
+    <string name="callFailed_incoming_cb_enabled">Party has barred all Incoming calls.</string>
+    <!-- In-call screen: status label for an incoming call that is not answered and forwarded  -->
+    <string name="callUnanswered_forwarded">Call Unanswered and Forwarded</string>
     <!-- In-call screen: call failure reason (call denied because domain specific access control is on) -->
     <string name="callFailed_dsac_restricted">All calls are restricted by access control.</string>
     <!-- In-call screen: call failure reason (Emergency call denied because domain specific access control is on)-->
@@ -499,6 +503,11 @@
     <!-- Description of the decline on target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
     <string name="description_target_decline">Decline</string>
 
+    <!-- Description of the answer directions in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
+    <string name="description_direction_up_right">Up Right</string>
+    <string name="description_direction_up_left">Up Left</string>
+    <string name="description_direction_down_left">Down Left</string>
+    <string name="description_direction_down_right">Down Right</string>
     <!-- Description of the up direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->
     <string name="description_direction_up">Slide up for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
     <!-- Description of the left direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->
@@ -506,12 +515,6 @@
     <!-- Description of the right direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->
     <string name="description_direction_right">Slide right for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
 
-    <!-- Description of the answer directions in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
-    <string name="description_direction_up_right">Up right</string>
-    <string name="description_direction_up_left">Up left</string>
-    <string name="description_direction_down_left">Down left</string>
-    <string name="description_direction_down_right">Down right</string>
-
     <!-- Dialog title for the vibration settings for voicemail notifications [CHAR LIMIT=40] -->
     <string name="voicemail_notification_vibrate_when_title" msgid="8731372580674292759">Vibrate</string>
     <!-- Dialog title for the vibration settings for voice mail notifications [CHAR LIMIT=40]-->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3fb2bb28..184ab121 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -126,7 +126,7 @@
          window background instead of the default dark grey.  (We don't just use
          Theme.Black.NoTitleBar directly, since we want any popups or dialogs
          from the InCallActivity to have the correct holo style. -->
-    <style name="Theme.InCallScreen" parent="@android:style/Theme.Holo.NoActionBar">
+    <style name="Theme.InCallScreen" parent="@android:style/Theme.Holo">
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item>
     </style>