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

am 4547e528: merge from open-source master

Browse Source 
Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken

* commit '4547e5284e79192373f3a6bb6c452501171bc1d6':
  Removed Calls to deprecated APIs and unused Imports
This commit is contained in:
The Android Open Source Project
2010-05-18 09:21:28 -07:00
committed by Android Git Automerger
parent 8473259ddb 4547e5284e
commit 400907086a
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.IntentFilter;
import android.os.Bundle;
import android.os.Handler;
import android.os.storage.IMountService;
import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.Environment;
import android.widget.Toast;
import android.util.Log;
/**
@@ -38,7 +35,7 @@ import android.util.Log;
*/
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() */
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
*/
public void onClick(DialogInterface dialog, int which) {
boolean positiveResult = which == BUTTON1;
boolean positiveResult = which == DialogInterface.BUTTON_POSITIVE;
// Stop playing the previous ringtone
mRingtoneManager.stopPreviousRingtone();