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

Merge "Update context on resume calls for BluetoothAdvertisingEnabler and BluetoothEnabler"

Browse Source
This commit is contained in:
Matthew Xie
2014-03-01 22:20:32 +00:00
committed by Android (Google) Code Review
parent f7890677df a504c4dcdf
commit 7f36c272c4
5 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -734,7 +734,7 @@ public class SettingsActivity extends Activity
mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
mDevelopmentPreferencesListener);
mHeaderAdapter.resume();
mHeaderAdapter.resume(this);
invalidateHeaders();
registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
@@ -1629,9 +1629,9 @@ public class SettingsActivity extends Activity
holder.mIcon.setImageDrawable(icon);
}
public void resume() {
public void resume(Context context) {
mWifiEnabler.resume();
mBluetoothEnabler.resume();
mBluetoothEnabler.resume(context);
}
public void pause() {