Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56d4bcd8 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 627356ce: am d6c0bb0f: merge from open-source master

parents 6e7cad67 627356ce

cmds/am/src/com/android/commands/am/Am.java

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ public class Am { 
        String uri = nextArg();

        if (uri != null) {

            Intent oldIntent = intent;

            intent = Intent.getIntent(uri);

            intent = Intent.parseUri(uri, 0);

            if (oldIntent.getAction() != null) {

                intent.setAction(oldIntent.getAction());

            }

core/java/android/preference/DialogPreference.java

+1 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.view.inputmethod.InputMethodManager;

import android.widget.TextView;



/**
@@ -275,7 +274,7 @@ public abstract class DialogPreference extends Preference implements 
    protected void showDialog(Bundle state) {

        Context context = getContext();



        mWhichButtonClicked = DialogInterface.BUTTON2;

        mWhichButtonClicked = DialogInterface.BUTTON_NEGATIVE;

        

        mBuilder = new AlertDialog.Builder(context)

            .setTitle(mDialogTitle)

core/java/android/widget/Gallery.java

+1 −1
Original line number Diff line number Diff line
@@ -1087,7 +1087,7 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList 
    @Override

    public boolean dispatchKeyEvent(KeyEvent event) {

        // Gallery steals all key events

        return event.dispatch(this);

        return event.dispatch(this, null, null);

    }



    /**

core/java/com/android/internal/app/NetInitiatedActivity.java

+2 −6
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ import android.content.DialogInterface; 
import android.content.Intent;

import android.content.IntentFilter;

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.util.Log;

import android.location.LocationManager;
@@ -43,8 +39,8 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa 
    private static final boolean DEBUG = true;

    private static final boolean VERBOSE = false;



    private static final int POSITIVE_BUTTON = AlertDialog.BUTTON1;

    private static final int NEGATIVE_BUTTON = AlertDialog.BUTTON2;

    private static final int POSITIVE_BUTTON = AlertDialog.BUTTON_POSITIVE;

    private static final int NEGATIVE_BUTTON = AlertDialog.BUTTON_NEGATIVE;



    // Dialog button text

    public static final String BUTTON_TEXT_ACCEPT = "Accept";