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

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

Merge "Fix 5044847: Minor tweaks to SecuritySettings."

parents 14f6934f 63cf89a4

res/layout/choose_lock_password.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    android:orientation="vertical"

    android:background="@android:color/background_dark"

    android:gravity="center_horizontal">



    <!-- header text ('Enter Pin') -->

res/layout/choose_lock_pattern.xml

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
    android:id="@+id/topLayout"

    android:orientation="vertical"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:background="@color/black">

    android:layout_height="match_parent">



    <!-- takes up all space above button bar at bottom -->

    <LinearLayout

res/layout/confirm_lock_pattern.xml

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
    android:id="@+id/topLayout"

    android:orientation="vertical"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:background="@color/black">

    android:layout_height="match_parent">



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

        android:layout_width="match_parent"

src/com/android/settings/ChooseLockPattern.java

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class ChooseLockPattern extends PreferenceActivity { 
            Introduction(

                    R.string.lockpattern_recording_intro_header,

                    LeftButtonMode.Cancel, RightButtonMode.ContinueDisabled,

                    R.string.lockpattern_recording_intro_footer, true),

                    ID_EMPTY_MESSAGE, true),

            HelpScreen(

                    R.string.lockpattern_settings_help_how_to_record,

                    LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false),