diff options
| author | Adam Powell <adamp@android.com> | 2013-01-09 12:03:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-09 12:03:36 -0800 |
| commit | 43f8ccf63a02b28be395fd223461f1421ea2aa99 (patch) | |
| tree | e3a489a6450885dbf0157bbb26306bd539054746 /src | |
| parent | 67b1761534d7e2518830cfb3d2c28271ffe56a26 (diff) | |
| parent | 6eb3b8d3b7ffc1d80ae7734042e2c4d36a77a19f (diff) | |
| download | android_packages_apps_Bluetooth-43f8ccf63a02b28be395fd223461f1421ea2aa99.tar.gz android_packages_apps_Bluetooth-43f8ccf63a02b28be395fd223461f1421ea2aa99.tar.bz2 android_packages_apps_Bluetooth-43f8ccf63a02b28be395fd223461f1421ea2aa99.zip | |
am 6eb3b8d3: Merge "Upgrade the app to better follow holo guidelines"
* commit '6eb3b8d3b7ffc1d80ae7734042e2c4d36a77a19f':
Upgrade the app to better follow holo guidelines
Diffstat (limited to 'src')
4 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java b/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java index c5628f208..8a07db0de 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java @@ -82,7 +82,6 @@ public class BluetoothOppBtEnablingActivity extends AlertActivity { // Set up the "dialog" final AlertController.AlertParams p = mAlertParams; - p.mIconId = android.R.drawable.ic_dialog_info; p.mTitle = getString(R.string.enabling_progress_title); p.mView = createView(); setupAlert(); diff --git a/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java b/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java index 0bdc6df60..f9ccc8895 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java @@ -106,7 +106,6 @@ public class BluetoothOppIncomingFileConfirmActivity extends AlertActivity imple // Set up the "dialog" final AlertController.AlertParams p = mAlertParams; - p.mIconId = android.R.drawable.ic_dialog_info; p.mTitle = getString(R.string.incoming_file_confirm_title); p.mView = createView(); p.mPositiveButtonText = getString(R.string.incoming_file_confirm_ok); diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java b/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java index 23c9cb8a2..993dc0bae 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java @@ -211,7 +211,6 @@ public class BluetoothOppTransferActivity extends AlertActivity implements private void setUpDialog() { // final AlertController.AlertParams p = mAlertParams; mPara = mAlertParams; - mPara.mIconId = android.R.drawable.ic_dialog_info; mPara.mTitle = getString(R.string.download_title); if ((mWhichDialog == DIALOG_RECEIVE_ONGOING) || (mWhichDialog == DIALOG_SEND_ONGOING)) { diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java b/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java index 0bcd98164..9d98f0da9 100644 --- a/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java +++ b/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java @@ -128,7 +128,6 @@ public class BluetoothPbapActivity extends AlertActivity implements final AlertController.AlertParams p = mAlertParams; switch (id) { case DIALOG_YES_NO_AUTH: - p.mIconId = android.R.drawable.ic_dialog_info; p.mTitle = getString(R.string.pbap_session_key_dialog_header); p.mView = createView(DIALOG_YES_NO_AUTH); p.mPositiveButtonText = getString(android.R.string.ok); |