diff options
| author | Jake Hamby <jhamby@google.com> | 2012-04-16 18:10:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-16 18:10:33 -0700 |
| commit | bae78c609a104b8194f7dda770859751a4db4cdd (patch) | |
| tree | f3953a6c07564d9a40366ea7d777a765ddb5bcd2 /src | |
| parent | f2dedc0f27f06cd1863f5fefa6cdca232b90790a (diff) | |
| parent | 494f646a300e3ca499f5d31cee74dc261f17bdc8 (diff) | |
| download | packages_apps_Settings-bae78c609a104b8194f7dda770859751a4db4cdd.zip packages_apps_Settings-bae78c609a104b8194f7dda770859751a4db4cdd.tar.gz packages_apps_Settings-bae78c609a104b8194f7dda770859751a4db4cdd.tar.bz2 | |
Merge "Remove "Searching/Tap To Pair" text from Bluetooth Settings."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/ProgressCategory.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java index c1b25d8..625aa59 100644 --- a/src/com/android/settings/ProgressCategory.java +++ b/src/com/android/settings/ProgressCategory.java @@ -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) { |