Merge klp-dev-plus-aosp into stage-aosp-masterandroid-l-preview_r2l-preview

Change-Id: I9f294587991055d15c369b3c1c4e23663ce35b9a

21 files changed, 519 insertions, 1170 deletions

diff --git a/proguard.flags b/proguard.flags
index bc881435..4e8310ca 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -6,3 +6,9 @@
 -keepclasseswithmembers class com.android.incallui.AnimationUtils$CrossFadeDrawable {
     *** setCrossFadeAlpha(...);
 }
+
+# Any class or method annotated with NeededForTesting or NeededForReflection.
+-keepclassmembers class * {
+@com.android.contacts.common.test.NeededForTesting *;
+@com.android.incallui.NeededForReflection *;
+}
diff --git a/res/anim/incall_dialpad_slide_in.xml b/res/anim/incall_dialpad_slide_in.xml
new file mode 100644
index 00000000..89f4552a
--- /dev/null
+++ b/res/anim/incall_dialpad_slide_in.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+<objectAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:valueFrom="1.0"
+    android:valueTo="0"
+    android:valueType="floatType"
+    android:propertyName="yFraction"
+    android:duration="200" />
\ No newline at end of file
diff --git a/res/anim/incall_dialpad_slide_out.xml b/res/anim/incall_dialpad_slide_out.xml
new file mode 100644
index 00000000..7fa03a25
--- /dev/null
+++ b/res/anim/incall_dialpad_slide_out.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+<objectAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:valueFrom="0"
+    android:valueTo="1.0"
+    android:valueType="floatType"
+    android:propertyName="yFraction"
+    android:duration="200" />
\ No newline at end of file
diff --git a/res/drawable/dialpad_key_colors.xml b/res/drawable/dialpad_key_colors.xml
new file mode 100644
index 00000000..27b4d4fc
--- /dev/null
+++ b/res/drawable/dialpad_key_colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true"
+        android:drawable="@color/background_dialpad_pressed" />
+    <item android:drawable="@color/background_dialpad" />
+</selector>
diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml
index 013d1b22..a182fc12 100644
--- a/res/layout/call_button_fragment.xml
+++ b/res/layout/call_button_fragment.xml
@@ -33,6 +33,9 @@
               android:id="@+id/bottomButtons"
               android:orientation="vertical"
               android:layout_width="match_parent"
+              android:background="#0000ff"
+              android:layout_margin="0dp"
+              android:padding="0dp"
               android:layout_height="wrap_content"
               android:layout_alignParentBottom="true"
               android:visibility="invisible">
@@ -51,7 +54,6 @@
     <ImageButton android:id="@+id/endButton"
                  style="@style/InCallEndButton"
                  android:layout_width="match_parent"
-                 android:layout_marginTop="2dp"
                  android:src="@drawable/ic_in_call_phone_hangup"
                  android:background="@drawable/end_call_background"
                  android:contentDescription="@string/onscreenEndCallText"/>
diff --git a/res/layout/dialpad_incall.xml b/res/layout/dialpad_incall.xml
new file mode 100644
index 00000000..d9473c1c
--- /dev/null
+++ b/res/layout/dialpad_incall.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<TableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialpad"
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="4"
+    android:layout_gravity="center_horizontal"
+    android:paddingLeft="@dimen/dialpad_horizontal_padding"
+    android:paddingRight="@dimen/dialpad_horizontal_padding"
+    android:background="@color/background_dialpad"
+    android:stretchColumns="*"
+    android:layoutDirection="ltr" >
+
+    <TableRow style="@style/InCallDialpadTableRowStyle">
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/one"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/two"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/three"/>
+    </TableRow>
+
+    <TableRow style="@style/InCallDialpadTableRowStyle">
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/four"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/five"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/six"/>
+    </TableRow>
+
+    <TableRow style="@style/InCallDialpadTableRowStyle">
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/seven"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/eight"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/nine"/>
+    </TableRow>
+
+    <TableRow style="@style/InCallDialpadTableRowStyle">
+        <com.android.dialer.dialpad.DialpadKeyButton
+            android:id="@+id/star"
+            style="@style/InCallDialpadKeyButtonStyle">
+            <LinearLayout
+                style="@style/InCallDialpadKeyInternalLayoutStyle">
+                <TextView
+                    android:id="@+id/dialpad_key_number"
+                    style="@style/InCallDialpadKeyStarPoundStyle"
+                    android:textSize="@dimen/dialpad_key_star_size" />
+                <View
+                    android:layout_height="match_parent"
+                    android:layout_width="@dimen/dialpad_key_letters_width" />
+            </LinearLayout>
+        </com.android.dialer.dialpad.DialpadKeyButton>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/zero"/>
+        <com.android.dialer.dialpad.DialpadKeyButton
+            android:id="@+id/pound"
+            style="@style/InCallDialpadKeyButtonStyle">
+            <LinearLayout
+                style="@style/InCallDialpadKeyInternalLayoutStyle">
+                <TextView
+                    android:id="@+id/dialpad_key_number"
+                    style="@style/InCallDialpadKeyStarPoundStyle"
+                    android:textSize="@dimen/dialpad_key_pound_size" />
+                <View
+                    android:layout_height="match_parent"
+                    android:layout_width="@dimen/dialpad_key_letters_width" />
+            </LinearLayout>
+        </com.android.dialer.dialpad.DialpadKeyButton>
+    </TableRow>
+</TableLayout>
diff --git a/res/layout/dialpad_key_incall.xml b/res/layout/dialpad_key_incall.xml
new file mode 100644
index 00000000..8ce4b513
--- /dev/null
+++ b/res/layout/dialpad_key_incall.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/InCallDialpadKeyButtonStyle">
+
+    <LinearLayout style="@style/InCallDialpadKeyInternalLayoutStyle">
+
+        <!-- Note in the referenced styles that we assign hard widths to these components
+             because we want them to line up vertically when we arrange them in an MxN grid -->
+
+        <TextView
+            android:id="@+id/dialpad_key_number"
+            style="@style/InCallDialpadKeyNumberStyle" />
+
+        <TextView
+            android:id="@+id/dialpad_key_letters"
+            style="@style/InCallDialpadKeyLettersStyle" />
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/dtmf_twelve_key_dialer_view.xml b/res/layout/dtmf_twelve_key_dialer_view.xml
index fe84010c..d921ca34 100644
--- a/res/layout/dtmf_twelve_key_dialer_view.xml
+++ b/res/layout/dtmf_twelve_key_dialer_view.xml
@@ -14,9 +14,7 @@
      limitations under the License.
 -->
 
-<!-- The grid of buttons used in the onscreen DTMF dialpad;
-     see dtmf_twelve_key_dialer_view.xml. -->
-<LinearLayout
+<view class="com.android.incallui.DialpadFragment$DialpadSlidingLinearLayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dtmf_twelve_key_dialer_view"
     android:layout_width="match_parent"
@@ -24,99 +22,41 @@
     android:orientation="vertical"
     android:layout_marginTop="1dip" >
 
-    <!-- Display of the digits you've typed so far.
-         This widget appears completely non-interactive to the user: you
-         can't edit or "hit backspace" since these are DTMF tones you've
-         already sent over the network.  But it's still an EditText rather
-         than a TextView because it needs to receive key events from a
-         hard keyboard, if present (see mDialerKeyListener). -->
-    <EditText
-        android:id="@+id/dtmfDialerField"
-        android:layout_width="match_parent"
-        android:layout_height="32dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="5dp"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:singleLine="true"
-        android:scrollHorizontally="true"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:freezesText="true"
-        android:background="@null"
-        android:textColor="@color/dtmf_dialer_display_text"
-        android:focusableInTouchMode="false"
-        android:clickable="false"/>
-
-    <TableLayout
-        android:id="@+id/dialpad"
+    <view class="com.android.incallui.DialpadFragment$HoverIgnoringLinearLayout"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="@integer/dialpad_layout_weight_dialpad"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/dialpad_vertical_margin"
-        android:paddingStart="5dip"
-        android:paddingEnd="5dip"
-        android:paddingBottom="10dip"
-        android:background="@color/dialpad_background"
-        android:layoutDirection="ltr">
-
-        <TableRow
-             android:layout_height="0px"
-             android:layout_weight="1">
-            <ImageButton android:id="@+id/one" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_1_no_vm_wht"
-                android:contentDescription="@string/description_image_button_one" />
-            <ImageButton android:id="@+id/two" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_2_wht"
-                android:contentDescription="@string/description_image_button_two" />
-            <ImageButton android:id="@+id/three" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_3_wht"
-                android:contentDescription="@string/description_image_button_three" />
-        </TableRow>
-
-        <TableRow
-             android:layout_height="0px"
-             android:layout_weight="1">
-            <ImageButton android:id="@+id/four" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_4_wht"
-                android:contentDescription="@string/description_image_button_four" />
-            <ImageButton android:id="@+id/five" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_5_wht"
-                android:contentDescription="@string/description_image_button_five" />
-            <ImageButton android:id="@+id/six" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_6_wht"
-                android:contentDescription="@string/description_image_button_six" />
-        </TableRow>
-
-        <TableRow
-             android:layout_height="0px"
-             android:layout_weight="1">
-            <ImageButton android:id="@+id/seven" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_7_wht"
-                android:contentDescription="@string/description_image_button_seven" />
-            <ImageButton android:id="@+id/eight" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_8_wht"
-                android:contentDescription="@string/description_image_button_eight" />
-            <ImageButton android:id="@+id/nine" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_9_wht"
-                android:contentDescription="@string/description_image_button_nine" />
-        </TableRow>
-
-        <TableRow
-             android:layout_height="0px"
-             android:layout_weight="1">
-            <ImageButton android:id="@+id/star" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_star_wht"
-                android:contentDescription="@string/description_image_button_star" />
-            <ImageButton android:id="@+id/zero" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_0_no_plus_wht"
-                android:contentDescription="@string/description_image_button_zero" />
-            <ImageButton android:id="@+id/pound" style="@style/DialpadButtonStyle"
-                android:src="@drawable/dial_num_pound_wht"
-                android:contentDescription="@string/description_image_button_pound" />
-        </TableRow>
-    </TableLayout>
-</LinearLayout>
+        android:background="@color/background_dialpad">
+
+
+        <!-- Display of the digits you've typed so far.
+             This widget appears completely non-interactive to the user: you
+             can't edit or "hit backspace" since these are DTMF tones you've
+             already sent over the network.  But it's still an EditText rather
+             than a TextView because it needs to receive key events from a
+             hard keyboard, if present (see mDialerKeyListener). -->
+        <EditText
+            android:id="@+id/dtmfDialerField"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:singleLine="true"
+            android:scrollHorizontally="true"
+            android:gravity="center"
+            android:freezesText="true"
+            android:background="@color/background_dialpad"
+            android:fontFamily="sans-serif-light"
+            android:textSize="@dimen/dialpad_digits_text_size"
+            android:textColor="@color/dialpad_digits_text_color"
+            android:focusableInTouchMode="false"
+            android:clickable="false"/>
+
+        <include layout="@layout/dialpad_incall"/>
+    </view>
+</view>
diff --git a/res/values/array.xml b/res/values/array.xml
index c4716453..3902e842 100644
--- a/res/values/array.xml
+++ b/res/values/array.xml
@@ -17,39 +17,6 @@
 
 <!-- Array resources for the Phone app. -->
 <resources>
-    <string-array translatable="false" name="transport_types">
-        <item>UDP</item>
-        <item>TCP</item>
-    </string-array>
-
-    <string-array translatable="true" name="sip_call_options_entries">
-        <item>@string/sip_call_options_entry_1</item>
-        <item>@string/sip_call_options_entry_2</item>
-        <item>@string/sip_call_options_entry_3</item>
-    </string-array>
-
-    <string-array translatable="true" name="sip_call_options_wifi_only_entries">
-        <item>@string/sip_call_options_wifi_only_entry_1</item>
-        <item>@string/sip_call_options_entry_2</item>
-        <item>@string/sip_call_options_entry_3</item>
-    </string-array>
-
-    <string-array translatable="false" name="sip_call_options_values">
-        <item>@string/sip_always</item>
-        <item>@string/sip_address_only</item>
-        <item>@string/sip_ask_me_each_time</item>
-    </string-array>
-
-    <string-array translatable="false" name="phone_type_values">
-        <item>@string/pstn_phone</item>
-        <item>@string/internet_phone</item>
-    </string-array>
-
-    <string-array translatable="true" name="sip_send_keepalive_options">
-        <item>@string/sip_system_decide</item>
-        <item>@string/sip_always_send_keepalive</item>
-    </string-array>
-
     <!-- "Target" resources for the GlowPadView widget used for incoming calls;
          see InCallTouchUi.showIncomingCallWidget() and incall_touch_ui.xml.  -->
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index bc00c953..e135fb72 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -16,41 +16,6 @@
   -->
 
 <resources>
-    <declare-styleable name="EditPhoneNumberPreference">
-        <!-- The enable button text. -->
-        <attr name="enableButtonText" format="string" />
-        <!-- The disable button text. -->
-        <attr name="disableButtonText" format="string" />
-        <!-- The change / update button text. -->
-        <attr name="changeNumButtonText" format="string" />
-        <!-- The confirm button mode. -->
-        <attr name="confirmMode">
-            <!-- Traditional single action "ok" button. -->
-            <enum name="confirm" value="0" />
-            <!-- Two state "enable/disable" button. -->
-            <enum name="activation" value="1" />
-        </attr>
-    </declare-styleable>
-
-    <declare-styleable name="CallForwardEditPreference">
-        <attr name="serviceClass">
-            <!-- voice -->
-            <enum name="voice" value="1" />
-            <!-- data -->
-            <enum name="data" value="2" />
-        </attr>
-        <attr name="reason">
-            <!-- unconditional  -->
-            <enum name="unconditional" value="0" />
-            <!-- busy -->
-            <enum name="busy" value="1" />
-            <!-- no_reply -->
-            <enum name="no_reply" value="2" />
-            <!-- not_reachable -->
-            <enum name="not_reachable" value="3" />
-        </attr>
-    </declare-styleable>
-
     <declare-styleable name="GlowPadView">
         <attr name="android:gravity"/>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6080e910..ca53f272 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -23,9 +23,6 @@
     <color name="incall_secondary_info_background">#8033b5e5</color> <!-- semitransparent blueish grey -->
     <color name="incall_call_banner_text_color">#FFFFFF</color> <!-- white -->
 
-    <!-- DTMF Dialer -->
-    <color name="dtmf_dialer_display_text">#FFFFFF</color> <!-- white -->
-
     <!-- Color of the theme of the People app -->
     <color name="people_app_theme_color">#33B5E5</color>
 
@@ -44,9 +41,24 @@
     <!-- Used when the End Call button is disabled -->
     <drawable name="end_call_disabled_state">#303030</drawable>
 
-    <!-- Dialpad background -->
-    <color name="dialpad_background">#000000</color>
+    <!-- Color of dialpad digits -->
+    <color name="dialpad_digits_text_color">#000000</color>
+
+    <!-- Background color of dialpad -->
+    <color name="background_dialpad">#ffffff</color>
+
+    <!-- Pressed color of dialpad buttons -->
+    <color name="background_dialpad_pressed">#ececec</color>
 
     <!-- Button background -->
     <color name="button_background">#000000</color>
+
+    <!-- Background color of action bars -->
+    <color name="actionbar_background_color">#3B77E7</color>
+
+    <!-- Secondary color of dialpad text (used for the letters corresponding to each digit -->
+    <color name="dialpad_secondary_text_color">#8b8b8b</color>
+
+    <!-- Translucent shadow color -->
+    <color name="translucent_shadow">#33999999</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ebfb9349..92e55d60 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -45,7 +45,7 @@
     <dimen name="in_call_button_height">76dp</dimen>
 
     <!-- Height of the in-call "End" button. Match with Contact's dimens/call_button_height -->
-    <dimen name="in_call_end_button_height">74dp</dimen>
+    <dimen name="in_call_end_button_height">60dp</dimen>
 
     <!-- Width of buttons in the extra button row. -->
     <dimen name="extra_row_button_width">56dp</dimen>
@@ -71,7 +71,8 @@
     <!-- Dimensions for Emergency Dialer and dialpad inside the in-call screen -->
     <dimen name="dialpad_horizontal_margin">4dp</dimen>
     <dimen name="dialpad_vertical_margin">2dp</dimen>
-    <dimen name="dialpad_digits_text_size">35sp</dimen>
+    <dimen name="dialpad_digits_text_size">36sp</dimen>
+    <dimen name="dialpad_digits_height">47dp</dimen>
 
     <!-- Just used in landscape mode -->
     <dimen name="emergency_dialer_digits_height">0px</dimen>
@@ -116,4 +117,18 @@
     <dimen name="glowpadview_margin_bottom">-48dip</dimen>
     <dimen name="glowpadview_margin_right">0dip</dimen>
 
+    <!-- Text dimensions for dialpad keys -->
+    <dimen name="dialpad_key_numbers_size">40sp</dimen>
+    <dimen name="dialpad_key_letters_size">13sp</dimen>
+    <dimen name="dialpad_key_star_size">26sp</dimen>
+    <dimen name="dialpad_key_pound_size">26sp</dimen>
+    <dimen name="dialpad_key_numbers_width">30dp</dimen>
+    <dimen name="dialpad_key_letters_width">50dp</dimen>
+    <dimen name="dialpad_key_height">56dp</dimen>
+    <dimen name="dialpad_key_plus_size">18sp</dimen>
+    <dimen name="dialpad_number_to_letters_padding">11dp</dimen>
+    <dimen name="dialpad_horizontal_padding">5dp</dimen>
+
+    <!-- Height of translucent shadow effect -->
+    <dimen name="translucent_shadow_height">2dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 62a1d5bf..04691718 100755..100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -114,638 +114,6 @@
          replace the "wild" character. -->
     <string name="wild_prompt_str">Replace wild character with</string>
 
-    <!-- missing voicemail number -->
-    <!-- Title of the "Missing voicemail number" dialog -->
-    <string name="no_vm_number">Missing voicemail number</string>
-    <!-- Body text of the "Missing voicemail number" dialog -->
-    <string name="no_vm_number_msg">No voicemail number is stored on the SIM card.</string>
-    <!-- Button label on the "Missing voicemail number" dialog -->
-    <string name="add_vm_number_str">Add number</string>
-
-    <!-- Status message displayed on SIM PIN unlock panel -->
-    <string name="puk_unlocked">Your SIM card has been unblocked. Your phone is unlocking\u2026</string>
-    <!-- network depersonalization -->
-    <!-- Label text for PIN entry widget on SIM Network Depersonalization panel -->
-    <string name="label_ndp">SIM network unlock PIN</string>
-    <!-- Button label on SIM Network Depersonalization panel -->
-    <string name="sim_ndp_unlock_text">Unlock</string>
-    <!-- Button label on SIM Network Depersonalization panel -->
-    <string name="sim_ndp_dismiss_text">Dismiss</string>
-    <!-- Status message displayed on SIM Network Depersonalization panel -->
-    <string name="requesting_unlock">Requesting network unlock\u2026</string>
-    <!-- Error message displayed on SIM Network Depersonalization panel -->
-    <string name="unlock_failed">Network unlock request unsuccessful.</string>
-    <!-- Success message displayed on SIM Network Depersonalization panel -->
-    <string name="unlock_success">Network unlock successful.</string>
-
-    <!-- settings strings -->
-
-    <!-- GSM Call settings screen, setting option name -->
-    <string name="labelGSMMore">GSM call settings</string>
-    <!-- CDM Call settings screen, setting option name -->
-    <string name="labelCDMAMore">CDMA call settings</string>
-    <!-- Mobile network settings screen, setting option name -->
-    <string name="apn_settings">Access Point Names</string>
-    <!-- Label for the "Network settings" screen in the Settings UI -->
-    <string name="settings_label">Network settings</string>
-    <!-- Call settings screen, setting option name -->
-    <string name="voicemail">Voicemail</string>
-    <!-- Call forwarding dialog box, voicemail number prefix -->
-    <string name="voicemail_abbreviated">VM:</string>
-    <!-- Mobile network settings screen, setting option name -->
-    <string name="networks">Network operators</string>
-    <!-- Call settings screen title -->
-    <string name="call_settings">Call settings</string>
-    <!-- GSM Call settings screen, setting option name -->
-    <string name="additional_gsm_call_settings">Additional settings</string>
-    <!-- GSM-only Call settings screen, setting option name-->
-    <string name="sum_gsm_call_settings">Additional GSM only call settings</string>
-    <!-- CDMA Call settings screen, setting option name -->
-    <string name="additional_cdma_call_settings">Additional CDMA call settings</string>
-    <!-- CDMA-only Call settings screen, setting option name-->
-    <string name="sum_cdma_call_settings">Additional CDMA only call settings</string>
-    <!-- Call setting screen, nework service setting name -->
-    <string name="labelNwService">Network service settings</string>
-    <!-- Call settings screen, setting option name -->
-    <string name="labelCallerId">Caller ID</string>
-    <!-- Additional call settings screen, setting summary text when the setting is being loaded [CHAR LIMIT=40] -->
-    <string name="sum_loading_settings">Loading settings\u2026</string>
-    <!-- Additional call settings screen, setting summary text when Caller ID is hidden -->
-    <string name="sum_hide_caller_id">Number hidden in outgoing calls</string>
-    <!-- Additional call settings screen, setting summary text when Caller ID is shown -->
-    <string name="sum_show_caller_id">Number displayed in outgoing calls</string>
-    <!-- Additional call settings screen, setting summary text for default Caller ID value -->
-    <string name="sum_default_caller_id">Use default operator settings to display my number in outgoing calls</string>
-    <!-- Additional call settings screen, setting check box name -->
-    <string name="labelCW">Call waiting</string>
-    <!-- Additional call settings screen, setting summary text when call waiting check box is selected -->
-    <string name="sum_cw_enabled">During a call, notify me of incoming calls</string>
-    <!-- Additional call settings screen, setting summary text when call waiting check box is clear -->
-    <string name="sum_cw_disabled">During a call, notify me of incoming calls</string>
-    <!-- Call forwarding settings screen, section heading -->
-    <string name="call_forwarding_settings">Call forwarding settings</string>
-    <!-- Call settings screen, setting option name -->
-    <string name="labelCF">Call forwarding</string>
-
-    <!-- Call forwarding settings screen, setting option name -->
-    <string name="labelCFU">Always forward</string>
-    <!-- Call forwarding dialog box, text field label -->
-    <string name="messageCFU">Always use this number</string>
-    <!-- Call forwarding settings screen, setting summary text when forwarding all calls -->
-    <string name="sum_cfu_enabled_indicator">Forwarding all calls</string>
-    <!-- Call forwarding settings screen, setting summary text the Always forward is set -->
-    <string name="sum_cfu_enabled">Forwarding all calls to <xliff:g id="phonenumber" example="555-1212">{0}</xliff:g></string>
-    <!-- Call forwarding settings screen, Always forward is enabled but the number is unavailable -->
-    <string name="sum_cfu_enabled_no_number">Number is unavailable</string>
-    <!-- Call forwarding settings screen, setting summary text when Always forward is disabled -->
-    <string name="sum_cfu_disabled">Disabled</string>
-
-    <!-- Call forwarding settings screen, setting option name -->
-    <string name="labelCFB">Forward when busy</string>
-    <!-- Call forwarding dialog box, text field label -->
-    <string name="messageCFB">Number when busy</string>
-    <!-- Call forwarding settings screen, setting summary text when forwarding to specific number when busy -->
-    <string name="sum_cfb_enabled">Forwarding to <xliff:g id="phonenumber" example="555-1212">{0}</xliff:g></string>
-    <!-- Call forwarding settings screen, setting summary text when forwarding when busy is disabled -->
-    <string name="sum_cfb_disabled">Disabled</string>
-    <!-- Error message displayed after failing to disable forwarding calls when the phone is busy -->
-    <string name="disable_cfb_forbidden">Your operator doesn\'t support disabling call forwarding when your phone is busy.</string>
-
-    <!-- Call forwarding settings screen, setting option name -->
-    <string name="labelCFNRy">Forward when unanswered</string>
-    <!-- Call forwarding dialog box, text field label -->
-    <string name="messageCFNRy">Number when unanswered</string>
-    <!-- Call forwarding settings screen, setting summary text when forwarding to a specific number when unanswered -->
-    <string name="sum_cfnry_enabled">Forwarding to <xliff:g id="phonenumber" example="555-1212">{0}</xliff:g></string>
-    <!-- Call forwarding settings screen, setting summary text when Forward when unanswered is disabled -->
-    <string name="sum_cfnry_disabled">Disabled</string>
-    <!-- Error message displayed after failing to disable forwarding calls when the phone does not answer -->
-    <string name="disable_cfnry_forbidden">Your operator doesn\'t support disabling call forwarding when your phone doesn\'t answer.</string>
-
-    <!-- Call forwarding settings screen, setting option name -->
-    <string name="labelCFNRc">Forward when unreachable</string>
-    <!-- Call forwarding dialog box, text field label -->
-    <string name="messageCFNRc">Number when unreachable</string>
-    <!-- Call forwarding settings screen, setting summary text when forwarding to a specific number when unreachable-->
-    <string name="sum_cfnrc_enabled">Forwarding to <xliff:g id="phonenumber" example="555-1212">{0}</xliff:g></string>
-    <!-- Call forwarding settings screen, setting summary text when Forward when unreachable is disabled -->
-    <string name="sum_cfnrc_disabled">Disabled</string>
-    <!-- Error message displayed after failing to disable forwarding calls when the phone is unreachable -->
-    <string name="disable_cfnrc_forbidden">Your carrier doesn\'t support disabling call forwarding when your phone is unreachable.</string>
-
-    <!-- Title of the progress dialog displayed while updating Call settings -->
-    <string name="updating_title">Call settings</string>
-    <!-- Title of the alert dialog displayed if an error occurs while updating Call settings -->
-    <string name="error_updating_title">Call settings error</string>
-    <!-- Toast in Call settings dialog while settings are being read -->
-    <string name="reading_settings">Reading settings\u2026</string>
-    <!-- Toast in Call settings dialog while settings are being saved -->
-    <string name="updating_settings">Updating settings\u2026</string>
-    <!-- Toast in Call settings dialog while settings are being reverted -->
-    <string name="reverting_settings">Reverting settings\u2026</string>
-    <!-- Status message displayed in the "Call settings error" dialog -->
-    <string name="response_error">Unexpected response from network.</string>
-    <!-- Status message displayed in the "Call settings error" dialog -->
-    <string name="exception_error">Network or SIM card error.</string>
-    <!-- Status message displayed in the "Call settings error" dialog when operation fails due to FDN
-         [CHAR LIMIT=NONE] -->
-    <string name="fdn_check_failure">Your Phone app\'s Fixed Dialing Numbers setting is turned on. As a result, some call-related features aren\'t working.</string>
-    <!-- Status message displayed in the "Call settings error" dialog -->
-    <string name="radio_off_error">Turn on the radio before viewing these settings.</string>
-    <!-- Button label used to dismiss the "Call settings error" dialog -->
-    <string name="close_dialog">OK</string>
-    <!-- Button label used in several settings-related dialogs -->
-    <string name="enable">Enable</string>
-    <!-- Button label used in several settings-related dialogs -->
-    <string name="disable">Disable</string>
-    <!-- Button label which indicates the user wants to update a stored
-         phone number; used in several settings-related dialogs -->
-    <string name="change_num">Update</string>
-    <!-- Phone settings: Caller ID preference values -->
-    <string-array name="clir_display_values">
-        <!-- Phone settings "Caller ID" preference option: use the default value -->
-        <item>Network default</item>
-        <!-- Phone settings "Caller ID" preference option: hide outgoing Caller ID info -->
-        <item>Hide number</item>
-        <!-- Phone settings "Caller ID" preference option: show outgoing Caller ID info -->
-        <item>Show number</item>
-    </string-array>
-    <!-- Phone settings: Internal keys used for Caller ID preference values.  DO NOT TRANSLATE. -->
-    <string-array name="clir_values" translatable="false">
-        <!-- Phone settings: Internal key used for Caller ID preference values.  DO NOT TRANSLATE. -->
-        <item><xliff:g>DEFAULT</xliff:g></item>
-        <!-- Phone settings: Internal key used for Caller ID preference values.  DO NOT TRANSLATE. -->
-        <item><xliff:g>HIDE</xliff:g></item>
-        <!-- Phone settings: Internal key used for Caller ID preference values.  DO NOT TRANSLATE. -->
-        <item><xliff:g>SHOW</xliff:g></item>
-    </string-array>
-
-    <!-- voicemail setting strings --><skip/>
-    <!-- Call settings screen, Set voicemail number dialog text -->
-    <string name="vm_changed">Voicemail number changed.</string>
-    <!-- Call settings screen, Set voicemail number dialog text -->
-    <string name="vm_change_failed">Couldn\'t change the voicemail number.\nContact your carrier if this problem persists.</string>
-    <!-- Call settings screen, displayed when vm provider supplied forwarding number change fails-->
-    <string name="fw_change_failed">Couldn\'t change the forwarding number.\nContact your carrier if this problem persists.</string>
-    <!-- Call settings screen, displayed when forwarding number read fails-->
-    <string name="fw_get_in_vm_failed">Couldn\'t retrieve and save current forwarding number settings.\nSwitch to the new provider anyway?</string>
-    <!-- Call settings screen, Set voicemail number dialog text -->
-    <string name="no_change">No changes were made.</string>
-    <!-- Call settings screen, "Voicemail" provider setting summary text when no provider is selected -->
-    <string name="sum_voicemail_choose_provider">Choose voicemail service</string>
-    <!-- Call settings screen, "Voicemail" screen, default option - My Carrier -->
-    <string name="voicemail_default">My carrier</string>
-
-    <!-- networks setting strings --><skip/>
-    <!-- Mobile network settings screen title -->
-    <string name="mobile_networks">Mobile network settings</string>
-    <!-- Available networks screen title/heading -->
-    <string name="label_available">Available networks</string>
-    <!-- Mobile network settings screen, toast when searching for available networks -->
-    <string name="load_networks_progress">Searching\u2026</string>
-    <!-- Available networks screen, text when no networks are found -->
-    <string name="empty_networks_list">No networks found.</string>
-    <!-- Available networks screen, setting option name -->
-    <string name="search_networks">Search networks</string>
-    <!-- Available networks screen, toast when an error is encountered when searching for networks -->
-    <string name="network_query_error">Error while searching for networks.</string>
-    <!-- Available networks screen, toast when registering on a specific network -->
-    <string name="register_on_network">Registering on <xliff:g id="network">%s</xliff:g>\u2026</string>
-    <!-- Available networks screen, toast when SIM card isn't allowed on a network -->
-    <string name="not_allowed">Your SIM card doesn\'t allow a connection to this network.</string>
-    <!-- Available networks screen, toast when unable to connect to a network temporarily -->
-    <string name="connect_later">Can\'t connect to this network right now. Try again later.</string>
-    <!-- Available networks screen, toast when registered on a specific network -->
-    <string name="registration_done">Registered on network.</string>
-    <!-- Mobile network settings screen setting option summary text -->
-    <string name="sum_carrier_select">Choose a network operator</string>
-    <!-- Available networks screen, setting summary text -->
-    <string name="sum_search_networks">Search for all available networks</string>
-    <!-- Available networks screen, setting option name -->
-    <string name="select_automatically">Choose automatically</string>
-    <!-- Available networks screen, setting summary text -->
-    <string name="sum_select_automatically">Automatically choose preferred network</string>
-    <string name="register_automatically">Automatic registration\u2026</string>
-    <string name="preferred_network_mode_title">Network Mode</string>
-    <string name="preferred_network_mode_summary">Change the network operating mode</string>
-    <string name="preferred_network_mode_dialogtitle">Preferred network mode</string>
-    <!-- Mobile network settings, summary for preferred network mode WCDMA preferred[CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_wcdma_perf_summary">Preferred network mode: WCDMA preferred</string>
-    <!-- Mobile network settings, summary for preferred network mode GSM [CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_gsm_only_summary">Preferred network mode: GSM only</string>
-    <!-- Mobile network settings, summary for preferred network mode WCDMA only [CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_wcdma_only_summary">Preferred network mode: WCDMA only</string>
-    <!-- Mobile network settings, summary for preferred network mode GSM / UMTS [CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_gsm_wcdma_summary">Preferred network mode: GSM / WCDMA</string>
-    <!-- Mobile network settings, summary for preferred network mode CDMA [CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_cdma_summary">Preferred network mode: CDMA</string>
-    <!-- Mobile network settings, summary for preferred network mode CDMA / EvDo [CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_cdma_evdo_summary">Preferred network mode: CDMA / EvDo</string>
-    <!-- Mobile network settings, summary for preferred network mode CDMA only [CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_cdma_only_summary">Preferred network mode: CDMA only</string>
-    <!-- Mobile network settings, summary for preferred network mode EvDo only [CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_evdo_only_summary">Preferred network mode: EvDo only</string>
-    <!-- Mobile network settings, summary for preferred network mode CDMA/EvDo/GSM/WCDMA[CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: CDMA/EvDo/GSM/WCDMA</string>
-    <!-- Mobile network settings, summary for preferred network mode LTE [CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_lte_summary">Preferred network mode: LTE </string>
-    <!-- Mobile network settings, summary for preferred network mode GSM/WCDMA/LTE [CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>
-    <!-- Mobile network settings, summary for preferred network mode CDMA+LTE/EVDO[CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_lte_cdma_evdo_summary">Preferred network mode: CDMA+LTE/EVDO</string>
-    <!-- Mobile network settings, summary for preferred network mode Global[CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_global_summary">Preferred network mode: Global</string>
-    <!-- Mobile network settings, summary for preferred network mode LTE / WCDMA[CHAR LIMIT=100] -->
-    <string name="preferred_network_mode_lte_wcdma_summary">Preferred network mode: LTE / WCDMA</string>
-
-
-    <string-array name="preferred_network_mode_choices">
-        <item>LTE / WCDMA</item>
-        <item>LTE</item>
-        <item>Global</item>
-        <item>GSM/WCDMA/LTE</item>
-        <item>CDMA + LTE/EvDo</item>
-        <item>CDMA/EvDo/GSM/WCDMA</item>
-        <item>EvDo only</item>
-        <item>CDMA w/o EvDo</item>
-        <item>CDMA/EvDo auto</item>
-        <item>GSM/WCDMA auto</item>
-        <item>WCDMA only</item>
-        <item>GSM only</item>
-        <item>GSM/WCDMA preferred</item>
-    </string-array>
-    <string-array name="preferred_network_mode_values"  translatable="false">
-        <item>"12"</item>
-        <item>"11"</item>
-        <item>"10"</item>
-        <item>"9"</item>
-        <item>"8"</item>
-        <item>"7"</item>
-        <item>"6"</item>
-        <item>"5"</item>
-        <item>"4"</item>
-        <item>"3"</item>
-        <item>"2"</item>
-        <item>"1"</item>
-        <item>"0"</item>
-    </string-array>
-    <!-- Mobile network settings screen, data enabling checkbox name -->
-    <string name="data_enabled">Data enabled</string>
-    <!-- Mobile network settings screen, setting summary text when check box is not selected (explains what selecting it would do) -->
-    <string name="data_enable_summary">Enable data access over Mobile network</string>
-    <!-- Mobile network settings screen, setting check box name -->
-    <string name="roaming">Data roaming</string>
-    <!-- Mobile network settings screen, setting summary text when check box is selected -->
-    <string name="roaming_enable">Connect to data services when roaming</string>
-    <!-- Mobile network settings screen, setting summary text when check box is clear -->
-    <string name="roaming_disable">Connect to data services when roaming</string>
-    <!-- Mobile network settings UI: notification message shown when you
-         lose data connectivity because you're roaming and you have the
-         "data roaming" feature turned off. -->
-    <string name="roaming_reenable_message">You\'ve lost data connectivity because you left your home network with data roaming turned off.</string>
-    <!-- Mobile network settings screen, dialog message when user selects the Data roaming check box -->
-    <string name="roaming_warning">Allow data roaming? You may incur significant roaming charges!</string>
-    <string name="gsm_umts_options">GSM/UMTS Options</string>
-    <string name="cdma_options">CDMA Options</string>
-
-    <!-- Screen option on the mobile network settings to go into data usage settings -->
-    <string name="throttle_data_usage">Data usage</string>
-    <!-- Data usage settings screen option for checking the current usage -->
-    <string name="throttle_current_usage">Data used in current period</string>
-    <!-- Data usage settings screen option for time frame-->
-    <string name="throttle_time_frame">Data use period</string>
-    <!-- Data usage settings screen option for throttling rate-->
-    <string name="throttle_rate">Data rate policy</string>
-    <!-- Data usage settings screen option for accessing the carrier website-->
-    <string name="throttle_help">Learn more</string>
-
-    <string name="throttle_status_subtext"><xliff:g id="used">%1$s</xliff:g> (<xliff:g id="used">%2$d</xliff:g>\u066A) of <xliff:g id="used">%3$s</xliff:g> period maximum\nNext period starts in <xliff:g id="used">%4$d</xliff:g> days (<xliff:g id="used">%5$s</xliff:g>)</string>
-
-    <string name="throttle_data_usage_subtext"><xliff:g id="used">%1$s</xliff:g> (<xliff:g id="used">%2$d</xliff:g>\u066A) of <xliff:g id="used">%3$s</xliff:g> period maximum</string>
-
-    <string name="throttle_data_rate_reduced_subtext"><xliff:g id="used">%1$s</xliff:g> maximum exceeded\nData rate reduced to <xliff:g id="used">%2$d</xliff:g> Kb/s</string>
-
-    <string name="throttle_time_frame_subtext"><xliff:g id="used">%1$d</xliff:g>\u066A of cycle elapsed\nNext period starts in <xliff:g id="used">%2$d</xliff:g> days (<xliff:g id="used">%3$s</xliff:g>)</string>
-
-    <string name="throttle_rate_subtext">Data rate reduced to <xliff:g id="used">%1$d</xliff:g> Kb/s if data use limit is exceeded</string>
-
-    <string name="throttle_help_subtext">More information about your carrier\'s mobile network data use policy</string>
-
-    <string name="cell_broadcast_sms">Cell Broadcast SMS</string>
-
-    <string name="enable_disable_cell_bc_sms">Cell Broadcast SMS</string>
-    <string name="cell_bc_sms_enable">Cell Broadcast SMS enabled</string>
-    <string name="cell_bc_sms_disable">Cell Broadcast SMS disabled</string>
-
-    <string name="cb_sms_settings">Cell Broadcast SMS settings</string>
-
-    <string name="enable_disable_emergency_broadcast">Emergency Broadcast</string>
-    <string name="emergency_broadcast_enable">Emergency Broadcast enabled</string>
-    <string name="emergency_broadcast_disable">Emergency Broadcast disabled</string>
-
-    <string name="enable_disable_administrative">Administrative</string>
-    <string name="administrative_enable">Administrative enabled</string>
-    <string name="administrative_disable">Administrative disabled</string>
-
-    <string name="enable_disable_maintenance">Maintenance</string>
-    <string name="maintenance_enable">Maintenance enabled</string>
-    <string name="maintenance_disable">Maintenance disabled</string>
-
-    <string name="general_news_settings">General News</string>
-    <string name="bf_news_settings">Business and Financial News</string>
-    <string name="sports_news_settings">Sports News</string>
-    <string name="entertainment_news_settings">Entertainment News</string>
-
-    <string name="enable_disable_local">Local</string>
-    <string name="local_enable">Local news enabled</string>
-    <string name="local_disable">Local news disabled</string>
-
-    <string name="enable_disable_regional">Regional</string>
-    <string name="regional_enable">Regional news enabled</string>
-    <string name="regional_disable">Regional news disabled</string>
-
-    <string name="enable_disable_national">National</string>
-    <string name="national_enable">National news enabled</string>
-    <string name="national_disable">National news disabled</string>
-
-    <string name="enable_disable_international">International</string>
-    <string name="international_enable">International news enabled</string>
-    <string name="international_disable">International news disabled</string>
-
-    <string name="list_language_title">Language</string>
-    <string name="list_language_summary">Select the news language</string>
-    <string-array name="list_language_entries">
-        <item>English</item>
-        <item>French</item>
-        <item>Spanish</item>
-        <item>Japanese</item>
-        <item>Korean</item>
-        <item>Chinese</item>
-        <item>Hebrew</item>
-    </string-array>
-    <string-array name="list_language_values">
-        <item>"1"</item>
-        <item>"2"</item>
-        <item>"3"</item>
-        <item>"4"</item>
-        <item>"5"</item>
-        <item>"6"</item>
-        <item>"7"</item>
-    </string-array>
-    <string name="list_language_dtitle">Languages</string>
-
-    <string name="enable_disable_local_weather">Local Weather</string>
-    <string name="local_weather_enable">Local Weather enabled</string>
-    <string name="local_weather_disable">Local Weather disabled</string>
-
-    <string name="enable_disable_atr">Area Traffic Reports</string>
-    <string name="atr_enable">Area Traffic Reports enabled</string>
-    <string name="atr_disable">Area Traffic Reports disabled</string>
-
-    <string name="enable_disable_lafs">Local Airport Flight Schedules</string>
-    <string name="lafs_enable">Local Airport Flight Schedules enabled</string>
-    <string name="lafs_disable">Local Airport Flight Schedules disabled</string>
-
-    <string name="enable_disable_restaurants">Restaurants</string>
-    <string name="restaurants_enable">Restaurants enabled</string>
-    <string name="restaurants_disable">Restaurants disabled</string>
-
-    <string name="enable_disable_lodgings">Lodgings</string>
-    <string name="lodgings_enable">Lodgings enabled</string>
-    <string name="lodgings_disable">Lodgings disabled</string>
-
-    <string name="enable_disable_retail_directory">Retail Directory</string>
-    <string name="retail_directory_enable">Retail Directory enabled</string>
-    <string name="retail_directory_disable">Retail Directory disabled</string>
-
-    <string name="enable_disable_advertisements">Advertisements</string>
-    <string name="advertisements_enable">Advertisements enabled</string>
-    <string name="advertisements_disable">Advertisements disabled</string>
-
-    <string name="enable_disable_stock_quotes">Stock Quotes</string>
-    <string name="stock_quotes_enable">Stock Quotes enabled</string>
-    <string name="stock_quotes_disable">Stock Quotes disabled</string>
-
-    <string name="enable_disable_eo">Employment Opportunities</string>
-    <string name="eo_enable">Employment Opportunities enabled</string>
-    <string name="eo_disable">Employment Opportunities disabled</string>
-
-    <string name="enable_disable_mhh">Medical, Health, and Hospital</string>
-    <string name="mhh_enable">Medical, Health, and Hospital enabled</string>
-    <string name="mhh_disable">Medical, Health, and Hospital disabled</string>
-
-    <string name="enable_disable_technology_news">Technology News</string>
-    <string name="technology_news_enable">Technology News enabled</string>
-    <string name="technology_news_disable">Technology News disabled</string>
-
-    <string name="enable_disable_multi_category">Multi-category</string>
-    <string name="multi_category_enable">Multi-category enabled</string>
-    <string name="multi_category_disable">Multi-category disabled</string>
-
-    <!-- Mobile network settings screen, setting option name -->
-    <string name="prefer_2g">Use only 2G networks</string>
-    <!-- Mobile network settings screen, setting summary text -->
-    <string name="prefer_2g_summary">Saves battery</string>
-
-    <!-- CDMA System select strings -->
-    <!-- Mobile network settings screen, setting option name -->
-    <string name="cdma_system_select_title">System select</string>
-    <!-- Mobile network settings screen, setting summary text -->
-    <string name="cdma_system_select_summary">Change the CDMA roaming mode</string>
-    <!-- System select settings screen title -->
-    <string name="cdma_system_select_dialogtitle">System select</string>
-    <string-array name="cdma_system_select_choices">
-        <!-- System select dialog screen, setting option name -->
-        <item>Home only</item>
-        <!-- Remove the following option "Affiliated Networks" from the option list -->
-        <!-- <item>Affiliated Networks</item> -->
-        <!-- System select dialog screen, setting option name -->
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="cdma_system_select_values" translatable="false">
-        <!-- Do not translate. -->
-        <item>"0"</item>
-        <!-- Remove the following value "1" which corresponds to "Affiliated Networks" above -->
-        <!-- <item>"1"</item>  -->
-        <!-- Do not translate. -->
-        <item>"2"</item>
-    </string-array>
-
-    <string name="cdma_subscription_title">CDMA subscription</string>
-    <string name="cdma_subscription_summary">Change between RUIM/SIM and NV</string>
-    <string name="cdma_subscription_dialogtitle">subscription</string>
-    <string-array name="cdma_subscription_choices">
-        <item>RUIM/SIM</item>
-        <item>NV</item>
-    </string-array>
-    <string-array name="cdma_subscription_values">
-        <item>"0"</item>
-        <item>"1"</item>
-    </string-array>
-    <!-- Preference title with which users can activate CDMA network [CHAR LIMIT=30] -->
-    <string name="cdma_activate_device">Activate device</string>
-    <!-- Preference title for launching an account manager page for prepaid LTE [CHAR LIMIT=30] -->
-    <string name="cdma_lte_data_service">Set up data service</string>
-
-    <!-- FDN settings strings -->
-    <!-- Call settings screen, setting option name -->
-    <string name="fdn">Fixed Dialing Numbers</string>
-    <!-- Call settings screen, button label that takes you to
-         the Fixed Dialing Number management screen -->
-    <string name="manage_fdn_list">FDN list</string>
-    <!-- Call settings screen, preference item label -->
-    <string name="fdn_activation">FDN activation</string>
-    <!-- Call settings setting option name when FDN is enabled -->
-    <string name="fdn_enabled">Fixed Dialing Numbers are enabled</string>
-    <!-- Call settings setting option name  when FDN is disabled-->
-    <string name="fdn_disabled">Fixed Dialing Numbers are disabled</string>
-    <!-- Call settings screen, setting option name -->
-    <string name="enable_fdn">Enable FDN</string>
-    <!-- Call settings screen, setting option name -->
-    <string name="disable_fdn">Disable FDN</string>
-    <!-- Call settings screen, setting option name -->
-    <string name="change_pin2">Change PIN2</string>
-    <!-- Call settings screen, setting option name when FDN is enabled -->
-    <string name="enable_fdn_ok">Disable FDN</string>
-    <!-- Call settings screen, setting option name when FDN is disabled -->
-    <string name="disable_fdn_ok">Enable FDN</string>
-    <!-- Call settings screen, setting summary text -->
-    <string name="sum_fdn">Manage Fixed Dialing Numbers</string>
-    <!-- Call settings, FDN screen, setting option name -->
-    <string name="sum_fdn_change_pin">Change PIN for FDN access</string>
-    <!-- Call settings, FDN screen, setting option name -->
-    <string name="sum_fdn_manage_list">Manage phone number list</string>
-    <!-- Voice privacy on CDMA is an added layer of voice encryption. Theoretically, it would be harder to break in to a phone call with this feature enabled. -->
-    <string name="voice_privacy">Voice privacy</string>
-    <string name="voice_privacy_summary">Enable enhanced privacy mode</string>
-    <string name="tty_mode_option_title">TTY mode</string>
-    <string name="tty_mode_option_summary">Set TTY mode</string>
-    <string name="auto_retry_mode_title">Auto-retry</string>
-    <string name="auto_retry_mode_summary">Enable Auto-retry mode</string>
-
-    <!-- FDN list screen: menu item label -->
-    <string name="menu_add">Add contact</string>
-    <!-- FDN list screen: menu item label -->
-    <string name="menu_edit">Edit contact</string>
-    <!-- FDN list screen: menu item label -->
-    <string name="menu_delete">Delete contact</string>
-
-    <!-- FDN related strings -->
-    <!-- Label for PIN2 entry screen -->
-    <string name="get_pin2">Type PIN2</string>
-    <!-- "Edit FDN Contact" screen: Label for the "name" text field -->
-    <string name="name">Name</string>
-    <!-- "Edit FDN Contact" screen: Label for the "number" text field -->
-    <string name="number">Number</string>
-    <!-- "Edit FDN Contact" screen: Button label for "save" action -->
-    <string name="save">Save</string>
-    <!-- Title of "Edit FDN Contact" screen for a new contact -->
-    <string name="add_fdn_contact">Add fixed dialing number</string>
-    <!-- "Edit FDN Contact" screen: status message displayed in a popup (toast) -->
-    <string name="adding_fdn_contact">Adding fixed dialing number\u2026</string>
-    <!-- "Edit FDN Contact" screen: status message displayed in a popup (toast) -->
-    <string name="fdn_contact_added">Fixed dialing number added.</string>
-    <!-- Title of "Edit FDN Contact" screen when editing an already-existing contact -->
-    <string name="edit_fdn_contact">Edit fixed dialing number</string>
-    <!-- "Edit FDN Contact" screen: status message displayed in a popup (toast) -->
-    <string name="updating_fdn_contact">Updating fixed dialing number\u2026</string>
-    <!-- "Edit FDN Contact" screen: status message displayed in a popup (toast) -->
-    <string name="fdn_contact_updated">Fixed dialing number updated.</string>
-    <!-- Title of "Delete FDN Contact" screen -->
-    <string name="delete_fdn_contact">Delete fixed dialing number</string>
-    <!-- "Delete FDN Contact" screen: status message displayed in a popup (toast) -->
-    <string name="deleting_fdn_contact">Deleting fixed dialing number\u2026</string>
-    <!-- "Delete FDN Contact" screen: status message displayed in a popup (toast) -->
-    <string name="fdn_contact_deleted">Fixed dialing number deleted.</string>
-    <!-- FDN settings: error message displayed in a popup (toast) -->
-    <string name="pin2_invalid">FDN wasn\'t updated because you typed an incorrect PIN.</string>
-    <!-- FDN settings: error message displayed in a popup (toast) -->
-    <string name="fdn_invalid_number">FDN wasn\'t updated because the number can\'t exceed 20 digits.</string>
-    <!-- FDN settings: error message displayed in a popup (toast), when the entered
-         FDN number was inappropriate, OR, PIN2 the user entered was incorrect.
-         Because of API restriction, there's no way to determine which is the exact
-         cause of the failure.
-         [CHAR LIMIT=NONE] -->
-    <string name="pin2_or_fdn_invalid">FDN wasn\'t updated. The PIN2 was incorrect, or the phone number was rejected.</string>
-
-    <!-- ADN related strings -->
-    <!-- Placeholder text displayed while loading the list of SIM contacts -->
-    <string name="simContacts_emptyLoading">Reading from SIM card\u2026</string>
-    <!-- Call settings, string that appears on FDN contact list when there are no contacts on the SIM. -->
-    <string name="simContacts_empty">No contacts on your SIM card.</string>
-    <!-- Call settings: title of the dialog that lets you select contacts from the SIM. -->
-    <string name="simContacts_title">Select contacts to import</string>
-    <!-- Appears when user tries to import contacts in SIM during Airplane mode
-      [CHAR LIMIT=NONE] -->
-    <string name="simContacts_airplaneMode">To import contacts from the SIM card, first turn off Airplane mode.</string>
-
-    <!-- SIM PIN strings -->
-    <!-- Title of "Enable/disable SIM PIN" screen -->
-    <string name="enable_pin">Enable/disable SIM PIN</string>
-    <!-- Title of "Change SIM PIN" screen -->
-    <string name="change_pin">Change SIM PIN</string>
-    <!-- SIM PIN screen: label for PIN entry widget -->
-    <string name="enter_pin_text">SIM PIN:</string>
-    <!-- SIM PIN screen: label for PIN entry widget -->
-    <string name="oldPinLabel">Old PIN</string>
-    <!-- SIM PIN screen: label for PIN entry widget -->
-    <string name="newPinLabel">New PIN</string>
-    <!-- SIM PIN screen: label for PIN entry widget -->
-    <string name="confirmPinLabel">Confirm new PIN</string>
-    <!-- SIM PIN screen: error message -->
-    <string name="badPin">The old PIN you typed isn\'t correct. Try again.</string>
-    <!-- SIM PIN screen: error message -->
-    <string name="mismatchPin">The PINs you typed don\'t match. Try again.</string>
-    <!-- SIM PIN screen: error message when PIN is too short or too long -->
-    <string name="invalidPin">Type a PIN that is 4 to 8 numbers.</string>
-    <!-- Title of "Disable SIM PIN" screen -->
-    <string name="disable_sim_pin">Disable SIM PIN</string>
-    <!-- Title of "Enable SIM PIN" screen -->
-    <string name="enable_sim_pin">Enable SIM PIN</string>
-    <!-- SIM PIN screen: progress message displayed while enabling -->
-    <string name="enable_in_progress">Please wait\u2026</string>
-    <!-- SIM PIN screen: status message displayed in a popup (toast) -->
-    <string name="enable_pin_ok">SIM PIN enabled.</string>
-    <!-- SIM PIN screen: status message displayed in a popup (toast) -->
-    <string name="disable_pin_ok">SIM PIN disabled.</string>
-    <!-- SIM PIN screen: error message displayed in a popup (toast) -->
-    <string name="pin_failed">The PIN you typed was incorrect.</string>
-    <!-- SIM PIN screen: status message displayed in a popup (toast) -->
-    <string name="pin_changed">SIM PIN changed successfully.</string>
-    <!-- SIM PIN screen: error message displayed in a dialog -->
-    <string name="puk_requested">Password incorrect, SIM is locked! PUK2 requested.</string>
-
-    <!-- SIM PIN2 strings -->
-    <!-- SIM PIN2 screen: label for PIN entry widget -->
-    <string name="enter_pin2_text">PIN2</string>
-    <!-- SIM PIN2 screen: label for PIN entry widget -->
-    <string name="oldPin2Label">Old PIN2</string>
-    <!-- SIM PIN2 screen: label for PIN entry widget -->
-    <string name="newPin2Label">New PIN2</string>
-    <!-- SIM PIN2 screen: label for PIN entry widget -->
-    <string name="confirmPin2Label">Confirm new PIN2</string>
-    <!-- SIM PIN2 screen: error message -->
-    <string name="badPuk2">The PUK2 you typed isn\'t correct. Try again. </string>
-    <!-- SIM PIN2 screen: error message -->
-    <string name="badPin2">The old PIN2 you typed isn\'t correct. Try again.</string>
-    <!-- SIM PIN2 screen: error message -->
-    <string name="mismatchPin2">The PIN2s you typed don\'t match. Try again.</string>
-    <!-- SIM PIN2 screen: error message -->
-    <string name="invalidPin2">Type a PIN2 that is 4 to 8 numbers.</string>
-    <!-- SIM PIN2 screen: error message -->
-    <string name="invalidPuk2">Type a PUK2 that is 8 numbers.</string>
-    <!-- SIM PIN2 screen: status message displayed in a popup (toast) -->
-    <string name="pin2_changed">PIN2 changed successfully.</string>
-    <!-- SIM PIN2 screen: label for PUK2 entry widget -->
-    <string name="label_puk2_code">Type PUK2 code</string>
-    <!-- SIM PIN2 screen: error message displayed in a dialog -->
-    <string name="fdn_enable_puk2_requested">Password incorrect. Change PIN2 and retry.</string>
-    <!-- SIM PIN2 screen: error message displayed in a dialog -->
-    <string name="puk2_requested">Password incorrect, SIM is locked. PUK2 requested.</string>
-
-    <!-- SIM PIN screen: button label -->
-    <string name="doneButton">Done</string>
-
     <!-- In-call screen: status label for a conference call -->
     <string name="caller_manage_header">Conference call <xliff:g id="conf_call_time">%s</xliff:g></string>
 
@@ -903,144 +271,6 @@
          to a video call. [CHAR LIMIT=10] -->
     <string name="onscreenVideoCallText">Video call</string>
 
-    <!-- Menu item label in SIM Contacts: Import a single contact entry from the SIM card -->
-    <string name="importSimEntry">Import</string>
-    <!-- Menu item label in SIM Contacts: Import all contact entries from the SIM card -->
-    <string name="importAllSimEntries">Import all</string>
-    <!-- SIM Contacts: status message displayed while importing card -->
-    <string name="importingSimContacts">Importing SIM contacts</string>
-    <!-- Import a single contact entry from contacts to the SIM card -->
-    <string name="importToFDNfromContacts">Import from contacts</string>
-
-    <!-- Hearing aid settings -->
-    <string name="hac_mode_title">Hearing aids</string>
-    <string name="hac_mode_summary">Turn on hearing aid compatibility</string>
-
-    <!-- Service option entries.  -->
-    <string-array name="tty_mode_entries">
-        <item>TTY Off</item>
-        <item>TTY Full</item>
-        <item>TTY HCO</item>
-        <item>TTY VCO</item>
-    </string-array>
-
-    <!-- Do not translate. -->
-    <string-array name="tty_mode_values" translatable="false">
-        <!-- Do not translate. -->
-        <item>0</item>
-        <!-- Do not translate. -->
-        <item>1</item>
-        <!-- Do not translate. -->
-        <item>2</item>
-        <!-- Do not translate. -->
-        <item>3</item>
-    </string-array>
-
-    <!-- Dtmf tones settings -->
-    <!-- Title for the DTMF Tones options displayed in Call Settings -->
-    <string name="dtmf_tones_title">DTMF tones</string>
-    <!-- Summary for the DTMF Tones options displayed in Call Settings -->
-    <string name="dtmf_tones_summary">Set the length of DTMF tones</string>
-    <!-- Options displayed as part of DTMF Tones in Call Settings -->
-    <string-array name="dtmf_tone_entries">
-      <item>Normal</item>
-      <item>Long</item>
-    </string-array>
-    <!-- Do not translate. -->
-    <string-array name="dtmf_tone_values" translatable="false">
-       <item>0</item>
-       <item>1</item>
-    </string-array>
-
-    <!-- Title for the dialog used to display CDMA DisplayInfo -->
-    <string name="network_message">Network message</string>
-
-    <!-- OTA-specific strings -->
-    <!-- Title shown on OTA screen -->
-    <string name="ota_title_activate">Activate your phone</string>
-    <!-- Message displayed on the OTA activation screen. -->
-    <string name="ota_touch_activate">A special call needs to be made to activate your phone service.
-    \n\nAfter pressing \u201CActivate\u201D, listen to the instructions provided to activate your phone.</string>
-
-    <!-- Title of skip activation dialog -->
-    <string name="ota_skip_activation_dialog_title">Skip activation\?</string>
-    <!-- Message displayed in skip activation dialog  -->
-    <string name="ota_skip_activation_dialog_message">If you skip activation, you can\'t place calls or connect to mobile data networks (though you can connect to Wi-Fi networks). Until you activate your phone, you are asked to activate it each time you turn it on.</string>
-    <!-- Label shown on dialog button that allows the user to skip activation -->
-    <string name="ota_skip_activation_dialog_skip_label">Skip</string>
-
-    <!-- Button label within the OTA activation screen -->
-    <string name="ota_activate">Activate</string>
-    <!-- Title text shown when phone activation is successful -->
-    <string name="ota_title_activate_success">Phone is activated.</string>
-    <!-- Title text shown on screen where activation fails -->
-    <string name="ota_title_problem_with_activation">Problem with activation</string>
-    <!-- Message displayed on the OTA "listening" screen. This message
-         needs to be kept at 2 lines or less to be sure that there's
-         enough room for the dialpad. [CHAR LIMIT=80] -->
-    <string name="ota_listen">Follow the spoken instructions until you hear that activation is complete.</string>
-
-    <!-- Button label within the OTA listen screen -->
-    <string name="ota_speaker">Speaker</string>
-    <!-- String to be displayed on OTA listen screen once user has selected the
-         correct option to begin provisioning -->
-    <string name="ota_progress">Wait while your phone is being programmed.</string>
-    <!-- String to display within the OTA Fail Notice dialog -->
-    <string name="ota_failure">Programming unsuccessful</string>
-    <!-- String to be displayed on the OTA Fail/Success screen upon successful provisioning -->
-    <string name="ota_successful">Your phone is now activated.  It may take up to 15 minutes for service to start.</string>
-    <!-- String to be displayed on the OTA Fail/Success screen upon unsuccessful provisioning -->
-    <string name="ota_unsuccessful">Your phone didn\'t activate.
-    \nYou may need to find an area with better coverage (near a window, or outside).
-    \n\nTry again or call customer service for more options.</string>
-    <!-- String to display within the OTA SPC Fail Notice dialog -->
-    <string name="ota_spc_failure">EXCESS SPC FAILURES</string>
-    <!-- Button label in OTA listen screen that cancels activation and goes to the previous screen -->
-    <string name="ota_call_end">Back</string>
-    <!-- Button label shown on OTA error screen to allow the user to try again -->
-    <string name="ota_try_again">Try again</string>
-    <!-- Button label shown on OTA screens that have a next screen -->
-    <string name="ota_next">Next</string>
-
-    <!-- Emergency Callback Mode (ECM) -->
-    <string name="ecm_exit_dialog">EcmExitDialog</string>
-    <!-- ECM: Status bar notification message -->
-    <string name="phone_entered_ecm_text">Entered Emergency Callback Mode</string>
-    <!-- ECM: Notification title -->
-    <string name="phone_in_ecm_notification_title">Emergency Callback Mode</string>
-    <!-- ECM: Notification body -->
-    <string name="phone_in_ecm_call_notification_text">Data connection disabled</string>
-    <plurals name="phone_in_ecm_notification_time">
-        <!-- number of minutes is one -->
-        <item quantity="one">No data connection for <xliff:g id="count">%s</xliff:g> minute</item>
-        <!-- number of minutes is not equal to one -->
-        <item quantity="other">No data connection for <xliff:g id="count">%s</xliff:g> minutes</item>
-    </plurals>
-    <!-- ECM: Dialog box message for exiting from the notifications screen -->
-    <plurals name="alert_dialog_exit_ecm">
-        <!-- number of minutes is one -->
-        <item quantity="one">The phone will be in Emergency Callback mode for <xliff:g id="count">%s</xliff:g> minute. While in this mode no apps using a data connection can be used. Do you want to exit now?</item>
-        <!-- number of minutes is not equal to one -->
-        <item quantity="other">The phone will be in Emergency Callback mode for <xliff:g id="count">%s</xliff:g> minutes. While in this mode no applications using a data connection can be used. Do you want to exit now?</item>
-    </plurals>
-    <!-- ECM: Dialog box message for exiting from any other app -->
-    <plurals name="alert_dialog_not_avaialble_in_ecm">
-        <!-- number of minutes is one -->
-        <item quantity="one">The selected action isn\'t available while in the Emergency Callback mode. The phone will be in this mode for <xliff:g id="count">%s</xliff:g> minute. Do you want to exit now?</item>
-        <!-- number of minutes is not equal to one -->
-        <item quantity="other">The selected action isn\'t available while in the Emergency Callback mode. The phone will be in this mode for <xliff:g id="count">%s</xliff:g> minutes. Do you want to exit now?</item>
-    </plurals>
-    <!-- ECM: Dialog box message while in emergency call -->
-    <string name="alert_dialog_in_ecm_call">The selected action isn\'t available while in an emergency call.</string>
-    <!-- ECM: Progress text -->
-    <string name="progress_dialog_exiting_ecm">Exiting Emergency Callback mode</string>
-    <!-- ECM: ECM exit dialog choice -->
-    <string name="alert_dialog_yes">Yes</string>
-    <!-- ECM: ECM exit dialog choice -->
-    <string name="alert_dialog_no">No</string>
-    <!-- ECM: ECM exit dialog choice -->
-    <string name="alert_dialog_dismiss">Dismiss</string>
-
     <!-- For incoming calls, this is a string we can get from a CDMA network instead of
          the actual phone number, to indicate there's no number present.  DO NOT TRANSLATE. -->
     <string-array name="absent_num" translatable="false">
@@ -1073,203 +303,6 @@
     <!--  Use this to describe the select contact button in EditPhoneNumberPreference; currently for screen readers through accessibility. -->
     <string name="selectContact">select contact</string>
 
-
-    <!-- Start of SIP related strings defined from here. -->
-
-    <!-- Title displayed SIP settings coming after other call settings in the call features screen. [CHAR LIMIT=NONE] -->
-    <string name="sip_settings">Internet call settings</string>
-    <!-- Title displayed SIP account settings in the sip settings category. [CHAR LIMIT=NONE] -->
-    <string name="sip_accounts">Internet calling (SIP) accounts</string>
-    <!-- Title displayed SIP account settings in the sip settings category. [CHAR LIMIT=NONE] -->
-    <string name="sip_accounts_title">Accounts</string>
-    <!-- Title displayed for the button of receiving incoming SIP calls flag. Enabled for receiving calls. [CHAR LIMIT=NONE] -->
-    <string name="sip_receive_calls">Receive incoming calls</string>
-    <!-- Help user to understand that it will require more battery usage if the 'receiving incoming call' is enabled. [CHAR LIMIT=NONE] -->
-    <string name="sip_receive_calls_summary">Reduces battery life</string>
-    <!-- Title for the dialog of selecting the way we handle an outgoing call. [CHAR LIMIT=NONE] -->
-    <string name="sip_call_options_title">Use Internet calling</string>
-    <!-- Title for the dialog of selecting the way we handle an outgoing call (Wi-Fi only). [CHAR LIMIT=NONE] -->
-    <string name="sip_call_options_wifi_only_title">Use Internet calling (Wi-Fi only)</string>
-
-    <!-- Item of the Internet call option dialog: for routing all outgoing calls via SIP. [CHAR LIMIT=NONE] -->
-    <string name="sip_call_options_entry_1">For all calls when data network is available</string>
-    <!-- Item of the Internet call option dialog: for routing a outgoing call via SIP if the destination is a SIP URI. [CHAR LIMIT=NONE] -->
-    <string name="sip_call_options_entry_2">Only for Internet calls</string>
-    <!-- Item of the Internet call option dialog: for asking user to select the way for each outgoing call. [CHAR LIMIT=NONE] -->
-    <string name="sip_call_options_entry_3">Ask for each call</string>
-    <!-- Item of the Internet call (Wi-Fi only) option dialog: for routing all outgoing calls via SIP. [CHAR LIMIT=NONE] -->
-    <string name="sip_call_options_wifi_only_entry_1">For all calls</string>
-
-    <!-- Title of the dialog to select the phone type for the outgoing call. [CHAR LIMIT=NONE] -->
-    <string name ="pick_outgoing_call_phone_type">Place call</string>
-
-    <!-- Title of the dialog to select the phone among the list of phones for the outgoing call. [CHAR LIMIT=NONE] -->
-    <string name ="pick_outgoing_sip_phone">Use Internet calling account:</string>
-
-    <!-- Text of checkbox to remember the sip phone for all outbound calls. [CHAR LIMIT=NONE] -->
-    <string name ="remember_my_choice">Always use to place Internet calls</string>
-
-    <!-- Help text of checkbox to unset the default sip phone for all outbound calls. [CHAR LIMIT=NONE] -->
-    <string name ="reset_my_choice_hint">You can change which Internet calling account to use by default from the Phone &gt; Settings &gt; Internet call settings &gt; Accounts screen.</string>
-
-    <!-- Item of the dialog to select the phone type for outgoing call. [CHAR LIMIT=NONE] -->
-    <string name ="pstn_phone">Cell phone call</string>
-
-    <!-- Item of the dialog to select the phone type for outgoing call. [CHAR LIMIT=NONE] -->
-    <string name ="internet_phone">Internet call</string>
-
-    <!-- Title of the dialog to redirect the user to SIP settings. [CHAR LIMIT=NONE] -->
-    <string name ="no_sip_account_found_title">No Internet calling account</string>
-    <!-- Message of the dialog to redirect the user to SIP settings. [CHAR LIMIT=NONE] -->
-    <string name ="no_sip_account_found">There are no Internet calling accounts on this phone. Do you want to add one now?</string>
-    <!-- Menu item for no sip account found dialog -->
-    <string name="sip_menu_add">Add</string>
-
-    <!-- Title for the button to add a new sip account. [CHAR LIMIT=NONE] -->
-    <string name="add_sip_account">Add account</string>
-    <!-- Title for the button to remove a sip account. [CHAR LIMIT=NONE] -->
-    <string name="remove_sip_account">Remove account</string>
-    <!-- String of the category which lists all sip accounts. [CHAR LIMIT=NONE] -->
-    <string name="sip_account_list">SIP accounts</string>
-    <!-- Toast message to indicate that the system is saving the account. [CHAR LIMIT=NONE] -->
-    <string name="saving_account">Saving the account\u2026</string>
-    <!-- Toast message to indicate that the system is removing the account. [CHAR LIMIT=NONE] -->
-    <string name="removing_account">Removing the account\u2026</string>
-
-    <!-- Menu item when the menu button is pressed in the sip account editor. [CHAR LIMIT=NONE] -->
-    <string name="sip_menu_save">Save</string>
-    <!-- Menu item when the menu button is pressed in the sip account editor. [CHAR LIMIT=NONE] -->
-    <string name="sip_menu_discard">Discard</string>
-
-    <!-- Title of the alert dialog. [CHAR LIMIT=NONE] -->
-    <string name="alert_dialog_close">Close the profile</string>
-    <!-- Title of the button to show in a alert dialog. [CHAR LIMIT=NONE] -->
-    <string name="alert_dialog_ok">OK</string>
-    <!-- Title of the button to show in a alert dialog. [CHAR LIMIT=NONE] -->
-    <string name="close_profile">Close</string>
-
-    <!-- Summary of a SIP account in the list of SIP accounts, consists of primary account status and registration status. This string indicates that this SIP account is a primary account and the string placeholder is the registration status, which will be one of the strings with name starting with "registration_status_" below. [CHAR LIMIT=NONE] -->
-    <string name="primary_account_summary_with">Primary account. <xliff:g id="registration_status" example="Registering...">%s</xliff:g></string>
-    <!-- Text of Internet-call registration status, checking current registration status with SIP service [CHAR LIMIT=NONE] -->
-    <string name="registration_status_checking_status">Checking status...</string>
-    <!-- Text of Internet-call registration status, registering with SIP server in order to receive calls on this account [CHAR LIMIT=NONE] -->
-    <string name="registration_status_registering">Registering\u2026</string>
-    <!-- Text of Internet-call registration status, still trying to register with SIP server [CHAR LIMIT=NONE] -->
-    <string name="registration_status_still_trying">Still trying\u2026</string>
-    <!-- Text of Internet-call registration status, currently not receiving calls on this account [CHAR LIMIT=NONE] -->
-    <string name="registration_status_not_receiving">Not receiving calls.</string>
-    <!-- Text of Internet-call registration status, no data connection [CHAR LIMIT=NONE] -->
-    <string name="registration_status_no_data">Account registration stopped because there is no Internet connection.</string>
-    <!-- Text of Internet-call registration status, no Wi-Fi connection [CHAR LIMIT=NONE] -->
-    <string name="registration_status_no_wifi_data">Account registration stopped because there is no Wi-Fi connection.</string>
-    <!-- Text of Internet-call registration status, registration process is not running due to some error [CHAR LIMIT=NONE] -->
-    <string name="registration_status_not_running">Account registration unsuccessful.</string>
-    <!-- Text of Internet-call registration status, currently we can receive calls on this account [CHAR LIMIT=NONE] -->
-    <string name="registration_status_done">Receiving calls.</string>
-    <!-- Text of Internet-call registration status, registration failed with a reason; will try again later [CHAR LIMIT=NONE] -->
-    <string name="registration_status_failed_try_later">Account registration unsuccessful: (<xliff:g id="registration_error_message" example="timed out">%s</xliff:g>); will try later</string>
-    <!-- Text of Internet-call registration status, registration failed due to invalid credentials [CHAR LIMIT=NONE] -->
-    <string name="registration_status_invalid_credentials">Account registration unsuccessful: Incorrect username or password.</string>
-    <!-- Text of Internet-call registration status, registration failed due to unknown host exception [CHAR LIMIT=NONE] -->
-    <string name="registration_status_server_unreachable">Account registration unsuccessful: Check the server name.</string>
-    <!-- Text for describing the account's owner and status. For example, 'Active, in use by Google Talk', it means that the account managed by SIP service was registered by the application 'Google Talk' and the status is active. [CHAR LIMIT=NONE] -->
-    <string name="third_party_account_summary">This account is currently in use by the <xliff:g id="account_owner" example="Google Talk">%s</xliff:g> app.</string>
-
-
-    <!-- Title of the sip editor screen. [CHAR LIMIT=NONE] -->
-    <string name="sip_edit_title">SIP account details</string>
-    <!-- Title of the sip editor screen. [CHAR LIMIT=NONE] -->
-    <string name="sip_edit_new_title">SIP account details</string>
-
-    <!-- Text of the domain address preference. [CHAR LIMIT=NONE] -->
-    <string name="domain_address_title">Server</string>
-    <!-- Text of the username preference. [CHAR LIMIT=NONE] -->
-    <string name="username_title">Username</string>
-    <!-- Text of the password preference. [CHAR LIMIT=NONE] -->
-    <string name="password_title">Password</string>
-    <!-- Text of the display name preference. [CHAR LIMIT=NONE] -->
-    <string name="display_name_title">Display name</string>
-    <!-- Text of the outbound proxy address preference. [CHAR LIMIT=NONE] -->
-    <string name="proxy_address_title">Outbound proxy address</string>
-    <!-- Text of the sip server/proxy port number. [CHAR LIMIT=NONE] -->
-    <string name="port_title">Port number</string>
-    <!-- Text of the transport type preference. [CHAR LIMIT=NONE] -->
-    <string name="transport_title">Transport type</string>
-    <!-- Text of the keepalive preference. [CHAR LIMIT=NONE] -->
-    <string name="send_keepalive_title">Send keep-alive</string>
-    <!-- Text of the set-primary preference. Simplified from "Make this my primary account". [CHAR LIMIT=NONE] -->
-    <string name="set_primary_title">Set as primary account</string>
-    <!-- Text of the set-primary preference summary. [CHAR LIMIT=NONE] -->
-    <string name="set_primary_summary">Used for outbound calls</string>
-    <!-- Text of the advanced settings section. [CHAR LIMIT=NONE] -->
-    <string name="advanced_settings">Optional settings</string>
-    <!-- Text of the username used in authentication. [CHAR LIMIT=NONE] -->
-    <string name="auth_username_title">Authentication username</string>
-    <!-- Help text of the auth_username field. [CHAR LIMIT=NONE] -->
-    <string name="auth_username_summary">Username used for authentication</string>
-
-    <!-- Initial status of the preferences is '<Not set>'. [CHAR LIMIT=NONE] -->
-    <string name="default_preference_summary">&lt;Not set&gt;</string>
-    <!-- Default value for the display-name preference summary. [CHAR LIMIT=NONE] -->
-    <string name="display_name_summary">&lt;Same as username&gt;</string>
-    <!-- Default value for the outbound-proxy-address preference summary. [CHAR LIMIT=NONE] -->
-    <string name="optional_summary">&lt;Optional&gt;</string>
-
-    <!-- Default sip server/proxy port number. -->
-    <string translatable="false" name="default_port">5060</string>
-    <!-- Default sip server/proxy transport protocol. -->
-    <string translatable="false" name="default_transport">UDP</string>
-
-
-    <!-- Hint to show the advanced settings section. [CHAR LIMIT=NONE] -->
-    <string name="advanced_settings_show">▷ Touch to show all</string>
-    <!-- Hint to hide the advanced settings section. [CHAR LIMIT=NONE] -->
-    <string name="advanced_settings_hide">▽ Touch to hide all</string>
-
-    <!-- Text in an alert dialog telling the user that some input field (name of which is also part of the strings being translated above) is required and can not be left blank. [CHAR LIMIT=NONE] -->
-    <string name="empty_alert"><xliff:g id="input_field_name" example="Username, Password...">%s</xliff:g> is required and can\'t be left blank.</string>
-    <!-- Showing that port number is out of range in an alert dialog. [CHAR LIMIT=NONE] -->
-    <string name="not_a_valid_port">Port number should be within 1000 and 65534.</string>
-
-    <!-- Title of the alert dialog to notify user that there is no Internet connectivity. [CHAR LIMIT=40] -->
-    <string name="no_internet_available_title">No Internet connection</string>
-    <!-- Title of the alert dialog to notify user that there is no Wi-Fi connectivity. [CHAR LIMIT=40] -->
-    <string name="no_wifi_available_title">No Wi-Fi connection</string>
-    <!-- Message of the alert dialog to notify user that there is no Internet connectivity. [CHAR LIMIT=NONE] -->
-    <string name="no_internet_available">To place an Internet call, check your Internet connection first.</string>
-    <!-- Message of the alert dialog to notify user that there is no Wi-Fi connectivity. [CHAR LIMIT=NONE] -->
-    <string name="no_wifi_available">You need to be connected to a Wi-Fi network for Internet calls (use the Wireless &amp; Network settings).</string>
-    <!-- Title of the alert dialog to notify user that Internet call is not supported. [CHAR LIMIT=40] -->
-    <string name="no_voip">Internet calling not supported</string>
-
-    <!-- Option for whether the SIP service should send keepalive messages. [CHAR LIMIT=40] -->
-    <string translatable="true" name="sip_system_decide">Automatic</string>
-    <!-- Option for whether the SIP service should send keepalive messages. [CHAR LIMIT=40] -->
-    <string translatable="true" name="sip_always_send_keepalive">Always send</string>
-
-    <!-- Do not translate the following strings. Used for the Internet call options. Need to be in-sync with Settings.System.SIP_ strings. -->
-    <string translatable="false" name="sip_always">SIP_ALWAYS</string>
-    <string translatable="false" name="sip_address_only">SIP_ADDRESS_ONLY</string>
-    <string translatable="false" name="sip_ask_me_each_time">SIP_ASK_ME_EACH_TIME</string>
-
-    <!-- Do not translate the following strings. Used for the preference keys -->
-    <string translatable="false" name="domain_address">SipDomain</string>
-    <string translatable="false" name="username">UserName</string>
-    <string translatable="false" name="password">Password</string>
-    <string translatable="false" name="display_name">DisplayName</string>
-    <string translatable="false" name="proxy_address">ProxyAddress</string>
-    <string translatable="false" name="port">Port</string>
-    <string translatable="false" name="transport">Protocol</string>
-    <string translatable="false" name="send_keepalive">SendKeepAlive</string>
-    <string translatable="false" name="set_primary">SetPrimary</string>
-    <string translatable="false" name="advanced_settings_container">advanced settings container</string>
-    <string translatable="false" name="auth_username">AuthUserName</string>
-    <!-- End of SIP settings related strings -->
-
-    <!-- Dialog title to notify user that Voice calling is not supported
-         on this device. [CHAR LIMIT=40] -->
-    <string name="not_voice_capable">Voice calling not supported</string>
-
     <!-- Canned response for the "Respond via SMS" feature for incoming calls. [CHAR LIMIT=35] -->
     <string name="respond_via_sms_canned_response_1">Can\'t talk now. What\'s up?</string>
     <!-- Canned response for the "Respond via SMS" feature for incoming calls. [CHAR LIMIT=35] -->
@@ -1484,4 +517,54 @@
 
     <!-- This can be used in any application wanting to disable the text "Emergency number" -->
     <string name="emergency_call_dialog_number_for_display">Emergency number</string>
+
+    <!-- The digit to be displayed on the 0 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_0_number">0</string>
+    <!-- The digit to be displayed on the 1 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_1_number">1</string>
+    <!-- The digit to be displayed on the 2 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_2_number">2</string>
+    <!-- The digit to be displayed on the 3 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_3_number">3</string>
+    <!-- The digit to be displayed on the 4 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_4_number">4</string>
+    <!-- The digit to be displayed on the 5 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_5_number">5</string>
+    <!-- The digit to be displayed on the 6 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_6_number">6</string>
+    <!-- The digit to be displayed on the 7 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_7_number">7</string>
+    <!-- The digit to be displayed on the 8 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_8_number">8</string>
+    <!-- The digit to be displayed on the 9 key of the dialpad [CHAR LIMIT=1]-->
+    <string name="dialpad_9_number">9</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_star_number">*</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_pound_number">#</string>
+
+    <!--  Do not translate. -->
+    <string name="dialpad_0_letters">+</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_1_letters"></string>
+    <!--  Do not translate. -->
+    <string name="dialpad_2_letters">ABC</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_3_letters">DEF</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_4_letters">GHI</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_5_letters">JKL</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_6_letters">MNO</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_7_letters">PQRS</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_8_letters">TUV</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_9_letters">WXYZ</string>
+    <!--  Do not translate. -->
+    <string name="dialpad_star_letters"></string>
+    <!--  Do not translate. -->
+    <string name="dialpad_pound_letters"></string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 91090b84..3fb2bb28 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -131,21 +131,52 @@
         <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item>
     </style>
 
-    <style name="DialpadButtonStyle">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">match_parent</item>
+    <style name="InCallDialpadTableRowStyle">
+        <item name="android:layout_height">0dp</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+
+    <style name="InCallDialpadKeyNumberStyle">
+        <item name="android:textColor">@color/actionbar_background_color</item>
+        <item name="android:textSize">@dimen/dialpad_key_numbers_size</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:layout_width">@dimen/dialpad_key_numbers_width</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="InCallDialpadKeyStarPoundStyle">
+        <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:layout_width">@dimen/dialpad_key_numbers_width</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="InCallDialpadKeyLettersStyle">
+        <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+        <item name="android:textSize">@dimen/dialpad_key_letters_size</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:layout_width">@dimen/dialpad_key_letters_width</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">@dimen/dialpad_number_to_letters_padding</item>
+    </style>
+
+    <style name="InCallDialpadKeyButtonStyle">
         <item name="android:soundEffectsEnabled">false</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/dialpad_key_height</item>
+        <item name="android:background">@drawable/dialpad_key_colors</item>
+        <item name="android:focusable">true</item>
     </style>
 
-    <style name="DialtactsDigitsTextAppearance">
-        <item name="android:maxLines">1</item>
-        <item name="android:textSize">@dimen/dialpad_digits_text_size</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:freezesText">true</item>
-        <item name="android:editable">true</item>
-        <item name="android:cursorVisible">false</item>
+    <style name="InCallDialpadKeyInternalLayoutStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:gravity">center</item>
     </style>
 
     <style name="PrimaryCallInfoPrimaryCallBanner">
diff --git a/src/com/android/incallui/AnswerFragment.java b/src/com/android/incallui/AnswerFragment.java
index 0b81ffee..c76c5071 100644
--- a/src/com/android/incallui/AnswerFragment.java
+++ b/src/com/android/incallui/AnswerFragment.java
@@ -156,6 +156,7 @@ public class AnswerFragment extends BaseFragment<AnswerPresenter, AnswerPresente
             }
         });
         mCannedResponsePopup = builder.create();
+        mCannedResponsePopup.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
         mCannedResponsePopup.show();
     }
 
@@ -261,6 +262,7 @@ public class AnswerFragment extends BaseFragment<AnswerPresenter, AnswerPresente
         // Keyboard up, show the dialog
         mCustomMessagePopup.getWindow().setSoftInputMode(
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        mCustomMessagePopup.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
         mCustomMessagePopup.show();
 
         // Send button starts out disabled
diff --git a/src/com/android/incallui/CallList.java b/src/com/android/incallui/CallList.java
index 4c43db7b..c1610580 100644
--- a/src/com/android/incallui/CallList.java
+++ b/src/com/android/incallui/CallList.java
@@ -311,7 +311,9 @@ public class CallList {
             if (state != Call.State.IDLE &&
                     state != Call.State.INVALID &&
                     state != Call.State.DISCONNECTED) {
+
                 call.setState(Call.State.DISCONNECTED);
+                call.setDisconnectCause(DisconnectCause.NOT_VALID);
                 updateCallInMap(call);
             }
         }
diff --git a/src/com/android/incallui/DialpadFragment.java b/src/com/android/incallui/DialpadFragment.java
index 5087561e..236b38c9 100644
--- a/src/com/android/incallui/DialpadFragment.java
+++ b/src/com/android/incallui/DialpadFragment.java
@@ -17,16 +17,22 @@
 package com.android.incallui;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.method.DialerKeyListener;
+import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TableRow;
+import android.widget.TextView;
 
 import java.util.HashMap;
 
@@ -37,6 +43,61 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
         implements DialpadPresenter.DialpadUi, View.OnTouchListener, View.OnKeyListener,
         View.OnHoverListener, View.OnClickListener {
 
+    private static final float DIALPAD_SLIDE_FRACTION = 1.0f;
+
+    /**
+     * LinearLayout with getter and setter methods for the translationY property using floats,
+     * for animation purposes.
+     */
+    public static class DialpadSlidingLinearLayout extends LinearLayout {
+
+        public DialpadSlidingLinearLayout(Context context) {
+            super(context);
+        }
+
+        public DialpadSlidingLinearLayout(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
+        public DialpadSlidingLinearLayout(Context context, AttributeSet attrs, int defStyle) {
+            super(context, attrs, defStyle);
+        }
+
+        public float getYFraction() {
+            final int height = getHeight();
+            if (height == 0) return 0;
+            return getTranslationY() / height;
+        }
+
+        public void setYFraction(float yFraction) {
+            setTranslationY(yFraction * getHeight());
+        }
+    }
+
+    /**
+     * LinearLayout that always returns true for onHoverEvent callbacks, to fix
+     * problems with accessibility due to the dialpad overlaying other fragments.
+     */
+    public static class HoverIgnoringLinearLayout extends LinearLayout {
+
+        public HoverIgnoringLinearLayout(Context context) {
+            super(context);
+        }
+
+        public HoverIgnoringLinearLayout(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
+        public HoverIgnoringLinearLayout(Context context, AttributeSet attrs, int defStyle) {
+            super(context, attrs, defStyle);
+        }
+
+        @Override
+        public boolean onHoverEvent(MotionEvent event) {
+            return true;
+        }
+    }
+
     private EditText mDtmfDialerField;
 
     /** Hash Map to map a view id to a character*/
@@ -254,9 +315,8 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
 
     @Override
     public void onClick(View v) {
-        Log.d(this, "onClick");
         final AccessibilityManager accessibilityManager = (AccessibilityManager)
-            getActivity().getSystemService(Context.ACCESSIBILITY_SERVICE);
+            v.getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
         // When accessibility is on, simulate press and release to preserve the
         // semantic meaning of performClick(). Required for Braille support.
         if (accessibilityManager.isEnabled()) {
@@ -273,7 +333,7 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
         // When touch exploration is turned on, lifting a finger while inside
         // the button's hover target bounds should perform a click action.
         final AccessibilityManager accessibilityManager = (AccessibilityManager)
-            getActivity().getSystemService(Context.ACCESSIBILITY_SERVICE);
+            v.getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
 
         if (accessibilityManager.isEnabled()
                 && accessibilityManager.isTouchExplorationEnabled()) {
@@ -382,6 +442,29 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
 
             setupKeypad(parent);
         }
+
+        final ViewTreeObserver vto = parent.getViewTreeObserver();
+        // Adjust the translation of the DialpadFragment in a preDrawListener instead of in
+        // DialtactsActivity, because at the point in time when the DialpadFragment is added,
+        // its views have not been laid out yet.
+        final ViewTreeObserver.OnPreDrawListener
+                preDrawListener = new ViewTreeObserver.OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+                if (isHidden()) return true;
+                if (parent.getTranslationY() == 0) {
+                    ((DialpadSlidingLinearLayout) parent)
+                            .setYFraction(DIALPAD_SLIDE_FRACTION);
+                }
+                final ViewTreeObserver vto = parent.getViewTreeObserver();
+                vto.removeOnPreDrawListener(this);
+                return true;
+            }
+
+        };
+
+        vto.addOnPreDrawListener(preDrawListener);
+
         return parent;
     }
 
@@ -440,21 +523,43 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
         }
     }
 
-    /**
-     * setup the keys on the dialer activity, using the keymaps.
-     */
-    private void setupKeypad(View parent) {
-        // for each view id listed in the displaymap
+    private void setupKeypad(View fragmentView) {
+        final int[] buttonIds = new int[] {R.id.zero, R.id.one, R.id.two, R.id.three, R.id.four,
+                R.id.five, R.id.six, R.id.seven, R.id.eight, R.id.nine, R.id.star, R.id.pound};
+
+        final int[] numberIds = new int[] {R.string.dialpad_0_number, R.string.dialpad_1_number,
+                R.string.dialpad_2_number, R.string.dialpad_3_number, R.string.dialpad_4_number,
+                R.string.dialpad_5_number, R.string.dialpad_6_number, R.string.dialpad_7_number,
+                R.string.dialpad_8_number, R.string.dialpad_9_number, R.string.dialpad_star_number,
+                R.string.dialpad_pound_number};
+
+        final int[] letterIds = new int[] {R.string.dialpad_0_letters, R.string.dialpad_1_letters,
+                R.string.dialpad_2_letters, R.string.dialpad_3_letters, R.string.dialpad_4_letters,
+                R.string.dialpad_5_letters, R.string.dialpad_6_letters, R.string.dialpad_7_letters,
+                R.string.dialpad_8_letters, R.string.dialpad_9_letters,
+                R.string.dialpad_star_letters, R.string.dialpad_pound_letters};
+
+        final Resources resources = getResources();
+
         View button;
-        for (int viewId : mDisplayMap.keySet()) {
-            // locate the view
-            button = parent.findViewById(viewId);
-            // Setup the listeners for the buttons
+        TextView numberView;
+        TextView lettersView;
+
+        for (int i = 0; i < buttonIds.length; i++) {
+            button = fragmentView.findViewById(buttonIds[i]);
             button.setOnTouchListener(this);
             button.setClickable(true);
             button.setOnKeyListener(this);
             button.setOnHoverListener(this);
             button.setOnClickListener(this);
+            numberView = (TextView) button.findViewById(R.id.dialpad_key_number);
+            lettersView = (TextView) button.findViewById(R.id.dialpad_key_letters);
+            final String numberString = resources.getString(numberIds[i]);
+            numberView.setText(numberString);
+            button.setContentDescription(numberString);
+            if (lettersView != null) {
+                lettersView.setText(resources.getString(letterIds[i]));
+            }
         }
     }
 }
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java
index aa4a715a..d41cc99a 100644
--- a/src/com/android/incallui/InCallActivity.java
+++ b/src/com/android/incallui/InCallActivity.java
@@ -21,6 +21,7 @@ import com.android.services.telephony.common.Call.State;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.FragmentTransaction;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.DialogInterface.OnCancelListener;
@@ -309,6 +310,10 @@ public class InCallActivity extends Activity {
         InCallPresenter.getInstance().getProximitySensor().onConfigurationChanged(config);
     }
 
+    public CallButtonFragment getCallButtonFragment() {
+        return mCallButtonFragment;
+    }
+
     private void internalResolveIntent(Intent intent) {
         final String action = intent.getAction();
 
@@ -366,7 +371,7 @@ public class InCallActivity extends Activity {
         if (mDialpadFragment == null) {
             mDialpadFragment = (DialpadFragment) getFragmentManager()
                     .findFragmentById(R.id.dialpadFragment);
-            mDialpadFragment.getView().setVisibility(View.INVISIBLE);
+            getFragmentManager().beginTransaction().hide(mDialpadFragment).commit();
         }
 
         if (mConferenceManagerFragment == null) {
@@ -399,13 +404,15 @@ public class InCallActivity extends Activity {
     }
 
     public void displayDialpad(boolean showDialpad) {
+        final FragmentTransaction ft = getFragmentManager().beginTransaction();
         if (showDialpad) {
-            mDialpadFragment.setVisible(true);
-            mCallCardFragment.setVisible(false);
+            ft.setCustomAnimations(R.anim.incall_dialpad_slide_in, 0);
+            ft.show(mDialpadFragment);
         } else {
-            mDialpadFragment.setVisible(false);
-            mCallCardFragment.setVisible(true);
+            ft.setCustomAnimations(0, R.anim.incall_dialpad_slide_out);
+            ft.hide(mDialpadFragment);
         }
+        ft.commitAllowingStateLoss();
 
         InCallPresenter.getInstance().getProximitySensor().onDialpadVisible(showDialpad);
     }
diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java
index 8bec492d..14026212 100644
--- a/src/com/android/incallui/InCallPresenter.java
+++ b/src/com/android/incallui/InCallPresenter.java
@@ -425,7 +425,9 @@ public class InCallPresenter implements CallList.Listener {
     }
 
     public void onPostDialCharWait(int callId, String chars) {
-        mInCallActivity.showPostCharWaitDialog(callId, chars);
+        if (isActivityStarted()) {
+            mInCallActivity.showPostCharWaitDialog(callId, chars);
+        }
     }
 
     /**
diff --git a/src/com/android/incallui/NeededForReflection.java b/src/com/android/incallui/NeededForReflection.java
new file mode 100644
index 00000000..363a0a54
--- /dev/null
+++ b/src/com/android/incallui/NeededForReflection.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.incallui;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Denotes that the class, constructor, method or field is used for reflection and therefore cannot
+ * be removed by tools like ProGuard.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.TYPE, ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.FIELD})
+public @interface NeededForReflection {}
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index 6d9fd600..2de1b2d0 100644
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -236,7 +236,6 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
                         mNotificationTimer.getState() == NotificationTimer.State.FIRED);
 
         if (showNotificationNow) {
-            Log.e(this, "showNotificationNow == true case", new Exception());
             showNotification(call, allowFullScreenIntent);
         } else {
             cancelInCall();