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

Commit 6d978428 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 5021968: Add input method switcher button to lock screen."

parents 53ec3ff7 858f8eaa

core/res/res/drawable-hdpi/ic_lockscreen_ime.png

0 → 100644
+202 B
Loading image diff...

core/res/res/drawable-mdpi/ic_lockscreen_ime.png

0 → 100644
+157 B
Loading image diff...

core/res/res/drawable-xhdpi/ic_lockscreen_ime.png

0 → 100644
+217 B
Loading image diff...

core/res/res/layout/keyguard_screen_password_landscape.xml

+14 −2
Original line number Diff line number Diff line
@@ -133,13 +133,14 @@ 


    <!-- Column 2 - password entry field and PIN keyboard -->

    <LinearLayout

        android:orientation="vertical"

        android:orientation="horizontal"

        android:layout_width="270dip"

        android:layout_gravity="center_vertical">



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

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:gravity="center"

            android:singleLine="true"

            android:textStyle="normal"
@@ -153,6 +154,17 @@ 
            android:suggestionsEnabled="false"

            />



        <ImageView android:id="@+id/switch_ime_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/ic_lockscreen_ime"

            android:clickable="true"

            android:padding="8dip"

            android:layout_gravity="center"

            android:background="?android:attr/selectableItemBackground"

            android:visibility="gone"

            />



    </LinearLayout>



    <!-- Numeric keyboard -->

core/res/res/layout/keyguard_screen_password_portrait.xml

+31 −14
Original line number Diff line number Diff line
@@ -95,23 +95,40 @@ 
        />



    <!-- Password entry field -->

    <LinearLayout

        android:layout_gravity="center_vertical|fill_horizontal"

        android:orientation="horizontal"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip">



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

            android:layout_width="0dip"

            android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_gravity="center_vertical|fill_horizontal"

            android:layout_weight="1"

            android:gravity="center_horizontal"

            android:singleLine="true"

            android:textStyle="normal"

            android:inputType="textPassword"

            android:textSize="36sp"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

            android:background="@drawable/lockscreen_password_field_dark"

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

            android:textColor="#ffffffff"

            android:imeOptions="actionDone"

            android:suggestionsEnabled="false"/>



        <ImageView android:id="@+id/switch_ime_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/ic_lockscreen_ime"

            android:clickable="true"

            android:padding="8dip"

            android:layout_gravity="center"

            android:background="?android:attr/selectableItemBackground"

            android:visibility="gone"

            />



    </LinearLayout>



    <!-- Numeric keyboard -->

    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"

        android:layout_width="match_parent"