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

Add moar dividers

Browse Source 
Bug: 27834471
Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2
This commit is contained in:
Jason Monk
2016-04-04 13:20:59 -04:00
parent bd5eb1331e
commit 3676b931d9
7 changed files with 101 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/DividedCategory.java Normal file
View File

@@ -0,0 +1,36 @@
/*
* 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;
import android.content.Context;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
/**
* PreferenceCategory that allows a divider above it.
*/
public class DividedCategory extends PreferenceCategory {
public DividedCategory(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
holder.setDividerAllowedAbove(true);
}
}

49
src/com/android/settings/DividerPreference.java Normal file
View File

@@ -0,0 +1,49 @@
/*
* 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;
import android.content.Context;
import android.content.res.TypedArray;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
public class DividerPreference extends Preference {
private Boolean mAllowAbove;
private Boolean mAllowBelow;
public DividerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.DividerPreference, 0, 0);
if (a.hasValue(R.styleable.DividerPreference_allowDividerAbove)) {
mAllowAbove = a.getBoolean(R.styleable.DividerPreference_allowDividerAbove, false);
}
if (a.hasValue(R.styleable.DividerPreference_allowDividerBelow)) {
mAllowBelow = a.getBoolean(R.styleable.DividerPreference_allowDividerBelow, false);
}
}
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
if (mAllowAbove != null) {
holder.setDividerAllowedAbove(mAllowAbove);
}
if (mAllowBelow != null) {
holder.setDividerAllowedBelow(mAllowBelow);
}
}
}

4
src/com/android/settings/datausage/TemplatePreferenceCategory.java
View File

@@ -17,10 +17,10 @@ package com.android.settings.datausage;
import android.content.Context;
import android.net.NetworkTemplate;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.util.AttributeSet;
import com.android.settings.DividedCategory;
public class TemplatePreferenceCategory extends PreferenceCategory implements TemplatePreference {
public class TemplatePreferenceCategory extends DividedCategory implements TemplatePreference {
private NetworkTemplate mTemplate;
private int mSubId;

16
src/com/android/settings/fuelgauge/WallOfTextPreference.java
View File

@@ -21,26 +21,14 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.widget.TextView;
import com.android.settings.DividerPreference;
public class WallOfTextPreference extends Preference {
public WallOfTextPreference(Context context) {
super(context);
}
public class WallOfTextPreference extends DividerPreference {
public WallOfTextPreference(Context context, AttributeSet attrs) {
super(context, attrs);
}
public WallOfTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
public WallOfTextPreference(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
@Override
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);