diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 60dffac..68fd8b8 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -38,7 +38,6 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
@@ -47,20 +46,17 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
-import android.graphics.DrawFilter;
-import android.graphics.Paint;
-import android.graphics.PaintFlagsDrawFilter;
 import android.graphics.Picture;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.hardware.SensorListener;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.WebAddress;
-import android.net.http.EventHandler;
 import android.net.http.SslCertificate;
 import android.net.http.SslError;
 import android.os.AsyncTask;
@@ -99,12 +95,6 @@
 import android.view.WindowManager;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.ScaleAnimation;
-import android.view.animation.TranslateAnimation;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.DownloadListener;
@@ -115,7 +105,6 @@
 import android.webkit.URLUtil;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
-import android.webkit.WebChromeClient.CustomViewCallback;
 import android.webkit.WebHistoryItem;
 import android.webkit.WebIconDatabase;
 import android.webkit.WebStorage;
@@ -127,13 +116,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -141,14 +125,10 @@
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
 public class BrowserActivity extends Activity
     implements View.OnCreateContextMenuListener,
@@ -754,19 +734,19 @@
      *              * *
      *               *
      */
-    private final SensorListener mSensorListener = new SensorListener() {
+    private final SensorEventListener mSensorEventListener = new SensorEventListener() {
         private long mLastGestureTime;
         private float[] mPrev = new float[3];
         private float[] mPrevDiff = new float[3];
         private float[] mDiff = new float[3];
         private float[] mRevertDiff = new float[3];
 
-        public void onSensorChanged(int sensor, float[] values) {
+        public void onSensorChanged(SensorEvent event) {
             boolean show = false;
             float[] diff = new float[3];
 
             for (int i = 0; i < 3; i++) {
-                diff[i] = values[i] - mPrev[i];
+                diff[i] = event.values[i] - mPrev[i];
                 if (Math.abs(diff[i]) > 1) {
                     show = true;
                 }
@@ -781,14 +761,14 @@
                 }
                 mDiff[i] += diff[i];
                 mPrevDiff[i] = diff[i];
-                mPrev[i] = values[i];
+                mPrev[i] = event.values[i];
             }
 
             if (false) {
                 // only shows if we think the delta is big enough, in an attempt
                 // to detect "serious" moves left/right or up/down
-                Log.d("BrowserSensorHack", "sensorChanged " + sensor + " ("
-                        + values[0] + ", " + values[1] + ", " + values[2] + ")"
+                Log.d("BrowserSensorHack", "sensorChanged " + event.sensor.getName() + " ("
+                        + event.values[0] + ", " + event.values[1] + ", " + event.values[2] + ")"
                         + " diff(" + diff[0] + " " + diff[1] + " " + diff[2]
                         + ")");
                 Log.d("BrowserSensorHack", "      mDiff(" + mDiff[0] + " "
@@ -831,7 +811,7 @@
             }
         }
 
-        public void onAccuracyChanged(int sensor, int accuracy) {
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
             // TODO Auto-generated method stub
 
         }
@@ -873,8 +853,8 @@
                 mSensorManager = (SensorManager) getSystemService(
                         Context.SENSOR_SERVICE);
             }
-            mSensorManager.registerListener(mSensorListener,
-                    SensorManager.SENSOR_ACCELEROMETER,
+            mSensorManager.registerListener(mSensorEventListener,
+                    mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
                     SensorManager.SENSOR_DELAY_FASTEST);
         } else {
             mSensorManager = null;
@@ -1137,7 +1117,7 @@
         WebView.disablePlatformNotifications();
 
         if (mSensorManager != null) {
-            mSensorManager.unregisterListener(mSensorListener);
+            mSensorManager.unregisterListener(mSensorEventListener);
         }
     }
 
@@ -4254,7 +4234,7 @@
         Intent intent = new Intent(this,
                 BrowserDownloadPage.class);
         intent.setData(downloadRecord);
-        startActivityForResult(intent, this.DOWNLOAD_PAGE);
+        startActivityForResult(intent, BrowserActivity.DOWNLOAD_PAGE);
 
     }