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

Commit d2405c73 authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

Merge "Improve Wi-Fi Easy Connect lock screen UI information"

parents aaf6e034 abfd8ab7

res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml

+3 −3
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ 
                android:id="@+id/error_message"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

                android:textAlignment="center"

                android:layout_marginTop="8dp"

                android:visibility="invisible"

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

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

                android:visibility="invisible"/>



        </LinearLayout>

res/layout/wifi_dpp_qrcode_generator_fragment.xml

+8 −0
Original line number Diff line number Diff line
@@ -40,6 +40,14 @@ 
                android:layout_height="@dimen/qrcode_size"

                android:src="@android:color/transparent"/>



            <TextView

                android:id="@+id/password"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

                android:textAlignment="center"

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

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

        </LinearLayout>



    </ScrollView>

res/layout/wifi_dpp_qrcode_scanner_fragment.xml

+3 −3
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ 
                android:id="@+id/error_message"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

                android:textAlignment="center"

                android:layout_marginTop="8dp"

                android:visibility="invisible"

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

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

                android:visibility="invisible"/>



        </LinearLayout>

res/values/strings.xml

+9 −5
Original line number Diff line number Diff line
@@ -2129,7 +2129,9 @@ 
    <!-- Title for the fragment to share Wi-Fi [CHAR LIMIT=50]  -->

    <string name="wifi_dpp_share_wifi">Share Wi\u2011Fi</string>

    <!-- Hint for the user to use another device to scan QR code on screen to join Wi-Fi [CHAR LIMIT=NONE] -->

    <string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code with another device to join \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>

    <string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d and share the password</string>

    <!-- Hint for the user to use another device to scan QR code on screen to join a open Wi-Fi [CHAR LIMIT=NONE] -->

    <string name="wifi_dpp_scan_open_network_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>

    <!-- Hint for QR code detection [CHAR LIMIT=NONE]  -->

    <string name="wifi_dpp_could_not_detect_valid_qr_code">Couldn\u2019t read QR code. Re-center code and try again</string>

    <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE]  -->
@@ -2166,8 +2168,12 @@ 
    <string name="wifi_dpp_connecting">Connecting\u2026</string>

    <!-- Title for the fragment to show that the QR code is for sharing Wi-Fi hotspot network [CHAR LIMIT=50] -->

    <string name="wifi_dpp_share_hotspot">Share hotspot</string>

    <!-- Hint for the user to share Wi-Fi hotspot network [CHAR LIMIT=NONE] -->

    <string name="wifi_dpp_scan_qr_code_to_share_hotspot">Scan this QR code with another device to join hotspot \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>

    <!-- Title for Wi-Fi DPP lockscreen title [CHAR LIMIT=50] -->

    <string name="wifi_dpp_lockscreen_title">Verify it\u0027s you</string>

    <!-- Hint for Wi-Fi password [CHAR LIMIT=50]  -->

    <string name="wifi_dpp_wifi_password">Wi\u2011Fi password: <xliff:g id="password" example="my password">%1$s</xliff:g></string>

    <!-- Hint for Wi-Fi hotspot password [CHAR LIMIT=50]  -->

    <string name="wifi_dpp_hotspot_password">Hotspot password: <xliff:g id="password" example="my password">%1$s</xliff:g></string>

     <!-- Label for the try again button [CHAR LIMIT=20]-->

    <string name="retry">Retry</string>

    <!-- Label for the check box to share a network with other users on the same device -->
@@ -3945,8 +3951,6 @@ 
    <string name="lockpassword_choose_your_pattern_header_for_face">To use face authentication, set pattern</string>

    <!-- Header on first screen of choose password/PIN as backup for face authentication flow. If this string cannot be translated in under 40 characters, please translate "Set face authentication backup" [CHAR LIMIT=40] -->

    <string name="lockpassword_choose_your_pin_header_for_face">To use face authentication, set PIN</string>

    <!-- Message on Wi-Fi Sharing screen [CHAR LIMIT=NONE] -->

    <string name="wifi_sharing_message">Your Wi\u2011Fi name and password for \"<xliff:g id="SSID" example="GoogleGuest">%1$s</xliff:g>\" will be shared.</string>









    <!-- Message to be used to explain the user that he needs to enter his pattern to continue a









         particular operation. [CHAR LIMIT=70]-->
































src/com/android/settings/wifi/details/WifiDetailPreferenceController.java



+1
−8






























Original line number
Diff line number
Diff line







@@ -771,14 +771,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController







     * Share the wifi network with QR code.









     */









    private void shareNetwork() {









        final String title = mContext.getString(









                R.string.lockpassword_confirm_your_pattern_header);









        final String description = String.format(









                mContext.getString(R.string.wifi_sharing_message),









                mAccessPoint.getSsidStr());



















        WifiDppUtils.showLockScreen(mContext, title, description,









                () -> launchWifiDppConfiguratorActivity());









        WifiDppUtils.showLockScreen(mContext, () -> launchWifiDppConfiguratorActivity());









    }



















    /**