From: Fan Zhang <zhfan@google.com>
Date: Tue, 18 Oct 2016 16:52:07 +0000 (-0700)
Subject: Put divider back when IA is turned off.
X-Git-Tag: android-x86-8.1-r1~1475^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8da724a8bb0e609bfa3f38d0bc0a1ed1a22a4592;p=android-x86%2Fpackages-apps-Settings.git

Put divider back when IA is turned off.

Bug: 32231177
Test: manual
Change-Id: I657e0bb3b8721c494cd1a6272b370b54ae5063ec
---

diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index b8959743a7..3d065784f1 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);
+        }
     }
 
     /**