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

Commit 2bbee0df authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am fac293b7: am a6f63294: am 560faa81: Merge "Remove dialog icons" into lmp-dev 

* commit 'fac293b71306ae7a1060736c93cb1c0a7ea0f7a4':
  Remove dialog icons
parents e31ebda7 f8ddc76c

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ public class ExternalMediaFormatActivity extends AlertActivity implements Dialog 
        Log.d("ExternalMediaFormatActivity", "onCreate!");

        Log.d("ExternalMediaFormatActivity", "onCreate!");

        // Set up the "dialog"

        // Set up the "dialog"

        final AlertController.AlertParams p = mAlertParams;

        final AlertController.AlertParams p = mAlertParams;

        p.mIconId = com.android.internal.R.drawable.stat_sys_warning;

        p.mTitle = getString(com.android.internal.R.string.extmedia_format_title);

        p.mTitle = getString(com.android.internal.R.string.extmedia_format_title);

        p.mMessage = getString(com.android.internal.R.string.extmedia_format_message);

        p.mMessage = getString(com.android.internal.R.string.extmedia_format_message);

        p.mPositiveButtonText = getString(com.android.internal.R.string.extmedia_format_button_format);

        p.mPositiveButtonText = getString(com.android.internal.R.string.extmedia_format_button_format);

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,6 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa 
        final Intent intent = getIntent();

        final Intent intent = getIntent();

        final AlertController.AlertParams p = mAlertParams;

        final AlertController.AlertParams p = mAlertParams;

        Context context = getApplicationContext();

        Context context = getApplicationContext();

        p.mIconId = com.android.internal.R.drawable.ic_dialog_usb;

        p.mTitle = intent.getStringExtra(GpsNetInitiatedHandler.NI_INTENT_KEY_TITLE);

        p.mTitle = intent.getStringExtra(GpsNetInitiatedHandler.NI_INTENT_KEY_TITLE);

        p.mMessage = intent.getStringExtra(GpsNetInitiatedHandler.NI_INTENT_KEY_MESSAGE);

        p.mMessage = intent.getStringExtra(GpsNetInitiatedHandler.NI_INTENT_KEY_MESSAGE);

        p.mPositiveButtonText = String.format(context.getString(R.string.gpsVerifYes));

        p.mPositiveButtonText = String.format(context.getString(R.string.gpsVerifYes));

packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,6 @@ public class UsbDebuggingActivity extends AlertActivity 




        final AlertController.AlertParams ap = mAlertParams;

        final AlertController.AlertParams ap = mAlertParams;

        ap.mTitle = getString(R.string.usb_debugging_title);

        ap.mTitle = getString(R.string.usb_debugging_title);

        ap.mIconId = com.android.internal.R.drawable.ic_dialog_usb;

        ap.mMessage = getString(R.string.usb_debugging_message, fingerprints);

        ap.mMessage = getString(R.string.usb_debugging_message, fingerprints);

        ap.mPositiveButtonText = getString(android.R.string.ok);

        ap.mPositiveButtonText = getString(android.R.string.ok);

        ap.mNegativeButtonText = getString(android.R.string.cancel);

        ap.mNegativeButtonText = getString(android.R.string.cancel);