diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 2c6e526..85724f7 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -25,10 +25,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.graphics.Color;
 import android.graphics.Point;
-import android.graphics.drawable.ColorDrawable;
 import android.media.AudioManager;
 import android.media.ToneGenerator;
 import android.net.Uri;
@@ -55,7 +52,6 @@
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 
 import com.android.phone.common.dialpad.DialpadKeyButton;
 import com.android.phone.common.util.ViewUtil;
@@ -193,7 +189,8 @@
         getWindow().setAttributes(lp);
 
         mColorExtractor = new ColorExtractor(this);
-        GradientColors lockScreenColors = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK);
+        GradientColors lockScreenColors = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,
+                ColorExtractor.TYPE_EXTRA_DARK);
         updateTheme(lockScreenColors.supportsDarkText());
 
         setContentView(R.layout.emergency_dialer);
@@ -494,7 +491,8 @@
         super.onStart();
 
         mColorExtractor.addOnColorsChangedListener(this);
-        GradientColors lockScreenColors = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK);
+        GradientColors lockScreenColors = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,
+                ColorExtractor.TYPE_EXTRA_DARK);
         // Do not animate when view isn't visible yet, just set an initial state.
         mBackgroundGradient.setColors(lockScreenColors, false);
         updateTheme(lockScreenColors.supportsDarkText());
@@ -736,8 +734,10 @@
     }
 
     @Override
-    public void onColorsChanged(GradientColors colors, int which) {
+    public void onColorsChanged(ColorExtractor extractor, int which) {
         if ((which & WallpaperManager.FLAG_LOCK) != 0) {
+            GradientColors colors = extractor.getColors(WallpaperManager.FLAG_LOCK,
+                    ColorExtractor.TYPE_EXTRA_DARK);
             mBackgroundGradient.setColors(colors);
             updateTheme(colors.supportsDarkText());
         }
