diff options
5 files changed, 58 insertions, 7 deletions
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml index d0cf60c..b09d607 100644 --- a/res/layout/preference_progress_category.xml +++ b/res/layout/preference_progress_category.xml @@ -18,7 +18,9 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="?android:attr/listSeparatorTextViewStyle" android:gravity="center_vertical" - android:orientation="horizontal"> + android:orientation="horizontal" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" > <!-- This text view has the style of the list separator text view without the background and padding. --> <TextView diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java index 6fe34bf..c85dd0b 100644 --- a/src/com/android/settings/ProgressCategory.java +++ b/src/com/android/settings/ProgressCategory.java @@ -21,17 +21,35 @@ import android.preference.Preference; import android.util.AttributeSet; import android.view.View; +/** + * A category with a progress spinner + */ public class ProgressCategory extends ProgressCategoryBase { - private final int mEmptyTextRes; + private int mEmptyTextRes; private boolean mProgress = false; private Preference mNoDeviceFoundPreference; private boolean mNoDeviceFoundAdded; + public ProgressCategory(Context context) { + this(context, null); + } + + public ProgressCategory(Context context, AttributeSet attrs) { + super(context, attrs, 0); + } + public ProgressCategory(Context context, AttributeSet attrs, - int emptyTextRes) { - super(context, attrs); + int defStyleAttr) { + this(context, attrs, defStyleAttr, 0); + } + + public ProgressCategory(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); setLayoutResource(R.layout.preference_progress_category); + } + + public void setEmptyTextRes(int emptyTextRes) { mEmptyTextRes = emptyTextRes; } diff --git a/src/com/android/settings/ProgressCategoryBase.java b/src/com/android/settings/ProgressCategoryBase.java index d120b94..c08806c 100644 --- a/src/com/android/settings/ProgressCategoryBase.java +++ b/src/com/android/settings/ProgressCategoryBase.java @@ -21,8 +21,21 @@ import android.preference.PreferenceCategory; import android.util.AttributeSet; public abstract class ProgressCategoryBase extends PreferenceCategory { + public ProgressCategoryBase(Context context) { + this(context, null); + } + public ProgressCategoryBase(Context context, AttributeSet attrs) { - super(context, attrs); + this(context, attrs, 0); + } + + public ProgressCategoryBase(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr, 0); + } + + public ProgressCategoryBase(Context context, AttributeSet attrs, int defStyleAttr, + int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); } /** diff --git a/src/com/android/settings/bluetooth/BluetoothProgressCategory.java b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java index 1c81360..9f64f9d 100644 --- a/src/com/android/settings/bluetooth/BluetoothProgressCategory.java +++ b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java @@ -22,8 +22,26 @@ import com.android.settings.R; import android.content.Context; import android.util.AttributeSet; +/** + * A Bluetooth discovery progress category + */ public class BluetoothProgressCategory extends ProgressCategory { + public BluetoothProgressCategory(Context context) { + this(context, null); + } + public BluetoothProgressCategory(Context context, AttributeSet attrs) { - super(context, attrs, R.string.bluetooth_no_devices_found); + this(context, attrs, 0); + } + + public BluetoothProgressCategory(Context context, AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0); + } + + public BluetoothProgressCategory(Context context, AttributeSet attrs, int defStyleAttr, + int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + + setEmptyTextRes(R.string.bluetooth_no_devices_found); } } diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index eb318cd..f329c3d 100755 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -292,7 +292,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem // Available devices category if (mAvailableDevicesCategory == null) { - mAvailableDevicesCategory = new BluetoothProgressCategory(getActivity(), null); + mAvailableDevicesCategory = new BluetoothProgressCategory(getActivity()); } else { mAvailableDevicesCategory.removeAll(); } |