PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dialog icons" into lmp-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-07-23 01:52:59 +00:00
committed by Android (Google) Code Review
parent ff941af733 54ccaf6f77
commit b125caa7ed
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -161,7 +161,6 @@ public final class BluetoothPairingDialog extends AlertActivity implements
private void createUserEntryDialog(CachedBluetoothDeviceManager deviceManager) { private void createUserEntryDialog(CachedBluetoothDeviceManager deviceManager) {
final AlertController.AlertParams p = mAlertParams; final AlertController.AlertParams p = mAlertParams;
p.mIconId = android.R.drawable.ic_dialog_info;
p.mTitle = getString(R.string.bluetooth_pairing_request); p.mTitle = getString(R.string.bluetooth_pairing_request);
p.mView = createPinEntryView(deviceManager.getName(mDevice)); p.mView = createPinEntryView(deviceManager.getName(mDevice));
p.mPositiveButtonText = getString(android.R.string.ok); p.mPositiveButtonText = getString(android.R.string.ok);
@@ -252,7 +251,6 @@ public final class BluetoothPairingDialog extends AlertActivity implements
private void createConfirmationDialog(CachedBluetoothDeviceManager deviceManager) { private void createConfirmationDialog(CachedBluetoothDeviceManager deviceManager) {
final AlertController.AlertParams p = mAlertParams; final AlertController.AlertParams p = mAlertParams;
p.mIconId = android.R.drawable.ic_dialog_info;
p.mTitle = getString(R.string.bluetooth_pairing_request); p.mTitle = getString(R.string.bluetooth_pairing_request);
p.mView = createView(deviceManager); p.mView = createView(deviceManager);
p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept); p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept);
@@ -264,7 +262,6 @@ public final class BluetoothPairingDialog extends AlertActivity implements
private void createConsentDialog(CachedBluetoothDeviceManager deviceManager) { private void createConsentDialog(CachedBluetoothDeviceManager deviceManager) {
final AlertController.AlertParams p = mAlertParams; final AlertController.AlertParams p = mAlertParams;
p.mIconId = android.R.drawable.ic_dialog_info;
p.mTitle = getString(R.string.bluetooth_pairing_request); p.mTitle = getString(R.string.bluetooth_pairing_request);
p.mView = createView(deviceManager); p.mView = createView(deviceManager);
p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept); p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept);
@@ -277,7 +274,6 @@ public final class BluetoothPairingDialog extends AlertActivity implements
private void createDisplayPasskeyOrPinDialog( private void createDisplayPasskeyOrPinDialog(
CachedBluetoothDeviceManager deviceManager) { CachedBluetoothDeviceManager deviceManager) {
final AlertController.AlertParams p = mAlertParams; final AlertController.AlertParams p = mAlertParams;
p.mIconId = android.R.drawable.ic_dialog_info;
p.mTitle = getString(R.string.bluetooth_pairing_request); p.mTitle = getString(R.string.bluetooth_pairing_request);
p.mView = createView(deviceManager); p.mView = createView(deviceManager);
p.mNegativeButtonText = getString(android.R.string.cancel); p.mNegativeButtonText = getString(android.R.string.cancel);

1
src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
View File

@@ -117,7 +117,6 @@ public class BluetoothPermissionActivity extends AlertActivity implements
private void showDialog(String title, int requestType) private void showDialog(String title, int requestType)
{ {
final AlertController.AlertParams p = mAlertParams; final AlertController.AlertParams p = mAlertParams;
p.mIconId = android.R.drawable.ic_dialog_info;
p.mTitle = title; p.mTitle = title;
if(DEBUG) Log.i(TAG, "showDialog() Request type: " + mRequestType + " this: " + this); if(DEBUG) Log.i(TAG, "showDialog() Request type: " + mRequestType + " this: " + this);
switch(requestType) switch(requestType)