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

Merge "[Manual Network Selection] UX improvement"

Browse Source
This commit is contained in:
Bonian Chen
2019-09-26 07:16:42 +00:00
committed by Android (Google) Code Review
parent d48189c564 cbb446e38a
commit 1e719a5766
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -135,6 +135,9 @@ public class NetworkSelectSettings extends DashboardFragment {
super.onStart(); super.onStart();
updateForbiddenPlmns(); updateForbiddenPlmns();
if (isProgressBarVisible()) {
return;
}
setProgressBarVisible(true); setProgressBarVisible(true);
mNetworkScanHelper.startNetworkScan( mNetworkScanHelper.startNetworkScan(
@@ -157,7 +160,6 @@ public class NetworkSelectSettings extends DashboardFragment {
@Override @Override
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
stopNetworkQuery();
} }
@Override @Override
@@ -377,6 +379,13 @@ public class NetworkSelectSettings extends DashboardFragment {
mConnectedPreferenceCategory.setVisible(true); mConnectedPreferenceCategory.setVisible(true);
} }
private boolean isProgressBarVisible() {
if (mProgressHeader == null) {
return false;
}
return (mProgressHeader.getVisibility() == View.VISIBLE);
}
protected void setProgressBarVisible(boolean visible) { protected void setProgressBarVisible(boolean visible) {
if (mProgressHeader != null) { if (mProgressHeader != null) {
mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE); mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
@@ -425,6 +434,7 @@ public class NetworkSelectSettings extends DashboardFragment {
@Override @Override
public void onDestroy() { public void onDestroy() {
stopNetworkQuery();
mNetworkScanExecutor.shutdown(); mNetworkScanExecutor.shutdown();
super.onDestroy(); super.onDestroy();
} }