From f2dee29d66b1d97c693522c517659961e2b76a98 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Mon, 21 Apr 2014 10:52:34 -0700 Subject: [PATCH] Remove non needed code for HeaderAdapter - before, we were showing a Swich for WiFi and Bluetooth entries in the Headers. As this is no more the case, remove the code that is no more usefull. - as a side effect, we are also removing the call to update the Search Index that was running when the Settings app was resuming or pausing. Change-Id: I26b40df5c7a664d196a249840638d89909b6bc24 --- src/com/android/settings/SettingsActivity.java | 3 --- src/com/android/settings/dashboard/HeaderAdapter.java | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index d25e97696f9..5bd33be3bf5 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -614,7 +614,6 @@ public class SettingsActivity extends Activity mDevelopmentPreferences.registerOnSharedPreferenceChangeListener( mDevelopmentPreferencesListener); - mHeaderAdapter.resume(this); invalidateHeaders(); registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); @@ -632,8 +631,6 @@ public class SettingsActivity extends Activity unregisterReceiver(mBatteryInfoReceiver); - mHeaderAdapter.pause(); - mDevelopmentPreferences.unregisterOnSharedPreferenceChangeListener( mDevelopmentPreferencesListener); diff --git a/src/com/android/settings/dashboard/HeaderAdapter.java b/src/com/android/settings/dashboard/HeaderAdapter.java index 720f83b248c..2f79c18f8e6 100644 --- a/src/com/android/settings/dashboard/HeaderAdapter.java +++ b/src/com/android/settings/dashboard/HeaderAdapter.java @@ -262,14 +262,4 @@ public class HeaderAdapter extends ArrayAdapter
{ holder.mIcon.setLayoutParams(lp); holder.mIcon.setImageDrawable(icon); } - - public void resume(Context context) { - mWifiEnabler.resume(context); - mBluetoothEnabler.resume(context); - } - - public void pause() { - mWifiEnabler.pause(); - mBluetoothEnabler.pause(); - } } \ No newline at end of file