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

Merge "Remove non needed code for HeaderAdapter"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-21 17:52:55 +00:00
committed by Android (Google) Code Review
parent d33b04ff06 f2dee29d66
commit a5c0c17304
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SettingsActivity.java
View File

@@ -618,7 +618,6 @@ public class SettingsActivity extends Activity
mDevelopmentPreferences.registerOnSharedPreferenceChangeListener( mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
mDevelopmentPreferencesListener); mDevelopmentPreferencesListener);
mHeaderAdapter.resume(this);
invalidateHeaders(); invalidateHeaders();
registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
@@ -636,8 +635,6 @@ public class SettingsActivity extends Activity
unregisterReceiver(mBatteryInfoReceiver); unregisterReceiver(mBatteryInfoReceiver);
mHeaderAdapter.pause();
mDevelopmentPreferences.unregisterOnSharedPreferenceChangeListener( mDevelopmentPreferences.unregisterOnSharedPreferenceChangeListener(
mDevelopmentPreferencesListener); mDevelopmentPreferencesListener);

10
src/com/android/settings/dashboard/HeaderAdapter.java
View File

@@ -262,14 +262,4 @@ public class HeaderAdapter extends ArrayAdapter<Header> {
holder.mIcon.setLayoutParams(lp); holder.mIcon.setLayoutParams(lp);
holder.mIcon.setImageDrawable(icon); holder.mIcon.setImageDrawable(icon);
} }
public void resume(Context context) {
mWifiEnabler.resume(context);
mBluetoothEnabler.resume(context);
}
public void pause() {
mWifiEnabler.pause();
mBluetoothEnabler.pause();
}
} }