Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
This commit is contained in:
The Android Open Source Project
2010-05-18 09:18:37 -07:00
parent 74e151c54c 15d24708b1
commit 4547e5284e
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/app/ExternalMediaFormatActivity.java
View File

@@ -23,13 +23,10 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.storage.IMountService; import android.os.storage.IMountService;
import android.os.Message;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.Environment; import android.os.Environment;
import android.widget.Toast;
import android.util.Log; import android.util.Log;
/** /**
@@ -38,7 +35,7 @@ import android.util.Log;
*/ */
public class ExternalMediaFormatActivity extends AlertActivity implements DialogInterface.OnClickListener { public class ExternalMediaFormatActivity extends AlertActivity implements DialogInterface.OnClickListener {
private static final int POSITIVE_BUTTON = AlertDialog.BUTTON1; private static final int POSITIVE_BUTTON = AlertDialog.BUTTON_POSITIVE;
/** Used to detect when the media state changes, in case we need to call finish() */ /** Used to detect when the media state changes, in case we need to call finish() */
private BroadcastReceiver mStorageReceiver = new BroadcastReceiver() { private BroadcastReceiver mStorageReceiver = new BroadcastReceiver() {

2
core/java/com/android/internal/app/RingtonePickerActivity.java
View File

@@ -223,7 +223,7 @@ public final class RingtonePickerActivity extends AlertActivity implements
* On click of Ok/Cancel buttons * On click of Ok/Cancel buttons
*/ */
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
boolean positiveResult = which == BUTTON1; boolean positiveResult = which == DialogInterface.BUTTON_POSITIVE;
// Stop playing the previous ringtone // Stop playing the previous ringtone
mRingtoneManager.stopPreviousRingtone(); mRingtoneManager.stopPreviousRingtone();