From 1efd7878c78aef97383f3bd9ab96635736549e83 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Thu, 30 Apr 2020 11:46:07 +0800 Subject: [PATCH] [Wi-Fi] Modify NetworkRequestDialog title & summary Design change for UX improvement. Bug: 155348488 Test: manual visual Change-Id: I07d441f6fda8017cc9f4561ef64d57ff8db86f0f --- res/layout/network_request_dialog_title.xml | 55 ++++++++++++------- res/values/strings.xml | 7 ++- .../NetworkRequestDialogBaseFragment.java | 27 +++++---- .../wifi/NetworkRequestDialogFragment.java | 2 + ...etworkRequestSingleSsidDialogFragment.java | 4 ++ 5 files changed, 64 insertions(+), 31 deletions(-) diff --git a/res/layout/network_request_dialog_title.xml b/res/layout/network_request_dialog_title.xml index b61a7db4d23..4385a883e30 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"> - + - + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index d4f3f7344ab..ead56d0b9c6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11701,7 +11701,12 @@ See less - Device to use with %1$s + Connect to device + + + %1$s + app wants to use a temporary Wi\u2011Fi network to connect to your device + No devices found. Make sure devices are turned on and available to connect. diff --git a/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java index eda3204a715..c17bacdc9f7 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java @@ -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) { } diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java index ee032ede6c0..edaa4d913dc 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java @@ -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); diff --git a/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java index 7a0ccbea58a..ec919276f6c 100644 --- a/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java @@ -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);