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

Merge "[Network Connection] Correct title padding"

Browse Source
This commit is contained in:
Cosmo Hsieh
2019-01-23 02:16:36 +00:00
committed by Android (Google) Code Review
parent 257f85e424 107e16ef28
commit b05f76369e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/network_request_dialog_title.xml
View File

@@ -26,7 +26,8 @@
android:id="@+id/network_request_title_text" android:id="@+id/network_request_title_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="16dip" android:paddingLeft="24dp"
android:paddingTop="18dp"
android:layout_weight="1" android:layout_weight="1"
android:textSize="18sp" android:textSize="18sp"
android:gravity="center_vertical" android:gravity="center_vertical"

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

@@ -29,6 +29,7 @@ import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -287,7 +288,13 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
final TextView summary = view.findViewById(android.R.id.summary); final TextView summary = view.findViewById(android.R.id.summary);
if (summary != null) { 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); final PreferenceImageView imageView = view.findViewById(android.R.id.icon);