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

Commit 925d206e authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

Merge "Make drop down sort widget match MD." into arc-apps

parents 8523c258 06e4f975

res/drawable/dropdown_sort_widget_background.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2017 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

  -->



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

        android:color="?attr/colorControlHighlight" >

    <item

        android:id="@android:id/mask"

        android:drawable="@android:color/white"/>

</ripple>

res/layout/dropdown_sort_widget.xml

+11 −5
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="@dimen/doc_header_height"

    android:paddingEnd="@dimen/dropdown_sort_widget_margin"

    android:paddingTop="@dimen/dropdown_sort_widget_margin"

    android:paddingBottom="@dimen/dropdown_sort_widget_margin"

    android:background="@drawable/sort_widget_background"

    android:gravity="center_vertical|end"

    android:orientation="horizontal">
@@ -28,7 +30,10 @@ 
    <TextView

        android:id="@+id/sort_dimen_dropdown"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_height="@dimen/dropdown_sort_widget_size"

        android:background="@drawable/dropdown_sort_widget_background"

        android:paddingStart="12dp"

        android:paddingEnd="12dp"

        android:gravity="center"

        android:fontFamily="sans-serif-medium"

        android:textSize="14sp"
@@ -36,10 +41,11 @@ 


    <ImageView

        android:id="@+id/sort_arrow"

        android:layout_width="@dimen/dropdown_sort_widget_icon_size"

        android:layout_height="@dimen/dropdown_sort_widget_icon_size"

        android:layout_marginStart="10dp"

        android:padding="3dp"

        android:layout_width="@dimen/dropdown_sort_widget_size"

        android:layout_height="@dimen/dropdown_sort_widget_size"

        android:layout_marginStart="4dp"

        android:background="@drawable/dropdown_sort_widget_background"

        android:padding="5dp"

        android:src="@drawable/ic_sort_arrow"

        android:accessibilityTraversalAfter="@id/sort_dimen_dropdown"/>

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ 
    <dimen name="doc_header_sort_icon_size">16dp</dimen>

    <dimen name="doc_header_height">60dp</dimen>



    <dimen name="dropdown_sort_widget_margin">20dp</dimen>

    <dimen name="dropdown_sort_widget_icon_size">30dp</dimen>

    <dimen name="dropdown_sort_widget_margin">12dp</dimen>

    <dimen name="dropdown_sort_widget_size">36dp</dimen>



    <dimen name="drop_icon_height">14dp</dimen>

    <dimen name="drop_icon_width">14dp</dimen>