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

diff --git a/res/drawable-hdpi/bt_incomming_file_notification.png b/res/drawable-hdpi/bt_incomming_file_notification.png
old mode 100755 (executable)
new mode 100644 (file)
index 18addce..ff72837
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 8d3f555..d53e0eb 100644 (file)
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 (file)
index 0000000..3762470
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 a5c5a39..626d931 100644 (file)
--- 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 c5628f2..8a07db0 100644 (file)
--- 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 0bdc6df..f9ccc88 100644 (file)
--- 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 23c9cb8..993dc0b 100644 (file)
--- 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 0bcd981..9d98f0d 100644 (file)
--- 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);