Merge "[Provider Model] Fixed Internet Settings always showing "Loading"" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
47b212c85b
@@ -272,8 +272,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
if (mWifiManager != null) {
|
||||
setLoading(true, false);
|
||||
mIsViewLoading = true;
|
||||
getView().postDelayed(mRemoveLoadingRunnable,
|
||||
mWifiManager.isWifiEnabled() ? 1000 : 100);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -431,6 +429,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
if (mIsViewLoading) {
|
||||
final long delayMillis = mWifiManager.isWifiEnabled() ? 1000 : 100;
|
||||
getView().postDelayed(mRemoveLoadingRunnable, delayMillis);
|
||||
}
|
||||
if (mIsRestricted) {
|
||||
restrictUi();
|
||||
return;
|
||||
|
Reference in New Issue
Block a user