Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1663522e authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Fixed layout for "Available Devices" in Bluetooth" into ics-mr1

parents 8266d1aa 648f4f66

res/layout/preference_progress_category.xml

+5 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_gravity="center_vertical"

        android:layout_gravity="left|bottom"

    />



    <TextView
@@ -38,10 +38,10 @@ 
        android:background="@null"

        android:paddingLeft="0dip"

        android:id="@+id/scanning_text"

        android:layout_width="wrap_content"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginRight="5sp"

        android:layout_weight="1"

        android:layout_gravity="right|bottom"

        android:text="@string/progress_scanning"

        />
@@ -51,6 +51,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        style="?android:attr/progressBarStyleSmallTitle"

        />

src/com/android/settings/ProgressCategory.java

+4 −4
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ public class ProgressCategory extends ProgressCategoryBase { 
    @Override

    public void onBindView(View view) {

        super.onBindView(view);

        final TextView textView = (TextView) view.findViewById(R.id.scanning_text);

        final TextView scanning = (TextView) view.findViewById(R.id.scanning_text);

        final View progressBar = view.findViewById(R.id.scanning_progress);



        textView.setText(mProgress ? R.string.progress_scanning : R.string.progress_tap_to_pair);

        scanning.setText(mProgress ? R.string.progress_scanning : R.string.progress_tap_to_pair);

        boolean noDeviceFound = (getPreferenceCount() == 0 ||

                (getPreferenceCount() == 1 && getPreference(0) == mNoDeviceFoundPreference));

        textView.setVisibility(noDeviceFound ? View.INVISIBLE : View.VISIBLE);

        progressBar.setVisibility(mProgress ? View.VISIBLE : View.INVISIBLE);

        scanning.setVisibility(noDeviceFound ? View.GONE : View.VISIBLE);

        progressBar.setVisibility(mProgress ? View.VISIBLE : View.GONE);



        if (mProgress || !noDeviceFound) {

            if (mNoDeviceFoundAdded) {