From 8da724a8bb0e609bfa3f38d0bc0a1ed1a22a4592 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 18 Oct 2016 09:52:07 -0700 Subject: [PATCH] Put divider back when IA is turned off. Bug: 32231177 Test: manual Change-Id: I657e0bb3b8721c494cd1a6272b370b54ae5063ec --- .../settings/dashboard/DashboardFragment.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index b8959743a76..3d065784f14 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -267,7 +267,9 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { final View view = super.onCreateView(inflater, container, savedInstanceState); - getListView().addItemDecoration(mDividerDecoration); + if (mDashboardFeatureProvider.isEnabled()) { + getListView().addItemDecoration(mDividerDecoration); + } return view; } @@ -284,10 +286,14 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment @Override public void setDivider(Drawable divider) { - // Intercept divider and set it transparent so system divider decoration is disabled. - // We will use our decoration to draw divider more intelligently. - mDividerDecoration.setDivider(divider); - super.setDivider(new ColorDrawable(Color.TRANSPARENT)); + if (mDashboardFeatureProvider.isEnabled()) { + // Intercept divider and set it transparent so system divider decoration is disabled. + // We will use our decoration to draw divider more intelligently. + mDividerDecoration.setDivider(divider); + super.setDivider(new ColorDrawable(Color.TRANSPARENT)); + } else { + super.setDivider(divider); + } } /**