From 648f4f66887e3bb0a289ff92f19c0c86e898c9a9 Mon Sep 17 00:00:00 2001 From: Gilles Debunne Date: Mon, 21 Nov 2011 19:46:39 +0100 Subject: [PATCH] Fixed layout for "Available Devices" in Bluetooth Bug 5646340. 'Title' and 'scanning' text are on the same line as a PreferenceCategory. The first one has a 0dp width, compensated by a 1 weight. When scanning is not displayed, it should be GONE rather than INVISIBLE to let the title take the whole space. When both are visible, they should split the space, or else, with long texts in foreign languages, scanning takes the whole space, leaving the title with an almost 0 width that generates a very high text because of wrapping. Distributing size among the two texts to accomodate for such cases. Changed padding and alignment to get reasonnable results for Slovenian language (i.e. very long text), when both title and scanning are displayed. Strangely, the right scanning alignment is not enforced, although I checked it is correctly set on the TextView. Not investigating further now since it may not be desired by UX anyway. Change-Id: I6b4c6fcbc350d3664749f58eee34ec0867720626 --- res/layout/preference_progress_category.xml | 9 +++++---- src/com/android/settings/ProgressCategory.java | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml index af411eeee2b..0a860af8777 100644 --- a/res/layout/preference_progress_category.xml +++ b/res/layout/preference_progress_category.xml @@ -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" /> @@ -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" /> diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java index e854a0038d6..c1b25d83b2e 100644 --- a/src/com/android/settings/ProgressCategory.java +++ b/src/com/android/settings/ProgressCategory.java @@ -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) {