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

Commit 906927f1 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Settings dashboard tablet fixes" into nyc-dev

parents 41dde76a 79f37067

res/layout/dashboard_category.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
    android:orientation="vertical"

    android:paddingBottom="8dip"

    android:background="@color/card_background"

    android:importantForAccessibility="noHideDescendants">

    android:importantForAccessibility="noHideDescendants"

    android:elevation="@dimen/dashboard_category_elevation" >



    <TextView android:id="@android:id/title"

        android:layout_width="match_parent"

res/layout/dashboard_tile.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
    android:gravity="center_vertical"

    android:minHeight="@dimen/dashboard_tile_minimum_height"

    android:clickable="true"

    android:background="@drawable/selectable_card" >

    android:background="@drawable/selectable_card"

    android:elevation="@dimen/dashboard_category_elevation" >



    <ImageView

        android:id="@android:id/icon"

src/com/android/settings/dashboard/DashboardDecorator.java

+2 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.support.v4.view.ViewCompat; 
import android.support.v7.widget.RecyclerView;

import android.support.v7.widget.RecyclerView.State;

import android.support.v7.widget.RecyclerView.ViewHolder;

import android.util.Log;

import android.util.TypedValue;

import android.view.View;

import com.android.settings.R;
@@ -41,8 +40,6 @@ public class DashboardDecorator extends RecyclerView.ItemDecoration { 
    @Override

    public void onDrawOver(Canvas c, RecyclerView parent, State state) {

        final int childCount = parent.getChildCount();

        final int width = parent.getWidth();

        final int bottom = parent.getBottom();

        for (int i = 1; i < childCount; i++) {

            final View child = parent.getChildAt(i);

            final ViewHolder holder = parent.getChildViewHolder(child);
@@ -56,7 +53,8 @@ public class DashboardDecorator extends RecyclerView.ItemDecoration { 
            }



            int top = getChildTop(child);

            mDivider.setBounds(0, top, width, top + mDivider.getIntrinsicHeight());

            mDivider.setBounds(child.getLeft(), top, child.getRight(),

                    top + mDivider.getIntrinsicHeight());

            mDivider.draw(c);

        }

    }