Merge "Remove UsbStorageActivity, which is no longer used."
This commit is contained in:
Yasuhiro Matsuda
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
2c24b88dac
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
@@ -1,77 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/main"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:padding="18dip"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
|
||||
<ImageView android:id="@+id/icon"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1"
|
||||
android:src="@drawable/usb_android" />
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1"
|
||||
>
|
||||
|
||||
<TextView android:id="@+id/banner"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginTop="10dip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="24sp"
|
||||
android:gravity="center"
|
||||
android:text="@string/usb_storage_title" />
|
||||
|
||||
<TextView android:id="@+id/message"
|
||||
android:layout_below="@id/banner"
|
||||
android:layout_marginTop="10dip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:gravity="center"
|
||||
android:text="@string/usb_storage_message" />
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginBottom="20dip"
|
||||
>
|
||||
|
||||
<Button android:id="@+id/mount_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="18dip"
|
||||
android:paddingEnd="18dip"
|
||||
android:text="@string/usb_storage_button_mount"
|
||||
/>
|
||||
<Button android:id="@+id/unmount_button"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="18dip"
|
||||
android:paddingEnd="18dip"
|
||||
android:text="@string/usb_storage_stop_button_mount"
|
||||
/>
|
||||
<ProgressBar android:id="@+id/progress"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:indeterminate="true"
|
||||
style="?android:attr/progressBarStyle"
|
||||
/>
|
||||
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,68 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/main"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:padding="18dip"
|
||||
>
|
||||
|
||||
<ImageView android:id="@+id/icon"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/usb_android" />
|
||||
|
||||
<TextView android:id="@+id/banner"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_below="@id/icon"
|
||||
android:layout_marginTop="10dip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="24sp"
|
||||
android:gravity="center"
|
||||
android:text="@string/usb_storage_title" />
|
||||
|
||||
<TextView android:id="@+id/message"
|
||||
android:layout_below="@id/banner"
|
||||
android:layout_marginTop="10dip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:gravity="center"
|
||||
android:text="@string/usb_storage_message" />
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginBottom="20dip"
|
||||
>
|
||||
|
||||
<Button android:id="@+id/mount_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="18dip"
|
||||
android:paddingEnd="18dip"
|
||||
android:text="@string/usb_storage_button_mount"
|
||||
/>
|
||||
<Button android:id="@+id/unmount_button"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="18dip"
|
||||
android:paddingEnd="18dip"
|
||||
android:text="@string/usb_storage_stop_button_mount"
|
||||
/>
|
||||
<ProgressBar android:id="@+id/progress"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:indeterminate="true"
|
||||
style="?android:attr/progressBarStyle"
|
||||
/>
|
||||
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
@@ -2827,53 +2827,7 @@
|
||||
<string name="no_permissions">No permissions required</string>
|
||||
<!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
|
||||
<string name="perm_costs_money">this may cost you money</string>
|
||||
|
||||
<!-- USB storage dialog strings -->
|
||||
<!-- This is the title for the activity's window. -->
|
||||
<string name="usb_storage_activity_title">USB mass storage</string>
|
||||
|
||||
<!-- See USB_STORAGE. USB_STORAGE_DIALOG: After the user selects the notification, a dialog is shown asking if he wants to mount. This is the title. -->
|
||||
<string name="usb_storage_title">USB connected</string>
|
||||
<!-- See USB_STORAGE. This is the message. [CHAR LIMIT=NONE] -->
|
||||
<string name="usb_storage_message" product="nosdcard">You\'ve connected to your computer via USB. Touch the button below if you want to copy files between your computer and your Android\'s USB storage.</string>
|
||||
<!-- See USB_STORAGE. This is the message. [CHAR LIMIT=NONE] -->
|
||||
<string name="usb_storage_message" product="default">You\'ve connected to your computer via USB. Touch the button below if you want to copy files between your computer and your Android\'s SD card.</string>
|
||||
<!-- See USB_STORAGE. This is the button text to mount the phone on the computer. -->
|
||||
<string name="usb_storage_button_mount">Turn on USB storage</string>
|
||||
<!-- See USB_STORAGE_DIALOG. If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
|
||||
<string name="usb_storage_error_message" product="nosdcard">There\'s a problem using your USB storage for USB mass storage.</string>
|
||||
<!-- See USB_STORAGE_DIALOG. If there was an error mounting, this is the text. -->
|
||||
<string name="usb_storage_error_message" product="default">There\'s a problem using your SD card for USB mass storage.</string>
|
||||
<!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across. This is the title -->
|
||||
<string name="usb_storage_notification_title">USB connected</string>
|
||||
<!-- See USB_STORAGE. This is the message. -->
|
||||
<string name="usb_storage_notification_message">Touch to copy files to/from your computer.</string>
|
||||
|
||||
<!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
|
||||
<string name="usb_storage_stop_notification_title">Turn off USB storage</string>
|
||||
<!-- See USB_STORAGE. This is the message. -->
|
||||
<string name="usb_storage_stop_notification_message">Touch to turn off USB storage.</string>
|
||||
|
||||
<!-- USB storage stop dialog strings -->
|
||||
<!-- This is the label for the activity, and should never be visible to the user. -->
|
||||
<!-- See USB_STORAGE_STOP. USB_STORAGE_STOP_DIALOG: After the user selects the notification, a dialog is shown asking if he wants to stop usb storage. This is the title. -->
|
||||
<string name="usb_storage_stop_title">USB storage in use</string>
|
||||
<!-- See USB_STORAGE_STOP. This is the message. [CHAR LIMIT=NONE] -->
|
||||
<string name="usb_storage_stop_message" product="nosdcard">Before turning off USB storage, unmount (\"eject\") your Android\'s USB storage from your computer.</string>
|
||||
<!-- See USB_STORAGE_STOP. This is the message. -->
|
||||
<string name="usb_storage_stop_message" product="default">Before turning off USB storage, unmount (\"eject\") your Android\'s SD card from your computer.</string>
|
||||
<!-- See USB_STORAGE_STOP. This is the button text to stop usb storage. -->
|
||||
<string name="usb_storage_stop_button_mount">Turn off USB storage</string>
|
||||
<!-- See USB_STORAGE_STOP_DIALOG. If there was an error stopping, this is the text. -->
|
||||
<string name="usb_storage_stop_error_message">There was a problem turning off USB storage. Check that you\'ve unmounted the USB host, then try again.</string>
|
||||
|
||||
<!-- USB_STORAGE_KILL_STORAGE_USERS dialog -->
|
||||
<string name="dlg_confirm_kill_storage_users_title">Turn on USB storage</string>
|
||||
<!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
|
||||
<string name="dlg_confirm_kill_storage_users_text">If you turn on USB storage, some apps you\'re using will stop and may be unavailable until you turn off USB storage.</string>
|
||||
<!-- USB_STORAGE_ERROR dialog dialog-->
|
||||
<string name="dlg_error_title">USB operation unsuccessful</string>
|
||||
<!-- USB_STORAGE_ERROR dialog ok button-->
|
||||
<!-- Dialog ok button-->
|
||||
<string name="dlg_ok">OK</string>
|
||||
|
||||
<!-- USB_PREFERENCES: Notification for when the user connected to the charger only. This is the title -->
|
||||
|
||||
@@ -1883,16 +1883,7 @@
|
||||
<java-symbol type="drawable" name="scrubber_control_disabled_holo" />
|
||||
<java-symbol type="drawable" name="scrubber_control_selector_holo" />
|
||||
<java-symbol type="drawable" name="scrubber_progress_horizontal_holo_dark" />
|
||||
<java-symbol type="drawable" name="usb_android" />
|
||||
<java-symbol type="drawable" name="usb_android_connected" />
|
||||
<java-symbol type="id" name="banner" />
|
||||
<java-symbol type="id" name="mount_button" />
|
||||
<java-symbol type="id" name="unmount_button" />
|
||||
<java-symbol type="layout" name="usb_storage_activity" />
|
||||
<java-symbol type="string" name="chooseUsbActivity" />
|
||||
<java-symbol type="string" name="dlg_confirm_kill_storage_users_text" />
|
||||
<java-symbol type="string" name="dlg_confirm_kill_storage_users_title" />
|
||||
<java-symbol type="string" name="dlg_error_title" />
|
||||
<java-symbol type="string" name="ext_media_badremoval_notification_message" />
|
||||
<java-symbol type="string" name="ext_media_badremoval_notification_title" />
|
||||
<java-symbol type="string" name="ext_media_checking_notification_message" />
|
||||
@@ -1916,15 +1907,6 @@
|
||||
<java-symbol type="string" name="ext_media_move_success_message" />
|
||||
<java-symbol type="string" name="ext_media_move_failure_title" />
|
||||
<java-symbol type="string" name="ext_media_move_failure_message" />
|
||||
<java-symbol type="string" name="usb_storage_error_message" />
|
||||
<java-symbol type="string" name="usb_storage_message" />
|
||||
<java-symbol type="string" name="usb_storage_notification_message" />
|
||||
<java-symbol type="string" name="usb_storage_notification_title" />
|
||||
<java-symbol type="string" name="usb_storage_stop_message" />
|
||||
<java-symbol type="string" name="usb_storage_stop_notification_message" />
|
||||
<java-symbol type="string" name="usb_storage_stop_notification_title" />
|
||||
<java-symbol type="string" name="usb_storage_stop_title" />
|
||||
<java-symbol type="string" name="usb_storage_title" />
|
||||
<java-symbol type="style" name="Animation.RecentApplications" />
|
||||
<java-symbol type="integer" name="dock_enter_exit_duration" />
|
||||
|
||||
|
||||
@@ -174,11 +174,6 @@
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
|
||||
<activity android:name=".usb.UsbStorageActivity"
|
||||
android:label="@*android:string/usb_storage_activity_title"
|
||||
android:excludeFromRecents="true">
|
||||
</activity>
|
||||
|
||||
<activity android:name=".tuner.TunerActivity"
|
||||
android:enabled="false"
|
||||
android:icon="@drawable/tuner"
|
||||
|
||||
@@ -1,329 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2007 Google Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.systemui.usb;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.ActivityManager;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.DialogInterface.OnCancelListener;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.hardware.usb.UsbManager;
|
||||
import android.os.Bundle;
|
||||
import android.os.Environment;
|
||||
import android.os.Handler;
|
||||
import android.os.HandlerThread;
|
||||
import android.os.IBinder;
|
||||
import android.os.RemoteException;
|
||||
import android.os.ServiceManager;
|
||||
import android.os.storage.IMountService;
|
||||
import android.os.storage.StorageEventListener;
|
||||
import android.os.storage.StorageManager;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.Button;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.internal.R;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* This activity is shown to the user to allow enabling of USB mass storage
|
||||
* on-demand (that is, when the USB cable is connected). It uses the alert
|
||||
* dialog style. It will be launched from a notification.
|
||||
*/
|
||||
public class UsbStorageActivity extends Activity
|
||||
implements View.OnClickListener, OnCancelListener {
|
||||
private static final String TAG = "UsbStorageActivity";
|
||||
|
||||
private Button mMountButton;
|
||||
private Button mUnmountButton;
|
||||
private ProgressBar mProgressBar;
|
||||
private TextView mBanner;
|
||||
private TextView mMessage;
|
||||
private ImageView mIcon;
|
||||
private StorageManager mStorageManager = null;
|
||||
private static final int DLG_CONFIRM_KILL_STORAGE_USERS = 1;
|
||||
private static final int DLG_ERROR_SHARING = 2;
|
||||
static final boolean localLOGV = false;
|
||||
private boolean mDestroyed;
|
||||
|
||||
// UI thread
|
||||
private Handler mUIHandler;
|
||||
|
||||
// thread for working with the storage services, which can be slow
|
||||
private Handler mAsyncStorageHandler;
|
||||
|
||||
/** Used to detect when the USB cable is unplugged, so we can call finish() */
|
||||
private BroadcastReceiver mUsbStateReceiver = new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
if (intent.getAction().equals(UsbManager.ACTION_USB_STATE)) {
|
||||
handleUsbStateChanged(intent);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private StorageEventListener mStorageListener = new StorageEventListener() {
|
||||
@Override
|
||||
public void onStorageStateChanged(String path, String oldState, String newState) {
|
||||
final boolean on = newState.equals(Environment.MEDIA_SHARED);
|
||||
switchDisplay(on);
|
||||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
if (mStorageManager == null) {
|
||||
mStorageManager = (StorageManager) getSystemService(Context.STORAGE_SERVICE);
|
||||
if (mStorageManager == null) {
|
||||
Log.w(TAG, "Failed to get StorageManager");
|
||||
}
|
||||
}
|
||||
|
||||
mUIHandler = new Handler();
|
||||
|
||||
HandlerThread thr = new HandlerThread("SystemUI UsbStorageActivity");
|
||||
thr.start();
|
||||
mAsyncStorageHandler = new Handler(thr.getLooper());
|
||||
|
||||
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
|
||||
if (Environment.isExternalStorageRemovable()) {
|
||||
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
|
||||
}
|
||||
|
||||
setContentView(com.android.internal.R.layout.usb_storage_activity);
|
||||
|
||||
mIcon = (ImageView) findViewById(com.android.internal.R.id.icon);
|
||||
mBanner = (TextView) findViewById(com.android.internal.R.id.banner);
|
||||
mMessage = (TextView) findViewById(com.android.internal.R.id.message);
|
||||
|
||||
mMountButton = (Button) findViewById(com.android.internal.R.id.mount_button);
|
||||
mMountButton.setOnClickListener(this);
|
||||
mUnmountButton = (Button) findViewById(com.android.internal.R.id.unmount_button);
|
||||
mUnmountButton.setOnClickListener(this);
|
||||
mProgressBar = (ProgressBar) findViewById(com.android.internal.R.id.progress);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
mDestroyed = true;
|
||||
}
|
||||
|
||||
private void switchDisplay(final boolean usbStorageInUse) {
|
||||
mUIHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
switchDisplayAsync(usbStorageInUse);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void switchDisplayAsync(boolean usbStorageInUse) {
|
||||
if (usbStorageInUse) {
|
||||
mProgressBar.setVisibility(View.GONE);
|
||||
mUnmountButton.setVisibility(View.VISIBLE);
|
||||
mMountButton.setVisibility(View.GONE);
|
||||
mIcon.setImageResource(com.android.internal.R.drawable.usb_android_connected);
|
||||
mBanner.setText(com.android.internal.R.string.usb_storage_stop_title);
|
||||
mMessage.setText(com.android.internal.R.string.usb_storage_stop_message);
|
||||
} else {
|
||||
mProgressBar.setVisibility(View.GONE);
|
||||
mUnmountButton.setVisibility(View.GONE);
|
||||
mMountButton.setVisibility(View.VISIBLE);
|
||||
mIcon.setImageResource(com.android.internal.R.drawable.usb_android);
|
||||
mBanner.setText(com.android.internal.R.string.usb_storage_title);
|
||||
mMessage.setText(com.android.internal.R.string.usb_storage_message);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
|
||||
mStorageManager.registerListener(mStorageListener);
|
||||
registerReceiver(mUsbStateReceiver, new IntentFilter(UsbManager.ACTION_USB_STATE));
|
||||
try {
|
||||
mAsyncStorageHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
switchDisplay(mStorageManager.isUsbMassStorageEnabled());
|
||||
}
|
||||
});
|
||||
} catch (Exception ex) {
|
||||
Log.e(TAG, "Failed to read UMS enable state", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPause() {
|
||||
super.onPause();
|
||||
|
||||
unregisterReceiver(mUsbStateReceiver);
|
||||
if (mStorageManager == null && mStorageListener != null) {
|
||||
mStorageManager.unregisterListener(mStorageListener);
|
||||
}
|
||||
}
|
||||
|
||||
private void handleUsbStateChanged(Intent intent) {
|
||||
boolean connected = intent.getExtras().getBoolean(UsbManager.USB_CONNECTED);
|
||||
if (!connected) {
|
||||
// It was disconnected from the plug, so finish
|
||||
finish();
|
||||
}
|
||||
}
|
||||
|
||||
private IMountService getMountService() {
|
||||
IBinder service = ServiceManager.getService("mount");
|
||||
if (service != null) {
|
||||
return IMountService.Stub.asInterface(service);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(int id, Bundle args) {
|
||||
switch (id) {
|
||||
case DLG_CONFIRM_KILL_STORAGE_USERS:
|
||||
return new AlertDialog.Builder(this)
|
||||
.setTitle(R.string.dlg_confirm_kill_storage_users_title)
|
||||
.setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
switchUsbMassStorage(true);
|
||||
}})
|
||||
.setNegativeButton(R.string.cancel, null)
|
||||
.setMessage(R.string.dlg_confirm_kill_storage_users_text)
|
||||
.setOnCancelListener(this)
|
||||
.create();
|
||||
case DLG_ERROR_SHARING:
|
||||
return new AlertDialog.Builder(this)
|
||||
.setTitle(R.string.dlg_error_title)
|
||||
.setNeutralButton(R.string.dlg_ok, null)
|
||||
.setMessage(R.string.usb_storage_error_message)
|
||||
.setOnCancelListener(this)
|
||||
.create();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private void scheduleShowDialog(final int id) {
|
||||
mUIHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (!mDestroyed) {
|
||||
removeDialog(id);
|
||||
showDialog(id);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void switchUsbMassStorage(final boolean on) {
|
||||
// things to do on the UI thread
|
||||
mUIHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
mUnmountButton.setVisibility(View.GONE);
|
||||
mMountButton.setVisibility(View.GONE);
|
||||
|
||||
mProgressBar.setVisibility(View.VISIBLE);
|
||||
// will be hidden once USB mass storage kicks in (or fails)
|
||||
}
|
||||
});
|
||||
|
||||
// things to do elsewhere
|
||||
mAsyncStorageHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (on) {
|
||||
mStorageManager.enableUsbMassStorage();
|
||||
} else {
|
||||
mStorageManager.disableUsbMassStorage();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void checkStorageUsers() {
|
||||
mAsyncStorageHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
checkStorageUsersAsync();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void checkStorageUsersAsync() {
|
||||
IMountService ims = getMountService();
|
||||
if (ims == null) {
|
||||
// Display error dialog
|
||||
scheduleShowDialog(DLG_ERROR_SHARING);
|
||||
}
|
||||
String extStoragePath = Environment.getExternalStorageDirectory().toString();
|
||||
boolean showDialog = false;
|
||||
try {
|
||||
int[] stUsers = ims.getStorageUsers(extStoragePath);
|
||||
if (stUsers != null && stUsers.length > 0) {
|
||||
showDialog = true;
|
||||
} else {
|
||||
// List of applications on sdcard.
|
||||
ActivityManager am = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
|
||||
List<ApplicationInfo> infoList = am.getRunningExternalApplications();
|
||||
if (infoList != null && infoList.size() > 0) {
|
||||
showDialog = true;
|
||||
}
|
||||
}
|
||||
} catch (RemoteException e) {
|
||||
// Display error dialog
|
||||
scheduleShowDialog(DLG_ERROR_SHARING);
|
||||
}
|
||||
if (showDialog) {
|
||||
// Display dialog to user
|
||||
scheduleShowDialog(DLG_CONFIRM_KILL_STORAGE_USERS);
|
||||
} else {
|
||||
if (localLOGV) Log.i(TAG, "Enabling UMS");
|
||||
switchUsbMassStorage(true);
|
||||
}
|
||||
}
|
||||
|
||||
public void onClick(View v) {
|
||||
if (v == mMountButton) {
|
||||
// Check for list of storage users and display dialog if needed.
|
||||
checkStorageUsers();
|
||||
} else if (v == mUnmountButton) {
|
||||
if (localLOGV) Log.i(TAG, "Disabling UMS");
|
||||
switchUsbMassStorage(false);
|
||||
}
|
||||
}
|
||||
|
||||
public void onCancel(DialogInterface dialog) {
|
||||
finish();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user