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

Commit c4d7bc85 authored by Anna Galusza's avatar Anna Galusza Committed by Android (Google) Code Review
Browse files

Merge "Update preview border. Bug: 27396174" into nyc-dev

parents dccc582d d658c0f6

res/drawable/preview_seek_bar_outline.xml

+25 −6
Original line number Diff line number Diff line
@@ -14,9 +14,28 @@ 
     limitations under the License.

-->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:top="0dp"

        android:bottom="0dp"

        android:right="0dp"

        android:left="0dp" >

        <shape

            android:shape="rectangle" >

            <stroke

            android:width="8dp"

            android:color="@color/seek_bar_preference_preview_border_tint" />

                android:width="@dimen/preview_pager_padding"

                android:color="?android:attr/colorPrimary" />

        </shape>

    </item>

    <item

        android:bottom="0dp"

        android:right="0dp"

        android:left="0dp" >

        <shape

            android:shape="rectangle"

            android:height="?android:attr/actionBarSize" >

            <solid

                android:color="?android:attr/colorPrimary" />

        </shape>

    </item>

</layer-list>

res/layout/preview_seek_bar_view_pager.xml

+11 −20
Original line number Diff line number Diff line
@@ -14,37 +14,28 @@ 
     limitations under the License.

-->



<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="0dp"

    android:layout_weight="1"

    android:foreground="@drawable/preview_seek_bar_outline" >

    android:orientation="vertical"

    android:padding="@dimen/preview_pager_padding"

    android:background="@drawable/preview_seek_bar_outline" >



    <android.support.v4.view.ViewPager

        android:id="@+id/preview_pager"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:background="?android:attr/colorBackgroundFloating" />



    <View

        android:layout_width="match_parent"

        android:layout_height="48dp"

        android:layout_alignParentTop="false"

        android:layout_alignParentBottom="true"

        android:layout_margin="8dp"

        android:background="@color/seek_bar_preference_preview_border_tint" />



    <TextView

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="?android:attr/actionBarSize"

        android:layout_marginStart="32dp"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="false"

        android:layout_alignParentBottom="true"

        android:gravity="center"

        android:paddingStart="32dp"

        android:gravity="start|center"

        android:text="@string/screen_zoom_preview_title"

        android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"

        android:textColor="@color/seek_bar_preference_preview_text"

        android:elevation="2dp"/>

</RelativeLayout>

        android:textColor="@color/seek_bar_preference_preview_text" />

</LinearLayout>

res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -124,7 +124,5 @@ 
    <color name="message_icon_text_outgoing">#ffffffff</color>



    <color name="seek_bar_preference_preview_text">#fff</color>

    <!-- Black at 80% opacity -->

    <color name="seek_bar_preference_preview_border_tint">#cc000000</color>



</resources>

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -291,4 +291,7 @@ 
    <!-- Restricted icon in switch bar -->

    <dimen name="restricted_icon_margin_end">16dp</dimen>



    <!-- Display Size and Font Size preview screen -->

    <dimen name="preview_pager_padding">8dp</dimen>



</resources>