Merge "Remove non needed code for HeaderAdapter"
This commit is contained in:
committed by
Android (Google) Code Review
commit
a5c0c17304
@@ -618,7 +618,6 @@ public class SettingsActivity extends Activity
|
||||
mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
|
||||
mDevelopmentPreferencesListener);
|
||||
|
||||
mHeaderAdapter.resume(this);
|
||||
invalidateHeaders();
|
||||
|
||||
registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
|
||||
@@ -636,8 +635,6 @@ public class SettingsActivity extends Activity
|
||||
|
||||
unregisterReceiver(mBatteryInfoReceiver);
|
||||
|
||||
mHeaderAdapter.pause();
|
||||
|
||||
mDevelopmentPreferences.unregisterOnSharedPreferenceChangeListener(
|
||||
mDevelopmentPreferencesListener);
|
||||
|
||||
|
@@ -262,14 +262,4 @@ public class HeaderAdapter extends ArrayAdapter<Header> {
|
||||
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();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user