diff options
Diffstat (limited to 'src/com/android/settings')
3 files changed, 12 insertions, 47 deletions
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index 7762b89..db4b9a5 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -18,6 +18,7 @@ package com.android.settings; import android.app.Fragment; import android.content.Context; +import android.bluetooth.BluetoothManager; import android.net.ConnectivityManager; import android.net.NetworkPolicyManager; import android.net.wifi.WifiManager; @@ -93,6 +94,12 @@ public class ResetNetworkConfirm extends InstrumentedFragment { policyManager.factoryReset(subscriberId); } + BluetoothManager btManager = (BluetoothManager) + context.getSystemService(Context.BLUETOOTH_SERVICE); + if (btManager != null) { + btManager.getAdapter().factoryReset(); + } + Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT) .show(); } diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java index 54d3830..43fae71 100644 --- a/src/com/android/settings/applications/AdvancedAppSettings.java +++ b/src/com/android/settings/applications/AdvancedAppSettings.java @@ -72,50 +72,6 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements mHighPowerPreference = findPreference(KEY_HIGH_POWER_APPS); mSystemAlertWindowPreference = findPreference(KEY_SYSTEM_ALERT_WINDOW); mWriteSettingsPreference = findPreference(KEY_WRITE_SETTINGS_APPS); - updateUI(); - } - - @Override - public void onDestroy() { - super.onDestroy(); - if (mPermissionReceiver != null) { - getContext().unregisterReceiver(mPermissionReceiver); - mPermissionReceiver = null; - } - } - - private void updateUI() { - ArrayList<AppEntry> allApps = mSession.getAllApps(); - - int countAppWithDomainURLs = 0; - for (AppEntry entry : allApps) { - boolean hasDomainURLs = - (entry.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS) != 0; - if (hasDomainURLs) countAppWithDomainURLs++; - } - String summary = getResources().getQuantityString( - R.plurals.domain_urls_apps_summary, countAppWithDomainURLs, countAppWithDomainURLs); - mAppDomainURLsPreference.setSummary(summary); - - int highPowerCount = PowerWhitelistBackend.getInstance().getWhitelistSize(); - mHighPowerPreference.setSummary(getResources().getQuantityString(R.plurals.high_power_count, - highPowerCount, highPowerCount)); - - if (mPermissionReceiver != null) { - getContext().unregisterReceiver(mPermissionReceiver); - } - mPermissionReceiver = PermissionsSummaryHelper.getAppWithPermissionsCounts(getContext(), - mPermissionCallback); - - Activity activity = getActivity(); - ApplicationsState appState = ApplicationsState.getInstance(activity - .getApplication()); - AppStateOverlayBridge overlayBridge = new AppStateOverlayBridge(activity, - appState, null); - AppStateWriteSettingsBridge writeSettingsBridge = new AppStateWriteSettingsBridge( - activity, appState, null); - new CountAppsWithOverlayPermission().execute(overlayBridge); - new CountAppsWithWriteSettingsPermission().execute(writeSettingsBridge); } @Override @@ -130,7 +86,7 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements @Override public void onPackageListChanged() { - updateUI(); + // No-op. } @Override diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 44ced66..8d5679f 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -553,8 +553,10 @@ public class ManageApplications extends InstrumentedFragment mOptionsMenu.findItem(R.id.sort_order_size).setVisible(mListType == LIST_TYPE_STORAGE && mSortOrder != R.id.sort_order_size); - mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem); - mOptionsMenu.findItem(R.id.hide_system).setVisible(mShowSystem); + mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem + && mListType != LIST_TYPE_HIGH_POWER); + mOptionsMenu.findItem(R.id.hide_system).setVisible(mShowSystem + && mListType != LIST_TYPE_HIGH_POWER); } @Override |