From c2fcca65f491e3f506328ccf8dee88f2c67c947b Mon Sep 17 00:00:00 2001
From: blunden <blunden2@gmail.com>
Date: Wed, 19 Sep 2012 00:57:46 +0200
Subject: Upgrade the app to better follow holo guidelines

- Fix the icon scaling in the transfer list
  The icon is centered and upscaled instead of just centered.

- Remove dialog info icon according to UI team recommendation

- Replace icons with holo versions and add xhdpi

Change-Id: Id3b06e8e06244ec8859d65404d779b66c1354e3d
---
 res/drawable-hdpi/bt_incomming_file_notification.png  | Bin 1565 -> 1299 bytes
 res/drawable-mdpi/bt_incomming_file_notification.png  | Bin 964 -> 1179 bytes
 res/drawable-xhdpi/bt_incomming_file_notification.png | Bin 0 -> 1392 bytes
 res/layout/bluetooth_transfer_item.xml                |   2 +-
 .../bluetooth/opp/BluetoothOppBtEnablingActivity.java |   1 -
 .../opp/BluetoothOppIncomingFileConfirmActivity.java  |   1 -
 .../bluetooth/opp/BluetoothOppTransferActivity.java   |   1 -
 .../android/bluetooth/pbap/BluetoothPbapActivity.java |   1 -
 8 files changed, 1 insertion(+), 5 deletions(-)
 mode change 100755 => 100644 res/drawable-hdpi/bt_incomming_file_notification.png
 create mode 100644 res/drawable-xhdpi/bt_incomming_file_notification.png

diff --git a/res/drawable-hdpi/bt_incomming_file_notification.png b/res/drawable-hdpi/bt_incomming_file_notification.png
old mode 100755
new mode 100644
index 18addce45..ff72837bf
Binary files a/res/drawable-hdpi/bt_incomming_file_notification.png and b/res/drawable-hdpi/bt_incomming_file_notification.png differ
diff --git a/res/drawable-mdpi/bt_incomming_file_notification.png b/res/drawable-mdpi/bt_incomming_file_notification.png
index 8d3f5550c..d53e0ebb5 100644
Binary files a/res/drawable-mdpi/bt_incomming_file_notification.png and b/res/drawable-mdpi/bt_incomming_file_notification.png differ
diff --git a/res/drawable-xhdpi/bt_incomming_file_notification.png b/res/drawable-xhdpi/bt_incomming_file_notification.png
new file mode 100644
index 000000000..3762470c6
Binary files /dev/null and b/res/drawable-xhdpi/bt_incomming_file_notification.png differ
diff --git a/res/layout/bluetooth_transfer_item.xml b/res/layout/bluetooth_transfer_item.xml
index a5c5a39e2..626d931f1 100644
--- a/res/layout/bluetooth_transfer_item.xml
+++ b/res/layout/bluetooth_transfer_item.xml
@@ -27,7 +27,7 @@
         android:layout_height="@android:dimen/app_icon_size"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
-        android:scaleType="fitCenter"
+        android:scaleType="center"
     />
 
     <TextView android:id="@+id/transfer_title"
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 ec0f8b26e..65341b1d6 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
@@ -105,7 +105,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);
-- 
cgit v1.2.3