auto import from //depot/cupcake/@132589

1 files changed, 15 insertions, 127 deletions

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 87e3412..aab529c 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -16,86 +16,60 @@
 
 package com.android.settings;
 
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Telephony;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.Toast;
 
 public class ApnSettings extends PreferenceActivity {
 
     public static final String EXTRA_POSITION = "position";
-    public static final String RESTORE_CARRIERS_URI =
-        "content://telephony/carriers/restore";
-
+    
     private static final int ID_INDEX = 0;
     private static final int NAME_INDEX = 1;
     private static final int APN_INDEX = 2;
 
     private static final int MENU_NEW = Menu.FIRST;
-    private static final int MENU_RESTORE = Menu.FIRST + 1;
-
-    private static final int EVENT_RESTORE_DEFAULTAPN_START = 1;
-    private static final int EVENT_RESTORE_DEFAULTAPN_COMPLETE = 2;
-
-    private static final int DIALOG_RESTORE_DEFAULTAPN = 1001;
-
-    private static final Uri DEFAULTAPN_URI = Uri.parse(RESTORE_CARRIERS_URI);
-
-    private static boolean mRestoreDefaultApnMode;
-
-    private RestoreApnUiHandler mRestoreApnUiHandler;
-    private RestoreApnProcessHandler mRestoreApnProcessHandler;
-
+    
     private Cursor mCursor;
 
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
-        addPreferencesFromResource(R.xml.apn_settings);
+        
+        addPreferencesFromResource(R.xml.apn_settings);    
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-
-        if (!mRestoreDefaultApnMode) {
-            fillList();
-        } else {
-            showDialog(DIALOG_RESTORE_DEFAULTAPN);
-        }
+        
+        fillList();
     }
-
+    
     private void fillList() {
         mCursor = managedQuery(Telephony.Carriers.CONTENT_URI, new String[] {
                 "_id", "name", "apn"}, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
 
         PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
         apnList.removeAll();
-
+        
         mCursor.moveToFirst();
         while (!mCursor.isAfterLast()) {
             String name = mCursor.getString(NAME_INDEX);
             String apn = mCursor.getString(APN_INDEX);
-
+            
             if (name != null && apn != null && TextUtils.getTrimmedLength(name) > 0
                     && TextUtils.getTrimmedLength(apn) > 0) {
                 Preference pref = new Preference((Context) this);
@@ -105,20 +79,17 @@ public class ApnSettings extends PreferenceActivity {
                 pref.setPersistent(false);
                 apnList.addPreference(pref);
             }
-
+            
             mCursor.moveToNext();
         }
     }
-
+    
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        menu.add(0, MENU_NEW, 0,
+        menu.add(0, MENU_NEW, 0, 
                 getResources().getString(R.string.menu_new))
                 .setIcon(android.R.drawable.ic_menu_add);
-        menu.add(0, MENU_RESTORE, 0,
-                getResources().getString(R.string.menu_restore))
-                .setIcon(android.R.drawable.ic_menu_upload);
         return true;
     }
 
@@ -128,18 +99,14 @@ public class ApnSettings extends PreferenceActivity {
         case MENU_NEW:
             addNewApn();
             return true;
-
-        case MENU_RESTORE:
-            restoreDefaultApn();
-            return true;
         }
         return super.onOptionsItemSelected(item);
     }
-
+    
     private void addNewApn() {
         startActivity(new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI));
     }
-
+    
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         int pos = Integer.parseInt(preference.getKey());
@@ -147,83 +114,4 @@ public class ApnSettings extends PreferenceActivity {
         startActivity(new Intent(Intent.ACTION_EDIT, url));
         return true;
     }
-
-    private boolean restoreDefaultApn() {
-        showDialog(DIALOG_RESTORE_DEFAULTAPN);
-        mRestoreDefaultApnMode = true;
-
-        if (mRestoreApnUiHandler == null) {
-            mRestoreApnUiHandler = new RestoreApnUiHandler();
-        }
-
-        if (mRestoreApnProcessHandler == null) {
-            HandlerThread restoreDefaultApnThread = new HandlerThread(
-                    "Restore default APN Handler: Process Thread");
-            restoreDefaultApnThread.start();
-            mRestoreApnProcessHandler = new RestoreApnProcessHandler(
-                    restoreDefaultApnThread.getLooper(), mRestoreApnUiHandler);
-        }
-
-        mRestoreApnProcessHandler
-                .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_START);
-        return true;
-    }
-
-    private class RestoreApnUiHandler extends Handler {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case EVENT_RESTORE_DEFAULTAPN_COMPLETE:
-                    fillList();
-                    getPreferenceScreen().setEnabled(true);
-                    mRestoreDefaultApnMode = false;
-                    dismissDialog(DIALOG_RESTORE_DEFAULTAPN);
-                    Toast.makeText(
-                        ApnSettings.this,
-                        getResources().getString(
-                                R.string.restore_default_apn_completed),
-                        Toast.LENGTH_LONG).show();
-                    break;
-            }
-        }
-    }
-
-    private class RestoreApnProcessHandler extends Handler {
-        private Handler mRestoreApnUiHandler;
-
-        public RestoreApnProcessHandler(Looper looper, Handler restoreApnUiHandler) {
-            super(looper);
-            this.mRestoreApnUiHandler = restoreApnUiHandler;
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case EVENT_RESTORE_DEFAULTAPN_START:
-                    ContentResolver resolver = getContentResolver();
-                    resolver.delete(DEFAULTAPN_URI, null, null);                    
-                    mRestoreApnUiHandler
-                        .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_COMPLETE);
-                    break;
-            }
-        }
-    }
-
-    @Override
-    protected Dialog onCreateDialog(int id) {
-        if (id == DIALOG_RESTORE_DEFAULTAPN) {
-            ProgressDialog dialog = new ProgressDialog(this);
-            dialog.setMessage(getResources().getString(R.string.restore_default_apn));
-            dialog.setCancelable(false);
-            return dialog;
-        }
-        return null;
-    }
-
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog) {
-        if (id == DIALOG_RESTORE_DEFAULTAPN) {
-            getPreferenceScreen().setEnabled(false);
-        }
-    }
 }