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

Commit 9cec1bec authored by Ben Komalo's avatar Ben Komalo
Browse files

Misc UI fixes for settings (mostly cryptkeeper) 

- fix padding issues in a lot of cryptkeeper screens
- fix sizing of clock that didn't fit anymore with the new font
- change titles from green to the new holo blue

Bug: 5247866
Change-Id: Ib934e9661c32cce26e1af40eaff133bae11f78dc
parent 24e07307

res/layout-land/crypt_keeper_progress.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        android:layout_alignParentLeft="true"

        android:layout_centerVertical="true"

        android:textSize="30dip"

        android:textColor="#ff99cc00"

        android:textColor="@color/title_color"

        android:text="@string/crypt_keeper_setup_title"

        android:gravity="bottom"

    />

res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
        android:layout_marginLeft="16dip"

        android:layout_below="@id/top_padding_layout"

        android:textSize="32dip"

        android:textColor="#ff99cc00"

        android:textColor="@color/title_color"

        android:text="@string/wifi_setup_title"

        android:gravity="bottom"/>

res/layout-sw600dp/crypt_keeper_password_entry.xml

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

>

    <include layout="@layout/crypt_keeper_status" />



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -38,6 +40,7 @@ 
            android:layout_width="wrap_content"

            android:layout_toRightOf="@+id/encroid"

            android:layout_marginTop="37dip"

            android:paddingLeft="17dip"

            android:paddingRight="17dip"

            android:singleLine="true"

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

res/layout-sw600dp/crypt_keeper_progress.xml

+6 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:padding="64dip"

    >

        <ImageView

            android:id="@+id/encroid"
@@ -42,8 +43,9 @@ 
            android:layout_alignParentTop="true"

            android:layout_alignParentLeft="true"

            android:layout_marginLeft="16dip"

            android:layout_marginRight="16dip"

            android:textSize="30dip"

            android:textColor="#ff99cc00"

            android:textColor="@color/title_color"

            android:text="@string/crypt_keeper_setup_title"

            android:gravity="bottom"

        />
@@ -68,8 +70,9 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@+id/top_divider"

            android:paddingLeft="152dip"

            android:paddingTop="21dip"

            android:layout_marginLeft="16dip"

            android:layout_marginRight="16dip"

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

        />
@@ -78,7 +81,6 @@ 
            android:id="@+id/bottom_divider"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingLeft="152dip"

            android:layout_above="@+id/factory_reset"

            android:visibility="gone"

        >
@@ -96,6 +98,7 @@ 
            android:layout_alignParentRight="true"

            android:layout_alignParentBottom="true"

            android:layout_marginBottom="80dip"

            android:layout_marginRight="16dip"

            android:text="@string/master_clear_button_text"

            android:visibility="gone"

        />

res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
        android:layout_marginLeft="16dip"

        android:layout_below="@id/top_padding_layout"

        android:textSize="32dip"

        android:textColor="#ff99cc00"

        android:textColor="@color/title_color"

        android:text="@string/wifi_setup_title"

        android:gravity="bottom"/>