Merge "Fix Spell Checker layout padding"
diff --git a/res/drawable-hdpi/ic_bt_config.png b/res/drawable-hdpi/ic_bt_config.png
index 939a14d..a204936 100644
--- a/res/drawable-hdpi/ic_bt_config.png
+++ b/res/drawable-hdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_config.png b/res/drawable-mdpi/ic_bt_config.png
index c2d7876..d266b39 100644
--- a/res/drawable-mdpi/ic_bt_config.png
+++ b/res/drawable-mdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_config.png b/res/drawable-xhdpi/ic_bt_config.png
index 6fec792..46077be 100644
--- a/res/drawable-xhdpi/ic_bt_config.png
+++ b/res/drawable-xhdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_config.png b/res/drawable-xxhdpi/ic_bt_config.png
index fc3600e..ad964b4 100644
--- a/res/drawable-xxhdpi/ic_bt_config.png
+++ b/res/drawable-xxhdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_config.png b/res/drawable-xxxhdpi/ic_bt_config.png
index bbefb4a..e89d484 100644
--- a/res/drawable-xxxhdpi/ic_bt_config.png
+++ b/res/drawable-xxxhdpi/ic_bt_config.png
Binary files differ
diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index 5a7aee5..17ee70c 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -19,16 +19,6 @@
android:layout_height="wrap_content"
android:gravity="center_vertical">
- <!-- Divider -->
- <ImageView
- android:id="@+id/divider"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:src="@drawable/nav_divider"
- android:contentDescription="@null"
- />
-
<!-- Details button -->
<ImageView
android:id="@+id/deviceDetails"
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index b09d607..5859fbf 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -17,8 +17,10 @@
<!-- Layout used for ProgressCategory in bluetooth settings. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:attr/listSeparatorTextViewStyle"
+ android:background="@null"
android:gravity="center_vertical"
android:orientation="horizontal"
+ android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" >
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0708163..5df457b 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -913,7 +913,7 @@
<item>16777216</item>
</string-array>
- <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=19]-->
+ <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
<string-array name="select_logd_size_summaries" >
<item>64K per log buffer</item>
<item>256K per log buffer</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c801d9a..57986ac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3182,7 +3182,7 @@
<string name="wifi_verbose_logging_summary">Increase Wifi logging level, show per SSID RSSI in WiFi Picker</string>
<!-- UI debug setting: limit size of Android logger buffers -->
<string name="select_logd_size_title">Logger buffer sizes</string>
- <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=34] -->
+ <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
<string name="select_logd_size_dialog_title">Select Logger sizes per log buffer</string>
<!-- Setting Checkbox title whether to allow mock locations -->
<string name="allow_mock_location">Allow mock locations</string>
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 330b9b8..e8bad0c 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -133,10 +133,10 @@
if (mCachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);
+
if (deviceDetails != null) {
deviceDetails.setOnClickListener(this);
deviceDetails.setTag(mCachedDevice);
- deviceDetails.setAlpha(isEnabled() ? 255 : sDimAlpha);
}
}
