drgreen/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: I0598edad283a177a5ddcc30e20d2284503e6038e
This commit is contained in:
The Android Open Source Project
2010-05-19 08:28:32 -07:00
parent aa2fe14849 2b9a49a30d
commit d6c0bb0f0f
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/am/src/com/android/commands/am/Am.java
View File

@ -205,7 +205,7 @@ public class Am {
String uri = nextArg(); String uri = nextArg();
if (uri != null) { if (uri != null) {
Intent oldIntent = intent; Intent oldIntent = intent;
intent = Intent.getIntent(uri); intent = Intent.parseUri(uri, 0);
if (oldIntent.getAction() != null) { if (oldIntent.getAction() != null) {
intent.setAction(oldIntent.getAction()); intent.setAction(oldIntent.getAction());
} }

3
core/java/android/preference/DialogPreference.java
View File

@ -33,7 +33,6 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.TextView; import android.widget.TextView;
/** /**
@ -275,7 +274,7 @@ public abstract class DialogPreference extends Preference implements
protected void showDialog(Bundle state) { protected void showDialog(Bundle state) {
Context context = getContext(); Context context = getContext();
mWhichButtonClicked = DialogInterface.BUTTON2; mWhichButtonClicked = DialogInterface.BUTTON_NEGATIVE;
mBuilder = new AlertDialog.Builder(context) mBuilder = new AlertDialog.Builder(context)
.setTitle(mDialogTitle) .setTitle(mDialogTitle)

2
core/java/android/widget/Gallery.java
View File

@ -1087,7 +1087,7 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList
@Override @Override
public boolean dispatchKeyEvent(KeyEvent event) { public boolean dispatchKeyEvent(KeyEvent event) {
// Gallery steals all key events // Gallery steals all key events
return event.dispatch(this); return event.dispatch(this, null, null);
} }
/** /**

9
core/java/com/android/internal/app/NetInitiatedActivity.java
View File

@ -23,14 +23,9 @@ 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.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.widget.Toast; import android.widget.Toast;
import android.util.Log; import android.util.Log;
import android.location.LocationManager; import android.location.LocationManager;
import com.android.internal.location.GpsLocationProvider;
import com.android.internal.location.GpsNetInitiatedHandler; import com.android.internal.location.GpsNetInitiatedHandler;
/** /**
@ -44,8 +39,8 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa
private static final boolean DEBUG = true; private static final boolean DEBUG = true;
private static final boolean VERBOSE = false; private static final boolean VERBOSE = false;
private static final int POSITIVE_BUTTON = AlertDialog.BUTTON1; private static final int POSITIVE_BUTTON = AlertDialog.BUTTON_POSITIVE;
private static final int NEGATIVE_BUTTON = AlertDialog.BUTTON2; private static final int NEGATIVE_BUTTON = AlertDialog.BUTTON_NEGATIVE;
// Dialog button text // Dialog button text
public static final String BUTTON_TEXT_ACCEPT = "Accept"; public static final String BUTTON_TEXT_ACCEPT = "Accept";