commit b125caa7ed29f1ecf5062452191d061fa890decb
author Alan Viverette <alanv@google.com> Wed Jul 23 01:52:59 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 22 22:02:55 2014 +0000
tree 538e8f8a9c1b8b8c7dc3374b69c3d4f94dce3486
parent ff941af733a86c4b9fdf1f7f23ac6405faf73231
parent 54ccaf6f77f02fe64dce98d72b184176e3fc50d8

Merge "Remove dialog icons" into lmp-dev

src/com/android/settings/bluetooth/BluetoothPairingDialog.java

diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index d6f27ef..9922042 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -161,7 +161,6 @@
 
     private void createUserEntryDialog(CachedBluetoothDeviceManager deviceManager) {
         final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = getString(R.string.bluetooth_pairing_request);
         p.mView = createPinEntryView(deviceManager.getName(mDevice));
         p.mPositiveButtonText = getString(android.R.string.ok);
@@ -252,7 +251,6 @@
 
     private void createConfirmationDialog(CachedBluetoothDeviceManager deviceManager) {
         final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = getString(R.string.bluetooth_pairing_request);
         p.mView = createView(deviceManager);
         p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept);
@@ -264,7 +262,6 @@
 
     private void createConsentDialog(CachedBluetoothDeviceManager deviceManager) {
         final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = getString(R.string.bluetooth_pairing_request);
         p.mView = createView(deviceManager);
         p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept);
@@ -277,7 +274,6 @@
     private void createDisplayPasskeyOrPinDialog(
             CachedBluetoothDeviceManager deviceManager) {
         final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = getString(R.string.bluetooth_pairing_request);
         p.mView = createView(deviceManager);
         p.mNegativeButtonText = getString(android.R.string.cancel);

src/com/android/settings/bluetooth/BluetoothPermissionActivity.java

diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 9f071cc..5426f52 100755
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -117,7 +117,6 @@
     private void showDialog(String title, int requestType)
     {
         final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = title;
         if(DEBUG) Log.i(TAG, "showDialog() Request type: " + mRequestType + " this: " + this);
         switch(requestType)