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

Commit 1f0719eb authored by Andy Mast's avatar Andy Mast Committed by Gerrit Code Review
Browse files

Fingerprint: Match Enrollment UI with SetupWizard 

Change-Id: I518fb97f1134ce03a4cd114c7d23e123d41c01b0
Issue-Id: SAMBAR-195
(cherry picked from commit 12c3b4eb)
parent 955359b7

res/drawable/setup_illustration_lock_screen_generic.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="rectangle">

            <size android:height="169dp" android:width="1dp"/>

            <size android:height="177dp" android:width="1dp"/>

            <solid android:color="@color/setup_wizard_header_background_color"/>

        </shape>

    </item>

    <item android:top="169dp">

    <item android:top="176dp">

        <shape android:shape="rectangle">

            <size android:height="56dp" android:width="1dp"/>

            <size android:height="65dp" android:width="1dp"/>

            <solid android:color="@color/setup_wizard_header_title_background_color"/>

        </shape>

    </item>

res/layout/setup_wizard_header_lock.xml

+4 −4
Original line number Diff line number Diff line
@@ -27,12 +27,11 @@ 
        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

        android:id="@+id/setup_illustration"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="241dp"

        android:background="@drawable/setup_illustration_bg"

        android:elevation="@dimen/setup_wizard_title_area_elevation"

        android:foreground="@drawable/setup_illustration"

        android:tag="stickyContainer"

        settings:aspectRatio="2.22">

        android:tag="stickyContainer">



        <TextView

            android:id="@+id/title"
@@ -40,6 +39,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:tag="sticky"

            android:layout_gravity="bottom"

            android:text="@string/wifi_setup_wizard_title"/>



    </com.android.settings.widget.SetupWizardIllustration>
@@ -49,7 +49,7 @@ 
        style="@style/SetupDetails"

        android:layout_width="match_parent"

        android:layout_height="84dp"

        android:layout_marginTop="16dp"

        android:layout_marginTop="26dp"

        android:layout_marginStart="40dp"

        android:layout_marginEnd="40dp"

        android:visibility="gone"/>

res/values/cm_styles.xml

+4 −3
Original line number Diff line number Diff line
@@ -24,15 +24,16 @@ 
        <item name="android:layout_marginBottom">0dp</item>

        <item name="android:paddingBottom">16dp</item>

        <item name="android:paddingTop">0dp</item>

        <item name="android:textSize">20sp</item>

        <item name="android:layout_marginStart">26dp</item>

        <item name="android:textSize">22sp</item>

    </style>



    <style name="SetupTitleManageFingerprints" parent="@style/SetupTitle">

        <item name="android:layout_marginBottom">0dp</item>

        <item name="android:layout_marginStart">16dp</item>

        <item name="android:paddingBottom">16dp</item>

        <item name="android:paddingTop">0dp</item>

        <item name="android:textSize">20sp</item>

        <item name="android:layout_marginStart">26dp</item>

        <item name="android:textSize">22sp</item>

    </style>



</resources>
 
 No newline at end of file