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

Merge "Put divider back when IA is turned off."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-18 18:34:59 +00:00
committed by Android (Google) Code Review
parent c33b78df9c 8da724a8bb
commit 84ec452cd7
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -267,7 +267,9 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
final View view = super.onCreateView(inflater, container, savedInstanceState); final View view = super.onCreateView(inflater, container, savedInstanceState);
if (mDashboardFeatureProvider.isEnabled()) {
getListView().addItemDecoration(mDividerDecoration); getListView().addItemDecoration(mDividerDecoration);
}
return view; return view;
} }
@@ -284,10 +286,14 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
@Override @Override
public void setDivider(Drawable divider) { public void setDivider(Drawable divider) {
if (mDashboardFeatureProvider.isEnabled()) {
// Intercept divider and set it transparent so system divider decoration is disabled. // Intercept divider and set it transparent so system divider decoration is disabled.
// We will use our decoration to draw divider more intelligently. // We will use our decoration to draw divider more intelligently.
mDividerDecoration.setDivider(divider); mDividerDecoration.setDivider(divider);
super.setDivider(new ColorDrawable(Color.TRANSPARENT)); super.setDivider(new ColorDrawable(Color.TRANSPARENT));
} else {
super.setDivider(divider);
}
} }
/** /**