Merge remote-tracking branch 'origin/LA.QSSI.11.0.R1.11.00.00.668.170.00' into fp4t-target-0414
diff --git a/res/drawable/stat_notify_error.xml b/res/drawable/stat_notify_error.xml
new file mode 100644
index 0000000..8c9353b
--- /dev/null
+++ b/res/drawable/stat_notify_error.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="#323333">
+ <path
+ android:pathData="M22.9,18.4L14,3.6c-1.1,-2 -2.9,-2 -4,0L1.1,18.4c-1.1,2 -0.2,3.5 2,3.5H21C23.1,21.9 24,20.3 22.9,18.4L22.9,18.4zM11.2,8c0,-0.5 0.4,-0.9 0.9,-0.9S13,7.5 13,8v6c0,0.5 -0.4,0.9 -0.9,0.9s-0.9,-0.4 -0.9,-0.9V8zM12,18.6c-0.7,0 -1.2,-0.6 -1.2,-1.2s0.6,-1.2 1.2,-1.2c0.6,0 1.2,0.6 1.2,1.2S12.7,18.6 12,18.6L12,18.6z"
+ android:fillColor="#ffffff"/>
+</vector>
diff --git a/res/drawable/stat_sys_download_done.xml b/res/drawable/stat_sys_download_done.xml
new file mode 100644
index 0000000..851556b
--- /dev/null
+++ b/res/drawable/stat_sys_download_done.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="#323333">
+ <path
+ android:pathData="M8.3,10.2V1h7.3v9.1h5.5L12,19.3l-9.1,-9.1H8.3zM2.9,21.1h18.3V23H2.9V21.1zM2.9,21.1"
+ android:fillColor="#ffffff"/>
+</vector>
diff --git a/res/drawable/stat_sys_upload_done.xml b/res/drawable/stat_sys_upload_done.xml
new file mode 100644
index 0000000..ffade1e
--- /dev/null
+++ b/res/drawable/stat_sys_upload_done.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="#323333">
+ <path
+ android:pathData="M2.9,13.8L12,4.7l9.1,9.1h-5.5V23H8.3v-9.1H2.9zM2.9,1h18.3v1.8H2.9V1zM2.9,2.9"
+ android:fillColor="#ffffff"/>
+</vector>
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 1bd0f9d..b3a63bf 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -46,6 +46,7 @@
import android.bluetooth.IBluetoothMetadataListener;
import android.bluetooth.IBluetoothSocketManager;
import android.bluetooth.OobData;
+import android.bluetooth.TctExtIBluetooth;
import android.bluetooth.UidTraffic;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -2216,6 +2217,11 @@
service.dump(fd, writer, args);
writer.close();
}
+
+ @Override
+ public TctExtIBluetooth getTctExtIBluetoothInterface(){
+ return null;
+ }
}
// ----API Methods--------
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransferAdapter.java b/src/com/android/bluetooth/opp/BluetoothOppTransferAdapter.java
index 134b2d6..17bede8 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppTransferAdapter.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppTransferAdapter.java
@@ -71,12 +71,12 @@
int status = cursor.getInt(cursor.getColumnIndexOrThrow(BluetoothShare.STATUS));
int dir = cursor.getInt(cursor.getColumnIndexOrThrow(BluetoothShare.DIRECTION));
if (BluetoothShare.isStatusError(status)) {
- iv.setImageResource(android.R.drawable.stat_notify_error);
+ iv.setImageResource(R.drawable.stat_notify_error);
} else {
if (dir == BluetoothShare.DIRECTION_OUTBOUND) {
- iv.setImageResource(android.R.drawable.stat_sys_upload_done);
+ iv.setImageResource(R.drawable.stat_sys_upload_done);
} else {
- iv.setImageResource(android.R.drawable.stat_sys_download_done);
+ iv.setImageResource(R.drawable.stat_sys_download_done);
}
}