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

Use framework support to customize dividers between prefs.

Browse Source 
Bug: 33579296
Test: make RunSettingsRoboTests
Change-Id: I1bb3b82b88dc727cda05b00058e6f40564f0e5db
This commit is contained in:
Fan Zhang
2017-01-25 15:32:17 -08:00
parent 427b99cbdc
commit bfb006aa32
6 changed files with 29 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/core/InstrumentedPreferenceFragment.java
View File

@@ -17,13 +17,7 @@
package com.android.settings.core;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.android.settings.core.instrumentation.Instrumentable;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -31,7 +25,6 @@ import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settings.core.lifecycle.ObservablePreferenceFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.survey.SurveyMixin;
import com.android.settings.widget.PreferenceDividerDecoration;
/**
* Instrumented fragment that logs visibility state.
@@ -44,9 +37,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
// metrics placeholder value. Only use this for development.
protected final int PLACEHOLDER_METRIC = 10000;
private final PreferenceDividerDecoration mDividerDecoration =
new PreferenceDividerDecoration();
private final VisibilityLoggerMixin mVisibilityLoggerMixin;
public InstrumentedPreferenceFragment() {
@@ -62,14 +52,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final View view = super.onCreateView(inflater, container, savedInstanceState);
getListView().addItemDecoration(mDividerDecoration);
return view;
}
@Override
public void onResume() {
mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
@@ -80,12 +62,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
}
@Override
public void setDivider(Drawable divider) {
mDividerDecoration.setDivider(divider);
super.setDivider(new ColorDrawable(Color.TRANSPARENT));
}
protected final Context getPrefContext() {
return getPreferenceManager().getContext();
}

9
src/com/android/settings/notification/VolumeSeekBarPreference.java
View File

@@ -59,15 +59,18 @@ public class VolumeSeekBarPreference extends SeekBarPreference {
}
public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
this(context, attrs, defStyleAttr, 0);
super(context, attrs, defStyleAttr);
setLayoutResource(R.layout.preference_volume_slider);
}
public VolumeSeekBarPreference(Context context, AttributeSet attrs) {
this(context, attrs, 0);
super(context, attrs);
setLayoutResource(R.layout.preference_volume_slider);
}
public VolumeSeekBarPreference(Context context) {
this(context, null);
super(context);
setLayoutResource(R.layout.preference_volume_slider);
}
public void setStream(int stream) {

79
src/com/android/settings/widget/PreferenceDividerDecoration.java
View File

@@ -1,79 +0,0 @@
/*
* 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.widget;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.support.v4.view.ViewCompat;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroupAdapter;
import android.support.v7.widget.RecyclerView;
import android.view.View;
public class PreferenceDividerDecoration extends RecyclerView.ItemDecoration {
private Drawable mDivider;
private int mDividerHeight;
public void setDivider(Drawable divider) {
if (divider != null) {
mDividerHeight = divider.getIntrinsicHeight();
} else {
mDividerHeight = 0;
}
mDivider = divider;
}
public void setDividerHeight(int dividerHeight) {
mDividerHeight = dividerHeight;
}
@Override
public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {
if (mDivider == null) {
return;
}
final int childCount = parent.getChildCount();
final int width = parent.getWidth();
for (int childViewIndex = 0; childViewIndex < childCount; childViewIndex++) {
final View view = parent.getChildAt(childViewIndex);
if (shouldDrawDividerAbove(view, parent)) {
int top = (int) ViewCompat.getY(view);
mDivider.setBounds(0, top, width, top + mDividerHeight);
mDivider.draw(c);
}
}
}
private boolean shouldDrawDividerAbove(View view, RecyclerView parent) {
final RecyclerView.Adapter adapter = parent.getAdapter();
if (adapter == null || !(adapter instanceof PreferenceGroupAdapter)) {
return false;
}
final PreferenceGroupAdapter prefAdapter = (PreferenceGroupAdapter) adapter;
final int adapterPosition = parent.getChildAdapterPosition(view);
if (adapterPosition == RecyclerView.NO_POSITION) {
return false;
}
final Preference pref = prefAdapter.getItem(adapterPosition);
if (pref instanceof PreferenceCategory) {
return adapterPosition != 0;
}
return pref instanceof FooterPreference;
}
}