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

31
res/values/styles_preference.xml
View File

@@ -21,35 +21,44 @@
<dimen name="preference_no_icon_padding_start">72dp</dimen> <dimen name="preference_no_icon_padding_start">72dp</dimen>
<style name="ApnPreference"> <!-- Fragment style -->
<style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">
<item name="android:layout">@layout/preference_list_fragment</item>
<item name="allowDividerAfterLastItem">false</item>
</style>
<!-- Preferences -->
<style name="SettingsPreference">
<item name="allowDividerAbove">false</item>
<item name="allowDividerBelow">true</item>
<item name="android:layout">@layout/preference_material_settings</item>
</style>
<style name="ApnPreference" parent="SettingsPreference">
<item name="android:layout">@layout/apn_preference_layout</item> <item name="android:layout">@layout/apn_preference_layout</item>
</style> </style>
<style name="EditTextPreference" <style name="EditTextPreference"
parent="@style/Preference.DialogPreference.EditTextPreference.Material"> parent="@style/Preference.DialogPreference.EditTextPreference.Material">
<item name="allowDividerAbove">false</item>
<item name="allowDividerBelow">true</item>
<item name="android:layout">@layout/preference_material_settings</item> <item name="android:layout">@layout/preference_material_settings</item>
<item name="android:dialogLayout">@layout/preference_dialog_edittext</item> <item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
</style> </style>
<style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material"> <style name="SettingsDropdownPreference" parent="SettingsPreference">
<item name="android:layout">@layout/preference_list_fragment</item>
</style>
<style name="SettingsPreference">
<item name="android:layout">@layout/preference_material_settings</item>
</style>
<style name="SettingsDropdownPreference">
<item name="android:layout">@layout/preference_dropdown_material_settings</item> <item name="android:layout">@layout/preference_dropdown_material_settings</item>
</style> </style>
<style name="SettingsDialogPreference" parent="SettingsPreference" /> <style name="SettingsDialogPreference" parent="SettingsPreference" />
<style name="SettingsPreferenceCategory" parent="@style/Preference.Category.Material"> <style name="SettingsPreferenceCategory" parent="@style/Preference.Category.Material">
<item name="allowDividerAbove">true</item>
<item name="allowDividerBelow">true</item>
<item name="android:layout">@layout/preference_category_material_settings</item> <item name="android:layout">@layout/preference_category_material_settings</item>
</style> </style>
<style name="SettingsSeekBarPreference"> <style name="SettingsSeekBarPreference" parent="SettingsPreference">
<item name="android:layout">@layout/preference_widget_seekbar_settings</item> <item name="android:layout">@layout/preference_widget_seekbar_settings</item>
</style> </style>

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

@@ -17,13 +17,7 @@
package com.android.settings.core; package com.android.settings.core;
import android.content.Context; import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle; 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.Instrumentable;
import com.android.settings.core.instrumentation.MetricsFeatureProvider; 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.core.lifecycle.ObservablePreferenceFragment;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.survey.SurveyMixin; import com.android.settings.survey.SurveyMixin;
import com.android.settings.widget.PreferenceDividerDecoration;
/** /**
* Instrumented fragment that logs visibility state. * Instrumented fragment that logs visibility state.
@@ -44,9 +37,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
// metrics placeholder value. Only use this for development. // metrics placeholder value. Only use this for development.
protected final int PLACEHOLDER_METRIC = 10000; protected final int PLACEHOLDER_METRIC = 10000;
private final PreferenceDividerDecoration mDividerDecoration =
new PreferenceDividerDecoration();
private final VisibilityLoggerMixin mVisibilityLoggerMixin; private final VisibilityLoggerMixin mVisibilityLoggerMixin;
public InstrumentedPreferenceFragment() { public InstrumentedPreferenceFragment() {
@@ -62,14 +52,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); 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 @Override
public void onResume() { public void onResume() {
mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity()); mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
@@ -80,12 +62,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { 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() { protected final Context getPrefContext() {
return getPreferenceManager().getContext(); 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) { 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) { public VolumeSeekBarPreference(Context context, AttributeSet attrs) {
this(context, attrs, 0); super(context, attrs);
setLayoutResource(R.layout.preference_volume_slider);
} }
public VolumeSeekBarPreference(Context context) { public VolumeSeekBarPreference(Context context) {
this(context, null); super(context);
setLayoutResource(R.layout.preference_volume_slider);
} }
public void setStream(int stream) { 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;
}
}

12
tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
View File

@@ -19,10 +19,6 @@ package com.android.settings;
import android.content.Context; import android.content.Context;
import android.os.UserManager; import android.os.UserManager;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import android.test.AndroidTestCase;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.DeviceInfoUtils;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -33,14 +29,13 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DeviceInfoSettingsTest extends AndroidTestCase { public class DeviceInfoSettingsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext; private Context mContext;
@@ -49,21 +44,18 @@ public class DeviceInfoSettingsTest extends AndroidTestCase {
@Mock @Mock
private UserManager mUserManager; private UserManager mUserManager;
private FakeFeatureFactory mFeatureFactory;
private DeviceInfoSettings mSettings; private DeviceInfoSettings mSettings;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mSettings = spy(new DeviceInfoSettings()); mSettings = spy(new DeviceInfoSettings());
doReturn(mScreen).when(mSettings).getPreferenceScreen(); doReturn(mScreen).when(mSettings).getPreferenceScreen();
} }
@Test @Test
public void getPrefXml_shoudlReturnDeviceInfoXml() { public void getPrefXml_shouldReturnDeviceInfoXml() {
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings); assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings);
} }
} }

113
tests/robotests/src/com/android/settings/widget/PreferenceDividerDecorationTest.java
View File

@@ -1,113 +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.content.Context;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
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;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PreferenceDividerDecorationTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
private Drawable mDrawable;
@Mock
private Canvas mCanvas;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private RecyclerView mRecyclerView;
@Mock
private PreferenceGroupAdapter mAdapter;
@Mock
private PreferenceCategory mPrefCategory;
@Mock
private Preference mNormalPref;
@Mock
private FooterPreference mFooterPref;
private PreferenceDividerDecoration mDecoration;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mDecoration = new PreferenceDividerDecoration();
mDecoration.setDivider(mDrawable);
mDecoration.setDividerHeight(3);
}
@Test
public void drawOver_footerPreference_shouldDrawDivider() {
when(mRecyclerView.getAdapter()).thenReturn(mAdapter);
when(mRecyclerView.getChildCount()).thenReturn(1);
when(mAdapter.getItem(anyInt())).thenReturn(mFooterPref);
mDecoration.onDrawOver(mCanvas, mRecyclerView, null /* state */);
verify(mDrawable).draw(mCanvas);
}
@Test
public void drawOver_preferenceCategory_shouldSkipFirst() {
when(mRecyclerView.getAdapter()).thenReturn(mAdapter);
when(mRecyclerView.getChildCount()).thenReturn(3);
when(mAdapter.getItem(anyInt())).thenReturn(mPrefCategory);
when(mRecyclerView.getChildAdapterPosition(any(View.class)))
.thenReturn(0)
.thenReturn(1)
.thenReturn(2);
mDecoration.onDrawOver(mCanvas, mRecyclerView, null /* state */);
// 3 prefCategory, should skip first draw
verify(mDrawable, times(2)).draw(mCanvas);
}
@Test
public void drawOver_preference_doNotDrawDivider() {
when(mRecyclerView.getAdapter()).thenReturn(mAdapter);
when(mRecyclerView.getChildCount()).thenReturn(1);
when(mAdapter.getItem(anyInt())).thenReturn(mNormalPref);
mDecoration.onDrawOver(mCanvas, mRecyclerView, null /* state */);
verify(mDrawable, never()).draw(mCanvas);
}
}