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

Merge "Remove animations in WifiSettings." into oc-dev

Browse Source 
am: 36a3579c61

Change-Id: I9c0a79d1caed78275e728fc454a97b4124f1da1e
This commit is contained in:
Sundeep Ghuman
2017-04-19 02:22:28 +00:00
committed by android-build-merger
parent 2bb10c9e57 36a3579c61
commit 56de2b521a
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -191,8 +191,10 @@ public class WifiSettings extends RestrictedSettingsFragment
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
getPreferenceManager().setPreferenceComparisonCallback( // TODO(b/37429702): Add animations and preference comparator back after initial screen is
new PreferenceManager.SimplePreferenceComparisonCallback()); // loaded (ODR).
setAnimationAllowed(false);
addPreferencesFromResource(R.xml.wifi_settings); addPreferencesFromResource(R.xml.wifi_settings);
mConnectedAccessPointPreferenceCategory = mConnectedAccessPointPreferenceCategory =
@@ -204,9 +206,6 @@ public class WifiSettings extends RestrictedSettingsFragment
mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS); mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS); mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
// Hide additional settings until access points are shown during onStart
showAdditionalSettings(false);
Context prefContext = getPrefContext(); Context prefContext = getPrefContext();
mAddPreference = new Preference(prefContext); mAddPreference = new Preference(prefContext);
mAddPreference.setIcon(R.drawable.ic_menu_add_inset); mAddPreference.setIcon(R.drawable.ic_menu_add_inset);
@@ -224,17 +223,6 @@ public class WifiSettings extends RestrictedSettingsFragment
mBgThread.start(); mBgThread.start();
} }
// TODO(b/37429702): Figure out how to temporarily disable animations during startup and remove
// this method.
private void showAdditionalSettings(boolean visible) {
mAdditionalSettingsPreferenceCategory.setVisible(visible);
mAdditionalSettingsPreferenceCategory.removeAll();
if (visible) {
mAdditionalSettingsPreferenceCategory.addPreference(mConfigureWifiSettingsPreference);
mAdditionalSettingsPreferenceCategory.addPreference(mSavedNetworksPreference);
}
}
@Override @Override
public void onDestroy() { public void onDestroy() {
mBgThread.quit(); mBgThread.quit();
@@ -359,8 +347,6 @@ public class WifiSettings extends RestrictedSettingsFragment
getView().removeCallbacks(mUpdateAccessPointsRunnable); getView().removeCallbacks(mUpdateAccessPointsRunnable);
updateAccessPointPreferences(); updateAccessPointPreferences();
} }
showAdditionalSettings(true);
} }
/** /**
@@ -394,7 +380,6 @@ public class WifiSettings extends RestrictedSettingsFragment
mWifiTracker.stopTracking(); mWifiTracker.stopTracking();
getView().removeCallbacks(mUpdateAccessPointsRunnable); getView().removeCallbacks(mUpdateAccessPointsRunnable);
getView().removeCallbacks(mHideProgressBarRunnable); getView().removeCallbacks(mHideProgressBarRunnable);
showAdditionalSettings(false);
super.onStop(); super.onStop();
} }