Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev
diff --git a/res/layout/network_request_dialog_title.xml b/res/layout/network_request_dialog_title.xml
index b61a7db..4385a88 100644
--- a/res/layout/network_request_dialog_title.xml
+++ b/res/layout/network_request_dialog_title.xml
@@ -18,28 +18,43 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="?android:attr/dialogPreferredPadding"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:background="?android:attr/selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeightSmall">
- <TextView
- android:id="@+id/network_request_title_text"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:paddingLeft="24dp"
- android:paddingTop="18dp"
- android:layout_weight="1"
- android:textSize="18sp"
- android:gravity="center_vertical"
- style="@style/info_label"/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingStart="24dp">
- <ProgressBar
- android:id="@+id/network_request_title_progress"
- style="?android:attr/progressBarStyleSmallTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_marginStart="16dip"
- android:minWidth="32dp"
- android:text="@string/progress_scanning"/>
+ <TextView
+ android:id="@+id/network_request_title_text"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:paddingTop="18dp"
+ android:layout_weight="1"
+ android:textSize="20sp"
+ android:gravity="center_vertical"
+ style="@style/info_label"/>
+
+ <ProgressBar
+ android:id="@+id/network_request_title_progress"
+ style="?android:attr/progressBarStyleSmallTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="20dp"
+ android:gravity="center_vertical"
+ android:layout_marginStart="16dip"
+ android:minWidth="32dp"
+ android:text="@string/progress_scanning"/>
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/network_request_summary_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="24dp"
+ android:paddingTop="18dp"
+ android:textSize="16sp"/>
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cdc5cdf..e3335e4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11739,7 +11739,12 @@
<string name="see_less">See less</string>
<!-- Title for Network connection request Dialog [CHAR LIMIT=60] -->
- <string name="network_connection_request_dialog_title">Device to use with <xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g></string>
+ <string name="network_connection_request_dialog_title">Connect to device</string>
+ <!-- Summary for Network connection request Dialog [CHAR LIMIT=NONE] -->
+ <string name="network_connection_request_dialog_summary">
+ <xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g>
+ app wants to use a temporary Wi\u2011Fi network to connect to your device
+ </string>
<!-- Message for Network connection timeout Dialog [CHAR LIMIT=NONE] -->
<string name="network_connection_timeout_dialog_message">No devices found. Make sure devices are turned on and available to connect.</string>
<!-- OK button for Network connection timeout Dialog [CHAR LIMIT=30] -->
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java
index eda3204..c17bacd 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java
@@ -23,10 +23,13 @@
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 @@
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 @@
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 @@
}
}
+ 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) {
}
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index ee032ed..edaa4d9 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -86,6 +86,8 @@
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);
diff --git a/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java
index 7a0ccbe..ec91927 100644
--- a/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java
@@ -7,7 +7,9 @@
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 @@
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);