Merge "Inline SeekBarPreference" (179cfcf6) · Commits · e / os / android_frameworks_base

core/java/android/preference/Preference.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.os.Parcelable;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.view.AbsSavedState;
		import android.view.KeyEvent;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -957,6 +958,17 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		}
		}

		/**
		* Allows a Preference to intercept key events without having focus.
		* For example, SeekBarPreference uses this to intercept +/- to adjust
		* the progress.
		* @return True if the Preference handled the key. Returns false by default.
		* @hide
		*/
		public boolean onKey(View v, int keyCode, KeyEvent event) {
		return false;
		}

		/**
		* Returns the {@link android.content.Context} of this Preference.
		* Each Preference in a Preference hierarchy can be

core/java/android/preference/PreferenceFragment.java

+18 −1

Original line number	Diff line number	Diff line
		@@ -20,13 +20,14 @@ import android.app.Activity;
		import android.app.Fragment;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.content.res.Configuration;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Message;
		import android.view.KeyEvent;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.View.OnKeyListener;
		import android.widget.ListView;

		/**
		@@ -350,6 +351,22 @@ public abstract class PreferenceFragment extends Fragment implements
		"Your content must have a ListView whose id attribute is " +
		"'android.R.id.list'");
		}
		mList.setOnKeyListener(mListOnKeyListener);
		mHandler.post(mRequestFocus);
		}

		private OnKeyListener mListOnKeyListener = new OnKeyListener() {

		@Override
		public boolean onKey(View v, int keyCode, KeyEvent event) {
		Object selectedItem = mList.getSelectedItem();
		if (selectedItem instanceof Preference) {
		View selectedView = mList.getSelectedView();
		return ((Preference)selectedItem).onKey(
		selectedView, keyCode, event);
		}
		return false;
		}

		};
		}

core/java/android/preference/SeekBarDialogPreference.java

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.preference;

		import android.content.Context;
		import android.graphics.drawable.Drawable;
		import android.preference.DialogPreference;
		import android.util.AttributeSet;
		import android.view.View;
		import android.widget.ImageView;
		import android.widget.SeekBar;

		/**
		* @hide
		*/
		public class SeekBarDialogPreference extends DialogPreference {
		private static final String TAG = "SeekBarDialogPreference";

		private Drawable mMyIcon;

		public SeekBarDialogPreference(Context context, AttributeSet attrs) {
		super(context, attrs);

		setDialogLayoutResource(com.android.internal.R.layout.seekbar_dialog);
		createActionButtons();

		// Steal the XML dialogIcon attribute's value
		mMyIcon = getDialogIcon();
		setDialogIcon(null);
		}

		// Allow subclasses to override the action buttons
		public void createActionButtons() {
		setPositiveButtonText(android.R.string.ok);
		setNegativeButtonText(android.R.string.cancel);
		}

		@Override
		protected void onBindDialogView(View view) {
		super.onBindDialogView(view);

		final ImageView iconView = (ImageView) view.findViewById(android.R.id.icon);
		if (mMyIcon != null) {
		iconView.setImageDrawable(mMyIcon);
		} else {
		iconView.setVisibility(View.GONE);
		}
		}

		protected static SeekBar getSeekBar(View dialogView) {
		return (SeekBar) dialogView.findViewById(com.android.internal.R.id.seekbar);
		}
		}

core/java/android/preference/SeekBarPreference.java

+202 −27

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		* Copyright (C) 2011 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -17,51 +17,226 @@
		package android.preference;

		import android.content.Context;
		import android.graphics.drawable.Drawable;
		import android.preference.DialogPreference;
		import android.content.res.TypedArray;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.AttributeSet;
		import android.view.KeyEvent;
		import android.view.View;
		import android.widget.ImageView;
		import android.widget.SeekBar;
		import android.widget.SeekBar.OnSeekBarChangeListener;

		/**
		* @hide
		*/
		public class SeekBarPreference extends DialogPreference {
		private static final String TAG = "SeekBarPreference";
		public class SeekBarPreference extends Preference
		implements OnSeekBarChangeListener {

		private Drawable mMyIcon;
		private int mProgress;
		private int mMax;
		private boolean mTrackingTouch;

		public SeekBarPreference(
		Context context, AttributeSet attrs, int defStyle) {
		super(context, attrs, defStyle);
		TypedArray a = context.obtainStyledAttributes(attrs,
		com.android.internal.R.styleable.ProgressBar, defStyle, 0);
		setMax(a.getInt(com.android.internal.R.styleable.ProgressBar_max, mMax));
		a.recycle();
		setLayoutResource(com.android.internal.R.layout.preference_widget_seekbar);
		}

		public SeekBarPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		this(context, attrs, 0);
		}

		setDialogLayoutResource(com.android.internal.R.layout.seekbar_dialog);
		createActionButtons();
		public SeekBarPreference(Context context) {
		this(context, null);
		}

		// Steal the XML dialogIcon attribute's value
		mMyIcon = getDialogIcon();
		setDialogIcon(null);
		@Override
		protected void onBindView(View view) {
		super.onBindView(view);
		SeekBar seekBar = (SeekBar) view.findViewById(
		com.android.internal.R.id.seekbar);
		seekBar.setOnSeekBarChangeListener(this);
		seekBar.setMax(mMax);
		seekBar.setProgress(mProgress);
		seekBar.setEnabled(isEnabled());
		}

		// Allow subclasses to override the action buttons
		public void createActionButtons() {
		setPositiveButtonText(android.R.string.ok);
		setNegativeButtonText(android.R.string.cancel);
		@Override
		public CharSequence getSummary() {
		return null;
		}

		@Override
		protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
		setProgress(restoreValue ? getPersistedInt(mProgress)
		: (Integer) defaultValue);
		}

		@Override
		protected void onBindDialogView(View view) {
		super.onBindDialogView(view);
		public boolean onKey(View v, int keyCode, KeyEvent event) {
		if (event.getAction() != KeyEvent.ACTION_UP) {
		if (keyCode == KeyEvent.KEYCODE_PLUS
		\|\| keyCode == KeyEvent.KEYCODE_EQUALS) {
		setProgress(getProgress() + 1);
		return true;
		}
		if (keyCode == KeyEvent.KEYCODE_MINUS) {
		setProgress(getProgress() - 1);
		return true;
		}
		}
		return false;
		}

		public void setMax(int max) {
		if (max != mMax) {
		mMax = max;
		notifyChanged();
		}
		}

		public void setProgress(int progress) {
		setProgress(progress, true);
		}

		private void setProgress(int progress, boolean notifyChanged) {
		if (progress > mMax) {
		progress = mMax;
		}
		if (progress < 0) {
		progress = 0;
		}
		if (progress != mProgress) {
		mProgress = progress;
		persistInt(progress);
		if (notifyChanged) {
		notifyChanged();
		}
		}
		}

		public int getProgress() {
		return mProgress;
		}

		final ImageView iconView = (ImageView) view.findViewById(android.R.id.icon);
		if (mMyIcon != null) {
		iconView.setImageDrawable(mMyIcon);
		/**
		* Persist the seekBar's progress value if callChangeListener
		* returns true, otherwise set the seekBar's progress to the stored value
		*/
		void syncProgress(SeekBar seekBar) {
		int progress = seekBar.getProgress();
		if (progress != mProgress) {
		if (callChangeListener(progress)) {
		setProgress(progress, false);
		} else {
		iconView.setVisibility(View.GONE);
		seekBar.setProgress(mProgress);
		}
		}
		}

		@Override
		public void onProgressChanged(
		SeekBar seekBar, int progress, boolean fromUser) {
		if (fromUser && !mTrackingTouch) {
		syncProgress(seekBar);
		}
		}

		@Override
		public void onStartTrackingTouch(SeekBar seekBar) {
		mTrackingTouch = true;
		}

		@Override
		public void onStopTrackingTouch(SeekBar seekBar) {
		mTrackingTouch = false;
		if (seekBar.getProgress() != mProgress) {
		syncProgress(seekBar);
		}
		}

		@Override
		protected Parcelable onSaveInstanceState() {
		/*
		* Suppose a client uses this preference type without persisting. We
		* must save the instance state so it is able to, for example, survive
		* orientation changes.
		*/

		final Parcelable superState = super.onSaveInstanceState();
		if (isPersistent()) {
		// No need to save instance state since it's persistent
		return superState;
		}

		// Save the instance state
		final SavedState myState = new SavedState(superState);
		myState.progress = mProgress;
		myState.max = mMax;
		return myState;
		}

		@Override
		protected void onRestoreInstanceState(Parcelable state) {
		if (!state.getClass().equals(SavedState.class)) {
		// Didn't save state for us in onSaveInstanceState
		super.onRestoreInstanceState(state);
		return;
		}

		protected static SeekBar getSeekBar(View dialogView) {
		return (SeekBar) dialogView.findViewById(com.android.internal.R.id.seekbar);
		// Restore the instance state
		SavedState myState = (SavedState) state;
		super.onRestoreInstanceState(myState.getSuperState());
		mProgress = myState.progress;
		mMax = myState.max;
		notifyChanged();
		}

		/**
		* SavedState, a subclass of {@link BaseSavedState}, will store the state
		* of MyPreference, a subclass of Preference.
		* <p>
		* It is important to always call through to super methods.
		*/
		private static class SavedState extends BaseSavedState {
		int progress;
		int max;

		public SavedState(Parcel source) {
		super(source);

		// Restore the click counter
		progress = source.readInt();
		max = source.readInt();
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		super.writeToParcel(dest, flags);

		// Save the click counter
		dest.writeInt(progress);
		dest.writeInt(max);
		}

		public SavedState(Parcelable superState) {
		super(superState);
		}

		@SuppressWarnings("unused")
		public static final Parcelable.Creator<SavedState> CREATOR =
		new Parcelable.Creator<SavedState>() {
		public SavedState createFromParcel(Parcel in) {
		return new SavedState(in);
		}

		public SavedState[] newArray(int size) {
		return new SavedState[size];
		}
		};
		}
		}

core/java/android/preference/VolumePreference.java

+18 −18

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener;
		/**
		* @hide
		*/
		public class VolumePreference extends SeekBarPreference implements
		public class VolumePreference extends SeekBarDialogPreference implements
		PreferenceManager.OnActivityStopListener, View.OnKeyListener {

		private static final String TAG = "VolumePreference";