Revert "Apply SettingsLib SeekBarPreference to Settings"

Revert submission 13422386-seekbar-sc-dev

Reason for revert: build broken in SettingsGoogle
Reverted Changes:
I0c2d0d5fb:Apply SettingsLib SeekBarPreference to SettingsGoo...
I1844bb3b0:Apply SettingsLib SeekBarPreference to a11y vibrat...
Ia3e4adec8:Apply SettingsLib SeekBarPreference to a11y vibrat...
Iadee57e9d:Apply SettingsLib SeekBarPreference to a11y vibrat...
I219878716:Apply SettingsLib SeekBarPreference to Settings
I959f5672c:Create SettingsLibSeekBarPreference
I92545a69c:Apply SettingsLib SeekBarPreference to a11y vibrat...

Change-Id: Ie6c3b0dc072e044796abdb33fca305f9f9d47c4d
Bug: 176818438

src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java

@@ -27,7 +27,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.accounts.AccountRestrictionHelper;
 import com.android.settings.core.SliderPreferenceController;
-import com.android.settingslib.Restrictable;
+import com.android.settingslib.RestrictedPreference;
 
 /**
  * Base class for preference controller that handles preference that enforce adjust volume
@@ -51,10 +51,10 @@ public abstract class AdjustVolumeRestrictedPreferenceController extends
 
     @Override
     public void updateState(Preference preference) {
-        if (!(preference instanceof Restrictable)) {
+        if (!(preference instanceof RestrictedPreference)) {
             return;
         }
-        mHelper.enforceRestrictionOnPreference(preference,
+        mHelper.enforceRestrictionOnPreference((RestrictedPreference) preference,
                 UserManager.DISALLOW_ADJUST_VOLUME, UserHandle.myUserId());
     }
 

src/com/android/settings/notification/VolumeSeekBarPreference.java

@@ -32,12 +32,12 @@ import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
-import com.android.settingslib.RestrictedSeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 
 import java.util.Objects;
 
 /** A slider preference that directly controls an audio stream volume (no dialog) **/
-public class VolumeSeekBarPreference extends RestrictedSeekBarPreference {
+public class VolumeSeekBarPreference extends SeekBarPreference {
     private static final String TAG = "VolumeSeekBarPreference";
 
     protected SeekBar mSeekBar;

src/com/android/settings/notification/app/BubblePreference.java

@@ -22,6 +22,7 @@ import static android.app.NotificationManager.BUBBLE_PREFERENCE_SELECTED;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
@@ -32,13 +33,13 @@ import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.Utils;
 import com.android.settingslib.R;
-import com.android.settingslib.Restrictable;
+import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreferenceHelper;
 
 /**
  * A tri-state preference allowing a user to specify what gets to bubble.
  */
-public class BubblePreference extends Preference implements View.OnClickListener, Restrictable {
+public class BubblePreference extends Preference implements View.OnClickListener {
     RestrictedPreferenceHelper mHelper;
 
     private int mSelectedPreference;
@@ -80,6 +81,12 @@ public class BubblePreference extends Preference implements View.OnClickListener
         return mSelectedPreference;
     }
 
+    public void setDisabledByAdmin(RestrictedLockUtils.EnforcedAdmin admin) {
+        if (mHelper.setDisabledByAdmin(admin)) {
+            notifyChanged();
+        }
+    }
+
     public void setSelectedVisibility(boolean visible) {
         mSelectedVisible = visible;
         notifyChanged();
@@ -142,16 +149,6 @@ public class BubblePreference extends Preference implements View.OnClickListener
         mBubbleNoneButton.setSelected(mContext, selected == BUBBLE_PREFERENCE_NONE);
     }
 
-    @Override
-    public RestrictedPreferenceHelper getHelper() {
-        return mHelper;
-    }
-
-    @Override
-    public void notifyPreferenceChanged() {
-        notifyChanged();
-    }
-
     private class ButtonViewHolder {
         private View mView;
         private ImageView mImageView;