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

Commit c6e000ff authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into... 

Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master
parents 983158e9 0cad4413

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.