Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e1a63fb authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove dividers of ActionButtonsPreference" into sc-dev am: bf3a8b54 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14753635

Change-Id: I5bbceff28dfe02043740e535b8136dbb36548e92
parents 11846dd2 bf3a8b54

packages/SettingsLib/ActionButtonsPreference/src/com/android/settingslib/widget/ActionButtonsPreference.java

+4 −4
Original line number Diff line number Diff line
@@ -93,10 +93,10 @@ public class ActionButtonsPreference extends Preference { 
    @Override

    public void onBindViewHolder(PreferenceViewHolder holder) {

        super.onBindViewHolder(holder);

        if (!BuildCompat.isAtLeastS()) {

            holder.setDividerAllowedAbove(true);

            holder.setDividerAllowedBelow(true);

        }



        final boolean allowedDivider = !BuildCompat.isAtLeastS();

        holder.setDividerAllowedAbove(allowedDivider);

        holder.setDividerAllowedBelow(allowedDivider);



        mButton1Info.mButton = (Button) holder.findViewById(R.id.button1);

        mButton2Info.mButton = (Button) holder.findViewById(R.id.button2);