Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f00d38d authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Set Wi-Fi password typeface to monospace" into main

parents 1ddef782 8b36ebf0

res/layout/wifi_dpp_qrcode_generator_fragment.xml

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ 
                android:focusable="true"

                android:longClickable="true"

                android:textAppearance="@android:style/TextAppearance.Material.Body1"

                android:textColor="?android:attr/textColorSecondary"/>

                android:textColor="?android:attr/textColorSecondary"

                android:typeface="monospace" />

        </LinearLayout>



    </LinearLayout>

src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java

+0 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.graphics.Bitmap; 
import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.provider.Settings;

import android.text.InputType;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;
@@ -120,8 +119,6 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment { 


        final String password = wifiNetworkConfig.getPreSharedKey();

        TextView passwordView = view.findViewById(R.id.password);

        passwordView.setInputType(

                InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);

        if (TextUtils.isEmpty(password)) {

            mSummary.setText(getString(

                    R.string.wifi_dpp_scan_open_network_qr_code_with_another_device,