diff options
author | Adam Powell <adamp@android.com> | 2013-01-10 15:39:13 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-10 15:39:13 -0800 |
commit | 3cba4c44cb1f249d78c43d6e40e508cd0505b95b (patch) | |
tree | 5a1f17876dd3b4c27e3c9d49441518beed5c1eff /src | |
parent | 24a20283edda2797a144262125e1d85775680f84 (diff) | |
parent | 43f8ccf63a02b28be395fd223461f1421ea2aa99 (diff) | |
download | android_packages_apps_Bluetooth-3cba4c44cb1f249d78c43d6e40e508cd0505b95b.tar.gz android_packages_apps_Bluetooth-3cba4c44cb1f249d78c43d6e40e508cd0505b95b.tar.bz2 android_packages_apps_Bluetooth-3cba4c44cb1f249d78c43d6e40e508cd0505b95b.zip |
am 43f8ccf6: am 6eb3b8d3: Merge "Upgrade the app to better follow holo guidelines"
* commit '43f8ccf63a02b28be395fd223461f1421ea2aa99':
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); |