Merge branch 'master' into froyo-release (e5599067) · Commits · e / os / android_frameworks_native

camera/libcameraservice/CameraService.cpp

+14 −15

Original line number	Original line	Diff line number	Diff line
	@@ -235,6 +235,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService,

	// Callback is disabled by default		// Callback is disabled by default
	mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP;		mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP;
			mOrientation = 0;
	cameraService->incUsers();		cameraService->incUsers();
	LOGV("Client::Client X (pid %d)", callingPid);		LOGV("Client::Client X (pid %d)", callingPid);
	}		}
	@@ -570,7 +571,8 @@ status_t CameraService::Client::setOverlay()
	// wait in the createOverlay call if the previous overlay is in the		// wait in the createOverlay call if the previous overlay is in the
	// process of being destroyed.		// process of being destroyed.
	for (int retry = 0; retry < 50; ++retry) {		for (int retry = 0; retry < 50; ++retry) {
	mOverlayRef = mSurface->createOverlay(w, h, OVERLAY_FORMAT_DEFAULT);		mOverlayRef = mSurface->createOverlay(w, h, OVERLAY_FORMAT_DEFAULT,
			mOrientation);
	if (mOverlayRef != NULL) break;		if (mOverlayRef != NULL) break;
	LOGW("Overlay create failed - retrying");		LOGW("Overlay create failed - retrying");
	usleep(20000);		usleep(20000);
	@@ -601,15 +603,9 @@ status_t CameraService::Client::registerPreviewBuffers()
	CameraParameters params(mHardware->getParameters());		CameraParameters params(mHardware->getParameters());
	params.getPreviewSize(&w, &h);		params.getPreviewSize(&w, &h);

	uint32_t transform = 0;
	if (params.getOrientation() ==
	CameraParameters::CAMERA_ORIENTATION_PORTRAIT) {
	LOGV("portrait mode");
	transform = ISurface::BufferHeap::ROT_90;
	}
	ISurface::BufferHeap buffers(w, h, w, h,		ISurface::BufferHeap buffers(w, h, w, h,
	PIXEL_FORMAT_YCbCr_420_SP,		PIXEL_FORMAT_YCbCr_420_SP,
	transform,		mOrientation,
	0,		0,
	mHardware->getPreviewHeap());		mHardware->getPreviewHeap());

	@@ -919,12 +915,6 @@ void CameraService::Client::handleShutter(
	if (mSurface != 0 && !mUseOverlay) {		if (mSurface != 0 && !mUseOverlay) {
	int w, h;		int w, h;
	CameraParameters params(mHardware->getParameters());		CameraParameters params(mHardware->getParameters());
	uint32_t transform = 0;
	if (params.getOrientation() == CameraParameters::CAMERA_ORIENTATION_PORTRAIT) {
	LOGV("portrait mode");
	transform = ISurface::BufferHeap::ROT_90;
	}

	if (size == NULL) {		if (size == NULL) {
	params.getPictureSize(&w, &h);		params.getPictureSize(&w, &h);
	} else {		} else {
	@@ -935,7 +925,7 @@ void CameraService::Client::handleShutter(
	LOGV("Snapshot image width=%d, height=%d", w, h);		LOGV("Snapshot image width=%d, height=%d", w, h);
	}		}
	ISurface::BufferHeap buffers(w, h, w, h,		ISurface::BufferHeap buffers(w, h, w, h,
	PIXEL_FORMAT_YCbCr_420_SP, transform, 0, mHardware->getRawHeap());		PIXEL_FORMAT_YCbCr_420_SP, mOrientation, 0, mHardware->getRawHeap());

	mSurface->registerBuffers(buffers);		mSurface->registerBuffers(buffers);
	}		}
	@@ -1200,6 +1190,15 @@ status_t CameraService::Client::setParameters(const String8& params)
	}		}

	CameraParameters p(params);		CameraParameters p(params);

			// The orientation parameter is actually for CameraService, not for the camera driver.
			if (p.getOrientation() == CameraParameters::CAMERA_ORIENTATION_PORTRAIT) {
			LOGV("portrait mode");
			mOrientation = ISurface::BufferHeap::ROT_90;
			} else {
			mOrientation = 0;
			}

	return mHardware->setParameters(p);		return mHardware->setParameters(p);
	}		}

camera/libcameraservice/CameraService.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -182,6 +182,7 @@ private:
	sp<CameraService> mCameraService;		sp<CameraService> mCameraService;
	sp<ISurface> mSurface;		sp<ISurface> mSurface;
	int mPreviewCallbackFlag;		int mPreviewCallbackFlag;
			int mOrientation;

	sp<MediaPlayer> mMediaPlayerClick;		sp<MediaPlayer> mMediaPlayerClick;
	sp<MediaPlayer> mMediaPlayerBeep;		sp<MediaPlayer> mMediaPlayerBeep;

camera/tests/CameraServiceTest/CameraServiceTest.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -283,7 +283,7 @@ public:
	virtual void postBuffer(ssize_t offset);		virtual void postBuffer(ssize_t offset);
	virtual void unregisterBuffers();		virtual void unregisterBuffers();
	virtual sp<OverlayRef> createOverlay(		virtual sp<OverlayRef> createOverlay(
	uint32_t w, uint32_t h, int32_t format);		uint32_t w, uint32_t h, int32_t format, int32_t orientation);
	virtual sp<GraphicBuffer> requestBuffer(int bufferIdx, int usage);		virtual sp<GraphicBuffer> requestBuffer(int bufferIdx, int usage);

	// new functions		// new functions
	@@ -346,7 +346,8 @@ void MSurface::waitUntil(int c0, int c1, int c2) {
	}		}
	}		}

	sp<OverlayRef> MSurface::createOverlay(uint32_t w, uint32_t h, int32_t format) {		sp<OverlayRef> MSurface::createOverlay(uint32_t w, uint32_t h, int32_t format,
			int32_t orientation) {
	// We don't expect this to be called in current hardware.		// We don't expect this to be called in current hardware.
	ASSERT(0);		ASSERT(0);
	sp<OverlayRef> dummy;		sp<OverlayRef> dummy;

common/java/com/android/common/widget/NumberPicker.java

deleted100644 → 0

+0 −412

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2008 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 com.android.common.widget;

	import android.content.Context;
	import android.os.Handler;
	import android.text.InputFilter;
	import android.text.InputType;
	import android.text.Spanned;
	import android.text.method.NumberKeyListener;
	import android.util.AttributeSet;
	import android.view.LayoutInflater;
	import android.view.View;
	import android.view.View.OnClickListener;
	import android.view.View.OnFocusChangeListener;
	import android.view.View.OnLongClickListener;
	import android.widget.TextView;
	import android.widget.LinearLayout;
	import android.widget.EditText;

	import com.android.internal.R;

	public class NumberPicker extends LinearLayout implements OnClickListener,
	OnFocusChangeListener, OnLongClickListener {

	public interface OnChangedListener {
	void onChanged(NumberPicker picker, int oldVal, int newVal);
	}

	public interface Formatter {
	String toString(int value);
	}

	/*
	* Use a custom NumberPicker formatting callback to use two-digit
	* minutes strings like "01". Keeping a static formatter etc. is the
	* most efficient way to do this; it avoids creating temporary objects
	* on every call to format().
	*/
	public static final NumberPicker.Formatter TWO_DIGIT_FORMATTER =
	new NumberPicker.Formatter() {
	final StringBuilder mBuilder = new StringBuilder();
	final java.util.Formatter mFmt = new java.util.Formatter(mBuilder);
	final Object[] mArgs = new Object[1];
	public String toString(int value) {
	mArgs[0] = value;
	mBuilder.delete(0, mBuilder.length());
	mFmt.format("%02d", mArgs);
	return mFmt.toString();
	}
	};

	private final Handler mHandler;
	private final Runnable mRunnable = new Runnable() {
	public void run() {
	if (mIncrement) {
	changeCurrent(mCurrent + 1);
	mHandler.postDelayed(this, mSpeed);
	} else if (mDecrement) {
	changeCurrent(mCurrent - 1);
	mHandler.postDelayed(this, mSpeed);
	}
	}
	};

	private final EditText mText;
	private final InputFilter mNumberInputFilter;

	private String[] mDisplayedValues;
	protected int mStart;
	protected int mEnd;
	protected int mCurrent;
	protected int mPrevious;
	private OnChangedListener mListener;
	private Formatter mFormatter;
	private long mSpeed = 300;

	private boolean mIncrement;
	private boolean mDecrement;

	public NumberPicker(Context context) {
	this(context, null);
	}

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

	@SuppressWarnings({"UnusedDeclaration"})
	public NumberPicker(Context context, AttributeSet attrs, int defStyle) {
	super(context, attrs);
	setOrientation(VERTICAL);
	LayoutInflater inflater =
	(LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
	inflater.inflate(R.layout.number_picker, this, true);
	mHandler = new Handler();
	InputFilter inputFilter = new NumberPickerInputFilter();
	mNumberInputFilter = new NumberRangeKeyListener();
	mIncrementButton = (NumberPickerButton) findViewById(R.id.increment);
	mIncrementButton.setOnClickListener(this);
	mIncrementButton.setOnLongClickListener(this);
	mIncrementButton.setNumberPicker(this);
	mDecrementButton = (NumberPickerButton) findViewById(R.id.decrement);
	mDecrementButton.setOnClickListener(this);
	mDecrementButton.setOnLongClickListener(this);
	mDecrementButton.setNumberPicker(this);

	mText = (EditText) findViewById(R.id.timepicker_input);
	mText.setOnFocusChangeListener(this);
	mText.setFilters(new InputFilter[] {inputFilter});
	mText.setRawInputType(InputType.TYPE_CLASS_NUMBER);

	if (!isEnabled()) {
	setEnabled(false);
	}
	}

	@Override
	public void setEnabled(boolean enabled) {
	super.setEnabled(enabled);
	mIncrementButton.setEnabled(enabled);
	mDecrementButton.setEnabled(enabled);
	mText.setEnabled(enabled);
	}

	public void setOnChangeListener(OnChangedListener listener) {
	mListener = listener;
	}

	public void setFormatter(Formatter formatter) {
	mFormatter = formatter;
	}

	/**
	* Set the range of numbers allowed for the number picker. The current
	* value will be automatically set to the start.
	*
	* @param start the start of the range (inclusive)
	* @param end the end of the range (inclusive)
	*/
	public void setRange(int start, int end) {
	mStart = start;
	mEnd = end;
	mCurrent = start;
	updateView();
	}

	/**
	* Set the range of numbers allowed for the number picker. The current
	* value will be automatically set to the start. Also provide a mapping
	* for values used to display to the user.
	*
	* @param start the start of the range (inclusive)
	* @param end the end of the range (inclusive)
	* @param displayedValues the values displayed to the user.
	*/
	public void setRange(int start, int end, String[] displayedValues) {
	mDisplayedValues = displayedValues;
	mStart = start;
	mEnd = end;
	mCurrent = start;
	updateView();
	}

	public void setCurrent(int current) {
	mCurrent = current;
	updateView();
	}

	/**
	* The speed (in milliseconds) at which the numbers will scroll
	* when the the +/- buttons are longpressed. Default is 300ms.
	*/
	public void setSpeed(long speed) {
	mSpeed = speed;
	}

	public void onClick(View v) {
	validateInput(mText);
	if (!mText.hasFocus()) mText.requestFocus();

	// now perform the increment/decrement
	if (R.id.increment == v.getId()) {
	changeCurrent(mCurrent + 1);
	} else if (R.id.decrement == v.getId()) {
	changeCurrent(mCurrent - 1);
	}
	}

	private String formatNumber(int value) {
	return (mFormatter != null)
	? mFormatter.toString(value)
	: String.valueOf(value);
	}

	protected void changeCurrent(int current) {

	// Wrap around the values if we go past the start or end
	if (current > mEnd) {
	current = mStart;
	} else if (current < mStart) {
	current = mEnd;
	}
	mPrevious = mCurrent;
	mCurrent = current;
	notifyChange();
	updateView();
	}

	protected void notifyChange() {
	if (mListener != null) {
	mListener.onChanged(this, mPrevious, mCurrent);
	}
	}

	protected void updateView() {

	/* If we don't have displayed values then use the
	* current number else find the correct value in the
	* displayed values for the current number.
	*/
	if (mDisplayedValues == null) {
	mText.setText(formatNumber(mCurrent));
	} else {
	mText.setText(mDisplayedValues[mCurrent - mStart]);
	}
	mText.setSelection(mText.getText().length());
	}

	private void validateCurrentView(CharSequence str) {
	int val = getSelectedPos(str.toString());
	if ((val >= mStart) && (val <= mEnd)) {
	if (mCurrent != val) {
	mPrevious = mCurrent;
	mCurrent = val;
	notifyChange();
	}
	}
	updateView();
	}

	public void onFocusChange(View v, boolean hasFocus) {

	/* When focus is lost check that the text field
	* has valid values.
	*/
	if (!hasFocus) {
	validateInput(v);
	}
	}

	private void validateInput(View v) {
	String str = String.valueOf(((TextView) v).getText());
	if ("".equals(str)) {

	// Restore to the old value as we don't allow empty values
	updateView();
	} else {

	// Check the new value and ensure it's in range
	validateCurrentView(str);
	}
	}

	/**
	* We start the long click here but rely on the {@link NumberPickerButton}
	* to inform us when the long click has ended.
	*/
	public boolean onLongClick(View v) {

	/* The text view may still have focus so clear it's focus which will
	* trigger the on focus changed and any typed values to be pulled.
	*/
	mText.clearFocus();

	if (R.id.increment == v.getId()) {
	mIncrement = true;
	mHandler.post(mRunnable);
	} else if (R.id.decrement == v.getId()) {
	mDecrement = true;
	mHandler.post(mRunnable);
	}
	return true;
	}

	public void cancelIncrement() {
	mIncrement = false;
	}

	public void cancelDecrement() {
	mDecrement = false;
	}

	private static final char[] DIGIT_CHARACTERS = new char[] {
	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
	};

	private NumberPickerButton mIncrementButton;
	private NumberPickerButton mDecrementButton;

	private class NumberPickerInputFilter implements InputFilter {
	public CharSequence filter(CharSequence source, int start, int end,
	Spanned dest, int dstart, int dend) {
	if (mDisplayedValues == null) {
	return mNumberInputFilter.filter(source, start, end, dest, dstart, dend);
	}
	CharSequence filtered = String.valueOf(source.subSequence(start, end));
	String result = String.valueOf(dest.subSequence(0, dstart))
	+ filtered
	+ dest.subSequence(dend, dest.length());
	String str = String.valueOf(result).toLowerCase();
	for (String val : mDisplayedValues) {
	val = val.toLowerCase();
	if (val.startsWith(str)) {
	return filtered;
	}
	}
	return "";
	}
	}

	private class NumberRangeKeyListener extends NumberKeyListener {

	// XXX This doesn't allow for range limits when controlled by a
	// soft input method!
	public int getInputType() {
	return InputType.TYPE_CLASS_NUMBER;
	}

	@Override
	protected char[] getAcceptedChars() {
	return DIGIT_CHARACTERS;
	}

	@Override
	public CharSequence filter(CharSequence source, int start, int end,
	Spanned dest, int dstart, int dend) {

	CharSequence filtered = super.filter(source, start, end, dest, dstart, dend);
	if (filtered == null) {
	filtered = source.subSequence(start, end);
	}

	String result = String.valueOf(dest.subSequence(0, dstart))
	+ filtered
	+ dest.subSequence(dend, dest.length());

	if ("".equals(result)) {
	return result;
	}
	int val = getSelectedPos(result);

	/* Ensure the user can't type in a value greater
	* than the max allowed. We have to allow less than min
	* as the user might want to delete some numbers
	* and then type a new number.
	*/
	if (val > mEnd) {
	return "";
	} else {
	return filtered;
	}
	}
	}

	private int getSelectedPos(String str) {
	if (mDisplayedValues == null) {
	return Integer.parseInt(str);
	} else {
	for (int i = 0; i < mDisplayedValues.length; i++) {

	/* Don't force the user to type in jan when ja will do */
	str = str.toLowerCase();
	if (mDisplayedValues[i].toLowerCase().startsWith(str)) {
	return mStart + i;
	}
	}

	/* The user might have typed in a number into the month field i.e.
	* 10 instead of OCT so support that too.
	*/
	try {
	return Integer.parseInt(str);
	} catch (NumberFormatException e) {

	/* Ignore as if it's not a number we don't care */
	}
	}
	return mStart;
	}

	/**
	* @return the current value.
	*/
	public int getCurrent() {
	return mCurrent;
	}
	}

common/java/com/android/common/widget/NumberPickerButton.java

deleted100644 → 0

+0 −86

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2008 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 com.android.common.widget;

	import android.content.Context;
	import android.util.AttributeSet;
	import android.view.KeyEvent;
	import android.view.MotionEvent;
	import android.widget.ImageButton;

	import com.android.internal.R;

	/**
	* This class exists purely to cancel long click events.
	*/
	public class NumberPickerButton extends ImageButton {

	private NumberPicker mNumberPicker;

	public NumberPickerButton(Context context, AttributeSet attrs,
	int defStyle) {
	super(context, attrs, defStyle);
	}

	public NumberPickerButton(Context context, AttributeSet attrs) {
	super(context, attrs);
	}

	public NumberPickerButton(Context context) {
	super(context);
	}

	public void setNumberPicker(NumberPicker picker) {
	mNumberPicker = picker;
	}

	@Override
	public boolean onTouchEvent(MotionEvent event) {
	cancelLongpressIfRequired(event);
	return super.onTouchEvent(event);
	}

	@Override
	public boolean onTrackballEvent(MotionEvent event) {
	cancelLongpressIfRequired(event);
	return super.onTrackballEvent(event);
	}

	@Override
	public boolean onKeyUp(int keyCode, KeyEvent event) {
	if ((keyCode == KeyEvent.KEYCODE_DPAD_CENTER)
	\|\| (keyCode == KeyEvent.KEYCODE_ENTER)) {
	cancelLongpress();
	}
	return super.onKeyUp(keyCode, event);
	}

	private void cancelLongpressIfRequired(MotionEvent event) {
	if ((event.getAction() == MotionEvent.ACTION_CANCEL)
	\|\| (event.getAction() == MotionEvent.ACTION_UP)) {
	cancelLongpress();
	}
	}

	private void cancelLongpress() {
	if (R.id.increment == getId()) {
	mNumberPicker.cancelIncrement();
	} else if (R.id.decrement == getId()) {
	mNumberPicker.cancelDecrement();
	}
	}
	}