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

Merge "Remove "Searching/Tap To Pair" text from Bluetooth Settings."

Browse Source
This commit is contained in:
Jake Hamby
2012-04-16 18:10:33 -07:00
committed by Android (Google) Code Review
parent f2dedc0f27 494f646a30
commit bae78c609a
3 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/layout/preference_progress_category.xml
View File

@@ -21,7 +21,7 @@
android:orientation="horizontal"
>
<!-- This and the other text view have the style of the list separator text view without the background and padding -->
<!-- This text view has the style of the list separator text view without the background and padding. -->
<TextView
style="?android:attr/listSeparatorTextViewStyle"
android:background="@null"
@@ -33,18 +33,6 @@
android:layout_gravity="left|bottom"
/>
<TextView
style="?android:attr/listSeparatorTextViewStyle"
android:background="@null"
android:paddingLeft="0dip"
android:id="@+id/scanning_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="right|bottom"
android:text="@string/progress_scanning"
/>
<ProgressBar
android:id="@+id/scanning_progress"
android:text="@string/progress_scanning"

4
res/values/strings.xml
View File

@@ -271,10 +271,6 @@
<string name="bluetooth_pairing">Pairing\u2026</string>
<!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
<string name="bluetooth_device">Unnamed Bluetooth device</string>
<!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
<string name="progress_scanning">Searching</string>
<!--Bluetooth settings screen, text that appears in heading bar when scanning for devices is finished, indicating that user can tap on a device to pair with it [CHAR LIMIT=20]-->
<string name="progress_tap_to_pair">Touch to pair</string>
<!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
<string name="bluetooth_no_devices_found">No nearby Bluetooth devices were found.</string>
<!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->

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

@@ -36,13 +36,10 @@ public class ProgressCategory extends ProgressCategoryBase {
@Override
public void onBindView(View view) {
super.onBindView(view);
final TextView scanning = (TextView) view.findViewById(R.id.scanning_text);
final View progressBar = view.findViewById(R.id.scanning_progress);
scanning.setText(mProgress ? R.string.progress_scanning : R.string.progress_tap_to_pair);
boolean noDeviceFound = (getPreferenceCount() == 0 ||
(getPreferenceCount() == 1 && getPreference(0) == mNoDeviceFoundPreference));
scanning.setVisibility(noDeviceFound ? View.GONE : View.VISIBLE);
progressBar.setVisibility(mProgress ? View.VISIBLE : View.GONE);
if (mProgress || !noDeviceFound) {