diff options
22 files changed, 601 insertions, 71 deletions
diff --git a/Android.mk b/Android.mk index a748b7b3f30a..4cd85ece2959 100644 --- a/Android.mk +++ b/Android.mk @@ -329,20 +329,36 @@ non_base_dirs := \ ../../external/apache-http/src/org/apache/http # These are relative to frameworks/base -dirs_to_document := \ - $(fwbase_dirs_to_document) \ +dirs_to_check_apis := \ + $(fwbase_dirs_to_document) \ $(non_base_dirs) +# These are relative to frameworks/base +# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk +dirs_to_document := \ + $(dirs_to_check_apis) \ + $(addprefix ../../, $(FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS)) + +# These are relative to frameworks/base html_dirs := \ $(FRAMEWORKS_BASE_SUBDIRS) \ $(non_base_dirs) +# Common sources for doc check and api check +common_src_files := \ + $(call find-other-html-files, $(html_dirs)) \ + $(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \ + $(addprefix ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca)) \ + # These are relative to frameworks/base framework_docs_LOCAL_SRC_FILES := \ $(call find-other-java-files, $(dirs_to_document)) \ - $(call find-other-html-files, $(html_dirs)) \ - $(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \ - $(addprefix ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca)) + $(common_src_files) + +# These are relative to frameworks/base +framework_docs_LOCAL_API_CHECK_SRC_FILES := \ + $(call find-other-java-files, $(dirs_to_check_apis)) \ + $(common_src_files) # This is used by ide.mk as the list of source files that are # always included. @@ -495,7 +511,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \ # ==== the api stubs and current.xml =========================== include $(CLEAR_VARS) -LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) +LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES) LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index c2a757f06808..4e3801141467 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -2512,13 +2512,16 @@ public class Camera { /** * Sets the white balance. Changing the setting will release the - * auto-white balance lock. + * auto-white balance lock. It is recommended not to change white + * balance and AWB lock at the same time. * * @param value new white balance. * @see #getWhiteBalance() * @see #setAutoWhiteBalanceLock(boolean) */ public void setWhiteBalance(String value) { + String oldValue = get(KEY_WHITE_BALANCE); + if (same(value, oldValue)) return; set(KEY_WHITE_BALANCE, value); set(KEY_AUTO_WHITEBALANCE_LOCK, FALSE); } @@ -3493,6 +3496,12 @@ public class Camera { return result; } + + private boolean same(String s1, String s2) { + if (s1 == null && s2 == null) return true; + if (s1 != null && s1.equals(s2)) return true; + return false; + } }; /** diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 2095e91fc00c..65b1bd04910d 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -1488,7 +1488,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal | AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED | AccessibilityEvent.TYPE_VIEW_HOVER_ENTER | AccessibilityEvent.TYPE_VIEW_HOVER_EXIT - | AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED; + | AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED + | AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED; /** * Temporary Rect currently for use in setBackground(). This will probably diff --git a/core/java/android/view/accessibility/AccessibilityEvent.java b/core/java/android/view/accessibility/AccessibilityEvent.java index c6f778f953fa..34b4dcc5ebb6 100644 --- a/core/java/android/view/accessibility/AccessibilityEvent.java +++ b/core/java/android/view/accessibility/AccessibilityEvent.java @@ -220,15 +220,6 @@ import java.util.List; * <li>{@link #isEnabled()} - Whether the source is enabled.</li> * <li>{@link #getContentDescription()} - The content description of the source.</li> * </ul> - * <em>Note:</em> This event type is not dispatched to descendants though - * {@link android.view.View#dispatchPopulateAccessibilityEvent(AccessibilityEvent) - * View.dispatchPopulateAccessibilityEvent(AccessibilityEvent)}, hence the event - * source {@link android.view.View} and the sub-tree rooted at it will not receive - * calls to {@link android.view.View#onPopulateAccessibilityEvent(AccessibilityEvent) - * View.onPopulateAccessibilityEvent(AccessibilityEvent)}. The preferred way to add - * text content to such events is by setting the - * {@link android.R.styleable#View_contentDescription contentDescription} of the source - * view.</br> * </p> * <p> * <b>View scrolled</b> - represents the event of scrolling a view. If diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index d2b7528b1170..5f1f2864f4b8 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -366,6 +366,7 @@ public class WebView extends AbsoluteLayout private final Rect mGLRectViewport = new Rect(); private final Rect mViewRectViewport = new Rect(); + private final RectF mVisibleContentRect = new RectF(); private boolean mGLViewportEmpty = false; /** @@ -4612,11 +4613,14 @@ public class WebView extends AbsoluteLayout + " extras=" + extras); } + calcOurContentVisibleRectF(mVisibleContentRect); if (canvas.isHardwareAccelerated()) { - int functor = nativeGetDrawGLFunction(mNativeClass, - mGLViewportEmpty ? null : mGLRectViewport, mGLViewportEmpty ? null : mViewRectViewport, getScale(), extras); - ((HardwareCanvas) canvas).callDrawGLFunction(functor); + Rect glRectViewport = mGLViewportEmpty ? null : mGLRectViewport; + Rect viewRectViewport = mGLViewportEmpty ? null : mViewRectViewport; + int functor = nativeGetDrawGLFunction(mNativeClass, glRectViewport, + viewRectViewport, mVisibleContentRect, getScale(), extras); + ((HardwareCanvas) canvas).callDrawGLFunction(functor); if (mHardwareAccelSkia != getSettings().getHardwareAccelSkiaEnabled()) { mHardwareAccelSkia = getSettings().getHardwareAccelSkiaEnabled(); nativeUseHardwareAccelSkia(mHardwareAccelSkia); @@ -4632,7 +4636,8 @@ public class WebView extends AbsoluteLayout canvas.setDrawFilter(df); // XXX: Revisit splitting content. Right now it causes a // synchronization problem with layers. - int content = nativeDraw(canvas, color, extras, false); + int content = nativeDraw(canvas, mVisibleContentRect, color, + extras, false); canvas.setDrawFilter(null); if (!mBlockWebkitViewMessages && content != 0) { mWebViewCore.sendMessage(EventHub.SPLIT_PICTURE_SET, content, 0); @@ -5788,8 +5793,9 @@ public class WebView extends AbsoluteLayout } else { mGLViewportEmpty = true; } + calcOurContentVisibleRectF(mVisibleContentRect); nativeUpdateDrawGLFunction(mGLViewportEmpty ? null : mGLRectViewport, - mGLViewportEmpty ? null : mViewRectViewport); + mGLViewportEmpty ? null : mViewRectViewport, mVisibleContentRect); } /** @@ -8786,7 +8792,6 @@ public class WebView extends AbsoluteLayout mSendScrollEvent = false; recordNewContentSize(draw.mContentSize.x, draw.mContentSize.y, updateLayout); - if (isPictureAfterFirstLayout) { // Reset the last sent data here since dealing with new page. mLastWidthSent = 0; @@ -9357,7 +9362,8 @@ public class WebView extends AbsoluteLayout * @hide only needs to be accessible to Browser and testing */ public void drawPage(Canvas canvas) { - nativeDraw(canvas, 0, 0, false); + calcOurContentVisibleRectF(mVisibleContentRect); + nativeDraw(canvas, mVisibleContentRect, 0, 0, false); } /** @@ -9488,13 +9494,14 @@ public class WebView extends AbsoluteLayout * MUST be passed to WebViewCore with SPLIT_PICTURE_SET message so that the * native allocation can be freed. */ - private native int nativeDraw(Canvas canvas, int color, int extra, - boolean splitIfNeeded); + private native int nativeDraw(Canvas canvas, RectF visibleRect, + int color, int extra, boolean splitIfNeeded); private native void nativeDumpDisplayTree(String urlOrNull); private native boolean nativeEvaluateLayersAnimations(int nativeInstance); private native int nativeGetDrawGLFunction(int nativeInstance, Rect rect, - Rect viewRect, float scale, int extras); - private native void nativeUpdateDrawGLFunction(Rect rect, Rect viewRect); + Rect viewRect, RectF visibleRect, float scale, int extras); + private native void nativeUpdateDrawGLFunction(Rect rect, Rect viewRect, + RectF visibleRect); private native void nativeExtendSelection(int x, int y); private native int nativeFindAll(String findLower, String findUpper, boolean sameAsLastSearch); diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index e993e2aa195e..5fed2f349f2e 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -416,7 +416,7 @@ unsigned TextLayoutCacheValue::shapeFontRun(HB_ShaperItem& shaperItem, SkPaint* FontData* data = reinterpret_cast<FontData*>(shaperItem.font->userData); switch(shaperItem.item.script) { case HB_Script_Arabic: - data->typeFace = getCachedTypeface(gArabicTypeface, TYPEFACE_ARABIC); + data->typeFace = getCachedTypeface(&gArabicTypeface, TYPEFACE_ARABIC); #if DEBUG_GLYPHS LOGD("Using Arabic Typeface"); #endif @@ -428,21 +428,21 @@ unsigned TextLayoutCacheValue::shapeFontRun(HB_ShaperItem& shaperItem, SkPaint* case SkTypeface::kNormal: case SkTypeface::kItalic: default: - data->typeFace = getCachedTypeface(gHebrewRegularTypeface, TYPE_FACE_HEBREW_REGULAR); + data->typeFace = getCachedTypeface(&gHebrewRegularTypeface, TYPE_FACE_HEBREW_REGULAR); #if DEBUG_GLYPHS LOGD("Using Hebrew Regular/Italic Typeface"); #endif break; case SkTypeface::kBold: case SkTypeface::kBoldItalic: - data->typeFace = getCachedTypeface(gHebrewBoldTypeface, TYPE_FACE_HEBREW_BOLD); + data->typeFace = getCachedTypeface(&gHebrewBoldTypeface, TYPE_FACE_HEBREW_BOLD); #if DEBUG_GLYPHS LOGD("Using Hebrew Bold/BoldItalic Typeface"); #endif break; } } else { - data->typeFace = getCachedTypeface(gHebrewRegularTypeface, TYPE_FACE_HEBREW_REGULAR); + data->typeFace = getCachedTypeface(&gHebrewRegularTypeface, TYPE_FACE_HEBREW_REGULAR); #if DEBUG_GLYPHS LOGD("Using Hebrew Regular Typeface"); #endif @@ -482,11 +482,14 @@ unsigned TextLayoutCacheValue::shapeFontRun(HB_ShaperItem& shaperItem, SkPaint* return result; } -SkTypeface* TextLayoutCacheValue::getCachedTypeface(SkTypeface* typeface, const char path[]) { - if (!typeface) { - typeface = SkTypeface::CreateFromFile(path); +SkTypeface* TextLayoutCacheValue::getCachedTypeface(SkTypeface** typeface, const char path[]) { + if (!*typeface) { + *typeface = SkTypeface::CreateFromFile(path); +#if DEBUG_GLYPHS + LOGD("Created SkTypeface from file: %s", path); +#endif } - return typeface; + return *typeface; } void TextLayoutCacheValue::computeValuesWithHarfbuzz(SkPaint* paint, const UChar* chars, diff --git a/core/jni/android/graphics/TextLayoutCache.h b/core/jni/android/graphics/TextLayoutCache.h index 06c74fcecefd..5c938f7582a8 100644 --- a/core/jni/android/graphics/TextLayoutCache.h +++ b/core/jni/android/graphics/TextLayoutCache.h @@ -174,7 +174,7 @@ private: static unsigned shapeFontRun(HB_ShaperItem& shaperItem, SkPaint* paint, size_t count, bool isRTL); - static SkTypeface* getCachedTypeface(SkTypeface* typeface, const char path[]); + static SkTypeface* getCachedTypeface(SkTypeface** typeface, const char path[]); static void deleteGlyphArrays(HB_ShaperItem& shaperItem); diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd index 877bded96393..b962f9686e89 100644 --- a/docs/html/guide/topics/media/camera.jd +++ b/docs/html/guide/topics/media/camera.jd @@ -29,6 +29,15 @@ parent.link=index.html </ol> </li> <li><a href="#saving-media">Saving Media Files</a></li> + <li><a href="#camera-features">Camera Features</a> + <ol> + <li><a href="#check-feature">Checking feature availability</a></li> + <li><a href="#using-features">Using camera features</a></li> + <li><a href="#metering-focus-areas">Metering and focus areas</a></li> + <li><a href="#face-detection">Face detection</a></li> + <li><a href="#time-lapse-video">Time lapse video</a></li> + </ol> + </li> </ol> <h2>Key Classes</h2> <ol> @@ -39,8 +48,7 @@ parent.link=index.html </ol> <h2>See also</h2> <ol> - <li><a href="{@docRoot}reference/android/hardware/Camera.html">Camera</a></li> - <li><a href="{@docRoot}reference/android/media/MediaRecorder.html">MediaRecorder</a></li> + <li><a href="{@docRoot}guide/topics/media/mediaplayer.html">Media Playback</a></li> <li><a href="{@docRoot}guide/topics/data/data-storage.html">Data Storage</a></li> </ol> </div> @@ -64,7 +72,7 @@ manifest</a>.</li> <li><strong>Quick Picture or Customized Camera</strong> - How will your application use the camera? Are you just interested in snapping a quick picture or video clip, or will your application -provide a new way to use cameras? For a getting a quick snap or clip, consider +provide a new way to use cameras? For a getting a quick snap or clip, consider <a href="#intents">Using Existing Camera Apps</a>. For developing a customized camera feature, check out the <a href="#custom-camera">Building a Camera App</a> section.</li> @@ -85,7 +93,7 @@ classes:</p> <dl> <dt>{@link android.hardware.Camera}</dt> <dd>This class is the primary API for controlling device cameras. This class is used to take -pictures or videos when you are building a camera application.</a>.</dd> +pictures or videos when you are building a camera application.</dd> <dt>{@link android.view.SurfaceView}</dt> <dd>This class is used to present a live camera preview to the user.</dd> @@ -120,8 +128,8 @@ for example: <pre> <uses-feature android:name="android.hardware.camera" /> </pre> - <p>For a list of camera features, see the manifest <a -href="{@docRoot}guide/topics/manifest/uses-feature-element.html#features-reference">Features + <p>For a list of camera features, see the manifest +<a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#hw-features">Features Reference</a>.</p> <p>Adding camera features to your manifest causes Android Market to prevent your application from being installed to devices that do not include a camera or do not support the camera features you @@ -148,6 +156,15 @@ application must request the audio capture permission. <uses-permission android:name="android.permission.RECORD_AUDIO" /> </pre> </li> + <li><strong>Location Permission</strong> - If your application tags images with GPS location +information, you must request location permission: +<pre> +<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> +</pre> +<p>For more information about getting user location, see +<a href="{@docRoot}guide/topics/location/obtaining-user-location.html">Obtaining User +Location</a>.</p> + </li> </ul> @@ -224,8 +241,8 @@ After the user finishes taking a picture (or cancels the operation), the user in your application, and you must intercept the {@link android.app.Activity#onActivityResult(int, int, android.content.Intent) onActivityResult()} method to receive the result of the intent and continue your application execution. For information -on how to receive the completed intent, see <a href="#intent-receive">Receiving Camera Intent -Result</a>.</p> +on how to receive the completed intent, see <a href="#intent-receive">Receiving camera intent +result</a>.</p> <h3 id="intent-video">Video capture intent</h3> @@ -360,8 +377,8 @@ properly release it for use by other applications.</li> <p>Camera hardware is a shared resource that must be carefully managed so your application does not collide with other applications that may also want to use it. The following sections discusses -how to detect camera hardware, how to request access to a camera and how to release it when your -application is done using it.</p> +how to detect camera hardware, how to request access to a camera, how to capture pictures or video +and how to release the camera when your application is done using it.</p> <p class="caution"><strong>Caution:</strong> Remember to release the {@link android.hardware.Camera} object by calling the {@link android.hardware.Camera#release() Camera.release()} when your @@ -492,7 +509,8 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback // ignore: tried to stop a non-existent preview } - // make any resize, rotate or reformatting changes here + // set preview size and make any resize, rotate or + // reformatting changes here // start preview with new settings try { @@ -506,6 +524,12 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback } </pre> +<p>If you want to set a specific size for your camera preview, set this in the {@code +surfaceChanged()} method as noted in the comments above. When setting preview size, you +<em>must use</em> values from {@link android.hardware.Camera.Parameters#getSupportedPreviewSizes}. +<em>Do not</em> set arbitrary values in the {@link +android.hardware.Camera.Parameters#setPreviewSize setPreviewSize()} method.</p> + <h3 id="preview-layout">Placing preview in a layout</h3> <p>A camera preview class, such as the example shown in the previous section, must be placed in the @@ -780,6 +804,10 @@ without creating a camera preview first and skip the first few steps of this pro since users typically prefer to see a preview before starting a recording, that process is not discussed here.</p> +<p class="note"><strong>Tip:</strong> If your application is typically used for recording video, set +{@link android.hardware.Camera.Parameters#setRecordingHint} to {@code true} prior to starting your +preview. This setting can help reduce the time it takes to start recording.</p> + <h4 id="configuring-mediarecorder">Configuring MediaRecorder</h4> <p>When using the {@link android.media.MediaRecorder} class to record video, you must perform configuration steps in a <em>specific order</em> and then call the {@link @@ -851,7 +879,7 @@ setAudioChannels()}</li> <li>{@link android.media.MediaRecorder#setAudioSamplingRate(int) setAudioSamplingRate()}</li> </ul> -<h4 id="start-stop-mediarecorder">Starting and Stopping MediaRecorder</h4> +<h4 id="start-stop-mediarecorder">Starting and stopping MediaRecorder</h4> <p>When starting and stopping video recording using the {@link android.media.MediaRecorder} class, you must follow a specific order, as listed below.</p> @@ -938,7 +966,7 @@ public class CameraActivity extends Activity { private MediaRecorder mMediaRecorder; ... - + @Override protected void onPause() { super.onPause(); @@ -1052,4 +1080,425 @@ instead. For more information, see <a href="{@docRoot}guide/topics/data/data-storage.html#SavingSharedFiles">Saving Shared Files</a>.</p> <p>For more information about saving files on an Android device, see <a -href="{@docRoot}guide/topics/data/data-storage.html">Data Storage</a>.</p>
\ No newline at end of file +href="{@docRoot}guide/topics/data/data-storage.html">Data Storage</a>.</p> + + +<h2 id="camera-features">Camera Features</h2> +<p>Android supports a wide array of camera features you can control with your camera application, +such as picture format, flash mode, focus settings, and many more. This section lists the common +camera features, and briefly discusses how to use them. Most camera features can be accessed and set +using the through {@link android.hardware.Camera.Parameters} object. However, there are several +important features that require more than simple settings in {@link +android.hardware.Camera.Parameters}. These features are covered in the following sections:<p> + +<ul> + <li><a href="#metering-focus-areas">Metering and focus areas</a></li> + <li><a href="#face-detection">Face detection</a></li> + <li><a href="#time-lapse-video">Time lapse video</a></li> +</ul> + +<p>For general information about how to use features that are controlled through {@link +android.hardware.Camera.Parameters}, review the <a href="#using-features">Using camera +features</a> section. For more detailed information about how to use features controlled through the +camera parameters object, follow the links in the feature list below to the API reference +documentation.</p> + +<p class="table-caption" id="table1"> + <strong>Table 1.</strong> Common camera features sorted by the Android API Level in which they +were introduced.</p> +<table> + <tr> + <th>Feature</th> <th>API Level</th> <th>Description</th> + </tr> + <tr> + <td><a href="#face-detection">Face Detection</a></td> + <td>14</td> + <td>Identify human faces within a picture and use them for focus, metering and white +balance</td> + </tr> + <tr> + <td><a href="#metering-focus-areas">Metering Areas</a></td> + <td>14</td> + <td>Specify one or more areas within an image for calculating white balance</td> + </tr> + <tr> + <td><a href="#metering-focus-areas">Focus Areas</a></td> + <td>14</td> + <td>Set one or more areas within an image to use for focus</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setAutoWhiteBalanceLock White Balance Lock}</td> + <td>14</td> + <td>Stop or start automatic white balance adjustments</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setAutoExposureLock Exposure Lock}</td> + <td>14</td> + <td>Stop or start automatic exposure adjustments</td> + </tr> + <tr> + <td>{@link android.hardware.Camera#takePicture Video Snapshot}</td> + <td>14</td> + <td>Take a picture while shooting video (frame grab)</td> + </tr> + <tr> + <td><a href="#time-lapse-video">Time Lapse Video</a></td> + <td>11</td> + <td>Record frames with set delays to record a time lapse video</td> + </tr> + <tr> + <td>{@link android.hardware.Camera#open(int) Multiple Cameras}</td> + <td>9</td> + <td>Support for more than one camera on a device, including front-facing and back-facing +cameras</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#getFocusDistances Focus Distance}</td> + <td>9</td> + <td>Reports distances between the camera and objects that appear to be in focus</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setZoom Zoom}</td> + <td>8</td> + <td>Set image magnification</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setExposureCompensation Exposure +Compensation}</td> + <td>8</td> + <td>Increase or decrease the light exposure level</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setGpsLatitude GPS Data}</td> + <td>5</td> + <td>Include or omit geographic location data with the image</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setWhiteBalance White Balance}</td> + <td>5</td> + <td>Set the white balance mode, which affects color values in the captured image</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setFocusMode Focus Mode}</td> + <td>5</td> + <td>Set how the camera focuses on a subject such as automatic, fixed, macro or infinity</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setSceneMode Scene Mode}</td> + <td>5</td> + <td>Apply a preset mode for specific types of photography situations such as night, beach, snow +or candlelight scenes</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setJpegQuality JPEG Quality}</td> + <td>5</td> + <td>Set the compression level for a JPEG image, which increases or decreases image output file +quality and size</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setFlashMode Flash Mode}</td> + <td>5</td> + <td>Turn flash on, off, or use automatic setting</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setColorEffect Color Effects}</td> + <td>5</td> + <td>Apply a color effect to the captured image such as black and white, sepia tone or negative. +</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setAntibanding Anti-Banding}</td> + <td>5</td> + <td>Reduces the effect of banding in color gradients due to JPEG compression</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setPictureFormat Picture Format}</td> + <td>1</td> + <td>Specify the file format for the picture</td> + </tr> + <tr> + <td>{@link android.hardware.Camera.Parameters#setPictureSize Picture Size}</td> + <td>1</td> + <td>Specify the pixel dimensions of the saved picture</td> + </tr> +</table> + +<p class="note"><strong>Note:</strong> These features are not supported on all devices due to +hardware differences and software implementation. For information on checking the availability +of features on the device where your application is running, see <a href="#check-feature">Checking +feature availability</a>.</p> + + +<h3 id="check-feature">Checking feature availability</h3> +<p>The first thing to understand when setting out to use camera features on Android devices is that +not all camera features are supported on all devices. In addition, devices that support a particular +feature may support them to different levels or with different options. Therefore, part of your +decision process as you develop a camera application is to decide what camera features you want to +support and to what level. After making that decision, you should plan on including code in your +camera application that checks to see if device hardware supports those features and fails +gracefully if a feature is not available.</p> + +<p>You can check the availabilty of camera features by getting an instance of a camera’s parameters +object, and checking the relevant methods. The following code sample shows you how to obtain a +{@link android.hardware.Camera.Parameters} object and check if the camera supports the autofocus +feature:</p> + +<pre> +// get Camera parameters +Camera.Parameters params = mCamera.getParameters(); + +List<String> focusModes = params.getSupportedFocusModes(); +if (focusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) { + // Autofocus mode is supported +} +</pre> + +<p>You can use the technique shown above for most camera features. The +{@link android.hardware.Camera.Parameters} object provides a {@code getSupported...()}, {@code +is...Supported()} or {@code getMax...()} method to determine if (and to what extent) a feature is +supported.</p> + +<p>If your application requires certain camera features in order to function properly, you can +require them through additions to your application manifest. When you declare the use of specific +camera features, such as flash and auto-focus, the Android Market restricts your application from +being installed on devices which do not support these features. For a list of camera features that +can be declared in your app manifest, see the manifest +<a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#hw-features"> Features +Reference</a>.</p> + +<h3 id="using-features">Using camera features</h3> +<p>Most camera features are activated and controlled using a {@link +android.hardware.Camera.Parameters} object. You obtain this object by first getting an instance of +the {@link android.hardware.Camera} object, calling the {@link +android.hardware.Camera#getParameters getParameters()} method, changing the returned parameter +object and then setting it back into the camera object, as demonstrated in the following example +code:</p> + +<pre> +// get Camera parameters +Camera.Parameters params = mCamera.getParameters(); +// set the focus mode +params.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO); +// set Camera parameters +mCamera.setParameters(params); +</pre> + +<p>This technique works for nearly all camera features, and most parameters can be changed at any +time after you have obtained an instance of the {@link android.hardware.Camera} object. Changes to +parameters are typically visible to the user immediately in the application’s camera preview. +On the software side, parameter changes may take several frames to actually take effect as the +camera hardware processes the new instructions and then sends updated image data.</p> + +<p class="caution"><strong>Important:</strong> Some camera features cannot be changed at will. In +particular, changing the size or orientation of the camera preview requires that you first stop the +preview, change the preview size, and then restart the preview. Starting with Android 4.0 (API +Level 14) preview orientation can be changed without restarting the preview.</p> + +<p>Other camera features require more code in order to implement, including:</p> +<ul> + <li>Metering and focus areas</li> + <li>Face detection</li> + <li>Time lapse video</li> +</ul> +<p>A quick outline of how to implement these features is provided in the following sections.</p> + + +<h3 id="metering-focus-areas">Metering and focus areas</h3> +<p>In some photographic scenarios, automatic focusing and light metering may not produce the +desired results. Starting with Android 4.0 (API Level 14), your camera application can provide +additional controls to allow your app or users to specify areas in an image to use for determining +focus or light level settings and pass these values to the camera hardware for use in capturing +images or video.</p> + +<p>Areas for metering and focus work very similarly to other camera features, in that you control +them through methods in the {@link android.hardware.Camera.Parameters} object. The following code +demonstrates setting two light metering areas for an instance of +{@link android.hardware.Camera}:</p> + +<pre> +// Create an instance of Camera +mCamera = getCameraInstance(); + +// set Camera parameters +Camera.Parameters params = mCamera.getParameters(); + +if (params.getMaxNumMeteringAreas() > 0){ // check that metering areas are supported + List<Camera.Area> meteringAreas = new ArrayList<Camera.Area>(); + + Rect areaRect1 = new Rect(-100, -100, 100, 100); // specify an area in center of image + meteringAreas.add(new Camera.Area(areaRect1, 600)); // set weight to 60% + Rect areaRect2 = new Rect(800, -1000, 1000, -800); // specify an area in upper right of image + meteringAreas.add(new Camera.Area(areaRect2, 400)); // set weight to 40% + params.setMeteringAreas(meteringAreas); +} + +mCamera.setParameters(params); +</pre> + +<p>The {@link android.hardware.Camera.Area} object contains two data parameters: A {@link +android.graphics.Rect} object for specifying an area within the camera’s field of view and a weight +value, which tells the camera what level of importance this area should be given in light metering +or focus calculations.</p> + +<p>The {@link android.graphics.Rect} field in a {@link android.hardware.Camera.Area} object +describes a rectangular shape mapped on a 2000 x 2000 unit grid. The coordinates -1000, -1000 +represent the top, left corner of the camera image, and coordinates 1000, 1000 represent the +bottom, right corner of the camera image, as shown in the illustration below.</p> + +<img src='images/camera-area-coordinates.png' /> +<p class="img-caption"> + <strong>Figure 1.</strong> The red lines illustrate the coordinate system for specifying a +{@link android.hardware.Camera.Area} within a camera preview. The blue box shows the location and +shape of an camera area with the {@link android.graphics.Rect} values 333,333,667,667. +</p> + +<p>The bounds of this coordinate system always correspond to the outer edge of the image visible in +the camera preview and do not shrink or expand with the zoom level. Similarly, rotation of the image +preview using {@link android.hardware.Camera#setDisplayOrientation Camera.setDisplayOrientation()} +does not remap the coordinate system.</p> + + +<h3 id="face-detection">Face detection</h3> +<p>For pictures that include people, faces are usually the most important part of the picture, and +should be used for determining both focus and white balance when capturing an image. The Android 4.0 +(API Level 14) framework provides APIs for identifying faces and calculating picture settings using +face recognition technology.</p> + +<p class="note"><strong>Note:</strong> While the face detection feature is running, +{@link android.hardware.Camera.Parameters#setWhiteBalance}, +{@link android.hardware.Camera.Parameters#setFocusAreas} and +{@link android.hardware.Camera.Parameters#setMeteringAreas} have no effect.</p> + +<p>Using the face detection feature in your camera application requires a few general steps:</p> +<ul> + <li>Check that face detection is supported on the device</li> + <li>Create a face detection listener</li> + <li>Add the face detection listener to your camera object</li> + <li>Start face detection after preview (and after <em>every</em> preview restart)</li> +</ul> + +<p>The face detection feature is not supported on all devices. You can check that this feature is +supported by calling {@link android.hardware.Camera.Parameters#getMaxNumDetectedFaces}. An +example of this check is shown in the {@code startFaceDetection()} sample method below.</p> + +<p>In order to be notified and respond to the detection of a face, your camera application must set +a listener for face detection events. In order to do this, you must create a listener class that +implements the {@link android.hardware.Camera.FaceDetectionListener} interface as shown in the +example code below.</p> + +<pre> +class MyFaceDetectionListener implements Camera.FaceDetectionListener { + + @Override + public void onFaceDetection(Face[] faces, Camera camera) { + if (faces.length > 0){ + Log.d("FaceDetection", "face detected: "+ faces.length + + " Face 1 Location X: " + faces[0].rect.centerX() + + "Y: " + faces[0].rect.centerY() ); + } + } +} +</pre> + +<p>After creating this class, you then set it into your application’s +{@link android.hardware.Camera} object, as shown in the example code below:</p> + +<pre> +mCamera.setFaceDetectionListener(new MyFaceDetectionListener()); +</pre> + +<p>Your application must start the face detection function each time you start (or restart) the +camera preview. Create a method for starting face detection so you can call it as needed, as shown +in the example code below.</p> + +<pre> +public void startFaceDetection(){ + // Try starting Face Detection + Camera.Parameters params = mCamera.getParameters(); + + // start face detection only *after* preview has started + if (params.getMaxNumDetectedFaces() > 0){ + // camera supports face detection, so can start it: + mCamera.startFaceDetection(); + } +} +</pre> + +<p>You must start face detection <em>each time</em> you start (or restart) the camera preview. If +you use the preview class shown in <a href="#camera-preview">Creating a preview class</a>, add your +{@link android.hardware.Camera#startFaceDetection startFaceDetection()} method to both the +{@link android.view.SurfaceHolder.Callback#surfaceCreated surfaceCreated()} and {@link +android.view.SurfaceHolder.Callback#surfaceChanged surfaceChanged()} methods in your preview class, +as shown in the sample code below.</p> + +<pre> +public void surfaceCreated(SurfaceHolder holder) { + try { + mCamera.setPreviewDisplay(holder); + mCamera.startPreview(); + + startFaceDetection(); // start face detection feature + + } catch (IOException e) { + Log.d(TAG, "Error setting camera preview: " + e.getMessage()); + } +} + +public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { + + if (mHolder.getSurface() == null){ + // preview surface does not exist + Log.d(TAG, "mHolder.getSurface() == null"); + return; + } + + try { + mCamera.stopPreview(); + + } catch (Exception e){ + // ignore: tried to stop a non-existent preview + Log.d(TAG, "Error stopping camera preview: " + e.getMessage()); + } + + try { + mCamera.setPreviewDisplay(mHolder); + mCamera.startPreview(); + + startFaceDetection(); // re-start face detection feature + + } catch (Exception e){ + // ignore: tried to stop a non-existent preview + Log.d(TAG, "Error starting camera preview: " + e.getMessage()); + } +} +</pre> + +<p class="note"><strong>Note:</strong> Remember to call this method <em>after</em> calling +{@link android.hardware.Camera#startPreview startPreview()}. Do not attempt to start face detection +in the {@link android.app.Activity#onCreate onCreate()} method of your camera app’s main activity, +as the preview is not available by this point in your application's the execution.</p> + + +<h3 id="time-lapse-video">Time lapse video</h3> +<p>Time lapse video allows users to create video clips that combine pictures taken a few seconds or +minutes apart. This feature uses {@link android.media.MediaRecorder} to record the images for a time +lapse sequence. </p> + +<p>To record a time lapse video with {@link android.media.MediaRecorder}, you must configure the +recorder object as if you are recording a normal video, setting the captured frames per second to a +low number and using one of the time lapse quality settings, as shown in the code example below.</p> + +<pre> +// Step 3: Set a CamcorderProfile (requires API Level 8 or higher) +mMediaRecorder.setProfile(CamcorderProfile.get(CamcorderProfile.QUALITY_TIME_LAPSE_HIGH)); +... +// Step 5.5: Set the video capture rate to a low number +mMediaRecorder.setCaptureRate(0.1); // capture a frame every 10 seconds +</pre> + +<p>These settings must be done as part of a larger configuration procedure for {@link +android.media.MediaRecorder}. For a full configuration code example, see <a +href="#configuring-mediarecorder">Configuring MediaRecorder</a>. Once the configuration is complete, +you start the video recording as if you were recording a normal video clip. For more information +about configuring and running {@link android.media.MediaRecorder}, see <a +href="#capture-video">Capturing videos</a>.</p> diff --git a/docs/html/guide/topics/media/images/camera-area-coordinates.png b/docs/html/guide/topics/media/images/camera-area-coordinates.png Binary files differnew file mode 100644 index 000000000000..9876453921c8 --- /dev/null +++ b/docs/html/guide/topics/media/images/camera-area-coordinates.png diff --git a/docs/html/guide/topics/media/index.jd b/docs/html/guide/topics/media/index.jd index 7c1754feb94f..0e0412a10d52 100644 --- a/docs/html/guide/topics/media/index.jd +++ b/docs/html/guide/topics/media/index.jd @@ -6,7 +6,7 @@ page.title=Multimedia and Camera <h2>Topics</h2> <ol> -<li><a href="{@docRoot}guide/topics/media/mediaplayer.html">MediaPlayer</a></li> +<li><a href="{@docRoot}guide/topics/media/mediaplayer.html">Media Playback</a></li> <li><a href="{@docRoot}guide/topics/media/jetplayer.html">JetPlayer</a></li> <li><a href="{@docRoot}guide/topics/media/camera.html">Camera</a></li> <li><a href="{@docRoot}guide/topics/media/audio-capture.html">Audio Capture</a></li> @@ -46,7 +46,8 @@ hardware.</p> and playback.</p> <dl> - <dt><strong><a href="{@docRoot}guide/topics/media/mediaplayer.html">MediaPlayer</a></strong></dt> + <dt><strong><a href="{@docRoot}guide/topics/media/mediaplayer.html">Media Playback</a></strong> + </dt> <dd>How to play audio and video in your application.</dd> <dt><strong><a href="{@docRoot}guide/topics/media/jetplayer.html">JetPlayer</a></strong></dt> diff --git a/docs/html/guide/topics/ui/menus.jd b/docs/html/guide/topics/ui/menus.jd index 29482444d8e8..7b5b3dc2f3c1 100644 --- a/docs/html/guide/topics/ui/menus.jd +++ b/docs/html/guide/topics/ui/menus.jd @@ -198,10 +198,11 @@ public boolean onCreateOptionsMenu(Menu menu) { } </pre> -<div class="figure" style="width:500px"> -<img src="{@docRoot}images/ui/actionbar.png" height="34" alt="" /> -<p class="img-caption"><strong>Figure 2.</strong> Screenshot of the Action Bar in the Email -application, with two action items from the Options Menu, plus the overflow menu.</p> +<div class="figure" style="width:450px"> +<img src="{@docRoot}images/ui/actionbar.png" alt="" /> +<p class="img-caption"><strong>Figure 2.</strong> Action bar from the <a +href="{@docRoot}resources/samples/HoneycombGallery/index.html">Honeycomb Gallery</a> app, including +navigation tabs and a camera action item (plus the overflow menu button).</p> </div> <p>You can also populate the menu in code, using {@link android.view.Menu#add(int,int,int,int) diff --git a/include/gui/SurfaceTextureClient.h b/include/gui/SurfaceTextureClient.h index 57f9e151deee..971a1b80dc88 100644 --- a/include/gui/SurfaceTextureClient.h +++ b/include/gui/SurfaceTextureClient.h @@ -40,6 +40,7 @@ public: protected: SurfaceTextureClient(); + virtual ~SurfaceTextureClient(); void setISurfaceTexture(const sp<ISurfaceTexture>& surfaceTexture); private: diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index f66e25f1dfd4..3d47f053a540 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -36,6 +36,12 @@ SurfaceTextureClient::SurfaceTextureClient() { SurfaceTextureClient::init(); } +SurfaceTextureClient::~SurfaceTextureClient() { + if (mConnectedToCpu) { + SurfaceTextureClient::disconnect(NATIVE_WINDOW_API_CPU); + } +} + void SurfaceTextureClient::init() { // Initialize the ANativeWindow function pointers. ANativeWindow::setSwapInterval = hook_setSwapInterval; diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index dff41c977b5a..e937587c62eb 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -67,7 +67,8 @@ <activity android:name=".usb.UsbStorageActivity" - android:excludeFromRecents="true"> + android:label="@*android:string/usb_storage_activity_title" + android:excludeFromRecents="true"> </activity> <activity android:name="com.android.internal.app.ExternalMediaFormatActivity" android:theme="@*android:style/Theme.Dialog.Alert" diff --git a/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png b/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png Binary files differindex cbd72fb7cd8b..c02bd424f51d 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png b/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png Binary files differindex 765133110704..05cdd9aa94e8 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png b/packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png Binary files differindex b6317797d946..2b2907b60843 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_launcher_settings.png diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java index 43dfb96b7cea..e61ef8ada9ed 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java @@ -114,16 +114,11 @@ public class UsbStorageActivity extends Activity thr.start(); mAsyncStorageHandler = new Handler(thr.getLooper()); - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - setProgressBarIndeterminateVisibility(true); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD); if (Environment.isExternalStorageRemovable()) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); } - setTitle(getString(com.android.internal.R.string.usb_storage_activity_title)); - setContentView(com.android.internal.R.layout.usb_storage_activity); mIcon = (ImageView) findViewById(com.android.internal.R.id.icon); diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index 0ef4ef3d2b3a..11da17c56f1d 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -564,9 +564,12 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler mForgotPattern = false; mHasOverlay = mUpdateMonitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE || mHasDialog; - if (mMode == Mode.LockScreen) { + + // Emulate activity life-cycle for both lock and unlock screen. + if (mLockScreen != null) { ((KeyguardScreen) mLockScreen).onPause(); - } else { + } + if (mUnlockScreen != null) { ((KeyguardScreen) mUnlockScreen).onPause(); } @@ -658,9 +661,11 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler @Override public void show() { - if (mMode == Mode.LockScreen) { + // Emulate activity life-cycle for both lock and unlock screen. + if (mLockScreen != null) { ((KeyguardScreen) mLockScreen).onResume(); - } else { + } + if (mUnlockScreen != null) { ((KeyguardScreen) mUnlockScreen).onResume(); } diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 13107f50d5eb..f7099e2c096a 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -39,6 +39,7 @@ import android.database.ContentObserver; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.RectF; +import android.os.BatteryManager; import android.os.Binder; import android.os.Bundle; import android.os.Handler; @@ -162,6 +163,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { static final boolean ENABLE_CAR_DOCK_HOME_CAPTURE = true; static final boolean ENABLE_DESK_DOCK_HOME_CAPTURE = false; + // Should screen savers use their own timeout, or the SCREEN_OFF_TIMEOUT? + static final boolean SEPARATE_TIMEOUT_FOR_SCREEN_SAVER = false; + static final int LONG_PRESS_POWER_NOTHING = 0; static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1; static final int LONG_PRESS_POWER_SHUT_OFF = 2; @@ -397,6 +401,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // visual screen saver support int mScreenSaverTimeout = 0; boolean mScreenSaverEnabled = true; + boolean mPluggedIn; // Behavior of ENDCALL Button. (See Settings.System.END_BUTTON_BEHAVIOR.) int mEndcallBehavior; @@ -460,8 +465,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { Settings.Secure.DEFAULT_INPUT_METHOD), false, this); resolver.registerContentObserver(Settings.System.getUriFor( "fancy_rotation_anim"), false, this); - resolver.registerContentObserver(Settings.Secure.getUriFor( - Settings.Secure.DREAM_TIMEOUT), false, this); + if (SEPARATE_TIMEOUT_FOR_SCREEN_SAVER) { + resolver.registerContentObserver(Settings.Secure.getUriFor( + Settings.Secure.DREAM_TIMEOUT), false, this); + } // otherwise SCREEN_OFF_TIMEOUT will do nicely updateSettings(); } @@ -768,6 +775,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { mDockMode = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, Intent.EXTRA_DOCK_STATE_UNDOCKED); } + + // watch the plug to know whether to trigger the screen saver + filter = new IntentFilter(); + filter.addAction(Intent.ACTION_BATTERY_CHANGED); + intent = context.registerReceiver(mPowerReceiver, filter); + if (intent != null) { + mPluggedIn = (0 != intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0)); + } + mVibrator = new Vibrator(); mLongPressVibePattern = getLongIntArray(mContext.getResources(), com.android.internal.R.array.config_longPressVibePattern); @@ -917,8 +933,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { updateRotation = true; } - mScreenSaverTimeout = Settings.Secure.getInt(resolver, - Settings.Secure.DREAM_TIMEOUT, 0); + if (SEPARATE_TIMEOUT_FOR_SCREEN_SAVER) { + mScreenSaverTimeout = Settings.Secure.getInt(resolver, + Settings.Secure.DREAM_TIMEOUT, 0); + } else { + mScreenSaverTimeout = Settings.System.getInt(resolver, + Settings.System.SCREEN_OFF_TIMEOUT, 0); + if (mScreenSaverTimeout > 0) { + // We actually want to activate the screensaver just before the + // power manager's screen timeout + mScreenSaverTimeout -= 5000; + } + } updateScreenSaverTimeoutLocked(); } if (updateRotation) { @@ -2957,6 +2983,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { } }; + BroadcastReceiver mPowerReceiver = new BroadcastReceiver() { + public void onReceive(Context context, Intent intent) { + if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) { + mPluggedIn = (0 != intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0)); + if (localLOGV) Log.v(TAG, "BATTERY_CHANGED: " + intent + " plugged=" + mPluggedIn); + } + } + }; + /** {@inheritDoc} */ public void screenTurnedOff(int why) { EventLog.writeEvent(70000, 0); @@ -3423,8 +3458,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { Log.w(TAG, "mScreenSaverActivator ran, but the screensaver should not be showing. Who's driving this thing?"); return; } + if (!mPluggedIn) { + if (localLOGV) Log.v(TAG, "mScreenSaverActivator: not running screen saver when not plugged in"); + return; + } if (localLOGV) Log.v(TAG, "mScreenSaverActivator entering dreamland"); + try { String component = Settings.Secure.getString( mContext.getContentResolver(), Settings.Secure.DREAM_COMPONENT); diff --git a/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java b/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java index 0d1f4360dc50..ba06996064fe 100644 --- a/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java @@ -383,6 +383,9 @@ public class SimPukUnlockScreen extends LinearLayout implements KeyguardScreen, public void onClick(View v) { if (v == mCancelButton) { + // clear the PIN/PUK entry fields if the user cancels + mPinText.setText(""); + mPukText.setText(""); mCallback.goToLockScreen(); return; } diff --git a/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java b/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java index f80637a1de49..9604cdc6e7b0 100644 --- a/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java @@ -359,6 +359,7 @@ public class SimUnlockScreen extends LinearLayout implements KeyguardScreen, Vie public void onClick(View v) { if (v == mCancelButton) { + mPinText.setText(""); // clear the PIN entry field if the user cancels mCallback.goToLockScreen(); return; } |
