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

Commit f4c77df0 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Fixed PIN display, including in Arabic." into jb-dev

parents e79e8758 9c308554

core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml

+2 −1
Original line number Diff line number Diff line
@@ -57,12 +57,13 @@ 
            android:background="@android:drawable/edit_text">



            <!-- displays dots as user enters pin -->

            <TextView android:id="@+id/pinDisplay"

            <EditText android:id="@+id/pinDisplay"

                android:layout_width="0dip"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:maxLines="1"

                android:textAppearance="?android:attr/textAppearanceLargeInverse"

                android:textColor="@android:color/primary_text_holo_light"

                android:textStyle="bold"

                android:inputType="textPassword"

            />

core/res/res/layout/keyguard_screen_sim_pin_portrait.xml

+2 −1
Original line number Diff line number Diff line
@@ -57,12 +57,13 @@ 
            android:background="@android:drawable/edit_text">



            <!-- displays dots as user enters pin -->

            <TextView android:id="@+id/pinDisplay"

            <EditText android:id="@+id/pinDisplay"

                android:layout_width="0dip"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:maxLines="1"

                android:textAppearance="?android:attr/textAppearanceLargeInverse"

                android:textColor="@android:color/primary_text_holo_light"

                android:textStyle="bold"

                android:inputType="textPassword"

            />

core/res/res/layout/keyguard_screen_sim_puk_landscape.xml

+3 −1
Original line number Diff line number Diff line
@@ -122,14 +122,16 @@ 
                      android:background="@android:drawable/edit_text">



                      <!-- displays dots as user enters new pin -->

                      <TextView android:id="@+id/pinDisplay"

                      <EditText android:id="@+id/pinDisplay"

                          android:layout_width="0dip"

                          android:layout_height="wrap_content"

                          android:layout_weight="1"

                          android:maxLines="1"

                          android:textAppearance="?android:attr/textAppearanceLargeInverse"

                          android:textColor="@android:color/primary_text_holo_light"

                          android:textStyle="bold"

                          android:inputType="textPassword"

                          android:hint="@android:string/keyguard_password_enter_pin_prompt"

                      />



                      <ImageButton android:id="@+id/pinDel"