PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gilles Debunne
2011-12-02 10:22:25 -08:00
committed by Android (Google) Code Review
parent 8266d1aa6b 648f4f6688
commit 1663522e1a
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/preference_progress_category.xml
View File

@@ -30,7 +30,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_gravity="center_vertical" android:layout_gravity="left|bottom"
/> />
<TextView <TextView
@@ -38,10 +38,10 @@
android:background="@null" android:background="@null"
android:paddingLeft="0dip" android:paddingLeft="0dip"
android:id="@+id/scanning_text" android:id="@+id/scanning_text"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_weight="1"
android:layout_marginRight="5sp" android:layout_gravity="right|bottom"
android:text="@string/progress_scanning" android:text="@string/progress_scanning"
/> />
@@ -51,6 +51,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip" android:layout_marginRight="16dip"
style="?android:attr/progressBarStyleSmallTitle" style="?android:attr/progressBarStyleSmallTitle"
/> />

8
src/com/android/settings/ProgressCategory.java
View File

@@ -36,14 +36,14 @@ public class ProgressCategory extends ProgressCategoryBase {
@Override @Override
public void onBindView(View view) { public void onBindView(View view) {
super.onBindView(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); 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 || boolean noDeviceFound = (getPreferenceCount() == 0 ||
(getPreferenceCount() == 1 && getPreference(0) == mNoDeviceFoundPreference)); (getPreferenceCount() == 1 && getPreference(0) == mNoDeviceFoundPreference));
textView.setVisibility(noDeviceFound ? View.INVISIBLE : View.VISIBLE); scanning.setVisibility(noDeviceFound ? View.GONE : View.VISIBLE);
progressBar.setVisibility(mProgress ? View.VISIBLE : View.INVISIBLE); progressBar.setVisibility(mProgress ? View.VISIBLE : View.GONE);
if (mProgress || !noDeviceFound) { if (mProgress || !noDeviceFound) {
if (mNoDeviceFoundAdded) { if (mNoDeviceFoundAdded) {