Merge "Remove dividers of ActionButtonsPreference" into sc-dev

This commit is contained in:
Edgar Wang
2021-06-01 05:15:41 +00:00
committed by Android (Google) Code Review

View File

@@ -93,10 +93,10 @@ public class ActionButtonsPreference extends Preference {
@Override @Override
public void onBindViewHolder(PreferenceViewHolder holder) { public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder); super.onBindViewHolder(holder);
if (!BuildCompat.isAtLeastS()) {
holder.setDividerAllowedAbove(true); final boolean allowedDivider = !BuildCompat.isAtLeastS();
holder.setDividerAllowedBelow(true); holder.setDividerAllowedAbove(allowedDivider);
} holder.setDividerAllowedBelow(allowedDivider);
mButton1Info.mButton = (Button) holder.findViewById(R.id.button1); mButton1Info.mButton = (Button) holder.findViewById(R.id.button1);
mButton2Info.mButton = (Button) holder.findViewById(R.id.button2); mButton2Info.mButton = (Button) holder.findViewById(R.id.button2);