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

Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev

Browse Source
This commit is contained in:
Arc Wang
2020-05-05 01:02:05 +00:00
committed by Android (Google) Code Review
parent 9bb55e1084 1efd7878c7
commit 032f77052b
5 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java
View File

@@ -23,10 +23,13 @@ import android.content.Intent;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.util.List;
/**
@@ -39,16 +42,7 @@ abstract public class NetworkRequestDialogBaseFragment extends InstrumentedDialo
final static String EXTRA_APP_NAME = "com.android.settings.wifi.extra.APP_NAME";
NetworkRequestDialogActivity mActivity = null;
protected String getTitle() {
final Intent intent = getActivity().getIntent();
String appName = "";
if (intent != null) {
appName = intent.getStringExtra(EXTRA_APP_NAME);
}
return getString(R.string.network_connection_request_dialog_title, appName);
}
private String mAppName = "";
@Override
public int getMetricsCategory() {
@@ -61,6 +55,11 @@ abstract public class NetworkRequestDialogBaseFragment extends InstrumentedDialo
if (context instanceof NetworkRequestDialogActivity) {
mActivity = (NetworkRequestDialogActivity) context;
}
final Intent intent = getActivity().getIntent();
if (intent != null) {
mAppName = intent.getStringExtra(EXTRA_APP_NAME);
}
}
@Override
@@ -78,6 +77,14 @@ abstract public class NetworkRequestDialogBaseFragment extends InstrumentedDialo
}
}
protected String getTitle() {
return getString(R.string.network_connection_request_dialog_title);
}
protected String getSummary() {
return getString(R.string.network_connection_request_dialog_summary, mAppName);
}
protected void onUserSelectionCallbackRegistration(
NetworkRequestUserSelectionCallback userSelectionCallback) {
}

2
src/com/android/settings/wifi/NetworkRequestDialogFragment.java
View File

@@ -86,6 +86,8 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme
final TextView title = customTitle.findViewById(R.id.network_request_title_text);
title.setText(getTitle());
final TextView summary = customTitle.findViewById(R.id.network_request_summary_text);
summary.setText(getSummary());
final ProgressBar progressBar = customTitle.findViewById(
R.id.network_request_title_progress);

4
src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java
View File

@@ -7,7 +7,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
/**
@@ -33,6 +35,8 @@ public class NetworkRequestSingleSsidDialogFragment extends
final View customTitle = inflater.inflate(R.layout.network_request_dialog_title, null);
final TextView title = customTitle.findViewById(R.id.network_request_title_text);
title.setText(getTitle());
final TextView summary = customTitle.findViewById(R.id.network_request_summary_text);
summary.setText(getSummary());
final ProgressBar progressBar = customTitle
.findViewById(R.id.network_request_title_progress);
progressBar.setVisibility(View.GONE);