From: Android (Google) Code Review <android-gerrit@google.com>
Date: Sat, 20 Jun 2009 00:16:33 +0000 (-0700)
Subject: Merge change 4674 into donut
X-Git-Tag: tegra-9.12.7~349^2
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=android%2Fplatform%2Fpackages%2Fapps%2FPhone.git;a=commitdiff_plain;h=bb120af49136e7b8580857199ea79816d87ffc66;hp=243575cc326b81d558ee0fa3c243e0121fd6f7f6

Merge change 4674 into donut

* changes:
  FIX 1914930 -- 	Bad state of Emergency Dialer after orientation change.
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9786fc42..cd4b30e9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -63,9 +63,10 @@
                       android:readPermission="android.permission.READ_CONTACTS"
                       android:writePermission="android.permission.WRITE_CONTACTS" />
 
-        <!-- A virtual emergency 12 key dialer -->
+        <!-- Dialer UI that only allows emergency calls -->
         <activity android:name="EmergencyDialer"
-            android:label="@string/emergencyDialerIconLabel">
+            android:label="@string/emergencyDialerIconLabel"
+            android:screenOrientation="nosensor">
             <intent-filter>
                 <action android:name="com.android.phone.EmergencyDialer.DIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 599d83c3..827fb301 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -44,7 +44,7 @@ import android.view.WindowManager;
 import android.widget.EditText;
 
 /**
- * EmergencyDialer is a special dailer that is used ONLY for dialing emergency calls.
+ * EmergencyDialer is a special dialer that is used ONLY for dialing emergency calls.
  * It is a special case of the TwelveKeyDialer that:
  *   1. allows ONLY emergency calls to be dialed
  *   2. disallows voicemail functionality
@@ -416,7 +416,7 @@ View.OnLongClickListener, View.OnKeyListener, TextWatcher {
     public void onPause() {
         // Turn keyguard back on and set the poke lock timeout to default.  There
         // is no need to do anything with the wake lock.
-        if (DBG) Log.d(LOG_TAG, "turning keyguard back on and closing the dailer");
+        if (DBG) Log.d(LOG_TAG, "turning keyguard back on and closing the dialer");
         PhoneApp app = (PhoneApp) getApplication();
         app.reenableKeyguard();
         app.setScreenTimeout(PhoneApp.ScreenTimeoutDuration.DEFAULT);