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

Revert "BLE peripheral mode (4/4): Settings change for advertising preference."

Browse Source 
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87
This commit is contained in:
Wei Wang
2014-02-27 16:28:34 -08:00
parent ee4f84b0fb
commit 17d2124c1c
16 changed files with 52 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
View File

@@ -25,10 +25,13 @@ import android.content.SharedPreferences;
import android.os.Handler;
import android.os.SystemProperties;
import android.preference.Preference;
import android.util.Log;
import android.text.format.DateUtils;
import com.android.settings.R;
import android.text.format.Time;
import android.util.Log;
/**
* BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
* checkbox. It sets/unsets discoverability and keeps track of how much time
@@ -60,8 +63,6 @@ final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClick
private Context mContext;
private final Handler mUiHandler;
private final Preference mDiscoveryPreference;
// Preference for visibility time out. Not final as it needs to be set through setter.
private Preference mVisibilityTimeoutPreference;
private final LocalBluetoothAdapter mLocalAdapter;
@@ -100,10 +101,6 @@ final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClick
discoveryPreference.setPersistent(false);
}
public void setVisibilityPreference(Preference visibilityPreference) {
mVisibilityTimeoutPreference = visibilityPreference;
}
public void resume(Context context) {
if (mLocalAdapter == null) {
return;
@@ -117,7 +114,6 @@ final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClick
mContext.registerReceiver(mReceiver, filter);
mDiscoveryPreference.setOnPreferenceClickListener(this);
handleModeChanged(mLocalAdapter.getScanMode());
updateVisibilityTimeoutDisplay();
}
public void pause() {
@@ -128,9 +124,6 @@ final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClick
mUiHandler.removeCallbacks(mUpdateCountdownSummaryRunnable);
mContext.unregisterReceiver(mReceiver);
mDiscoveryPreference.setOnPreferenceClickListener(null);
if (mVisibilityTimeoutPreference != null) {
mVisibilityTimeoutPreference.setOnPreferenceClickListener(null);
}
}
public boolean onPreferenceClick(Preference preference) {
@@ -161,23 +154,6 @@ final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClick
mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);
}
updateVisibilityTimeoutDisplay();
}
// Update visibility timeout preference.
private void updateVisibilityTimeoutDisplay() {
if (mVisibilityTimeoutPreference == null) {
return;
}
int index = getDiscoverableTimeoutIndex();
String visibilitySummary = "";
CharSequence[] timeoutChoices =
mContext.getResources().getTextArray(R.array.bluetooth_visibility_timeout_entries);
if (index >= 0 && index < timeoutChoices.length) {
visibilitySummary = timeoutChoices[index].toString();
}
mVisibilityTimeoutPreference.setSummary(visibilitySummary);
}
private void updateTimerDisplay(int timeout) {