From 107e16ef28603a3f2218fa1853759692802ca527 Mon Sep 17 00:00:00 2001 From: cosmohsieh Date: Tue, 22 Jan 2019 15:13:10 +0800 Subject: [PATCH] [Network Connection] Correct title padding Padding of dialog title needs to align design doc. Bug: 123161302 Test: manual Change-Id: I4b8a3d12dd309b0c1812694c42c7e0d283c619f2 --- res/layout/network_request_dialog_title.xml | 3 ++- .../settings/wifi/NetworkRequestDialogFragment.java | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/res/layout/network_request_dialog_title.xml b/res/layout/network_request_dialog_title.xml index fa0108531fd..186768e6d0e 100644 --- a/res/layout/network_request_dialog_title.xml +++ b/res/layout/network_request_dialog_title.xml @@ -26,7 +26,8 @@ android:id="@+id/network_request_title_text" android:layout_width="0dp" android:layout_height="match_parent" - android:paddingLeft="16dip" + android:paddingLeft="24dp" + android:paddingTop="18dp" android:layout_weight="1" android:textSize="18sp" android:gravity="center_vertical" diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java index 0ed85447c2e..2dd01a33168 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java @@ -29,6 +29,7 @@ import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -287,7 +288,13 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp final TextView summary = view.findViewById(android.R.id.summary); if (summary != null) { - summary.setText(accessPoint.getSettingsSummary()); + final String summaryString = accessPoint.getSettingsSummary(); + if (TextUtils.isEmpty(summaryString)) { + summary.setVisibility(View.GONE); + } else { + summary.setVisibility(View.VISIBLE); + summary.setText(summaryString); + } } final PreferenceImageView imageView = view.findViewById(android.R.id.icon);