Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf am: ef2c734413 am: 701b89a3b9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: Id48f9bb739d55cb239133fb98cd72b2c97c1e3e0
This commit is contained in:
TreeHugger Robot
2021-08-20 11:35:29 +00:00
committed by Automerger Merge Worker
parent 8a51d3a749 701b89a3b9
commit 49ab5d1a72
12 changed files with 61 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/settings/widget/LabeledSeekBarPreference.java
View File

@@ -20,11 +20,9 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.SeekBar;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.PreferenceViewHolder;
@@ -37,8 +35,6 @@ public class LabeledSeekBarPreference extends SeekBarPreference {
private final int mTextEndId;
private final int mTickMarkId;
private OnPreferenceChangeListener mStopListener;
@Nullable
private CharSequence mSummary;
public LabeledSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
@@ -56,7 +52,6 @@ public class LabeledSeekBarPreference extends SeekBarPreference {
R.string.summary_placeholder);
mTickMarkId = styledAttrs.getResourceId(
R.styleable.LabeledSeekBarPreference_tickMark, /* defValue= */ 0);
mSummary = styledAttrs.getText(R.styleable.Preference_android_summary);
styledAttrs.recycle();
}
@@ -81,15 +76,6 @@ public class LabeledSeekBarPreference extends SeekBarPreference {
com.android.internal.R.id.seekbar);
seekBar.setTickMark(tickMark);
}
final TextView summary = (TextView) holder.findViewById(android.R.id.summary);
if (mSummary != null) {
summary.setText(mSummary);
summary.setVisibility(View.VISIBLE);
} else {
summary.setText(null);
summary.setVisibility(View.GONE);
}
}
public void setOnPreferenceChangeStopListener(OnPreferenceChangeListener listener) {
@@ -104,24 +90,5 @@ public class LabeledSeekBarPreference extends SeekBarPreference {
mStopListener.onPreferenceChange(this, seekBar.getProgress());
}
}
@Override
public void setSummary(CharSequence summary) {
super.setSummary(summary);
mSummary = summary;
notifyChanged();
}
@Override
public void setSummary(int summaryResId) {
super.setSummary(summaryResId);
mSummary = getContext().getText(summaryResId);
notifyChanged();
}
@Override
public CharSequence getSummary() {
return mSummary;
}
}