494f646a30
The second text field next to "Available devices" in the Bluetooth Settings device list creates a cluttered heading that wraps to multiple lines in some locales. It's unnecessary because there's a graphical progress spinner when searching for devices, and "Touch to pair" is easily discoverable. Remove the second text field and the "Searching" and "Touch to pair" string resources. Bug: 5496221 Change-Id: I7b71222415152014426cf54fc112fe5379d350dc
70 lines
2.4 KiB
Java
70 lines
2.4 KiB
Java
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings;
|
|
|
|
import android.content.Context;
|
|
import android.preference.Preference;
|
|
import android.util.AttributeSet;
|
|
import android.view.View;
|
|
import android.widget.TextView;
|
|
|
|
public class ProgressCategory extends ProgressCategoryBase {
|
|
|
|
private boolean mProgress = false;
|
|
private Preference mNoDeviceFoundPreference;
|
|
private boolean mNoDeviceFoundAdded;
|
|
|
|
public ProgressCategory(Context context, AttributeSet attrs) {
|
|
super(context, attrs);
|
|
setLayoutResource(R.layout.preference_progress_category);
|
|
}
|
|
|
|
@Override
|
|
public void onBindView(View view) {
|
|
super.onBindView(view);
|
|
final View progressBar = view.findViewById(R.id.scanning_progress);
|
|
|
|
boolean noDeviceFound = (getPreferenceCount() == 0 ||
|
|
(getPreferenceCount() == 1 && getPreference(0) == mNoDeviceFoundPreference));
|
|
progressBar.setVisibility(mProgress ? View.VISIBLE : View.GONE);
|
|
|
|
if (mProgress || !noDeviceFound) {
|
|
if (mNoDeviceFoundAdded) {
|
|
removePreference(mNoDeviceFoundPreference);
|
|
mNoDeviceFoundAdded = false;
|
|
}
|
|
} else {
|
|
if (!mNoDeviceFoundAdded) {
|
|
if (mNoDeviceFoundPreference == null) {
|
|
mNoDeviceFoundPreference = new Preference(getContext());
|
|
mNoDeviceFoundPreference.setLayoutResource(R.layout.preference_empty_list);
|
|
mNoDeviceFoundPreference.setTitle(R.string.bluetooth_no_devices_found);
|
|
mNoDeviceFoundPreference.setSelectable(false);
|
|
}
|
|
addPreference(mNoDeviceFoundPreference);
|
|
mNoDeviceFoundAdded = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void setProgress(boolean progressOn) {
|
|
mProgress = progressOn;
|
|
notifyChanged();
|
|
}
|
|
}
|