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

Commit bdfc27f9 authored by Maurice Lam's avatar Maurice Lam
Browse files

Update GLIF button styles

- The negative/secondary button styles now have the correct alpha
  for the touch highlight. (24%)
- The negative/secondary buttons now align correctly based on their
  labels text, instead of based on the bounds of the touch highlight.
- Fixed issues with button shadows being cropped.

Test: Manual inspection. Existing tests pass.
Change-Id: I261e504d661d7a53eda3561a26942ea11ba0d429
parent f1c80dea
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@
            android:layout_weight="1.0"
            android:layout_marginStart="?attr/suwMarginSides"
            android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
            android:clipChildren="false"
            android:clipToPadding="false"
            android:orientation="vertical">

            <ImageView
@@ -86,7 +88,9 @@
            <RelativeLayout
                android:layout_width="match_parent"
                android:layout_height="0dip"
                android:layout_weight="1.0">
                android:layout_weight="1.0"
                android:clipChildren="false"
                android:clipToPadding="false">

                <!-- confirm / restart buttons -->
                <LinearLayout android:id="@+id/buttonContainer"
@@ -94,6 +98,8 @@
                    android:layout_height="wrap_content"
                    android:layout_centerHorizontal="true"
                    android:layout_alignParentBottom="true"
                    android:clipChildren="false"
                    android:clipToPadding="false"
                    android:orientation="horizontal">

                    <!-- left / top button: skip, or re-try -->
+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@
            android:layout_height="match_parent"
            android:layout_marginStart="?attr/suwMarginSides"
            android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
            android:clipChildren="false"
            android:clipToPadding="false"
            android:orientation="vertical">

            <ImageView
+5 −1
Original line number Diff line number Diff line
@@ -36,12 +36,16 @@
            android:layout_height="match_parent"
            android:layout_marginStart="?attr/suwMarginSides"
            android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
            android:clipChildren="false"
            android:clipToPadding="false"
            android:orientation="vertical">

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical">
                android:orientation="vertical"
                android:clipChildren="false"
                android:clipToPadding="false">

                <ImageView
                    android:id="@+id/suw_layout_icon"
+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@
            android:layout_weight="1"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
            android:clipChildren="false"
            android:clipToPadding="false"
            android:orientation="vertical">

            <TextView
@@ -59,6 +61,8 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="8dp"
                android:clipChildren="false"
                android:clipToPadding="false"
                android:orientation="horizontal">

                <Button
+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@
        style="@style/SuwContentFrame"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:clipChildren="false"
        android:clipToPadding="false"
        android:gravity="center_horizontal"
        android:orientation="vertical">

@@ -54,6 +56,8 @@
                android:id="@+id/bottom_container"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:clipChildren="false"
                android:clipToPadding="false"
                android:orientation="vertical">

            <android.support.v7.widget.RecyclerView
Loading