OSDN Git Service

Put divider back when IA is turned off.
authorFan Zhang <zhfan@google.com>
Tue, 18 Oct 2016 16:52:07 +0000 (09:52 -0700)
committerFan Zhang <zhfan@google.com>
Tue, 18 Oct 2016 16:52:07 +0000 (09:52 -0700)
Bug: 32231177
Test: manual
Change-Id: I657e0bb3b8721c494cd1a6272b370b54ae5063ec

src/com/android/settings/dashboard/DashboardFragment.java

index b895974..3d06578 100644 (file)
@@ -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);
+        }
     }
 
     /**