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

Commit 729c213f authored by Xin Li's avatar Xin Li
Browse files

Merge QQ3A.200605.002 into master 

Bug: 158095402
Merged-In: I614914b738e3af198fe21b881d2e475e2e8eda41
Change-Id: Idd585020a1fed163866339c09d614dca0ca6e55f
parents 6045e9b9 cbebca98

res/layout/edit_user_info_dialog_content.xml

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
        android:labelFor="@id/user_photo"

        android:inputType="text|textCapWords"

        android:selectAllOnFocus="true"

        android:hint="@string/user_nickname"/>

        android:hint="@string/user_nickname"

        android:maxLength="100"/>



</LinearLayout>

res/layout/wifi_dialog.xml

+1 −2
Original line number Diff line number Diff line
@@ -156,8 +156,7 @@ 
                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            style="@style/wifi_item_spinner"

                            android:prompt="@string/please_select_phase2"

                            android:entries="@array/wifi_phase2_entries" />

                            android:prompt="@string/please_select_phase2" />

                </LinearLayout>



                <LinearLayout android:id="@+id/l_ca_cert"

res/values-af/strings.xml

+4337 −4346

File changed.

Preview size limit exceeded, changes collapsed.

res/values-am/strings.xml

+4339 −4348

File changed.

Preview size limit exceeded, changes collapsed.

res/values-ar/strings.xml

+4372 −4409

File changed.

Preview size limit exceeded, changes collapsed.