Merge "Settings tweaks" into nyc-dev

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+package com.android.settings.dashboard;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+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;
+
+public class DashboardDecorator extends RecyclerView.ItemDecoration {
+
+    private final Context mContext;
+    private final Drawable mDivider;
+
+    public DashboardDecorator(Context context) {
+        mContext = context;
+        TypedValue value = new TypedValue();
+        mContext.getTheme().resolveAttribute(android.R.attr.listDivider, value, true);
+        mDivider = mContext.getDrawable(value.resourceId);
+    }
+
+    @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);
+            if (holder.getItemViewType() == R.layout.dashboard_category) {
+                if (parent.getChildViewHolder(parent.getChildAt(i - 1)).getItemViewType()
+                        != R.layout.dashboard_tile) {
+                    continue;
+                }
+            } else if (holder.getItemViewType() != R.layout.condition_card) {
+                continue;
+            }
+
+            int top = getChildTop(child);
+            mDivider.setBounds(0, top, width, top + mDivider.getIntrinsicHeight());
+            mDivider.draw(c);
+        }
+    }
+
+    private int getChildTop(View child) {
+        final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
+                .getLayoutParams();
+        return child.getTop() + params.topMargin + Math.round(ViewCompat.getTranslationY(child));
+    }
+}

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

@@ -171,6 +171,7 @@ public class DashboardSummary extends InstrumentedFragment
         mDashboard.setLayoutManager(mLayoutManager);
         mDashboard.setHasFixedSize(true);
         mDashboard.setListener(this);
+        mDashboard.addItemDecoration(new DashboardDecorator(getContext()));
         mAdapter = new DashboardAdapter(getContext());
         mAdapter.setConditions(mConditionManager.getConditions());
         mAdapter.setSuggestions(mSuggestionParser);

src/com/android/settings/fuelgauge/BatteryHistoryPreference.java

@@ -76,6 +76,7 @@ public class BatteryHistoryPreference extends Preference {
         ((TextView) view.findViewById(R.id.charge)).setText(mBatteryInfo.batteryPercentString);
         ((TextView) view.findViewById(R.id.estimation)).setText(mBatteryInfo.remainingLabel);
         UsageView usageView = (UsageView) view.findViewById(R.id.battery_usage);
+        usageView.findViewById(R.id.label_group).setAlpha(.7f);
         mBatteryInfo.bindHistory(usageView);
     }
 }