commit 1e60c9603e02f95158d21b4a2089dc45dffb41c1
author San Mehat <san@google.com> Fri Feb 05 11:35:45 2010 -0800
committer San Mehat <san@google.com> Mon Feb 08 16:26:16 2010 -0800
tree db40e19878090465ad7c90ca9b68e518bdad73f9
parent 07c61c6dbb805ab9aa60ceffd3bd1fb528a3dc65

Settings: Refactor for new API and remove some unused references / imports

Signed-off-by: San Mehat <san@google.com>

src/com/android/settings/SdCardSettings.java

diff --git a/src/com/android/settings/SdCardSettings.java b/src/com/android/settings/SdCardSettings.java
index 4a83843..2ff5d8a 100644
--- a/src/com/android/settings/SdCardSettings.java
+++ b/src/com/android/settings/SdCardSettings.java
@@ -24,9 +24,10 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.Environment;
-import android.os.IMountService;
 import android.os.ServiceManager;
 import android.os.StatFs;
+import android.os.storage.StorageManager;
+import android.os.storage.IMountService;
 import android.text.format.Formatter;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -45,6 +46,7 @@
 
         setContentView(R.layout.sdcard_settings_screen);
 
+        mStorageManager = (StorageManager) getSystemService(Context.STORAGE_SERVICE);
         mMountService = IMountService.Stub.asInterface(ServiceManager.getService("mount"));
 
         mRemovedLayout = findViewById(R.id.removed);
@@ -105,10 +107,7 @@
     private void update() {
 
         try {
-            String path = Environment.getExternalStorageDirectory().getPath();
-            mMassStorage.setChecked(
-                    mMountService.getVolumeShared(
-                            Environment.getExternalStorageDirectory().getPath(), "ums"));
+            mMassStorage.setChecked(mStorageManager.isUsbMassStorageEnabled());
         } catch (Exception ex) {
         }
 
@@ -158,11 +157,9 @@
         public void onClick(View v) {
             try {
                 if (mMassStorage.isChecked()) {
-                    mMountService.shareVolume(
-                            Environment.getExternalStorageDirectory().getPath(), "ums");
+                    mStorageManager.enableUsbMassStorage();
                 } else {
-                    mMountService.unshareVolume(
-                            Environment.getExternalStorageDirectory().getPath(), "ums");
+                    mStorageManager.disableUsbMassStorage();
                 }
             } catch (Exception ex) {
             }
@@ -194,7 +191,8 @@
         }
     };
 
-    private IMountService   mMountService;
+    private StorageManager mStorageManager;
+    private IMountService mMountService;
 
     private CheckBox    mMassStorage;