PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings dashboard tablet fixes" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-04-13 19:11:14 +00:00
committed by Android (Google) Code Review
parent 41dde76a6b 79f3706785
commit 906927f1c8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/dashboard_category.xml
View File

@@ -21,7 +21,8 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dip" android:paddingBottom="8dip"
android:background="@color/card_background" android:background="@color/card_background"
android:importantForAccessibility="noHideDescendants"> android:importantForAccessibility="noHideDescendants"
android:elevation="@dimen/dashboard_category_elevation" >
<TextView android:id="@android:id/title" <TextView android:id="@android:id/title"
android:layout_width="match_parent" android:layout_width="match_parent"

3
res/layout/dashboard_tile.xml
View File

@@ -21,7 +21,8 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/dashboard_tile_minimum_height" android:minHeight="@dimen/dashboard_tile_minimum_height"
android:clickable="true" android:clickable="true"
android:background="@drawable/selectable_card" > android:background="@drawable/selectable_card"
android:elevation="@dimen/dashboard_category_elevation" >
<ImageView <ImageView
android:id="@android:id/icon" android:id="@android:id/icon"

6
src/com/android/settings/dashboard/DashboardDecorator.java
View File

@@ -21,7 +21,6 @@ import android.support.v4.view.ViewCompat;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.State; import android.support.v7.widget.RecyclerView.State;
import android.support.v7.widget.RecyclerView.ViewHolder; import android.support.v7.widget.RecyclerView.ViewHolder;
import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.View; import android.view.View;
import com.android.settings.R; import com.android.settings.R;
@@ -41,8 +40,6 @@ public class DashboardDecorator extends RecyclerView.ItemDecoration {
@Override @Override
public void onDrawOver(Canvas c, RecyclerView parent, State state) { public void onDrawOver(Canvas c, RecyclerView parent, State state) {
final int childCount = parent.getChildCount(); final int childCount = parent.getChildCount();
final int width = parent.getWidth();
final int bottom = parent.getBottom();
for (int i = 1; i < childCount; i++) { for (int i = 1; i < childCount; i++) {
final View child = parent.getChildAt(i); final View child = parent.getChildAt(i);
final ViewHolder holder = parent.getChildViewHolder(child); final ViewHolder holder = parent.getChildViewHolder(child);
@@ -56,7 +53,8 @@ public class DashboardDecorator extends RecyclerView.ItemDecoration {
} }
int top = getChildTop(child); 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); mDivider.draw(c);
} }
} }