Merge "Fix read from uninitialized memory."
diff --git a/Android.mk b/Android.mk
index d26c313..c18b24b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -402,8 +402,8 @@
resources/samples/CubeLiveWallpaper "Cube Live Wallpaper" \
-samplecode $(sample_dir)/Home \
resources/samples/Home "Home" \
- -samplecode $(sample_dir)/Honeycomb-Gallery \
- resources/samples/Honeycomb-Gallery "Honeycomb Gallery" \
+ -samplecode $(sample_dir)/HoneycombGallery \
+ resources/samples/HoneycombGallery "Honeycomb Gallery" \
-samplecode $(sample_dir)/JetBoy \
resources/samples/JetBoy "JetBoy" \
-samplecode $(sample_dir)/LunarLander \
diff --git a/api/current.xml b/api/current.xml
index 15463de..bd86302 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -204632,6 +204632,195 @@
</parameter>
</method>
</class>
+<class name="LruCache"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="LruCache"
+ type="android.util.LruCache"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="maxSize" type="int">
+</parameter>
+</constructor>
+<method name="create"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+<parameter name="key" type="K">
+</parameter>
+</method>
+<method name="createCount"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="entryEvicted"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+<parameter name="key" type="K">
+</parameter>
+<parameter name="value" type="V">
+</parameter>
+</method>
+<method name="evictAll"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="evictionCount"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="get"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="key" type="K">
+</parameter>
+</method>
+<method name="hitCount"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="missCount"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="put"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="key" type="K">
+</parameter>
+<parameter name="value" type="V">
+</parameter>
+</method>
+<method name="putCount"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="size"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="sizeOf"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+<parameter name="key" type="K">
+</parameter>
+<parameter name="value" type="V">
+</parameter>
+</method>
+<method name="snapshot"
+ return="java.util.Map<K, V>"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="toString"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="true"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</class>
<class name="MalformedJsonException"
extends="java.io.IOException"
abstract="false"
@@ -263805,7 +263994,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="t" type="T">
+<parameter name="arg0" type="T">
</parameter>
</method>
</interface>
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index e9f28fa..3316ea5 100644
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -660,8 +660,7 @@
} else {
Log.i(TAG, "Rejecting incoming HID connection from " + address);
}
- } else if (BluetoothUuid.isBnep(uuid) || BluetoothUuid.isNap(uuid) &&
- mBluetoothService.allowIncomingTethering()){
+ } else if (BluetoothUuid.isBnep(uuid) && mBluetoothService.allowIncomingTethering()){
authorized = true;
} else {
Log.i(TAG, "Rejecting incoming " + deviceUuid + " connection from " + address);
diff --git a/core/java/android/util/LruCache.java b/core/java/android/util/LruCache.java
new file mode 100644
index 0000000..b85bf39
--- /dev/null
+++ b/core/java/android/util/LruCache.java
@@ -0,0 +1,249 @@
+/*
+ * 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.
+ * 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.util;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * A cache that holds strong references to a limited number of values. Each time
+ * a value is accessed, it is moved to the head of a queue. When a value is
+ * added to a full cache, the value at the end of that queue is evicted and may
+ * become eligible for garbage collection.
+ *
+ * <p>If your cached values hold resources that need to be explicitly released,
+ * override {@link #entryEvicted}. This method is only invoked when values are
+ * evicted. Values replaced by calls to {@link #put} must be released manually.
+ *
+ * <p>If a cache miss should be computed on demand for the corresponding keys,
+ * override {@link #create}. This simplifies the calling code, allowing it to
+ * assume a value will always be returned, even when there's a cache miss.
+ *
+ * <p>By default, the cache size is measured in the number of entries. Override
+ * {@link #sizeOf} to size the cache in different units. For, this cache is
+ * limited to 4MiB of bitmaps:
+ * <pre> {@code
+ * int cacheSize = 4 * 1024 * 1024; // 4MiB
+ * LruCache<String, Bitmap> bitmapCache = new LruCache<String, Bitmap>(cacheSize) {
+ * protected int sizeOf(String key, Bitmap value) {
+ * return value.getByteCount();
+ * }
+ * }}</pre>
+ */
+public class LruCache<K, V> {
+ private final LinkedHashMap<K, V> map;
+
+ /** Size of this cache in units. Not necessarily the number of elements. */
+ private int size;
+ private final int maxSize;
+
+ private int putCount;
+ private int createCount;
+ private int evictionCount;
+ private int hitCount;
+ private int missCount;
+
+ /**
+ * @param maxSize for caches that do not override {@link #sizeOf}, this is
+ * the maximum number of entries in the cache. For all other caches,
+ * this is the maximum sum of the sizes of the entries in this cache.
+ */
+ public LruCache(int maxSize) {
+ if (maxSize <= 0) {
+ throw new IllegalArgumentException("maxSize <= 0");
+ }
+ this.maxSize = maxSize;
+ this.map = new LinkedHashMap<K, V>(0, 0.75f, true);
+ }
+
+ /**
+ * Returns the value for {@code key} if it exists in the cache or can be
+ * created by {@code #create}. If a value was returned, it is moved to the
+ * head of the queue. This returns null if a value is not cached and cannot
+ * be created.
+ */
+ public synchronized final V get(K key) {
+ if (key == null) {
+ throw new NullPointerException();
+ }
+
+ V result = map.get(key);
+ if (result != null) {
+ hitCount++;
+ return result;
+ }
+
+ missCount++;
+
+ // TODO: release the lock while calling this potentially slow user code
+ result = create(key);
+
+ if (result != null) {
+ createCount++;
+ size += safeSizeOf(key, result);
+ map.put(key, result);
+ trimToSize(maxSize);
+ }
+ return result;
+ }
+
+ /**
+ * Caches {@code value} for {@code key}. The value is moved to the head of
+ * the queue.
+ *
+ * @return the previous value mapped by {@code key}. Although that entry is
+ * no longer cached, it has not been passed to {@link #entryEvicted}.
+ */
+ public synchronized final V put(K key, V value) {
+ if (key == null || value == null) {
+ throw new NullPointerException();
+ }
+
+ putCount++;
+ size += safeSizeOf(key, value);
+ V previous = map.put(key, value);
+ if (previous != null) {
+ size -= safeSizeOf(key, previous);
+ }
+ trimToSize(maxSize);
+ return previous;
+ }
+
+ private void trimToSize(int maxSize) {
+ while (size > maxSize) {
+ Map.Entry<K, V> toEvict = map.eldest();
+ if (toEvict == null) {
+ break; // map is empty; if size is not 0 then throw an error below
+ }
+
+ K key = toEvict.getKey();
+ V value = toEvict.getValue();
+ map.remove(key);
+ size -= safeSizeOf(key, value);
+ evictionCount++;
+
+ // TODO: release the lock while calling this potentially slow user code
+ entryEvicted(key, value);
+ }
+
+ if (size < 0 || (map.isEmpty() && size != 0)) {
+ throw new IllegalStateException(getClass().getName()
+ + ".sizeOf() is reporting inconsistent results!");
+ }
+ }
+
+ /**
+ * Called for entries that have reached the tail of the least recently used
+ * queue and are be removed. The default implementation does nothing.
+ */
+ protected void entryEvicted(K key, V value) {}
+
+ /**
+ * Called after a cache miss to compute a value for the corresponding key.
+ * Returns the computed value or null if no value can be computed. The
+ * default implementation returns null.
+ */
+ protected V create(K key) {
+ return null;
+ }
+
+ private int safeSizeOf(K key, V value) {
+ int result = sizeOf(key, value);
+ if (result < 0) {
+ throw new IllegalStateException("Negative size: " + key + "=" + value);
+ }
+ return result;
+ }
+
+ /**
+ * Returns the size of the entry for {@code key} and {@code value} in
+ * user-defined units. The default implementation returns 1 so that size
+ * is the number of entries and max size is the maximum number of entries.
+ *
+ * <p>An entry's size must not change while it is in the cache.
+ */
+ protected int sizeOf(K key, V value) {
+ return 1;
+ }
+
+ /**
+ * Clear the cache, calling {@link #entryEvicted} on each removed entry.
+ */
+ public synchronized final void evictAll() {
+ trimToSize(-1); // -1 will evict 0-sized elements
+ }
+
+ /**
+ * For caches that do not override {@link #sizeOf}, this is the number of
+ * entries in the cache. For all other caches, this is the sum of the sizes
+ * of the entries in this cache.
+ */
+ public synchronized final int size() {
+ return size;
+ }
+
+ /**
+ * Returns the number of times {@link #get} returned a value.
+ */
+ public synchronized final int hitCount() {
+ return hitCount;
+ }
+
+ /**
+ * Returns the number of times {@link #get} returned null or required a new
+ * value to be created.
+ */
+ public synchronized final int missCount() {
+ return missCount;
+ }
+
+ /**
+ * Returns the number of times {@link #create(Object)} returned a value.
+ */
+ public synchronized final int createCount() {
+ return createCount;
+ }
+
+ /**
+ * Returns the number of times {@link #put} was called.
+ */
+ public synchronized final int putCount() {
+ return putCount;
+ }
+
+ /**
+ * Returns the number of values that have been evicted.
+ */
+ public synchronized final int evictionCount() {
+ return evictionCount;
+ }
+
+ /**
+ * Returns a copy of the current contents of the cache, ordered from least
+ * recently accessed to most recently accessed.
+ */
+ public synchronized final Map<K, V> snapshot() {
+ return new LinkedHashMap<K, V>(map);
+ }
+
+ @Override public synchronized final String toString() {
+ int accesses = hitCount + missCount;
+ int hitPercent = accesses != 0 ? (100 * hitCount / accesses) : 0;
+ return String.format("LruCache[maxSize=%d,hits=%d,misses=%d,hitRate=%d%%]",
+ maxSize, hitCount, missCount, hitPercent);
+ }
+}
diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index a92272c..fd7bceb 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -69,6 +69,8 @@
private int mGravity;
+ private Rect mTempRect = new Rect();
+
/**
* Construct a new spinner with the given context's theme.
*
@@ -260,8 +262,8 @@
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
if (mPopup != null && MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.AT_MOST) {
final int measuredWidth = getMeasuredWidth();
- setMeasuredDimension(Math.min(Math.max(measuredWidth, mPopup.measureContentWidth()),
- MeasureSpec.getSize(widthMeasureSpec)),
+ setMeasuredDimension(Math.min(Math.max(measuredWidth,
+ measureContentWidth(getAdapter())), MeasureSpec.getSize(widthMeasureSpec)),
getMeasuredHeight());
}
}
@@ -455,7 +457,50 @@
public CharSequence getPrompt() {
return mPopup.getHintText();
}
-
+
+ private int measureContentWidth(SpinnerAdapter adapter) {
+ if (adapter == null) {
+ return 0;
+ }
+
+ int width = 0;
+ View itemView = null;
+ int itemType = 0;
+ final int widthMeasureSpec =
+ MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+ final int heightMeasureSpec =
+ MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+
+ // Make sure the number of items we'll measure is capped. If it's a huge data set
+ // with wildly varying sizes, oh well.
+ final int start = Math.max(0, getSelectedItemPosition());
+ final int count = Math.min(adapter.getCount(), start + MAX_ITEMS_MEASURED);
+ for (int i = start; i < count; i++) {
+ final int positionType = adapter.getItemViewType(i);
+ if (positionType != itemType) {
+ itemType = positionType;
+ itemView = null;
+ }
+ itemView = adapter.getView(i, itemView, this);
+ if (itemView.getLayoutParams() == null) {
+ itemView.setLayoutParams(new ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.WRAP_CONTENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT));
+ }
+ itemView.measure(widthMeasureSpec, heightMeasureSpec);
+ width = Math.max(width, itemView.getMeasuredWidth());
+ }
+
+ // Add background padding to measured width
+ Drawable popupBackground = getBackground();
+ if (popupBackground != null) {
+ popupBackground.getPadding(mTempRect);
+ width += mTempRect.left + mTempRect.right;
+ }
+
+ return width;
+ }
+
/**
* <p>Wrapper class for an Adapter. Transforms the embedded Adapter instance
* into a ListAdapter.</p>
@@ -581,8 +626,6 @@
*/
public void setPromptText(CharSequence hintText);
public CharSequence getHintText();
-
- public int measureContentWidth();
}
private class DialogPopup implements SpinnerPopup, DialogInterface.OnClickListener {
@@ -624,23 +667,14 @@
setSelection(which);
dismiss();
}
-
- public int measureContentWidth() {
- // Doesn't matter for dialog mode
- return 0;
- }
}
private class DropdownPopup extends ListPopupWindow implements SpinnerPopup {
private CharSequence mHintText;
- private int mPopupMaxWidth;
- private Rect mTempRect = new Rect();
+ private ListAdapter mAdapter;
public DropdownPopup(Context context, AttributeSet attrs, int defStyleRes) {
super(context, attrs, 0, defStyleRes);
-
- final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
- mPopupMaxWidth = metrics.widthPixels / 2;
setAnchorView(Spinner.this);
setModal(true);
@@ -653,6 +687,12 @@
});
}
+ @Override
+ public void setAdapter(ListAdapter adapter) {
+ super.setAdapter(adapter);
+ mAdapter = adapter;
+ }
+
public CharSequence getHintText() {
return mHintText;
}
@@ -664,59 +704,12 @@
@Override
public void show() {
- setWidth(Spinner.this.getWidth());
+ setWidth(Math.max(measureContentWidth((SpinnerAdapter) mAdapter),
+ Spinner.this.getWidth()));
setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
super.show();
getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE);
setSelection(Spinner.this.getSelectedItemPosition());
}
-
- @Override
- public int measureContentWidth() {
- final SpinnerAdapter adapter = getAdapter();
- if (adapter == null) {
- return 0;
- }
-
- int width = 0;
- View itemView = null;
- int itemType = 0;
- final int widthMeasureSpec =
- MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
- final int heightMeasureSpec =
- MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
-
- // Make sure the number of items we'll measure is capped. If it's a huge data set
- // with wildly varying sizes, oh well.
- final int start = Math.max(0, getSelectedItemPosition());
- final int count = Math.min(adapter.getCount(), start + MAX_ITEMS_MEASURED);
- for (int i = start; i < count; i++) {
- final int positionType = adapter.getItemViewType(i);
- if (positionType != itemType) {
- itemType = positionType;
- itemView = null;
- }
- itemView = adapter.getDropDownView(i, itemView, Spinner.this);
- if (itemView.getLayoutParams() == null) {
- itemView.setLayoutParams(generateDefaultLayoutParams());
- }
- itemView.measure(widthMeasureSpec, heightMeasureSpec);
- width = Math.max(width, itemView.getMeasuredWidth());
- }
-
- // Add background padding to measured width
- Drawable popupBackground = getBackground();
- if (popupBackground != null) {
- popupBackground.getPadding(mTempRect);
- width += mTempRect.left + mTempRect.right;
- }
-
- return width;
- }
-
- private ViewGroup.LayoutParams generateDefaultLayoutParams() {
- return new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
- ViewGroup.LayoutParams.WRAP_CONTENT);
- }
}
}
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 772eefd..28b106b 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8012,11 +8012,9 @@
return true;
case ID_SELECT_ALL:
+ // This does not enter text selection mode. Text is highlighted, so that it can be
+ // bulk edited, like selectAllOnFocus does.
selectAll();
- // Update controller positions after selection change.
- if (hasSelectionController()) {
- getSelectionController().show();
- }
return true;
case ID_PASTE:
@@ -8134,6 +8132,8 @@
return true;
}
+ boolean handled = false;
+
// Long press in empty space moves cursor and shows the Paste affordance if available.
if (!isPositionOnText(mLastDownPositionX, mLastDownPositionY) &&
mInsertionControllerEnabled) {
@@ -8141,11 +8141,10 @@
stopSelectionActionMode();
Selection.setSelection((Spannable)mText, offset);
getInsertionController().show(0);
- mDiscardNextActionUp = true;
- return true;
+ handled = true;
}
- if (mSelectionActionMode != null) {
+ if (!handled && mSelectionActionMode != null) {
if (touchPositionIsInSelection()) {
// Start a drag
final int start = getSelectionStart();
@@ -8156,21 +8155,21 @@
startDrag(data, getTextThumbnailBuilder(selectedText), localState, 0);
stopSelectionActionMode();
} else {
+ // New selection at touch position
updateSelectedRegion();
}
- performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
- mDiscardNextActionUp = true;
- return true;
+ handled = true;
}
// Start a new selection
- if (startSelectionActionMode()) {
+ handled |= !handled && startSelectionActionMode();
+
+ if (handled) {
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
mDiscardNextActionUp = true;
- return true;
}
- return false;
+ return handled;
}
/**
diff --git a/core/java/com/android/internal/view/menu/ActionMenuView.java b/core/java/com/android/internal/view/menu/ActionMenuView.java
index ff15e44..7775f00 100644
--- a/core/java/com/android/internal/view/menu/ActionMenuView.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuView.java
@@ -25,7 +25,6 @@
import android.view.SoundEffectConstants;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewParent;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -193,61 +192,125 @@
menu.setActionWidthLimit(width);
menu.setMaxActionItems(mMaxItems);
+ final boolean cleared = mMenu != menu;
mMenu = menu;
- updateChildren(true);
+ updateChildren(cleared);
}
public void updateChildren(boolean cleared) {
- final boolean reserveOverflow = mReserveOverflow;
- removeAllViews();
-
- final ArrayList<MenuItemImpl> itemsToShow = mMenu.getActionItems(reserveOverflow);
+ final ArrayList<MenuItemImpl> itemsToShow = mMenu.getActionItems(mReserveOverflow);
final int itemCount = itemsToShow.size();
boolean needsDivider = false;
+ int childIndex = 0;
for (int i = 0; i < itemCount; i++) {
final MenuItemImpl itemData = itemsToShow.get(i);
boolean hasDivider = false;
if (needsDivider) {
- addView(makeDividerView(), makeDividerLayoutParams());
+ if (!isDivider(getChildAt(childIndex))) {
+ addView(makeDividerView(), childIndex, makeDividerLayoutParams());
+ }
hasDivider = true;
+ childIndex++;
}
- View actionView = itemData.getActionView();
-
- if (actionView != null) {
- final ViewParent parent = actionView.getParent();
- if (parent instanceof ViewGroup) {
- ((ViewGroup) parent).removeView(actionView);
- }
- addView(actionView, makeActionViewLayoutParams(actionView));
+ View childToAdd = itemData.getActionView();
+ boolean needsPreDivider = false;
+ if (childToAdd != null) {
+ childToAdd.setLayoutParams(makeActionViewLayoutParams(childToAdd));
} else {
ActionMenuItemView view = (ActionMenuItemView) itemData.getItemView(
MenuBuilder.TYPE_ACTION_BUTTON, this);
view.setItemInvoker(this);
- if (i > 0 && !hasDivider && view.hasText() && itemData.getIcon() == null) {
- addView(makeDividerView(), makeDividerLayoutParams());
- }
- addView(view);
+ needsPreDivider = i > 0 && !hasDivider && view.hasText() &&
+ itemData.getIcon() == null;
needsDivider = view.hasText();
+ childToAdd = view;
}
+
+ boolean addPreDivider = removeChildrenUntil(childIndex, childToAdd, needsPreDivider);
+
+ if (addPreDivider) addView(makeDividerView(), childIndex, makeDividerLayoutParams());
+ if (needsPreDivider) childIndex++;
+
+ if (getChildAt(childIndex) != childToAdd) {
+ addView(childToAdd, childIndex);
+ }
+ childIndex++;
}
- if (reserveOverflow) {
- if (mMenu.getNonActionItems(true).size() > 0) {
- if (itemCount > 0) {
- addView(makeDividerView(), makeDividerLayoutParams());
- }
+ final boolean hasOverflow = mOverflowButton != null && mOverflowButton.getParent() == this;
+ final boolean needsOverflow = mReserveOverflow && mMenu.getNonActionItems(true).size() > 0;
+
+ if (hasOverflow != needsOverflow) {
+ if (needsOverflow) {
if (mOverflowButton == null) {
OverflowMenuButton button = new OverflowMenuButton(mContext);
mOverflowButton = button;
}
- addView(mOverflowButton);
+ boolean addDivider = removeChildrenUntil(childIndex, mOverflowButton, true);
+ if (addDivider && itemCount > 0) {
+ addView(makeDividerView(), childIndex, makeDividerLayoutParams());
+ childIndex++;
+ }
+ addView(mOverflowButton, childIndex);
+ childIndex++;
} else {
- mOverflowButton = null;
+ removeView(mOverflowButton);
+ }
+ } else {
+ if (needsOverflow) {
+ boolean overflowDivider = itemCount > 0;
+ boolean addDivider = removeChildrenUntil(childIndex, mOverflowButton,
+ overflowDivider);
+ if (addDivider && itemCount > 0) {
+ addView(makeDividerView(), childIndex, makeDividerLayoutParams());
+ }
+ if (overflowDivider) {
+ childIndex += 2;
+ } else {
+ childIndex++;
+ }
}
}
+
+ while (getChildCount() > childIndex) {
+ removeViewAt(childIndex);
+ }
+ }
+
+ private boolean removeChildrenUntil(int start, View targetChild, boolean needsPreDivider) {
+ final int childCount = getChildCount();
+ boolean found = false;
+ for (int i = start; i < childCount; i++) {
+ final View child = getChildAt(i);
+ if (child == targetChild) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ return needsPreDivider;
+ }
+
+ for (int i = start; i < getChildCount(); ) {
+ final View child = getChildAt(i);
+ if (needsPreDivider && isDivider(child)) {
+ needsPreDivider = false;
+ i++;
+ continue;
+ }
+ if (child == targetChild) break;
+ removeViewAt(i);
+ }
+
+ return needsPreDivider;
+ }
+
+ private static boolean isDivider(View v) {
+ return v != null && v.getId() == com.android.internal.R.id.action_menu_divider;
}
public boolean showOverflowMenu() {
@@ -302,6 +365,7 @@
ImageView result = new ImageView(mContext);
result.setImageDrawable(mDivider);
result.setScaleType(ImageView.ScaleType.FIT_XY);
+ result.setId(com.android.internal.R.id.action_menu_divider);
return result;
}
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 3c3f14b..e3a66c5 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -250,6 +250,8 @@
}
public void setMenu(Menu menu) {
+ if (menu == mOptionsMenu) return;
+
MenuBuilder builder = (MenuBuilder) menu;
mOptionsMenu = builder;
if (mMenuView != null) {
diff --git a/core/res/res/values/ids.xml b/core/res/res/values/ids.xml
index 7a0fede..d05685c 100644
--- a/core/res/res/values/ids.xml
+++ b/core/res/res/values/ids.xml
@@ -73,4 +73,5 @@
<item type="id" name="fillInIntent" />
<item type="id" name="rowTypeId" />
<item type="id" name="up" />
+ <item type="id" name="action_menu_divider" />
</resources>
diff --git a/core/tests/coretests/src/android/util/LruCacheTest.java b/core/tests/coretests/src/android/util/LruCacheTest.java
new file mode 100644
index 0000000..506315d
--- /dev/null
+++ b/core/tests/coretests/src/android/util/LruCacheTest.java
@@ -0,0 +1,385 @@
+/*
+ * 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.
+ * 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.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import junit.framework.TestCase;
+
+public final class LruCacheTest extends TestCase {
+ private int expectedCreateCount;
+ private int expectedPutCount;
+ private int expectedHitCount;
+ private int expectedMissCount;
+ private int expectedEvictionCount;
+
+ public void testStatistics() {
+ LruCache<String, String> cache = new LruCache<String, String>(3);
+ assertStatistics(cache);
+
+ assertEquals(null, cache.put("a", "A"));
+ expectedPutCount++;
+ assertStatistics(cache);
+ assertHit(cache, "a", "A");
+ assertSnapshot(cache, "a", "A");
+
+ assertEquals(null, cache.put("b", "B"));
+ expectedPutCount++;
+ assertStatistics(cache);
+ assertHit(cache, "a", "A");
+ assertHit(cache, "b", "B");
+ assertSnapshot(cache, "a", "A", "b", "B");
+
+ assertEquals(null, cache.put("c", "C"));
+ expectedPutCount++;
+ assertStatistics(cache);
+ assertHit(cache, "a", "A");
+ assertHit(cache, "b", "B");
+ assertHit(cache, "c", "C");
+ assertSnapshot(cache, "a", "A", "b", "B", "c", "C");
+
+ assertEquals(null, cache.put("d", "D"));
+ expectedPutCount++;
+ expectedEvictionCount++; // a should have been evicted
+ assertStatistics(cache);
+ assertMiss(cache, "a");
+ assertHit(cache, "b", "B");
+ assertHit(cache, "c", "C");
+ assertHit(cache, "d", "D");
+ assertHit(cache, "b", "B");
+ assertHit(cache, "c", "C");
+ assertSnapshot(cache, "d", "D", "b", "B", "c", "C");
+
+ assertEquals(null, cache.put("e", "E"));
+ expectedPutCount++;
+ expectedEvictionCount++; // d should have been evicted
+ assertStatistics(cache);
+ assertMiss(cache, "d");
+ assertMiss(cache, "a");
+ assertHit(cache, "e", "E");
+ assertHit(cache, "b", "B");
+ assertHit(cache, "c", "C");
+ assertSnapshot(cache, "e", "E", "b", "B", "c", "C");
+ }
+
+ public void testStatisticsWithCreate() {
+ LruCache<String, String> cache = newCreatingCache();
+ assertStatistics(cache);
+
+ assertCreated(cache, "aa", "created-aa");
+ assertHit(cache, "aa", "created-aa");
+ assertSnapshot(cache, "aa", "created-aa");
+
+ assertCreated(cache, "bb", "created-bb");
+ assertMiss(cache, "c");
+ assertSnapshot(cache, "aa", "created-aa", "bb", "created-bb");
+
+ assertCreated(cache, "cc", "created-cc");
+ assertSnapshot(cache, "aa", "created-aa", "bb", "created-bb", "cc", "created-cc");
+
+ expectedEvictionCount++; // aa will be evicted
+ assertCreated(cache, "dd", "created-dd");
+ assertSnapshot(cache, "bb", "created-bb", "cc", "created-cc", "dd", "created-dd");
+
+ expectedEvictionCount++; // bb will be evicted
+ assertCreated(cache, "aa", "created-aa");
+ assertSnapshot(cache, "cc", "created-cc", "dd", "created-dd", "aa", "created-aa");
+ }
+
+ public void testCreateOnCacheMiss() {
+ LruCache<String, String> cache = newCreatingCache();
+ String created = cache.get("aa");
+ assertEquals("created-aa", created);
+ }
+
+ public void testNoCreateOnCacheHit() {
+ LruCache<String, String> cache = newCreatingCache();
+ cache.put("aa", "put-aa");
+ assertEquals("put-aa", cache.get("aa"));
+ }
+
+ public void testConstructorDoesNotAllowZeroCacheSize() {
+ try {
+ new LruCache<String, String>(0);
+ fail();
+ } catch (IllegalArgumentException expected) {
+ }
+ }
+
+ public void testCannotPutNullKey() {
+ LruCache<String, String> cache = new LruCache<String, String>(3);
+ try {
+ cache.put(null, "A");
+ fail();
+ } catch (NullPointerException expected) {
+ }
+ }
+
+ public void testCannotPutNullValue() {
+ LruCache<String, String> cache = new LruCache<String, String>(3);
+ try {
+ cache.put("a", null);
+ fail();
+ } catch (NullPointerException expected) {
+ }
+ }
+
+ public void testToString() {
+ LruCache<String, String> cache = new LruCache<String, String>(3);
+ assertEquals("LruCache[maxSize=3,hits=0,misses=0,hitRate=0%]", cache.toString());
+
+ cache.put("a", "A");
+ cache.put("b", "B");
+ cache.put("c", "C");
+ cache.put("d", "D");
+
+ cache.get("a"); // miss
+ cache.get("b"); // hit
+ cache.get("c"); // hit
+ cache.get("d"); // hit
+ cache.get("e"); // miss
+
+ assertEquals("LruCache[maxSize=3,hits=3,misses=2,hitRate=60%]", cache.toString());
+ }
+
+ public void testEvictionWithSingletonCache() {
+ LruCache<String, String> cache = new LruCache<String, String>(1);
+ cache.put("a", "A");
+ cache.put("b", "B");
+ assertSnapshot(cache, "b", "B");
+ }
+
+ public void testEntryEvictedWhenFull() {
+ List<String> expectedEvictionLog = new ArrayList<String>();
+ final List<String> evictionLog = new ArrayList<String>();
+ LruCache<String, String> cache = new LruCache<String, String>(3) {
+ @Override protected void entryEvicted(String key, String value) {
+ evictionLog.add(key + "=" + value);
+ }
+ };
+
+ cache.put("a", "A");
+ cache.put("b", "B");
+ cache.put("c", "C");
+ assertEquals(expectedEvictionLog, evictionLog);
+
+ cache.put("d", "D");
+ expectedEvictionLog.add("a=A");
+ assertEquals(expectedEvictionLog, evictionLog);
+ }
+
+ /**
+ * Replacing the value for a key doesn't cause an eviction but it does bring
+ * the replaced entry to the front of the queue.
+ */
+ public void testPutDoesNotCauseEviction() {
+ final List<String> evictionLog = new ArrayList<String>();
+ List<String> expectedEvictionLog = new ArrayList<String>();
+ LruCache<String, String> cache = new LruCache<String, String>(3) {
+ @Override protected void entryEvicted(String key, String value) {
+ evictionLog.add(key + "=" + value);
+ }
+ };
+
+ cache.put("a", "A");
+ cache.put("b", "B");
+ cache.put("c", "C");
+ cache.put("b", "B2");
+ assertEquals(expectedEvictionLog, evictionLog);
+ assertSnapshot(cache, "a", "A", "c", "C", "b", "B2");
+ }
+
+ public void testCustomSizesImpactsSize() {
+ LruCache<String, String> cache = new LruCache<String, String>(10) {
+ @Override protected int sizeOf(String key, String value) {
+ return key.length() + value.length();
+ }
+ };
+
+ assertEquals(0, cache.size());
+ cache.put("a", "AA");
+ assertEquals(3, cache.size());
+ cache.put("b", "BBBB");
+ assertEquals(8, cache.size());
+ cache.put("a", "");
+ assertEquals(6, cache.size());
+ }
+
+ public void testEvictionWithCustomSizes() {
+ LruCache<String, String> cache = new LruCache<String, String>(4) {
+ @Override protected int sizeOf(String key, String value) {
+ return value.length();
+ }
+ };
+
+ cache.put("a", "AAAA");
+ assertSnapshot(cache, "a", "AAAA");
+ cache.put("b", "BBBB"); // should evict a
+ assertSnapshot(cache, "b", "BBBB");
+ cache.put("c", "CC"); // should evict b
+ assertSnapshot(cache, "c", "CC");
+ cache.put("d", "DD");
+ assertSnapshot(cache, "c", "CC", "d", "DD");
+ cache.put("e", "E"); // should evict c
+ assertSnapshot(cache, "d", "DD", "e", "E");
+ cache.put("f", "F");
+ assertSnapshot(cache, "d", "DD", "e", "E", "f", "F");
+ cache.put("g", "G"); // should evict d
+ assertSnapshot(cache, "e", "E", "f", "F", "g", "G");
+ cache.put("h", "H");
+ assertSnapshot(cache, "e", "E", "f", "F", "g", "G", "h", "H");
+ cache.put("i", "III"); // should evict e, f, and g
+ assertSnapshot(cache, "h", "H", "i", "III");
+ cache.put("j", "JJJ"); // should evict h and i
+ assertSnapshot(cache, "j", "JJJ");
+ }
+
+ public void testEvictionThrowsWhenSizesAreInconsistent() {
+ LruCache<String, int[]> cache = new LruCache<String, int[]>(4) {
+ @Override protected int sizeOf(String key, int[] value) {
+ return value[0];
+ }
+ };
+
+ int[] a = { 4 };
+ cache.put("a", a);
+
+ // get the cache size out of sync
+ a[0] = 1;
+ assertEquals(4, cache.size());
+
+ // evict something
+ try {
+ cache.put("b", new int[] { 2 });
+ fail();
+ } catch (IllegalStateException expected) {
+ }
+ }
+
+ public void testEvictionThrowsWhenSizesAreNegative() {
+ LruCache<String, String> cache = new LruCache<String, String>(4) {
+ @Override protected int sizeOf(String key, String value) {
+ return -1;
+ }
+ };
+
+ try {
+ cache.put("a", "A");
+ fail();
+ } catch (IllegalStateException expected) {
+ }
+ }
+
+ /**
+ * Naive caches evict at most one element at a time. This is problematic
+ * because evicting a small element may be insufficient to make room for a
+ * large element.
+ */
+ public void testDifferentElementSizes() {
+ LruCache<String, String> cache = new LruCache<String, String>(10) {
+ @Override protected int sizeOf(String key, String value) {
+ return value.length();
+ }
+ };
+
+ cache.put("a", "1");
+ cache.put("b", "12345678");
+ cache.put("c", "1");
+ assertSnapshot(cache, "a", "1", "b", "12345678", "c", "1");
+ cache.put("d", "12345678"); // should evict a and b
+ assertSnapshot(cache, "c", "1", "d", "12345678");
+ cache.put("e", "12345678"); // should evict c and d
+ assertSnapshot(cache, "e", "12345678");
+ }
+
+ public void testEvictAll() {
+ final List<String> evictionLog = new ArrayList<String>();
+ LruCache<String, String> cache = new LruCache<String, String>(10) {
+ @Override protected void entryEvicted(String key, String value) {
+ evictionLog.add(key + "=" + value);
+ }
+ };
+
+ cache.put("a", "A");
+ cache.put("b", "B");
+ cache.put("c", "C");
+ cache.evictAll();
+ assertEquals(0, cache.size());
+ assertEquals(Arrays.asList("a=A", "b=B", "c=C"), evictionLog);
+ }
+
+ public void testEvictAllEvictsSizeZeroElements() {
+ LruCache<String, String> cache = new LruCache<String, String>(10) {
+ @Override protected int sizeOf(String key, String value) {
+ return 0;
+ }
+ };
+
+ cache.put("a", "A");
+ cache.put("b", "B");
+ cache.evictAll();
+ assertSnapshot(cache);
+ }
+
+ private LruCache<String, String> newCreatingCache() {
+ return new LruCache<String, String>(3) {
+ @Override protected String create(String key) {
+ return (key.length() > 1) ? ("created-" + key) : null;
+ }
+ };
+ }
+
+ private void assertHit(LruCache<String, String> cache, String key, String value) {
+ assertEquals(value, cache.get(key));
+ expectedHitCount++;
+ assertStatistics(cache);
+ }
+
+ private void assertMiss(LruCache<String, String> cache, String key) {
+ assertEquals(null, cache.get(key));
+ expectedMissCount++;
+ assertStatistics(cache);
+ }
+
+ private void assertCreated(LruCache<String, String> cache, String key, String value) {
+ assertEquals(value, cache.get(key));
+ expectedMissCount++;
+ expectedCreateCount++;
+ assertStatistics(cache);
+ }
+
+ private void assertStatistics(LruCache<?, ?> cache) {
+ assertEquals("create count", expectedCreateCount, cache.createCount());
+ assertEquals("put count", expectedPutCount, cache.putCount());
+ assertEquals("hit count", expectedHitCount, cache.hitCount());
+ assertEquals("miss count", expectedMissCount, cache.missCount());
+ assertEquals("eviction count", expectedEvictionCount, cache.evictionCount());
+ }
+
+ private <T> void assertSnapshot(LruCache<T, T> cache, T... keysAndValues) {
+ List<T> actualKeysAndValues = new ArrayList<T>();
+ for (Map.Entry<T, T> entry : cache.snapshot().entrySet()) {
+ actualKeysAndValues.add(entry.getKey());
+ actualKeysAndValues.add(entry.getValue());
+ }
+
+ // assert using lists because order is important for LRUs
+ assertEquals(Arrays.asList(keysAndValues), actualKeysAndValues);
+ }
+}
diff --git a/docs/html/guide/appendix/faq/commontasks.jd b/docs/html/guide/appendix/faq/commontasks.jd
index 200a93f..4747379 100644
--- a/docs/html/guide/appendix/faq/commontasks.jd
+++ b/docs/html/guide/appendix/faq/commontasks.jd
@@ -124,8 +124,9 @@
<h2>Implementing Activity Callbacks</h2>
<p>Android calls a number of callbacks to let you draw your screen, store data before
pausing, and refresh data after closing. You must implement at least some of
- these methods. See <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Lifecycles</a>
- discussion in Application Fundamentals to learn when and in what order these methods
+ these methods. See the <a
+href="{@docRoot}guide/topics/fundamentals/activites.html#Lifecycle">Activities</a>
+ document to learn when and in what order these methods
are called. Here are some of the standard types of screen classes that Android provides:</p>
<ul>
<li>{@link android.app.Activity android.app.Activity} - This is a standard screen,
@@ -150,9 +151,9 @@
<p>When you open a new screen you can decide whether to make it transparent or floating,
or full-screen. The choice of new screen affects the event sequence of events
in the old screen (if the new screen obscures the old screen, a different
- series of events is called in the old screen). See <a
- href="{@docRoot}guide/topics/fundamentals.html#lcycles">Lifecycles</a> discussion
- in Application Fundamentals for details. </p>
+ series of events is called in the old screen). See the <a
+ href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activities</a> document for
+details. </p>
<p>Transparent or floating windows are implemented in three
standard ways: </p>
<ul>
@@ -309,7 +310,8 @@
the application is finalized. See the topics for {@link android.app.Activity#onSaveInstanceState} and
{@link android.app.Activity#onCreate} for
examples of storing and retrieving state.</p>
-<p>Read more about the lifecycle of an application in <a href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a>.</p>
+<p>Read more about the lifecycle of an activity in <a
+href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a> document.</p>
<h3>Storing and Retrieving Larger or More Complex Persistent Data<a name="storingandretrieving" id="storingandretrieving"></a></h3>
<p>Your application can store files or complex collection objects, and reserve them
for private use by itself or other activities in the application, or it can expose
diff --git a/docs/html/guide/appendix/install-location.jd b/docs/html/guide/appendix/install-location.jd
index 914aa66..7f96809 100644
--- a/docs/html/guide/appendix/install-location.jd
+++ b/docs/html/guide/appendix/install-location.jd
@@ -193,7 +193,7 @@
provide additional services when innactive. When external storage becomes unavailable and a game
process is killed, there should be no visible effect when the storage becomes available again and
the user restarts the game (assuming that the game properly saved its state during the normal
-<a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Activity lifecycle</a>).</p>
+<a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activity lifecycle</a>).</p>
<p>If your application requires several megabytes for the APK file, you should
carefully consider whether to enable the application to install on the external storage so that
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index ab52999..dfc4f7b 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -28,6 +28,16 @@
<span class="zh-CN" style="display:none">Android 是什么？</span>
<span class="zh-TW" style="display:none">什麼是 Android？</span>
</a></li>
+ <li><a href="<?cs var:toroot ?>guide/topics/fundamentals.html">
+ <span class="en">Application Fundamentals</span>
+ <span class="de" style="display:none">Anwendungsgrundlagen</span>
+ <span class="es" style="display:none">Fundamentos de las aplicaciones</span>
+ <span class="fr" style="display:none">Principes de base des applications</span>
+ <span class="it" style="display:none">Concetti fondamentali sulle applicazioni</span>
+ <span class="ja" style="display:none">開発の基礎</span>
+ <span class="zh-CN" style="display:none">应用程序基础</span>
+ <span class="zh-TW" style="display:none">應用程式基本原理</span>
+ </a></li>
<!-- <li><a style="color:gray;">The Android SDK</a></li> -->
<!-- <li><a style="color:gray;">Walkthrough for Developers</a></li> -->
@@ -47,21 +57,41 @@
<span class="zh-TW" style="display:none">架構主題</span>
</h2>
<ul>
- <li><a href="<?cs var:toroot ?>guide/topics/fundamentals.html">
- <span class="en">Application Fundamentals</span>
- <span class="de" style="display:none">Anwendungsgrundlagen</span>
- <span class="es" style="display:none">Fundamentos de las aplicaciones</span>
- <span class="fr" style="display:none">Principes de base des applications</span>
- <span class="it" style="display:none">Concetti fondamentali sulle applicazioni</span>
- <span class="ja" style="display:none">開発の基礎</span>
- <span class="zh-CN" style="display:none">应用程序基础</span>
- <span class="zh-TW" style="display:none">應用程式基本原理</span>
-
- </a></li>
- <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/fragments.html">
+ <li class="toggle-list">
+ <div><a href="<?cs var:toroot ?>guide/topics/fundamentals/activities.html">
+ <span class="en">Activities</span>
+ </a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/fragments.html">
<span class="en">Fragments</span>
</a> <span class="new">new!</span></li>
+ <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/tasks-and-back-stack.html">
+ <span class="en">Tasks and Back Stack</span>
+ </a></li>
+ </ul>
+ </li>
+ <li class="toggle-list">
+ <div><a href="<?cs var:toroot ?>guide/topics/fundamentals/services.html">
+ <span class="en">Services</span>
+ </a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/bound-services.html">
+ <span class="en">Bound Services</span>
+ </a></li>
+ </ul>
+ </li>
+ <li><a href="<?cs var:toroot ?>guide/topics/providers/content-providers.html">
+ <span class="en">Content Providers</span>
+ </a></li>
+ <li><a href="<?cs var:toroot ?>guide/topics/intents/intents-filters.html">
+ <span class="en">Intents and Intent Filters</span>
+ </a></li>
+ <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/processes-and-threads.html">
+ <span class="en">Processes and Threads</span>
+ </a></li>
</ul>
+
+
<ul>
<li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/ui/index.html">
@@ -95,7 +125,7 @@
<span class="en">Creating Status Bar Notifications</span>
</a></li>
</ul>
- </li>
+ </li><!-- end of notifying the user -->
<li><a href="<?cs var:toroot ?>guide/topics/ui/themes.html">
<span class="en">Applying Styles and Themes</span>
</a></li>
@@ -112,7 +142,8 @@
<span class="en">How Android Draws Views</span>
</a></li>
</ul>
- </li>
+ </li><!-- end of User Interface -->
+
<li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/resources/index.html">
<span class="en">Application Resources</span>
@@ -144,12 +175,9 @@
<li><a href="<?cs var:toroot ?>guide/topics/resources/style-resource.html">Style</a></li>
<li><a href="<?cs var:toroot ?>guide/topics/resources/more-resources.html">More Types</a></li>
</ul>
- </li>
+ </li><!-- end of resource types -->
</ul>
- </li>
- <li><a href="<?cs var:toroot ?>guide/topics/intents/intents-filters.html">
- <span class="en">Intents and Intent Filters</span>
- </a></li>
+ </li><!-- end of app resources -->
<li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/data/data-storage.html">
<span class="en">Data Storage</span>
@@ -161,18 +189,13 @@
</li>
</ul>
</li>
- <li><a href="<?cs var:toroot ?>guide/topics/providers/content-providers.html">
- <span class="en">Content Providers</span>
- </a></li>
<li><a href="<?cs var:toroot ?>guide/topics/security/security.html">
<span class="en">Security and Permissions</span>
</a></li>
- <!-- <li><a style="color:gray;">Processes and Threads</a></li> -->
- <!-- <li><a style="color:gray;">Interprocess Communication</a></li> -->
<li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/manifest/manifest-intro.html">
- <span class="en">The AndroidManifest.xml File</span>
- </a></div>
+ <span class="en">The AndroidManifest.xml File</span>
+ </a></div>
<ul>
<li><a href="<?cs var:toroot ?>guide/topics/manifest/action-element.html"><action></a></li>
<li><a href="<?cs var:toroot ?>guide/topics/manifest/activity-element.html"><activity></a></li>
@@ -199,8 +222,9 @@
<li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html"><uses-permission></a></li>
<li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a></li>
</ul>
- </li>
- </ul>
+ </li><!-- end of the manifest file -->
+ </ul>
+
<ul>
<li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html">
@@ -252,6 +276,10 @@
<li><a href="<?cs var:toroot?>guide/topics/wireless/bluetooth.html">
<span class="en">Bluetooth</span>
</a></li>
+ <li><a href="<?cs var:toroot?>guide/topics/network/sip.html">
+ <span class="en">Session Initiation Protocol</span></a>
+ <span class="new">new!</span>
+ </li>
<li class="toggle-list">
<div><a href="<?cs var:toroot?>guide/topics/search/index.html">
<span class="en">Search</span>
@@ -510,33 +538,25 @@
<li><a href="<?cs var:toroot ?>guide/developing/tools/logcat.html">logcat</a></li>
<li><a href="<?cs var:toroot ?>guide/developing/tools/mksdcard.html">mksdcard</a></li>
<li><a href="<?cs var:toroot ?>guide/developing/tools/monkey.html">Monkey</a></li>
- <li class="toggle-list">
- <div>
- <a href="<?cs var:toroot ?>guide/developing/tools/monkeyrunner_concepts.html">
- <span class="en">monkeyrunner</span>
- </a>
- </div>
- <ul>
- <li>
- <a href="<?cs var:toroot ?>guide/developing/tools/MonkeyDevice.html">
- <span class="en">MonkeyDevice</span>
- </a>
- </li>
- <li>
- <a href="<?cs var:toroot ?>guide/developing/tools/MonkeyImage.html">
- <span class="en">MonkeyImage</span>
- </a>
- </li>
- <li>
- <a href="<?cs var:toroot ?>guide/developing/tools/MonkeyRunner.html">
- <span class="en">MonkeyRunner</span>
- </a>
- </li>
- </ul>
- </li>
- <li><a href="<?cs var:toroot ?>guide/developing/tools/proguard.html">ProGuard</a></li>
- <li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li>
- <li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html">Traceview</a></li>
+ <li class="toggle-list">
+ <div><a href="<?cs var:toroot ?>guide/developing/tools/monkeyrunner_concepts.html">
+ <span class="en">monkeyrunner</span>
+ </a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>guide/developing/tools/MonkeyDevice.html">
+ <span class="en">MonkeyDevice</span>
+ </a></li>
+ <li><a href="<?cs var:toroot ?>guide/developing/tools/MonkeyImage.html">
+ <span class="en">MonkeyImage</span>
+ </a></li>
+ <li><a href="<?cs var:toroot ?>guide/developing/tools/MonkeyRunner.html">
+ <span class="en">MonkeyRunner</span>
+ </a></li>
+ </ul>
+ </li>
+ <li><a href="<?cs var:toroot ?>guide/developing/tools/proguard.html">ProGuard</a></li>
+ <li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li>
+ <li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html">Traceview</a></li>
<li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html">zipalign</a></li>
</ul>
</li>
diff --git a/docs/html/guide/index.jd b/docs/html/guide/index.jd
index 1ffea20..38f71c0 100644
--- a/docs/html/guide/index.jd
+++ b/docs/html/guide/index.jd
@@ -28,7 +28,7 @@
<dt><b>Framework Topics</b></dt>
<dd>Discussions of particular parts of the Android framework
-and API. For an overview of the framework, begin with
+and API. For an introduction to the framework, begin with
<a href="{@docRoot}guide/topics/fundamentals.html">Application
Fundamentals</a>. Then explore other topics — from
designing a user interface and setting up resources to storing
diff --git a/docs/html/guide/practices/ui_guidelines/activity_task_design.jd b/docs/html/guide/practices/ui_guidelines/activity_task_design.jd
index 6cb98e6..7f35b04 100644
--- a/docs/html/guide/practices/ui_guidelines/activity_task_design.jd
+++ b/docs/html/guide/practices/ui_guidelines/activity_task_design.jd
@@ -81,8 +81,10 @@
<p>
Be sure to look at the <a href="#design_tips">Design Tips</a> section
for guidelines, tips, and things to avoid. This document is a
- complement to <a href={@docRoot}guide/topics/fundamentals.html
- title="Application Fundamentals">Application Fundamentals</a>,
+ complement to the <a href="{@docRoot}guide/topics/fundamentals.html">Application
+Fundamentals</a> documentation (particularly the <a
+href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back Stack</a>
+document),
which covers the underlying mechanics for programmers.
</p>
@@ -146,9 +148,9 @@
<p>
An activity handles a particular type of content (data) and accepts a
- set of related user actions. In general, each activity has a
- <a href={@docRoot}guide/topics/fundamentals.html#actlife
- title=lifecycle>lifecycle</a> that is independent of the other
+ set of related user actions. Each activity has a
+ <a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">lifecycle</a> that is
+independent of the other
activities in its application or task — each activity is
launched (started) independently, and the user or system can start,
run, pause, resume, stop and restart it as needed. Because of this
@@ -225,9 +227,8 @@
<p>
An activity is the most prominent of four <em>components</em> of an
application. The other components are service, content provider and
- broadcast receiver. For more details on activities, see Activity in
- <a href={@docRoot}guide/topics/fundamentals.html#appcomp
- title="Application Components">Application Components</a>.
+ broadcast receiver. For more details on activities, see the
+ <a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a> document.
</p>
@@ -553,15 +554,6 @@
network connection and allows the map to continue loading in the
background.
- <p>
- Note that when you write an activity, you can make it stop or
- continue running when it is moved to the background (see
- onStop() in <a href={@docRoot}guide/topics/fundamentals.html#actlife
- title="Activity Lifecycle">Activity Lifecycle</a>).
- For activities that download data from the network, it's recommended
- to let them continue downloading so the user can multi-task.
- </p>
-
</li>
<li>
@@ -715,9 +707,8 @@
</p>
<p>
- For more on intents, see {@link android.content.Intent Intent class} and
- <a href={@docRoot}guide/topics/fundamentals.html#ifilters
- title="intent filters">intent filters</a>.
+ For more about intents, see <a
+href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and Intent Filters</a>.
</p>
@@ -914,8 +905,8 @@
Home screen), or from a shortcut icon on the Home screen, or
from the task switcher. (The mechanism for this is for the
activity to have an
- <a href={@docRoot}guide/topics/fundamentals.html#ifilters
- title="Intent filter">intent filter</a> with action MAIN and
+ <a href={@docRoot}guide/topics/intents/intents-filters.html>intent filter</a> with action
+MAIN and
category LAUNCHER.)
</li>
</ul>
diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd
index 3de5627..89306a2 100644
--- a/docs/html/guide/topics/appwidgets/index.jd
+++ b/docs/html/guide/topics/appwidgets/index.jd
@@ -333,10 +333,10 @@
on the period defined by the first one and the second update period will be ignored
(they'll both be updated every two hours, not every hour).</p>
-<p class="note"><strong>Note:</strong> Because the AppWidgetProvider is a BroadcastReceiver,
-your process is not guaranteed to keep running after the callback methods return (see
-<a href="{@docRoot}guide/topics/fundamentals.html#broadlife">Application Fundamentals >
-Broadcast Receiver Lifecycle</a> for more information). If your App Widget setup process can take several
+<p class="note"><strong>Note:</strong> Because {@link android.appwidget.AppWidgetProvider} is an
+extension of {@link android.content.BroadcastReceiver}, your process is not guaranteed to keep
+running after the callback methods return (see {@link android.content.BroadcastReceiver} for
+information about the broadcast lifecycle). If your App Widget setup process can take several
seconds (perhaps while performing web requests) and you require that your process continues,
consider starting a {@link android.app.Service}
in the {@link android.appwidget.AppWidgetProvider#onUpdate(Context,AppWidgetManager,int[])
diff --git a/docs/html/guide/topics/fundamentals.jd b/docs/html/guide/topics/fundamentals.jd
index 1658fa6..f427a92 100644
--- a/docs/html/guide/topics/fundamentals.jd
+++ b/docs/html/guide/topics/fundamentals.jd
@@ -4,1779 +4,512 @@
<div id="qv-wrapper">
<div id="qv">
-<h2>In this document</h2>
-<ol>
-<li><a href="#appcomp">Application Components</a>
- <ol>
- <li><a href="#actcomp">Activating components: intents</a></li>
- <li><a href="#endcomp">Shutting down components</a></li>
- <li><a href="#manfile">The manifest file</a></li>
- <li><a href="#ifilters">Intent filters</a></li>
- </ol></li>
-<li><a href="#acttask">Activities and Tasks</a>
- <ol>
- <li><a href="#afftask">Affinities and new tasks</a></li>
- <li><a href="#lmodes">Launch modes</a></li>
- <li><a href="#clearstack">Clearing the stack</a></li>
- <li><a href="#starttask">Starting tasks</a></li>
- <li><a href="#commonpatterns">Common patterns</a></li>
- </ol></li>
-<li><a href="#procthread">Processes and Threads</a>
- <ol>
- <li><a href="#procs">Processes</a></li>
- <li><a href="#threads">Threads</a></li>
- <li><a href="#rpc">Remote procedure calls</a></li>
- <li><a href="#tsafe">Thread-safe methods</a></li>
- </ol></li>
-<li><a href="#lcycles">Component Lifecycles</a>
- <ol>
- <li><a href="#actlife">Activity lifecycle</a></li>
- <li><a href="#servlife">Service lifecycle</a></li>
- <li><a href="#broadlife">Broadcast receiver lifecycle</a></li>
- <li><a href="#proclife">Processes and lifecycles</a></li>
- </ol></li>
-</ol>
-
-<h2>Key classes</h2>
-<ol>
-<li>{@link android.app.Activity}</li>
-<li>{@link android.app.Service}</li>
-<li>{@link android.content.BroadcastReceiver}</li>
-<li>{@link android.content.ContentProvider}</li>
-<li>{@link android.content.Intent}</li>
-</ol>
-
-</div>
-</div>
-
-<p>
-Android applications are written in the Java programming language.
-The compiled Java code — along with any data and resource
-files required by the application — is bundled into an
-<i>Android package</i>, an archive file
-marked by an {@code .apk} suffix. This file is the vehicle
-for distributing the application and installing it on mobile devices;
-it's the file users download to their devices. All the code in a
-single {@code .apk} file is considered to be one <i>application</i>.
-</p>
-
-<p>
-In many ways, each Android application lives in its own world:
-</p>
-
+<h2>Quickview</h2>
<ul>
-<li>By default, every application runs in its own Linux process.
-Android starts the process when any of the application's code needs to be
-executed, and shuts down the process when it's no longer needed and system
-resources are required by other applications.</li>
-
-<li>Each process has its own virtual machine (VM), so application code
-runs in isolation from the code of all other applications.</li>
-
-<li>By default, each application is assigned a unique Linux user ID.
-Permissions are set so that the application's files are visible only to
-that user and only to the application itself — although there are ways
-to export them to other applications as well.</li>
+ <li>Android applications are composed of one or more application components (activities,
+services, content providers, and broadcast receivers)</li>
+ <li>Each component performs a different role in the overall application behavior, and each
+one can be activated individually (even by other applications)</li>
+ <li>The manifest file must declare all components in the application and should also declare
+all application requirements, such as the minimum version of Android required and any hardware
+configurations required</li>
+ <li>Non-code application resources (images, strings, layout files, etc.) should include
+alternatives for different device configurations (such as different strings for different
+languages and different layouts for different screen sizes)</li>
</ul>
-<p>
-It's possible to arrange for two applications to share the same user ID,
-in which case they will be able to see each other's files. To conserve
-system resources, applications with the same ID can also arrange to run
-in the same Linux process, sharing the same VM.
-</p>
+
+<h2>In this document</h2>
+<ol>
+<li><a href="#Components">Application Components</a>
+ <ol>
+ <li><a href="#ActivatingComponents">Activating components</a></li>
+ </ol>
+</li>
+<li><a href="#Manifest">The Manifest File</a>
+ <ol>
+ <li><a href="#DeclaringComponents">Declaring components</a></li>
+ <li><a href="#DeclaringRequirements">Declaring application requirements</a></li>
+ </ol>
+</li>
+<li><a href="#Resources">Application Resources</a></li>
+</ol>
+</div>
+</div>
+
+<p>Android applications are written in the Java programming language. The Android SDK tools compile
+the code—along with any data and resource files—into an <i>Android package</i>, an
+archive file with an {@code .apk} suffix. All the code in a single {@code .apk} file is considered
+to be one application and is the file that Android-powered devices use to install the
+application.</p>
+
+<p>Once installed on a device, each Android application lives in its own security sandbox: </p>
+
+<ul>
+ <li>The Android operating system is a multi-user Linux system in which each application is a
+different user.</li>
+
+<li>By default, the system assigns each application a unique Linux user ID (the ID is used only by
+the system and is unknown to the application). The system sets permissions for all the files in an
+application so that only the user ID assigned to that application can access them. </li>
+
+<li>Each process has its own virtual machine (VM), so an application's code runs in isolation from
+other applications.</li>
+
+<li>By default, every application runs in its own Linux process. Android starts the process when any
+of the application's components need to be executed, then shuts down the process when it's no longer
+needed or when the system must recover memory for other applications.</li>
+</ul>
+
+<p>In this way, the Android system implements the <em>principle of least privilege</em>. That is,
+each application, by default, has access only to the components that it requires to do its work and
+no more. This creates a very secure environment in which an application cannot access parts of
+the system for which it is not given permission.</p>
+
+<p>However, there are ways for an application to share data with other applications and for an
+application to access system services:</p>
+
+<ul>
+ <li>It's possible to arrange for two applications to share the same Linux user ID, in which case
+they are able to access each other's files. To conserve system resources, applications with the
+same user ID can also arrange to run in the same Linux process and share the same VM (the
+applications must also be signed with the same certificate).</li>
+ <li>An application can request permission to access device data such as the user's
+contacts, SMS messages, the mountable storage (SD card), camera, Bluetooth, and more. All
+application permissions must be granted by the user at install time.</li>
+</ul>
+
+<p>That covers the basics regarding how an Android application exists within the system. The rest of
+this document introduces you to:</p>
+<ul>
+ <li>The core framework components that define your application.</li>
+ <li>The manifest file in which you declare components and required device features for your
+application.</li>
+ <li>Resources that are separate from the application code and allow your application to
+gracefully optimize its behavior for a variety of device configurations.</li>
+</ul>
+
+<p class="note"><strong>Tip:</strong> If you're new to Android development, we suggest that you
+follow the Beginner's Path link at the bottom of this page. For each document in the Application
+Fundamentals, the Beginner's Path points you to the document we suggest you read next, in order
+to get up to speed on the core Android concepts.</p>
-<h2 id="appcomp">Application Components</h2>
-<p>
-A central feature of Android is that one application can make use of elements
-of other applications (provided those applications permit it). For example,
-if your application needs to display a scrolling list of images and another
-application has developed a suitable scroller and made it available to others,
-you can call upon that scroller to do the work, rather than develop your own.
-Your application doesn't incorporate the code of the other application or
-link to it. Rather, it simply starts up that piece of the other application
-when the need arises.
-</p>
+<h2 id="Components">Application Components</h2>
-<p>
-For this to work, the system must be able to start an application process
-when any part of it is needed, and instantiate the Java objects for that part.
-Therefore, unlike applications on most other systems, Android applications don't
-have a single entry point for everything in the application (no {@code main()}
-function, for example). Rather, they have essential <i>components</i> that
-the system can instantiate and run as needed. There are four types of components:
-</p>
+<p>Application components are the essential building blocks of an Android application. Each
+component is a different point through which the system can enter your application. Not all
+components are actual entry points for the user and some depend on each other, but each one exists
+as its own entity and plays a specific role—each one is a unique building block that
+helps define your application's overall behavior.</p>
+
+<p>There are four different types of application components. Each type serves a distinct purpose
+and has a distinct lifecycle that defines how the component is created and destroyed.</p>
+
+<p>Here are the four types of application components:</p>
<dl>
<dt><b>Activities</b></dt>
-<dd>An <i>activity</i> presents a visual user interface for one focused endeavor
-the user can undertake. For example, an activity might present a list of
-menu items users can choose from or it might display photographs along
-with their captions. A text messaging application might have one activity
-that shows a list of contacts to send messages to, a second activity to write
-the message to the chosen contact, and other activities to review old messages
-or change settings. Though they work together to form a cohesive user interface,
-each activity is independent of the others.
-Each one is implemented as a subclass of the {@link android.app.Activity} base class.
-<p>
-An application might consist of just one activity or, like the text messaging
-application just mentioned, it may contain several.
-What the activities are, and how many there are depends, of course, on the
-application and its design. Typically, one of the activities is marked
-as the first one that should be presented to the user when the application is
-launched. Moving from one activity to another is accomplished by having the
-current activity start the next one.
-</p>
+<dd>An <i>activity</i> represents a single screen with a user interface. For example,
+an email application might have one activity that shows a list of new
+emails, another activity to compose an email, and another activity for reading emails. Although
+the activities work together to form a cohesive user experience in the email application, each one
+is independent of the others. As such, a different application can start any one of these
+activities (if the email application allows it). For example, a camera application can start the
+activity in the email application that composes new mail, in order for the user to share a picture.
-<p>
-Each activity is given a default window to draw in. Typically, the window
-fills the screen, but it might be smaller than the screen and float on top
-of other windows. An activity can also make use of additional windows —
-for example, a pop-up dialog that calls for a user response in the midst of
-the activity, or a window that presents users with vital information when they
-select a particular item on-screen.
-</p>
+<p>An activity is implemented as a subclass of {@link android.app.Activity} and you can learn more
+about it in the <a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a>
+developer guide.</p>
+</dd>
-<p>
-The visual content of the window is provided by a hierarchy of views —
-objects derived from the base {@link android.view.View} class. Each view
-controls a particular rectangular space within the window. Parent views
-contain and organize the layout of their children. Leaf views (those at the
-bottom of the hierarchy) draw in the rectangles they control and respond to
-user actions directed at that space. Thus, views are where the activity's
-interaction with the user takes place. For example, a view might display
-a small image and initiate an action when the user taps that image. Android
-has a number of ready-made views that you can use — including buttons,
-text fields, scroll bars, menu items, check boxes, and more.
-</p>
-<p>
-A view hierarchy is placed within an activity's window by the
-<code>{@link android.app.Activity#setContentView Activity.setContentView()}</code>
-method. The <i>content view</i> is the View object at the root of the hierarchy.
-(See the separate <a href="{@docRoot}guide/topics/ui/index.html">User Interface</a>
-document for more information on views and the hierarchy.)
-</p>
+<dt><b>Services</b></dt>
-<p><dt><b>Services</b></dt>
-<dd>A <i>service</i> doesn't have a visual user interface, but rather runs in
-the background for an indefinite period of time. For example, a service might
-play background music as the user attends to other matters, or it might fetch
-data over the network or calculate something and provide the result to activities
-that need it. Each service extends the {@link android.app.Service} base class.
+<dd>A <i>service</i> is a component that runs in the background to perform long-running
+operations or to perform work for remote processes. A service
+does not provide a user interface. For example, a service might play music in the background while
+the user is in a different application, or it might fetch data over the network without
+blocking user interaction with an activity. Another component, such as an activity, can start the
+service and let it run or bind to it in order to interact with it.
-<p>
-A prime example is a media player playing songs from a play list. The player
-application would probably have one or more activities that allow the user to
-choose songs and start playing them. However, the music playback itself would
-not be handled by an activity because users will expect the music to keep
-playing even after they leave the player and begin something different.
-To keep the music going, the media player activity could start a service to run
-in the background. The system would then keep the music playback service running
-even after the activity that started it leaves the screen.
-</p>
+<p>A service is implemented as a subclass of {@link android.app.Service} and you can learn more
+about it in the <a href="{@docRoot}guide/topics/fundamentals/services.html">Services</a> developer
+guide.</p>
+</dd>
-<p>
-It's possible to connect to (bind to) an ongoing service (and start the service
-if it's not already running). While connected, you can communicate with the
-service through an interface that the service exposes. For the music service,
-this interface might allow users to pause, rewind, stop, and restart the playback.
-</p>
-
-<p>
-Like activities and the other components, services run in the main thread of
-the application process. So that they won't block other components or the
-user interface, they often spawn another thread for time-consuming tasks
-(like music playback). See <a href="#procthread">Processes and Threads</a>, later.
-</p></dd>
-
-<dt><b>Broadcast receivers</b></dt>
-<dd>A <i>broadcast receiver</i> is a component that does nothing but
-receive and react to broadcast announcements. Many broadcasts originate in
-system code — for example, announcements that the timezone has changed,
-that the battery is low, that a picture has been taken, or that the user
-changed a language preference. Applications can also initiate broadcasts
-— for example, to let other applications know that some data has been
-downloaded to the device and is available for them to use.
-
-<p>
-An application can have any number of broadcast receivers to respond to any
-announcements it considers important. All receivers extend the {@link
-android.content.BroadcastReceiver} base class.
-</p>
-
-<p>
-Broadcast receivers do not display a user interface. However, they may start
-an activity in response to the information they receive, or they may use
-the {@link android.app.NotificationManager} to alert the user. Notifications
-can get the user's attention in various ways — flashing
-the backlight, vibrating the device, playing a sound, and so on. They
-typically place a persistent icon in the status bar, which users can open to
-get the message.
-</p></dd>
<dt><b>Content providers</b></dt>
-<dd>A <i>content provider</i> makes a specific set of the application's data
-available to other applications. The data can be stored in the file system,
-in an SQLite database, or in any other manner that makes sense.
-The content provider extends the {@link android.content.ContentProvider} base
-class to implement a standard set of methods that enable other applications
-to retrieve and store data of the type it controls. However, applications
-do not call these methods directly. Rather they use a {@link
-android.content.ContentResolver} object and call its methods instead.
-A ContentResolver can talk to any content provider; it cooperates with the
-provider to manage any interprocess communication that's involved.
-<p>
-See the separate
-<a href="{@docRoot}guide/topics/providers/content-providers.html">Content
-Providers</a> document for more information on using content providers.
-</p></dd>
+<dd>A <i>content provider</i> manages a shared set of application data. You can store the data in
+the file system, an SQLite database, on the web, or any other persistent storage location your
+application can access. Through the content provider, other applications can query or even modify
+the data (if the content provider allows it). For example, the Android system provides a content
+provider that manages the user's contact information. As such, any application with the proper
+permissions can query part of the content provider (such as {@link
+android.provider.ContactsContract.Data}) to read and write information about a particular person.
+
+<p>Content providers are also useful for reading and writing data that is private to your
+application and not shared. For example, the <a
+href="{@docRoot}resources/samples/NotePad/index.html">Note Pad</a> sample application uses a
+content provider to save notes.</p>
+
+<p>A content provider is implemented as a subclass of {@link android.content.ContentProvider}
+and must implement a standard set of APIs that enable other applications to perform
+transactions. For more information, see the <a
+href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a> developer
+guide.</p>
+</dd>
+
+
+<dt><b>Broadcast receivers</b></dt>
+
+<dd>A <i>broadcast receiver</i> is a component that responds to system-wide broadcast
+announcements. Many broadcasts originate from the system—for example, a broadcast announcing
+that the screen has turned off, the battery is low, or a picture was captured.
+Applications can also initiate broadcasts—for example, to let other applications know that
+some data has been downloaded to the device and is available for them to use. Although broadcast
+receivers don't display a user interface, they may <a
+href="{@docRoot}guide/topics/ui/notifiers/notifications.html">create a status bar notification</a>
+to alert the user when a broadcast event occurs. More commonly, though, a broadcast receiver is
+just a "gateway" to other components and is intended to do a very minimal amount of work. For
+instance, it might initiate a service to perform some work based on the event.
+
+<p>A broadcast receiver is implemented as a subclass of {@link android.content.BroadcastReceiver}
+and each broadcast is delivered as an {@link android.content.Intent} object. For more information,
+see the {@link android.content.BroadcastReceiver} class.</p>
+</dd>
</dl>
-<p>
-Whenever there's a request that should be handled by a particular component,
-Android makes sure that the application process of the component is running,
-starting it if necessary, and that an appropriate instance of the component
-is available, creating the instance if necessary.
-</p>
-<h3 id="actcomp">Activating components: intents</h3>
+<p>A unique aspect of the Android system design is that any application can start another
+application’s component. For example, if you want the user to capture a
+photo with the device camera, there's probably another application that does that and your
+application can use it, instead of developing an activity to capture a photo yourself. You don't
+need to incorporate or even link to the code from the camera application.
+Instead, you can simply start the activity in the camera application that captures a
+photo. When complete, the photo is even returned to your application so you can use it. To the user,
+it seems as if the camera is actually a part of your application.</p>
-<p>
-Content providers are activated when they're targeted by a request from a
-ContentResolver. The other three components — activities, services,
-and broadcast receivers — are activated by asynchronous messages
-called <i>intents</i>. An intent is an {@link android.content.Intent}
-object that holds the content of the message. For activities and services,
-it names the action being requested and specifies the URI of the data to
-act on, among other things. For example, it might convey a request for
-an activity to present an image to the user or let the user edit some
-text. For broadcast receivers, the Intent object names the action being
-announced. For example, it might announce to interested parties that the
-camera button has been pressed.
-</p>
+<p>When the system starts a component, it starts the process for that application (if it's not
+already running) and instantiates the classes needed for the component. For example, if your
+application starts the activity in the camera application that captures a photo, that activity
+runs in the process that belongs to the camera application, not in your application's process.
+Therefore, unlike applications on most other systems, Android applications don't have a single entry
+point (there's no {@code main()} function, for example).</p>
-<p>
-There are separate methods for activating each type of component:
-</p>
+<p>Because the system runs each application in a separate process with file permissions that
+restrict access to other applications, your application cannot directly activate a component from
+another application. The Android system, however, can. So, to activate a component in
+another application, you must deliver a message to the system that specifies your <em>intent</em> to
+start a particular component. The system then activates the component for you.</p>
+
+<h3 id="ActivatingComponents">Activating Components</h3>
+
+<p>Three of the four component types—activities, services, and
+broadcast receivers—are activated by an asynchronous message called an <em>intent</em>.
+Intents bind individual components to each other at runtime (you can think of them
+as the messengers that request an action from other components), whether the component belongs
+to your application or another.</p>
+
+<p>An intent is created with an {@link android.content.Intent} object, which defines a message to
+activate either a specific component or a specific <em>type</em> of component—an intent
+can be either explicit or implicit, respectively.</p>
+
+<p>For activities and services, an intent defines the action to perform (for example, to "view" or
+"send" something) and may specify the URI of the data to act on (among other things that the
+component being started might need to know). For example, an intent might convey a request for an
+activity to show an image or to open a web page. In some cases, you can start an
+activity to receive a result, in which case, the activity also returns
+the result in an {@link android.content.Intent} (for example, you can issue an intent to let
+the user pick a personal contact and have it returned to you—the return intent includes a
+URI pointing to the chosen contact).</p>
+
+<p>For broadcast receivers, the intent simply defines the
+announcement being broadcast (for example, a broadcast to indicate the device battery is low
+includes only a known action string that indicates "battery is low").</p>
+
+<p>The other component type, content provider, is not activated by intents. Rather, it is
+activated when targeted by a request from a {@link android.content.ContentResolver}. The content
+resolver handles all direct transactions with the content provider so that the component that's
+performing transactions with the provider doesn't need to and instead calls methods on the {@link
+android.content.ContentResolver} object. This leaves a layer of abstraction between the content
+provider and the component requesting information (for security).</p>
+
+<p>There are separate methods for activiting each type of component:</p>
<ul>
-
-<li>An activity is launched (or given something new to do) by passing an
-Intent object to <code>{@link android.content.Context#startActivity
-Context.startActivity()}</code> or <code>{@link
-android.app.Activity#startActivityForResult
-Activity.startActivityForResult()}</code>. The responding activity can
-look at the initial intent that caused it to be launched by calling its
-<code>{@link android.app.Activity#getIntent getIntent()}</code> method.
-Android calls the activity's <code>{@link
-android.app.Activity#onNewIntent onNewIntent()}</code> method to pass
-it any subsequent intents.
-
-<p>
-One activity often starts the next one. If it expects a result back from
-the activity it's starting, it calls {@code startActivityForResult()}
-instead of {@code startActivity()}. For example, if it starts an activity
-that lets the user pick a photo, it might expect to be returned the chosen
-photo. The result is returned in an Intent object that's passed to the
-calling activity's <code>{@link android.app.Activity#onActivityResult
-onActivityResult()}</code> method.
-</p>
-</li>
-
-<li><p>A service is started (or new instructions are given to an ongoing
-service) by passing an Intent object to <code>{@link
-android.content.Context#startService Context.startService()}</code>.
-Android calls the service's <code>{@link android.app.Service#onStartCommand
-onStartCommand()}</code> method and passes it the Intent object.</p>
-
-<p>
-Similarly, an intent can be passed to <code>{@link
-android.content.Context#bindService Context.bindService()}</code> to
-establish an ongoing connection between the calling component and a
-target service. The service receives the Intent object in
-an <code>{@link android.app.Service#onBind onBind()}</code> call.
-(If the service is not already running, {@code bindService()} can
-optionally start it.) For example, an activity might establish a connection
-with the music playback service mentioned earlier so that it can provide
-the user with the means (a user interface) for controlling the playback.
-The activity would call {@code bindService()} to set up that connection,
-and then call methods defined by the service to affect the playback.
-</p>
-
-<p>
-A later section, <a href="#rpc">Remote procedure calls</a>, has more details
-about binding to a service.
-</p>
-</li>
-
-<li><p>An application can initiate a broadcast by passing an Intent object to
-methods like <code>{@link
-android.content.Context#sendBroadcast(Intent) Context.sendBroadcast()}</code>,
-<code>{@link android.content.Context#sendOrderedBroadcast(Intent, String)
-Context.sendOrderedBroadcast()}</code>, and <code>{@link
-android.content.Context#sendStickyBroadcast Context.sendStickyBroadcast()}</code>
-in any of their variations. Android delivers the intent to all interested
-broadcast receivers by calling their <code>{@link
-android.content.BroadcastReceiver#onReceive onReceive()}</code> methods.</p></li>
-
+ <li>You can start an activity (or give it something new to do) by
+passing an {@link android.content.Intent} to {@link android.content.Context#startActivity
+startActivity()} or {@link android.app.Activity#startActivityForResult startActivityForResult()}
+(when you want the activity to return a result).</li>
+ <li>You can start a service (or give new instructions to an ongoing service) by
+passing an {@link android.content.Intent} to {@link android.content.Context#startService
+startService()}. Or you can bind to the service by passing an {@link android.content.Intent} to
+{@link android.content.Context#bindService bindService()}.</li>
+ <li>You can initiate a broadcast by passing an {@link android.content.Intent} to methods like
+{@link android.content.Context#sendBroadcast(Intent) sendBroadcast()}, {@link
+android.content.Context#sendOrderedBroadcast(Intent, String) sendOrderedBroadcast()}, or {@link
+android.content.Context#sendStickyBroadcast sendStickyBroadcast()}.</li>
+ <li>You can perform a query to a content provider by calling {@link
+android.content.ContentProvider#query query()} on a {@link android.content.ContentResolver}.</li>
</ul>
-<p>
-For more on intent messages, see the separate article,
-<a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents
-and Intent Filters</a>.
-</p>
+<p>For more information about using intents, see the <a
+href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and
+Intent Filters</a> document. More information about activating specific components is also provided
+in the following documents: <a
+href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a>, <a
+href="{@docRoot}guide/topics/fundamentals/services.html">Services</a>, {@link
+android.content.BroadcastReceiver} and <a
+href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>.</p>
-<h3 id="endcomp">Shutting down components</h3>
+<h2 id="Manifest">The Manifest File</h2>
-<p>
-A content provider is active only while it's responding to a request from
-a ContentResolver. And a broadcast receiver is active only while it's
-responding to a broadcast message. So there's no need to explicitly shut
-down these components.
-</p>
+<p>Before the Android system can start an application component, the system must know that the
+component exists by reading the application's {@code AndroidManifest.xml} file (the "manifest"
+file). Your application must declare all its components in this file, which must be at the root of
+the application project directory.</p>
-<p>
-Activities, on the other hand, provide the user interface. They're
-in a long-running conversation with the user and may remain active,
-even when idle, as long as the conversation continues. Similarly, services
-may also remain running for a long time. So Android has methods to shut
-down activities and services in an orderly way:
-</p>
-
+<p>The manifest does a number of things in addition to declaring the application's components,
+such as:</p>
<ul>
-<li>An activity can be shut down by calling its
-<code>{@link android.app.Activity#finish finish()}</code> method. One activity can
-shut down another activity (one it started with {@code startActivityForResult()}) by
-calling <code>{@link android.app.Activity#finishActivity finishActivity()}</code>.</li>
-
-<li>A service can be stopped by calling its
-<code>{@link android.app.Service#stopSelf stopSelf()}</code> method, or by calling
-<code>{@link android.content.Context#stopService Context.stopService()}</code>.</li>
+ <li>Identify any user permissions the application requires, such as Internet access or
+read-access to the user's contacts.</li>
+ <li>Declare the minimum <a href="{@docRoot}guide/appendix/api-levels.html">API Level</a>
+required by the application, based on which APIs the application uses.</li>
+ <li>Declare hardware and software features used or required by the application, such as a camera,
+bluetooth services, or a multitouch screen.</li>
+ <li>API libraries the application needs to be linked against (other than the Android framework
+APIs), such as the <a
+href="http://code.google.com/android/add-ons/google-apis/maps-overview.html">Google Maps
+library</a>.</li>
+ <li>And more</li>
</ul>
-<p>
-Components might also be shut down by the system when they are no longer being
-used or when Android must reclaim memory for more active components. A later
-section, <a href="#lcycles">Component Lifecycles</a>, discusses this
-possibility and its ramifications in more detail.
-</p>
+<h3 id="DeclaringComponents">Declaring components</h3>
-<h3 id="manfile">The manifest file</h3>
+<p>The primary task of the manifest is to inform the system about the application's components. For
+example, a manifest file can declare an activity as follows: </p>
-<p>
-Before Android can start an application component, it must learn that
-the component exists. Therefore, applications declare their components
-in a manifest file that's bundled into the Android package, the {@code .apk}
-file that also holds the application's code, files, and resources.
-</p>
-
-<p>
-The manifest is a structured XML file and is always named AndroidManifest.xml
-for all applications. It does a number of things in addition to declaring the
-application's components, such as naming any libraries the application needs
-to be linked against (besides the default Android library) and identifying
-any permissions the application expects to be granted.
-</p>
-
-<p>
-But the principal task of the manifest is to inform Android about the application's
-components. For example, an activity might be declared as follows:
-</p>
-
-<pre><?xml version="1.0" encoding="utf-8"?>
-<manifest . . . >
- <application . . . >
- <activity android:name="com.example.project.FreneticActivity"
- android:icon="@drawable/small_pic.png"
- android:label="@string/freneticLabel"
- . . . >
+<pre>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest ... >
+ <application android:icon="@drawable/app_icon.png" ... >
+ <activity android:name="com.example.project.ExampleActivity"
+ android:label="@string/example_label" ... >
</activity>
- . . .
+ ...
</application>
</manifest></pre>
-<p>
-The {@code name} attribute of the
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-element names the {@link android.app.Activity} subclass that implements the
-activity. The {@code icon} and {@code label} attributes point to
-resource files containing an icon and label that can be displayed
-to users to represent the activity.
-</p>
+<p>In the <code><a
+href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
+element, the {@code android:icon} attribute points to resources for an icon that identifies the
+application.</p>
-<p>
-The other components are declared in a similar way —
-<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
-elements for services,
-<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>
-elements for broadcast receivers, and
-<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
-elements for content providers. Activities, services, and content providers
-that are not declared in the manifest are not visible to the system and are
-consequently never run. However, broadcast receivers can either be
-declared in the manifest, or they can be created dynamically in code
-(as {@link android.content.BroadcastReceiver} objects)
-and registered with the system by calling
-<code>{@link android.content.Context#registerReceiver Context.registerReceiver()}</code>.
-</p>
+<p>In the <code><a
+href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> element,
+the {@code android:name} attribute specifies the fully qualified class name of the {@link
+android.app.Activity} subclass and the {@code android:label} attributes specifies a string
+to use as the user-visible label for the activity.</p>
-<p>
-For more on how to structure a manifest file for your application, see
-<a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The
-AndroidManifest.xml File</a>.
+<p>You must declare all application components this way:</p>
+<ul>
+ <li><code><a
+href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> elements
+for activities</li>
+ <li><code><a
+href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> elements for
+services</li>
+ <li><code><a
+href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code> elements
+for broadcast receivers</li>
+ <li><code><a
+href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> elements
+for content providers</li>
+</ul>
+
+<p>Activities, services, and content providers that you include in your source but do not declare
+in the manifest are not visible to the system and, consequently, can never run. However,
+broadcast
+receivers can be either declared in the manifest or created dynamically in code (as
+{@link android.content.BroadcastReceiver} objects) and registered with the system by calling
+{@link android.content.Context#registerReceiver registerReceiver()}.</p>
+
+<p>For more about how to structure the manifest file for your application, see the <a
+href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a>
+documentation. </p>
+
+
+
+<h3 id="DeclaringComponentCapabilities">Declaring component capabilities</h3>
+
+<p>As discussed above, in <a href="#ActivatingComponents">Activating Components</a>, you can use an
+{@link android.content.Intent} to start activities, services, and broadcast receivers. You can do so
+by explicitly naming the target component (using the component class name) in the intent. However,
+the real power of intents lies in the concept of intent actions. With intent actions, you simply
+describe the type of action you want to perform (and optionally, the data upon which you’d like to
+perform the action) and allow the system to find a component on the device that can perform the
+action and start it. If there are multiple components that can perform the action described by the
+intent, then the user selects which one to use.</p>
+
+<p>The way the system identifies the components that can respond to an intent is by comparing the
+intent received to the <i>intent filters</i> provided in the manifest file of other applications on
+the device.</p>
+
+<p>When you declare a component in your application's manifest, you can optionally include
+intent filters that declare the capabilities of the component so it can respond to intents
+from other applications. You can declare an intent filter for your component by
+adding an <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
+<intent-filter>}</a> element as a child of the component's declaration element.</p>
+
+<p>For example, an email application with an activity for composing a new email might declare an
+intent filter in its manifest entry to respond to "send" intents (in order to send email). An
+activity in your application can then create an intent with the “send” action ({@link
+android.content.Intent#ACTION_SEND}), which the system matches to the email application’s “send”
+activity and launches it when you invoke the intent with {@link android.app.Activity#startActivity
+startActivity()}.</p>
+
+<p>For more about creating intent filters, see the <a
+href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and Intent Filters</a> document.
</p>
-<h3 id="ifilters">Intent filters</h3>
-<p>
-An Intent object can explicitly name a target component. If it does,
-Android finds that component (based on the declarations in the manifest
-file) and activates it. But if a target is not explicitly named,
-Android must locate the best component to respond to the intent.
-It does so by comparing the Intent object to the <i>intent filters</i>
-of potential targets. A component's intent filters inform Android of
-the kinds of intents the component is able to handle. Like other
-essential information about the component, they're declared in the
-manifest file. Here's an extension of the previous example that adds
-two intent filters to the activity:
-</p>
+<h3 id="DeclaringRequirements">Declaring application requirements</h3>
-<pre><?xml version="1.0" encoding="utf-8"?>
-<manifest . . . >
- <application . . . >
- <activity android:name="com.example.project.FreneticActivity"
- android:icon="@drawable/small_pic.png"
- android:label="@string/freneticLabel"
- . . . >
- <intent-filter . . . >
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- <intent-filter . . . >
- <action android:name="com.example.project.BOUNCE" />
- <data android:mimeType="image/jpeg" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
- . . .
- </application>
-</manifest></pre>
+<p>There are a variety of devices powered by Android and not all of them provide the
+same features and capabilities. In order to prevent your application from being installed on devices
+that lack features needed by your application, it's important that you clearly define a profile for
+the types of devices your application supports by declaring device and software requirements in your
+manifest file. Most of these declarations are informational only and the system does not read
+them, but external services such as Android Market do read them in order to provide filtering
+for users when they search for applications from their device.</p>
-<p>
-The first filter in the example — the combination of the action
-"{@code android.intent.action.MAIN}" and the category
-"{@code android.intent.category.LAUNCHER}" — is a common one.
-It marks the activity as one that should be represented in the
-application launcher, the screen listing applications users can launch
-on the device. In other words, the activity is the entry point for
-the application, the initial one users would see when they choose
-the application in the launcher.
-</p>
+<p>For example, if your application requires a camera and uses APIs introduced in Android 2.1 (<a
+href="{@docRoot}guide/appendix/api-levels.html">API Level</a> 7), you should declare these as
+requirements in your manifest file. That way, devices that do <em>not</em> have a camera and have an
+Android version <em>lower</em> than 2.1 cannot install your application from Android Market.</p>
-<p>
-The second filter declares an action that the activity can perform on
-a particular type of data.
-</p>
+<p>However, you can also declare that your applicaiton uses the camera, but does not
+<em>require</em> it. In that case, your application must perform a check at runtime to determine
+if the device has a camera and disable any features that use the camera if one is not available.</p>
-<p>
-A component can have any number of intent filters, each one declaring a
-different set of capabilities. If it doesn't have any filters, it can
-be activated only by intents that explicitly name the component as the
-target.
-</p>
-
-<p>
-For a broadcast receiver that's created and registered in code, the
-intent filter is instantiated directly as an {@link android.content.IntentFilter}
-object. All other filters are set up in the manifest.
-</p>
-
-<p>
-For more on intent filters, see a separate document,
-<a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents
-and Intent Filters</a>.
-</p>
-
-
-<h2 id="acttask">Activities and Tasks</h2>
-
-<p>
-As noted earlier, one activity can start another, including one defined
-in a different application. Suppose, for example, that you'd like
-to let users display a street map of some location. There's already an
-activity that can do that, so all your activity needs to do is put together
-an Intent object with the required information and pass it to
-{@code startActivity()}. The map viewer will display the map. When the user
-hits the BACK key, your activity will reappear on screen.
-</p>
-
-<p>
-To the user, it will seem as if the map viewer is part of the same application
-as your activity, even though it's defined in another application and runs in
-that application's process. Android maintains this user experience by keeping
-both activities in the same <i>task</i>. Simply put, a task is what the user
-experiences as an "application." It's a group of related activities, arranged
-in a stack. The root activity in the stack is the one that began the task
-— typically, it's an activity the user selected in the application launcher.
-The activity at the top of the stack is one that's currently running —
-the one that is the focus for user actions. When one activity starts another,
-the new activity is pushed on the stack; it becomes the running activity.
-The previous activity remains in the stack. When the user presses the BACK key,
-the current activity is popped from the stack, and the previous one resumes as
-the running activity.
-</p>
-
-<p>
-The stack contains objects, so if a task has more than one instance of the same
-Activity subclass open — multiple map viewers, for example — the
-stack has a separate entry for each instance. Activities in the stack are never
-rearranged, only pushed and popped.
-</p>
-
-<p>
-A task is a stack of activities, not a class or an element in the manifest file.
-So there's no way to set values for a task independently of its activities.
-Values for the task as a whole are set in the root activity. For example, the
-next section will talk about the "affinity of a task"; that value is read from
-the affinity set for the task's root activity.
-</p>
-
-<p>
-All the activities in a task move together as a unit. The entire task (the entire
-activity stack) can be brought to the foreground or sent to the background.
-Suppose, for instance, that the current task has four activities in its stack
-— three under the current activity. The user presses the HOME key, goes
-to the application launcher, and selects a new application (actually, a new <i>task</i>).
-The current task goes into the background and the root activity for the new task is displayed.
-Then, after a short period, the user goes back to the home screen and again selects
-the previous application (the previous task). That task, with all four
-activities in the stack, comes forward. When the user presses the BACK
-key, the screen does not display the activity the user just left (the root
-activity of the previous task). Rather, the activity on the top of the stack
-is removed and the previous activity in the same task is displayed.
-</p>
-
-<p>
-The behavior just described is the default behavior for activities and tasks.
-But there are ways to modify almost all aspects of it. The association of
-activities with tasks, and the behavior of an activity within a task, is
-controlled by the interaction between flags set in the Intent object that
-started the activity and attributes set in the activity's
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-element in the manifest. Both requester and respondent have a say in what happens.
-</p>
-
-<p>
-In this regard, the principal Intent flags are:
-
-<p style="margin-left: 2em">{@code FLAG_ACTIVITY_NEW_TASK}
-<br/>{@code FLAG_ACTIVITY_CLEAR_TOP}
-<br/>{@code FLAG_ACTIVITY_RESET_TASK_IF_NEEDED}
-<br/>{@code FLAG_ACTIVITY_SINGLE_TOP}</p>
-
-<p>
-The principal {@code <activity>} attributes are:
-
-<p style="margin-left: 2em">{@code taskAffinity}
-<br/>{@code launchMode}
-<br/>{@code allowTaskReparenting}
-<br/>{@code clearTaskOnLaunch}
-<br/>{@code alwaysRetainTaskState}
-<br/>{@code finishOnTaskLaunch}</p>
-
-<p>
-The following sections describe what some of these flags and attributes do,
-how they interact, and what considerations should govern their use.
-</p>
-
-
-<h3 id="afftask">Affinities and new tasks</h3>
-
-<p>
-By default, all the activities in an application have an <i>affinity</i> for each
-other — that is, there's a preference for them all to belong to the
-same task. However, an individual affinity can be set for each activity
-with the {@code taskAffinity} attribute of the {@code <activity>} element.
-Activities defined in different applications can share an affinity, or activities
-defined in the same application can be assigned different affinities.
-The affinity comes into play in two circumstances: When the Intent object
-that launches an activity contains the {@code FLAG_ACTIVITY_NEW_TASK} flag,
-and when an activity has its {@code allowTaskReparenting} attribute set
-to "{@code true}".
-</p>
+<p>Here are some of the important device characteristics that you should consider as you design and
+develop your application:</p>
<dl>
-<dt>The <code>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</code> flag</dt>
-<dd>As described earlier, a new activity is, by default, launched into
-the task of the activity that called {@code startActivity()}. It's pushed
- onto the same stack as the caller. However, if the Intent object passed
-to {@code startActivity()} contains the {@code FLAG_ACTIVITY_NEW_TASK}
-flag, the system looks for a different task to house the new activity.
-Often, as the name of the flag implies, it's a new task. However, it
-doesn't have to be. If there's already an existing task with the same
-affinity as the new activity, the activity is launched into that task. If
-not, it begins a new task.</dd>
+ <dt>Screen size and density</dt>
+ <dd>In order to categorize devices by their screen type, Android defines two characteristics for
+each device: screen size (the physical dimensions of the screen) and screen density (the physical
+density of the pixels on the screen, or dpi—dots per inch). To simplify all the different
+types of screen configurations, the Android system generalizes them into select groups that make
+them easier to target.
+<p>The screen sizes are: small, normal, large, and extra large.<br/>
+The screen densities are: low density, medium density, high density, and extra high density.</p>
-<dt>The <code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html#reparent">allowTaskReparenting</a></code>
-attribute</dt>
-<dd>If an activity has its {@code allowTaskReparenting} attribute set
-to "{@code true}", it can move from the task it starts in to the task
-it has an affinity for when that task comes to the fore. For example,
-suppose that an activity that reports weather conditions in selected
-cities is defined as part of a travel application. It has the same
-affinity as other activities in the same application (the default
-affinity) and it allows reparenting. One of your activities
-starts the weather reporter, so it initially belongs to the same task as
-your activity. However, when the travel application next comes forward,
-the weather reporter will be reassigned to and displayed with that task.</dd>
+<p>By default, your application is compatible with all screen sizes and densities,
+because the Android system makes the appropriate adjustments to your UI layout and image
+resources. However, you should create specialized layouts for certain screen sizes and provide
+specialized images for certain densities, using alternative layout resources, and by declaring in
+your manifest exactly which screen sizes your application supports with the <a
+href="{@docRoot}guide/topics/manifest/supports-screens.html">{@code
+<supports-screens>}</a> element.</p>
+<p>For more information, see the <a
+href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>
+document.</p></dd>
+
+ <dt>Input configurations</dt>
+ <dd>Many devices provide a different type of user input mechanism, such as a hardware keyboard, a
+trackball, or a five-way navigation pad. If your application requires a particular kind of input
+hardware, then you should declare it in your manifest with the <a
+href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">{@code
+<uses-configuration>}</a> element. However, it is rare that an application should require
+a certain input configuration.</dd>
+
+ <dt>Device features</dt>
+ <dd>There are many hardware and software features that may or may not exist on a given
+Android-powered device, such as a camera, a light sensor, bluetooth, a certain
+version of OpenGL, or the fidelity of the touchscreen. You should never assume that a certain
+feature is available on all Android-powered devices (other than the availability of the standard
+Android library), so you should declare any features used by your application with the <a
+href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a>
+element.</dd>
+
+ <dt>Platform Version</dt>
+ <dd>Different Android-powered devices often run different versions of the Android platform,
+such as Android 1.6 or Android 2.3. Each successive version often includes additional APIs not
+available in the previous version. In order to indicate which set of APIs are available, each
+platform version specifies an <a
+href="{@docRoot}guide/appendix/api-levels.html">API Level</a> (for example, Android 1.0 is API Level
+1 and Android 2.3 is API Level 9). If you use any APIs that were added to the platform after
+version 1.0, you should declare the minimum API Level in which those APIs were introduced using the
+<a href="{@docRoot}guide/topics/manifest/uses-sdk.html">{@code <uses-sdk>}</a> element.</dd>
</dl>
-<p>
-If an {@code .apk} file contains more than one "application"
-from the user's point of view, you will probably want to assign different
-affinities to the activities associated with each of them.
-</p>
+<p>It's important that you declare all such requirements for your application, because, when you
+distribute your application on Android Market, Market uses these declarations to filter which
+applications are available on each device. As such, your application should be available only to
+devices that meet all your application requirements.</p>
+<p>For more information about how Android Market filters applications based on these (and other)
+requirements, see the <a href="{@docRoot}guide/appendix/market-filters.html">Market Filters</a>
+document.</p>
-<h3 id="lmodes">Launch modes</h3>
-<p>
-There are four different launch modes that can be assigned to an {@code
-<activity>} element's
-<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">launchMode</a></code>
-attribute:
-</p>
-<p style="margin-left: 2em">"{@code standard}" (the default mode)
-<br>"{@code singleTop}"
-<br>"{@code singleTask}"
-<br>"{@code singleInstance}"</p>
+<h2 id="Resources">Application Resources</h2>
-<p>
-The modes differ from each other on these four points:
-</p>
+<p>An Android application is composed of more than just code—it requires resources that are
+separate from the source code, such as images, audio files, and anything relating to the visual
+presentation of the application. For example, you should define animations, menus, styles, colors,
+and the layout of activity user interfaces with XML files. Using application resources makes it easy
+to update various characteristics of your application without modifying code and—by providing
+sets of alternative resources—enables you to optimize your application for a variety of
+device configurations (such as different languages and screen sizes).</p>
-<ul>
+<p>For every resource that you include in your Android project, the SDK build tools define a unique
+integer ID, which you can use to reference the resource from your application code or from
+other resources defined in XML. For example, if your application contains an image file named {@code
+logo.png} (saved in the {@code res/drawable/} directory), the SDK tools generate a resource ID
+named {@code R.drawable.logo}, which you can use to reference the image and insert it in your
+user interface.</p>
-<li><b>Which task will hold the activity that responds to the intent</b>.
-For the "{@code standard}" and "{@code singleTop}" modes, it's the task that
-originated the intent (and called
-<code>{@link android.content.Context#startActivity startActivity()}</code>)
-— unless the Intent object contains the
-<code>{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK}</code> flag.
-In that case, a different task is chosen as described in the previous
-section, <a href="#afftask">Affinities and new tasks</a>.
+<p>One of the most important aspects of providing resources separate from your source code
+is the ability for you to provide alternative resources for different device
+configurations. For example, by defining UI strings in XML, you can translate the strings into other
+languages and save those strings in separate files. Then, based on a language <em>qualifier</em>
+that you append to the resource directory's name (such as {@code res/values-fr/} for French string
+values) and the user's language setting, the Android system applies the appropriate language strings
+to your UI.</p>
-<p>
-In contrast, the "{@code singleTask}" and "{@code singleInstance}" modes mark
-activities that are always at the root of a task. They define a task; they're
-never launched into another task.
-</p>
+<p>Android supports many different <em>qualifiers</em> for your alternative resources. The
+qualifier is a short string that you include in the name of your resource directories in order to
+define the device configuration for which those resources should be used. As another
+example, you should often create different layouts for your activities, depending on the
+device's screen orientation and size. For example, when the device screen is in portrait
+orientation (tall), you might want a layout with buttons to be vertical, but when the screen is in
+landscape orientation (wide), the buttons should be aligned horizontally. To change the layout
+depending on the orientation, you can define two different layouts and apply the appropriate
+qualifier to each layout's directory name. Then, the system automatically applies the appropriate
+layout depending on the current device orientation.</p>
-<li><p><b>Whether there can be multiple instances of the activity</b>.
-A "{@code standard}" or "{@code singleTop}" activity can be instantiated
-many times. They can belong to multiple tasks, and a given task can have
-multiple instances of the same activity.
-</p>
+<p>For more about the different kinds of resources you can include in your application and how
+to create alternative resources for various device configurations, see the <a
+href="{@docRoot}guide/topics/resources/index.html">Application Resources</a> developer guide.</p>
-<p>
-In contrast, "{@code singleTask}" and "{@code singleInstance}" activities
-are limited to just one instance. Since these activities are at the root
-of a task, this limitation means that there is never more than a single
-instance of the task on the device at one time.
-</p>
-<li><p><b>Whether the instance can have other activities in its task</b>.
-A "{@code singleInstance}" activity stands alone as the only activity in its
-task. If it starts another activity, that activity will be launched into a
-different task regardless of its launch mode — as if {@code
-FLAG_ACTIVITY_NEW_TASK} was in the intent. In all other respects, the
-"{@code singleInstance}" mode is identical to "{@code singleTask}".</p>
+<h2>Beginner's Path</h2>
-<p>
-The other three modes permit multiple activities to belong to the task.
-A "{@code singleTask}" activity will always be the root activity of the task,
-but it can start other activities that will be assigned to its
-task. Instances of "{@code standard}" and "{@code singleTop}"
-activities can appear anywhere in a stack.
-</p></li>
-
-<li><b>Whether a new instance of the class will be launched
-to handle a new intent</b>. For the default "{@code standard}" mode, a
-new instance is created to respond to every new intent. Each instance
-handles just one intent. For the "{@code singleTop}" mode, an existing
-instance of the class is re-used to handle a new intent if it resides
-at the top of the activity stack of the target task. If it does not
-reside at the top, it is not re-used. Instead, a new instance
-is created for the new intent and pushed on the stack.
-
-<p>
-For example, suppose a task's activity stack consists of root activity A with
-activities B, C, and D on top in that order, so the stack is A-B-C-D. An intent
-arrives for an activity of type D. If D has the default "{@code standard}" launch
-mode, a new instance of the class is launched and the stack becomes A-B-C-D-D.
-However, if D's launch mode is "{@code singleTop}", the existing instance is
-expected to handle the new intent (since it's at the top of the stack) and the
-stack remains A-B-C-D.
-</p>
-
-<p>
-If, on the other hand, the arriving intent is for an activity of type B, a new
-instance of B would be launched no matter whether B's mode is "{@code standard}"
-or "{@code singleTop}" (since B is not at the top of the stack), so the resulting
-stack would be A-B-C-D-B.
-</p>
-
-<p>
-As noted above, there's never more than one instance of a "{@code singleTask}"
-or "{@code singleInstance}" activity, so that instance is expected to handle
-all new intents. A "{@code singleInstance}" activity is always at the top of
-the stack (since it is the only activity in the task), so it is always in
-position to handle the intent. However, a "{@code singleTask}" activity may
-or may not have other activities above it in the stack. If it does, it is not
-in position to handle the intent, and the intent is dropped. (Even though the
-intent is dropped, its arrival would have caused the task to come to the
-foreground, where it would remain.)
-</p>
-</li>
-
-</ul>
-
-<p>
-When an existing activity is asked to handle a new intent, the Intent
-object is passed to the activity in an
-<code>{@link android.app.Activity#onNewIntent onNewIntent()}</code> call.
-(The intent object that originally started the activity can be retrieved by
-calling <code>{@link android.app.Activity#getIntent getIntent()}</code>.)
-</p>
-
-<p>
-Note that when a new instance of an Activity is created to handle a new
-intent, the user can always press the BACK key to return to the previous state
-(to the previous activity). But when an existing instance of an
-Activity handles a new intent, the user cannot press the BACK key to
-return to what that instance was doing before the new intent arrived.
-</p>
-
-<p>
-For more on launch modes, see the description of the <code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html#lmode"><activity></a></code>
-element.
-</p>
-
-
-<h3 id="clearstack">Clearing the stack</h3>
-
-<p>
-If the user leaves a task for a long time, the system clears the task of all
-activities except the root activity. When the user returns to the task again,
-it's as the user left it, except that only the initial activity is present.
-The idea is that, after
-a time, users will likely have abandoned what they were doing before and are
-returning to the task to begin something new.
-</p>
-
-<p>
-That's the default. There are some activity attributes that can be used to
-control this behavior and modify it:
-</p>
-
-<dl>
-<dt>The <code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html#always">alwaysRetainTaskState</a></code>
-attribute</dt>
-<dd>If this attribute is set to "{@code true}" in the root activity of a task,
-the default behavior just described does not happen.
-The task retains all activities in its stack even after a long period.</dd>
-
-<dt>The <code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html#clear">clearTaskOnLaunch</a></code>
-attribute</dt>
-<dd>If this attribute is set to "{@code true}" in the root activity of a task,
-the stack is cleared down to the root activity whenever the user leaves the task
-and returns to it. In other words, it's the polar opposite of
-{@code alwaysRetainTaskState}. The user always returns to the task in its
-initial state, even after a momentary absence.</dd>
-
-<dt>The <code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html#finish">finishOnTaskLaunch</a></code>
-attribute</dt>
-<dd>This attribute is like {@code clearTaskOnLaunch}, but it operates on a
-single activity, not an entire task. And it can cause any activity to go
-away, including the root activity. When it's set to "{@code true}", the
-activity remains part of the task only for the current session. If the user
-leaves and then returns to the task, it no longer is present.</dd>
-</dl>
-
-<p>
-There's another way to force activities to be removed from the stack.
-If an Intent object includes the <code>{@link
-android.content.Intent#FLAG_ACTIVITY_CLEAR_TOP FLAG_ACTIVITY_CLEAR_TOP}</code>
-flag, and the target task already has an instance of the type of activity that
-should handle the intent in its stack, all activities above that instance
-are cleared away so that it stands at the top of the stack and can respond
-to the intent.
-If the launch mode of the designated activity is "{@code standard}", it too
-will be removed from the stack, and a new instance will be launched to handle
-the incoming intent. That's because a new instance is always created for
-a new intent when the launch mode is "{@code standard}".
-</p>
-
-<p>
-{@code FLAG_ACTIVITY_CLEAR_TOP} is most often used in conjunction
-with {@code FLAG_ACTIVITY_NEW_TASK}. When used together, these flags are
-a way of locating an existing activity in another task and putting it in
-a position where it can respond to the intent.
-</p>
-
-
-<h3 id="starttask">Starting tasks</h3>
-
-<p>
-An activity is set up as the entry point for a task by giving it
-an intent filter with "{@code android.intent.action.MAIN}" as the
-specified action and "{@code android.intent.category.LAUNCHER}" as
-the specified category. (There's an example of this type of filter
-in the earlier <a href="#ifilters">Intent Filters</a> section.)
-A filter of this kind causes an icon and label for the activity to be
-displayed in the application launcher, giving users a way both to
-launch the task and to return to it at any time after it has been
-launched.
-</p>
-
-<p>
-This second ability is important: Users must be able to leave a task
-and then come back to it later. For this reason, the two launch modes
-that mark activities as always initiating a task, "{@code singleTask}"
-and "{@code singleInstance}", should be used only when the activity has
-a {@code MAIN} and {@code LAUNCHER} filter.
-Imagine, for example, what could happen if the filter is missing:
-An intent launches a "{@code singleTask}" activity, initiating a new task,
-and the user spends some time working in that task. The user then presses
-the HOME key. The task is now ordered behind and obscured by the home
-screen. And, because it is not represented in the application launcher,
-the user has no way to return to it.
-</p>
-
-<p>
-A similar difficulty attends the {@code FLAG_ACTIVITY_NEW_TASK} flag.
-If this flag causes an activity to
-begin a new task and the user presses the HOME key to leave it, there
-must be some way for the user to navigate back to it again. Some
-entities (such as the notification manager) always start activities
-in an external task, never as part of their own, so they always put
-{@code FLAG_ACTIVITY_NEW_TASK} in the intents they pass to
-{@code startActivity()}. If you have an activity that can be invoked
-by an external entity that might use this flag, take care that the user
-has a independent way to get back to the task that's started.
-</p>
-
-<p>
-For those cases where you don't want the user to be able to return
-to an activity, set the {@code <activity>} element's {@code
-finishOnTaskLaunch} to "{@code true}".
-See <a href="#clearstack">Clearing the stack</a>, earlier.
-</p>
-
-
-<h3 id="commonpatterns">Common patterns</h3>
-
-<p>
-In most cases an application won't use any flags or special features.
-This gives the standard interaction the user expects: launching the application
-brings any existing task to the foreground, or starts the main activity in
-a new task if there isn't one.
-</p>
-
-<p>
-If an application posts notifications, it needs to decide how the user's
-selection of a notification should impact any currently running task. The
-current suggested behavior is that any current tasks be completely removed,
-replaced with a new task containing a stack of activities representing where
-the user is jumping in to the app. This can be accomplished with a combination
-of the {@link android.app.PendingIntent#getActivities PendingIntent.getActivities()}
-method and {@link android.content.Intent#FLAG_ACTIVITY_CLEAR_TASK Intent.FLAG_ACTIVITY_CLEAR_TASK}.
-</p>
-
-<p>
-For example, here is sample code to build an array of Intents to launch an
-application into an activity three levels deep. The first Intent is always
-the main Intent of the application as started by the launcher. The exact
-details of the Intent data will of course depend on your application.
-</p>
-
-{@sample development/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
- intent_array}
-
-<p>
-In some cases an application may not want to directly launch its application
-from a notification, but instead go to a intermediate summary activity. To
-accomplish this, the summary activity should be given a task affinity that
-is different from the main application (one will typically give it no affinity,
-that is "") so that it does not get launched into any existing application task.
-</p>
-
-{@sample development/samples/ApiDemos/AndroidManifest.xml no_task_affinity}
-
-<p>
-The PendingIntent to launch this then does not need to supply anything special:
-</p>
-
-{@sample development/samples/ApiDemos/src/com/example/android/apis/app/IncomingMessage.java
- pending_intent}
-
-<p>
-If an application implements an app widget, it should generally use the same
-approach as the first one for notifications: when the user taps on the app
-widget it should throw away any current task of the application and start a
-new task with potentially multiple activities representing the state the
-user is jumping in to.
-</p>
-
-<h2 id="procthread">Processes and Threads</h2>
-
-<p>
-When the first of an application's components needs to be run, Android
-starts a Linux process for it with a single thread of execution. By default,
-all components of the application run in that process and thread.
-</p>
-
-<p>
-However, you can arrange for components to run in other processes, and you
-can spawn additional threads for any process.
-</p>
-
-
-<h3 id="procs">Processes</h3>
-
-<p>
-The process where a component runs is controlled by the manifest file.
-The component elements — {@code <activity>},
-{@code <service>}, {@code <receiver>}, and {@code <provider>}
-— each have a {@code process} attribute that can specify a process
-where that component should run. These attributes can be set so that each
-component runs in its own process, or so that some components share a process
-while others do not. They can also be set so that components of
-different applications run in the same process — provided that the
-applications share the same Linux user ID and are signed by the same authorities.
-The {@code <application>} element also has a {@code process} attribute,
-for setting a default value that applies to all components.
-</p>
-
-<p>
-All components are instantiated in the main thread of the specified
-process, and system calls to the component are dispatched from that
-thread. Separate threads are not created for each instance. Consequently,
-methods that respond to those calls — methods like
-<code>{@link android.view.View#onKeyDown View.onKeyDown()}</code> that report
-user actions and the lifecycle notifications discussed later in the
-<a href="#lcycles">Component Lifecycles</a> section — always run in the
-main thread of the process. This means
-that no component should perform long or blocking operations (such as networking
-operations or computation loops) when called by the system, since this will block
-any other components also in the process. You can spawn separate threads for
-long operations, as discussed under <a href="#threads">Threads</a>, next.
-</p>
-
-<p>
-Android may decide to shut down a process at some point, when memory is
-low and required by other processes that are more immediately serving
-the user. Application components running in the process are consequently
-destroyed. A process is restarted for those components when there's again
-work for them to do.
-</p>
-
-<p>
-When deciding which processes to terminate, Android weighs their relative
-importance to the user. For example, it more readily shuts down a process
-with activities that are no longer visible on screen than a process with
-visible activities.
-The decision whether to terminate a process, therefore, depends on the state
-of the components running in that process. Those states are the subject of
-a later section, <a href="#lcycles">Component Lifecycles</a>.
-</p>
-
-
-<h3 id="threads">Threads</h3>
-
-<p>
-Even though you may confine your application to a single process, there will
-likely be times when you will need to spawn a thread to do some background
-work. Since the user interface must always be quick to respond to user actions,
-the thread that hosts an activity should not also host time-consuming operations
-like network downloads. Anything that may not be completed quickly should be
-assigned to a different thread.
-</p>
-
-<p>
-Threads are created in code using standard Java {@link java.lang.Thread}
-objects. Android provides a number of convenience classes for managing
-threads — {@link android.os.Looper} for running a message loop within
-a thread, {@link android.os.Handler} for processing messages, and
-{@link android.os.HandlerThread} for setting up a thread with a message loop.
-</p>
-
-
-<h3 id="rpc">Remote procedure calls</h3>
-
-<p>
-Android has a lightweight mechanism for remote procedure calls (RPCs)
-— where a method is called locally, but executed remotely (in another
-process), with any result returned back to the caller.
-This entails decomposing the method call and all its attendant data to a
-level the operating system can understand, transmitting it from the local
-process and address space to the remote process and address space, and
-reassembling and reenacting the call there. Return values have to be
-transmitted in the opposite direction. Android provides all the code
-to do that work, so that you can concentrate on defining and implementing
-the RPC interface itself.
-</p>
-
-<p>
-An RPC interface can include only methods. By default,
-all methods are executed synchronously (the local method blocks until the
-remote method finishes), even if there is no return value.
-</p>
-
-<p>
-In brief, the mechanism works as follows: You'd begin by declaring the
-RPC interface you want to implement using a simple IDL (interface definition
-language). From that declaration, the
-<code><a href="{@docRoot}guide/developing/tools/aidl.html">aidl</a></code>
-tool generates a Java interface definition that must be made available to
-both the local and the remote process. It contains two inner class, as shown
-in the following diagram:
-</p>
-
-<p style="margin-left: 2em">
-<img src="{@docRoot}images/binder_rpc.png" alt="RPC mechanism." />
-</p>
-
-<p>
-The inner classes have all the code needed to administer remote procedure
-calls for the interface you declared with the IDL.
-Both inner classes implement the {@link android.os.IBinder}
-interface. One of them is used locally and internally by the system;
-the code you write can ignore it.
-The other, called Stub, extends the {@link android.os.Binder}
-class. In addition to internal code for effectuating the IPC calls, it
-contains declarations for the methods in the RPC interface you declared.
-You would subclass Stub to implement those methods, as indicated in the
-diagram.
-</p>
-
-<p>
-Typically, the remote process would be managed by a service (because a
-service can inform the system about the process and its connections to
-other processes). It would have both the interface file generated by
-the {@code aidl} tool and the Stub subclass implementing the
-RPC methods. Clients of the service would have only the interface file
-generated by the {@code aidl} tool.
-</p>
-
-<p>
-Here's how a connection between a service and its clients is set up:
-</p>
-
-<ul>
-<li>Clients of the service (on the local side) would implement
-<code>{@link android.content.ServiceConnection#onServiceConnected
-onServiceConnected()}</code> and
-<code>{@link android.content.ServiceConnection#onServiceDisconnected
-onServiceDisconnected()}</code> methods so they can be notified
-when a successful connection to the remote service is established, and
-when it goes away. They would then call
-<code>{@link android.content.Context#bindService bindService()}</code>
-to set up the connection.
-</li>
-
-<li>
-The service's <code>{@link android.app.Service#onBind onBind()}</code>
-method would be implemented to either accept or reject the connection,
-depending on the intent it receives (the intent passed to
-{@code bindService()}). If the connection is accepted, it returns
-an instance of the Stub subclass.
-</li>
-
-<li>If the service accepts the connection, Android calls the
-client's {@code onServiceConnected()} method and passes it an IBinder
-object, a proxy for the Stub subclass managed by the service. Through
-the proxy, the client can make calls on the remote service.
-</li>
-</ul>
-
-<p>
-This brief description omits some details of the RPC mechanism. For more
-information, see
-<a href="{@docRoot}guide/developing/tools/aidl.html">Designing a Remote
-Interface Using AIDL</a> and the {@link android.os.IBinder IBinder} class
-description.
-</p>
-
-
-<h3 id="tsafe">Thread-safe methods</h3>
-
-<p>
-In a few contexts, the methods you implement may be called from more
-than one thread, and therefore must be written to be thread-safe.
-</p>
-
-<p>
-This is primarily true for methods that can be called remotely —
-as in the RPC mechanism discussed in the previous section.
-When a call on a method implemented in an IBinder object originates
-in the same process as the IBinder, the method is executed in the
-caller's thread. However, when the call originates in another process,
-the method is executed in a thread chosen from a pool of threads that
-Android maintains in the same process as the IBinder; it's not executed
-in the main thread of the process. For example, whereas a service's
-{@code onBind()} method would be called from the main thread of the
-service's process, methods implemented in the object that {@code onBind()}
-returns (for example, a Stub subclass that implements RPC methods) would
-be called from threads in the pool.
-Since services can have more than one client, more than one pool thread
-can engage the same IBinder method at the same time. IBinder methods
-must, therefore, be implemented to be thread-safe.
-</p>
-
-<p>
-Similarly, a content provider can receive data requests that originate in
-other processes. Although the ContentResolver and ContentProvider classes
-hide the details of how the interprocess communication is managed,
-ContentProvider methods that respond to those requests — the methods
-<code>{@link android.content.ContentProvider#query query()}</code>,
-<code>{@link android.content.ContentProvider#insert insert()}</code>,
-<code>{@link android.content.ContentProvider#delete delete()}</code>,
-<code>{@link android.content.ContentProvider#update update()}</code>, and
-<code>{@link android.content.ContentProvider#getType getType()}</code>
-— are called from a pool of threads in the content provider's
-process, not the main thread of the process. Since these methods
-may be called from any number of threads at the same time, they too must
-be implemented to be thread-safe.
-</p>
-
-
-<h2 id="lcycles">Component Lifecycles</h2>
-
-<p>
-Application components have a lifecycle — a beginning when
-Android instantiates them to respond to intents through to an end when
-the instances are destroyed. In between, they may sometimes be active
-or inactive,or, in the case of activities, visible to the user or
-invisible. This section discusses the lifecycles of activities,
-services, and broadcast receivers — including the states that they
-can be in during their lifetimes, the methods that notify you of transitions
-between states, and the effect of those states on the possibility that
-the process hosting them might be terminated and the instances destroyed.
-</p>
-
-
-<h3 id="actlife">Activity lifecycle</h3>
-
-<p>An activity has essentially three states:</p>
-
-<ul>
-<li> It is <em>active</em> or <em>running</em> when it is in the foreground of the
-screen (at the top of the activity stack for the current task). This is the
-activity that is the focus for the user's actions.</li>
-
-<li><p>It is <em>paused</em> if it has lost focus but is still visible to the user.
-That is, another activity lies on top of it and that activity either is transparent
-or doesn't cover the full screen, so some of the paused activity can show through.
-A paused activity is completely alive (it maintains all state and member information
-and remains attached to the window manager), but can be killed by the system in
-extreme low memory situations.</p></li>
-
-<li><p>It is <em>stopped</em> if it is completely obscured by another activity.
-It still retains all state and member information. However, it is no longer
-visible to the user so its window is hidden and it will often be killed by the
-system when memory is needed elsewhere.</p></li>
-</ul>
-
-<p>
-If an activity is paused or stopped, the system can drop it from memory either
-by asking it to finish (calling its {@link android.app.Activity#finish finish()}
-method), or simply killing its process. When it is displayed again
-to the user, it must be completely restarted and restored to its previous state.
-</p>
-
-<p>
-As an activity transitions from state to state, it is notified of the change
-by calls to the following protected methods:
-</p>
-
-<p style="margin-left: 2em">{@code void onCreate(Bundle <i>savedInstanceState</i>)}
-<br/>{@code void onStart()}
-<br/>{@code void onRestart()}
-<br/>{@code void onResume()}
-<br/>{@code void onPause()}
-<br/>{@code void onStop()}
-<br/>{@code void onDestroy()}</p>
-
-<p>
-All of these methods are hooks that you can override to do appropriate work
-when the state changes. All activities must implement
-<code>{@link android.app.Activity#onCreate onCreate()}</code> to do the
-initial setup when the object is first instantiated.
-Many will also implement <code>{@link android.app.Activity#onPause onPause()}</code>
-to commit data changes and otherwise prepare to stop interacting with the user.
-</p>
-
-<div class="sidebox-wrapper">
-<div class="sidebox">
-<h2>Calling into the superclass</h2>
-<p>
-An implementation of any activity lifecycle method should always first
-call the superclass version. For example:
-</p>
-
-<pre>protected void onPause() {
- super.onPause();
- . . .
-}</pre>
-</div>
-</div>
-
-
-<p>
-Taken together, these seven methods define the entire lifecycle of an
-activity. There are three nested loops that you can monitor by
-implementing them:
-</p>
-
-<ul>
-<li>The <b>entire lifetime</b> of an activity happens between the first call
-to <code>{@link android.app.Activity#onCreate onCreate()}</code> through to a
-single final call to <code>{@link android.app.Activity#onDestroy}</code>.
-An activity does all its initial setup of "global" state in {@code onCreate()},
-and releases all remaining resources in {@code onDestroy()}. For example,
-if it has a thread running in the background to download data from the network,
-it may create that thread in {@code onCreate()} and then stop the thread in
-{@code onDestroy()}.</li>
-
-<li><p>The <b>visible lifetime</b> of an activity happens between a call to
-<code>{@link android.app.Activity#onStart onStart()}</code> until a
-corresponding call to <code>{@link android.app.Activity#onStop onStop()}</code>.
-During this time, the user can see the activity on-screen, though it may not
-be in the foreground and interacting with the user. Between these two methods,
-you can maintain resources that are needed to show the activity to the user.
-For example, you can register a {@link android.content.BroadcastReceiver} in
-{@code onStart()} to monitor for changes that impact your UI, and unregister
-it in {@code onStop()} when the user can no longer see what you are displaying.
-The {@code onStart()} and {@code onStop()} methods can be called multiple times,
-as the activity alternates between being visible and hidden to the user.</p></li>
-
-<li><p>The <b>foreground lifetime</b> of an activity happens between a call
-to <code>{@link android.app.Activity#onResume onResume()}</code> until a
-corresponding call to <code>{@link android.app.Activity#onPause onPause()}</code>.
-During this time, the activity is in front of all other activities on screen and
-is interacting with the user. An activity can frequently transition between the
-resumed and paused states — for example, {@code onPause()} is called when
-the device goes to sleep or when a new activity is started, {@code onResume()}
-is called when an activity result or a new intent is delivered. Therefore, the
-code in these two methods should be fairly lightweight.</p></li>
-</ul>
-
-<p>
-The following diagram illustrates these loops and the paths an activity
-may take between states. The colored ovals are major states the activity
-can be in. The square rectangles represent the callback methods you can implement
-to perform operations when the activity transitions between states.
-<p>
-
-<p style="margin-left: 2em"><img src="{@docRoot}images/activity_lifecycle.png"
-alt="State diagram for an Android activity lifecycle." /></p>
-
-<p>
-The following table describes each of these methods in more detail and
-locates it within the activity's overall lifecycle:
-</p>
-
-<table border="2" width="85%" frame="hsides" rules="rows">
-<colgroup align="left" span="3"></colgroup>
-<colgroup align="left"></colgroup>
-<colgroup align="center"></colgroup>
-<colgroup align="center"></colgroup>
-
-<thead>
-<tr><th colspan="3">Method</th> <th>Description</th> <th>Killable?</th> <th>Next</th></tr>
-</thead>
-
-<tbody>
-<tr>
- <td colspan="3" align="left"><code>{@link android.app.Activity#onCreate onCreate()}</code></td>
- <td>Called when the activity is first created.
- This is where you should do all of your normal static set up —
- create views, bind data to lists, and so on. This method is passed
- a Bundle object containing the activity's previous state, if that
- state was captured (see <a href="#actstate">Saving Activity State</a>,
- later).
- <p>Always followed by {@code onStart()}.</p></td>
- <td align="center">No</td>
- <td align="center">{@code onStart()}</td>
-</tr>
-
-<tr>
- <td rowspan="5" style="border-left: none; border-right: none;"> </td>
- <td colspan="2" align="left"><code>{@link android.app.Activity#onRestart
-onRestart()}</code></td>
- <td>Called after the activity has been stopped, just prior to it being
- started again.
- <p>Always followed by {@code onStart()}</p></td>
- <td align="center">No</td>
- <td align="center">{@code onStart()}</td>
-</tr>
-
-<tr>
- <td colspan="2" align="left"><code>{@link android.app.Activity#onStart onStart()}</code></td>
- <td>Called just before the activity becomes visible to the user.
- <p>Followed by {@code onResume()} if the activity comes
- to the foreground, or {@code onStop()} if it becomes hidden.</p></td>
- <td align="center">No</td>
- <td align="center">{@code onResume()} <br/>or<br/> {@code onStop()}</td>
-</tr>
-
-<tr>
- <td rowspan="2" style="border-left: none;"> </td>
- <td align="left"><code>{@link android.app.Activity#onResume onResume()}</code></td>
- <td>Called just before the activity starts
- interacting with the user. At this point the activity is at
- the top of the activity stack, with user input going to it.
- <p>Always followed by {@code onPause()}.</p></td>
- <td align="center">No</td>
- <td align="center">{@code onPause()}</td>
-</tr>
-
-<tr>
- <td align="left"><code>{@link android.app.Activity#onPause onPause()}</code></td>
- <td>Called when the system is about to start resuming another
- activity. This method is typically used to commit unsaved changes to
- persistent data, stop animations and other things that may be consuming
- CPU, and so on. It should do whatever it does very quickly, because
- the next activity will not be resumed until it returns.
- <p>Followed either by {@code onResume()} if the activity
- returns back to the front, or by {@code onStop()} if it becomes
- invisible to the user.</td>
- <td align="center"><strong style="color:#800000">Yes</strong></td>
- <td align="center">{@code onResume()} <br/>or<br/> {@code onStop()}</td>
-</tr>
-
-<tr>
- <td colspan="2" align="left"><code>{@link android.app.Activity#onStop onStop()}</code></td>
- <td>Called when the activity is no longer visible to the user. This
- may happen because it is being destroyed, or because another activity
- (either an existing one or a new one) has been resumed and is covering it.
- <p>Followed either by {@code onRestart()} if
- the activity is coming back to interact with the user, or by
- {@code onDestroy()} if this activity is going away.</p></td>
- <td align="center"><strong style="color:#800000">Yes</strong></td>
- <td align="center">{@code onRestart()} <br/>or<br/> {@code onDestroy()}</td>
-</tr>
-
-<tr>
- <td colspan="3" align="left"><code>{@link android.app.Activity#onDestroy
-onDestroy()}</code></td>
- <td>Called before the activity is destroyed. This is the final call
- that the activity will receive. It could be called either because the
- activity is finishing (someone called <code>{@link android.app.Activity#finish
- finish()}</code> on it), or because the system is temporarily destroying this
- instance of the activity to save space. You can distinguish
- between these two scenarios with the <code>{@link
- android.app.Activity#isFinishing isFinishing()}</code> method.</td>
- <td align="center"><strong style="color:#800000">Yes</strong></td>
- <td align="center"><em>nothing</em></td>
-</tr>
-</tbody>
-</table>
-
-<p>
-Note the <b>Killable</b> column in the table above. It indicates
-whether or not the system can kill the process hosting the activity
-<em>at any time after the method returns, without executing another
-line of the activity's code</em>. Three methods ({@code onPause()},
-{@code onStop()}, and {@code onDestroy()}) are marked "Yes." Because
-{@code onPause()} is the first of the three, it's the only one that's
-guaranteed to be called before the process is killed —
-{@code onStop()} and {@code onDestroy()} may not be. Therefore, you
-should use {@code onPause()} to write any persistent data (such as user
-edits) to storage.
-</p>
-
-<p>
-Methods that are marked "No" in the <b>Killable</b> column protect the
-process hosting the activity from being killed from the moment they are
-called. Thus an activity is in a killable state, for example, from the
-time {@code onPause()} returns to the time {@code onResume()} is called.
-It will not again be killable until {@code onPause()} again returns.
-</p>
-
-<p>
-As noted in a later section, <a href="#proclife">Processes and lifecycle</a>,
-an activity that's not technically "killable" by this definition might
-still be killed by the system — but that would happen only in
-extreme and dire circumstances when there is no other recourse.
-</p>
-
-
-<h4 id="actstate">Saving activity state</h4>
-
-<p>
-When the system, rather than the user, shuts down an activity to conserve
-memory, the user may expect to return to the activity and find it in its
-previous state.
-</p>
-
-<p>
-To capture that state before the activity is killed, you can implement
-an <code>{@link android.app.Activity#onSaveInstanceState
-onSaveInstanceState()}</code> method for the activity. Android calls this
-method before making the activity vulnerable to being destroyed —
-that is, before {@code onPause()} is called. It
-passes the method a {@link android.os.Bundle} object where you can record
-the dynamic state of the activity as name-value pairs. When the activity is
-again started, the Bundle is passed both to {@code onCreate()} and to a
-method that's called after {@code onStart()}, <code>{@link
-android.app.Activity#onRestoreInstanceState onRestoreInstanceState()}</code>,
-so that either or both of them can recreate the captured state.
-</p>
-
-<p>
-Unlike {@code onPause()} and the other methods discussed earlier,
-{@code onSaveInstanceState()} and {@code onRestoreInstanceState()} are
-not lifecycle methods. They are not always called. For example, Android
-calls {@code onSaveInstanceState()} before the activity becomes
-vulnerable to being destroyed by the system, but does not bother
-calling it when the instance is actually being destroyed by a user action
-(such as pressing the BACK key). In that case, the user won't expect to
-return to the activity, so there's no reason to save its state.
-</p>
-
-<p>
-Because {@code onSaveInstanceState()} is not always called, you should
-use it only to record the transient state of the activity, not to store
-persistent data. Use {@code onPause()} for that purpose instead.
-</p>
-
-
-<h4 id="coordact">Coordinating activities</h4>
-
-<p>
-When one activity starts another, they both experience lifecycle
-transitions. One pauses and may stop, while the other starts up.
-On occasion, you may need to coordinate these activities, one with
-the other.
-</p>
-
-<p>
-The order of lifecycle callbacks is well defined,
-particularly when the two activities are in the same process:
-</p>
-
-<ol>
-<li>The current activity's {@code onPause()} method is called.</li>
-
-<li>Next, the starting activity's {@code onCreate()}, {@code onStart()},
-and {@code onResume()} methods are called in sequence.</li>
-
-<li>Then, if the starting activity is no longer visible
-on screen, its {@code onStop()} method is called.</li>
-</ol>
-
-
-<h3 id="servlife">Service lifecycle</h3>
-
-<p>
-A service can be used in two ways:
-</p>
-
-<ul>
-<li>It can be started and allowed to run until someone stops it or
-it stops itself. In this mode, it's started by calling
-<code>{@link android.content.Context#startService Context.startService()}</code>
-and stopped by calling
-<code>{@link android.content.Context#stopService Context.stopService()}</code>.
-It can stop itself by calling
-<code>{@link android.app.Service#stopSelf() Service.stopSelf()}</code> or
-<code>{@link android.app.Service#stopSelfResult Service.stopSelfResult()}</code>.
-Only one {@code stopService()} call is needed to stop the service, no matter how
-many times {@code startService()} was called.</li>
-
-<li><p>It can be operated programmatically using an interface that
-it defines and exports. Clients establish a connection to the Service
-object and use that connection to call into the service. The connection is
-established by calling
-<code>{@link android.content.Context#bindService Context.bindService()}</code>,
-and is closed by calling
-<code>{@link android.content.Context#unbindService Context.unbindService()}</code>.
-Multiple clients can bind to the same service.
-If the service has not already been launched, {@code bindService()} can optionally
-launch it.
-</p></li>
-</ul>
-
-<p>
-The two modes are not entirely separate. You can bind to a service that
-was started with {@code startService()}. For example, a background music
-service could be started by calling {@code startService()} with an Intent
-object that identifies the music to play. Only later, possibly when the
-user wants to exercise some control over the player or get information
-about the current song, would an activity
-establish a connection to the service by calling {@code bindService()}.
-In cases like this, {@code stopService()}
-will not actually stop the service until the last binding is closed.
-</p>
-
-<p>
-Like an activity, a service has lifecycle methods that you can implement
-to monitor changes in its state. But they are fewer than the activity
-methods — only three — and they are public, not protected:
-</p>
-
-<p style="margin-left: 2em">{@code void onCreate()}
-<br/>{@code void onStart(Intent <i>intent</i>)}
-<br/>{@code void onDestroy()}</p>
-
-<p>
-By implementing these methods, you can monitor two nested loops of the
-service's lifecycle:
-</p>
-
-<ul>
-<li>The <b>entire lifetime</b> of a service happens between the time
-<code>{@link android.app.Service#onCreate onCreate()}</code> is called and
-the time <code>{@link android.app.Service#onDestroy}</code> returns.
-Like an activity, a service does its initial setup in {@code onCreate()},
-and releases all remaining resources in {@code onDestroy()}. For example,
-a music playback service could create the thread where the music will be played
-in {@code onCreate()}, and then stop the thread in {@code onDestroy()}.</li>
-
-<li><p>The <b>active lifetime</b> of a service begins with a call to
-<code>{@link android.app.Service#onStartCommand onStartCommand()}</code>. This method
-is handed the Intent object that was passed to {@code startService()}.
-The music service would open the Intent to discover which music to
-play, and begin the playback.</p>
-
-<p>
-There's no equivalent callback for when the service stops — no
-{@code onStop()} method.
-</p></li>
-</ul>
-
-<p>
-The {@code onCreate()} and {@code onDestroy()} methods are called for all
-services, whether they're started by
-<code>{@link android.content.Context#startService Context.startService()}</code>
-or
-<code>{@link android.content.Context#bindService Context.bindService()}</code>.
-However, {@code onStartCommand()} is called only for services started by {@code
-startService()}.
-</p>
-
-<p>
-If a service permits others to
-bind to it, there are additional callback methods for it to implement:
-</p>
-
-<p style="margin-left: 2em">{@code IBinder onBind(Intent <i>intent</i>)}
-<br/>{@code boolean onUnbind(Intent <i>intent</i>)}
-<br/>{@code void onRebind(Intent <i>intent</i>)}</p>
-
-<p>
-The <code>{@link android.app.Service#onBind onBind()}</code> callback is passed
-the Intent object that was passed to {@code bindService} and
-<code>{@link android.app.Service#onUnbind onUnbind()}</code> is handed
-the intent that was passed to {@code unbindService()}.
-If the service permits the binding, {@code onBind()}
-returns the communications channel that clients use to interact with the service.
-The {@code onUnbind()} method can ask for
-<code>{@link android.app.Service#onRebind onRebind()}</code>
-to be called if a new client connects to the service.
-</p>
-
-<p>
-The following diagram illustrates the callback methods for a service.
-Although, it separates services that are created via {@code startService}
-from those created by {@code bindService()}, keep in mind that any service,
-no matter how it's started, can potentially allow clients to bind to it,
-so any service may receive {@code onBind()} and {@code onUnbind()} calls.
-</p>
-
-<p style="margin-left: 2em"><img src="{@docRoot}images/service_lifecycle.png"
-alt="State diagram for Service callbacks." /></p>
-
-
-<h3 id="broadlife">Broadcast receiver lifecycle</h3>
-
-<p>
-A broadcast receiver has single callback method:
-</p>
-
-<p style="margin-left: 2em">{@code void onReceive(Context <i>curContext</i>, Intent <i>broadcastMsg</i>)}</p>
-
-<p>
-When a broadcast message arrives for the receiver, Android calls its
-<code>{@link android.content.BroadcastReceiver#onReceive onReceive()}</code>
-method and passes it the Intent object containing the message. The broadcast
-receiver is considered to be active only while it is executing this method.
-When {@code onReceive()} returns, it is inactive.
-</p>
-
-<p>
-A process with an active broadcast receiver is protected from being killed.
-But a process with only inactive components can be killed by the system at
-any time, when the memory it consumes is needed by other processes.
-</p>
-
-<p>
-This presents a problem when the response to a broadcast message is time
-consuming and, therefore, something that should be done in a separate thread,
-away from the main thread where other components of the user interface run.
-If {@code onReceive()} spawns the thread and then returns, the entire process,
-including the new thread, is judged to be inactive (unless other application
-components are active in the process), putting it in jeopardy of being killed.
-The solution to this problem is for {@code onReceive()} to start a service
-and let the service do the job, so the
-system knows that there is still active work being done in the process.
-</p>
-
-<p>
-The next section has more on the vulnerability of processes to being killed.
-</p>
-
-
-<h3 id="proclife">Processes and lifecycles</h3>
-
-<p>The Android system tries to maintain an application process for as
-long as possible, but eventually it will need to remove old processes when
-memory runs low. To determine which processes to keep and which to kill,
-Android places each process into an "importance hierarchy" based on the
-components running in it and the state of those components. Processes
-with the lowest importance are eliminated first, then those with the next
-lowest, and so on. There are five levels in the hierarchy. The following
-list presents them in order of importance:
-</p>
-
-<ol>
-
-<li>A <b>foreground process</b> is one that is required for
-what the user is currently doing. A process is considered to be
-in the foreground if any of the following conditions hold:
-
-<ul>
-<li>It is running an activity that the user is interacting with
-(the Activity object's <code>{@link android.app.Activity#onResume
-onResume()}</code> method has been called).</li>
-
-<li><p>It hosts a service that's bound
-to the activity that the user is interacting with.</p></li>
-
-<li><p>It has a {@link android.app.Service} object that's executing
-one of its lifecycle callbacks (<code>{@link android.app.Service#onCreate
-onCreate()}</code>, <code>{@link android.app.Service#onStartCommand onStartCommand()}</code>,
-or <code>{@link android.app.Service#onDestroy onDestroy()}</code>).</p></li>
-
-<li><p>It has a {@link android.content.BroadcastReceiver} object that's
-executing its <code>{@link android.content.BroadcastReceiver#onReceive
-onReceive()}</code> method.</p></li>
-</ul>
-
-<p>
-Only a few foreground processes will exist at any given time. They
-are killed only as a last resort — if memory is so low that
-they cannot all continue to run. Generally, at that point, the device has
-reached a memory paging state, so killing some foreground processes is
-required to keep the user interface responsive.
-</p></li>
-
-<li><p>A <b>visible process</b> is one that doesn't have any foreground
-components, but still can affect what the user sees on screen.
-A process is considered to be visible if either of the following conditions
-holds:</p>
-
-<ul>
-<li>It hosts an activity that is not in the foreground, but is still visible
-to the user (its <code>{@link android.app.Activity#onPause onPause()}</code>
-method has been called). This may occur, for example, if the foreground
-activity is a dialog that allows the previous activity to be seen behind it.</li>
-
-<li><p>It hosts a service that's bound to a visible activity.</p></li>
-</ul>
-
-<p>
-A visible process is considered extremely important and will not be killed
-unless doing so is required to keep all foreground processes running.
-</p></li>
-
-<li><p>A <b>service process</b> is one that is running a service that
-has been started with the
-<code>{@link android.content.Context#startService startService()}</code>
-method and that does not fall into either of the two higher categories.
-Although service processes are not directly tied to anything the
-user sees, they are generally doing things that the user cares about (such
-as playing an mp3 in the background or downloading data on the network),
-so the system keeps them running unless there's not enough
-memory to retain them along with all foreground and visible processes.
-</p></li>
-
-<li><p>A <b>background process</b> is one holding an activity
-that's not currently visible to the user (the Activity object's
-<code>{@link android.app.Activity#onStop onStop()}</code> method has been called).
-These processes have no direct impact on the user experience, and can be killed
-at any time to reclaim memory for a foreground, visible, or service process.
-Usually there are many background processes running, so they are kept in an
-LRU (least recently used) list to ensure that the process with the activity that
-was most recently seen by the user is the last to be killed.
-If an activity implements its lifecycle methods correctly, and captures its current
-state, killing its process will not have a deleterious effect on the user experience.
-</p></li>
-
-<li><p>An <b>empty process</b> is one that doesn't hold any active application
-components. The only reason to keep such a process around is as a cache to
-improve startup time the next time a component needs to run in it. The system
-often kills these processes in order to balance overall system resources between
-process caches and the underlying kernel caches.</p></li>
-
-</ol>
-
-<p>
-Android ranks a process at the highest level it can, based upon the
-importance of the components currently active in the process. For example,
-if a process hosts a service and a visible activity, the process will be
-ranked as a visible process, not a service process.
-</p>
-
-<p>
-In addition, a process's ranking may be increased because other processes are
-dependent on it. A process that is serving another process can never be
-ranked lower than the process it is serving. For example, if a content
-provider in process A is serving a client in process B, or if a service in
-process A is bound to a component in process B, process A will always be
-considered at least as important as process B.
-</p>
+<p>For a close look at implementing activities—the components your users use to
+interact with your application—continue with the <b><a
+href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a></b> document.</p>
-<p>
-Because a process running a service is ranked higher than one with background
-activities, an activity that initiates a long-running operation might do
-well to start a service for that operation, rather than simply spawn a thread
-— particularly if the operation will likely outlast the activity.
-Examples of this are playing music in the background
-and uploading a picture taken by the camera to a web site. Using a service
-guarantees that the operation will have at least "service process" priority,
-regardless of what happens to the activity. As noted in the
-<a href="#broadlife">Broadcast receiver lifecycle</a> section earlier, this
-is the same reason that broadcast receivers should employ services rather
-than simply put time-consuming operations in a thread.
-</p>
diff --git a/docs/html/guide/topics/fundamentals/index.jd b/docs/html/guide/topics/fundamentals/index.jd
deleted file mode 100644
index f427a92..0000000
--- a/docs/html/guide/topics/fundamentals/index.jd
+++ /dev/null
@@ -1,515 +0,0 @@
-page.title=Application Fundamentals
-@jd:body
-
-<div id="qv-wrapper">
-<div id="qv">
-
-<h2>Quickview</h2>
-<ul>
- <li>Android applications are composed of one or more application components (activities,
-services, content providers, and broadcast receivers)</li>
- <li>Each component performs a different role in the overall application behavior, and each
-one can be activated individually (even by other applications)</li>
- <li>The manifest file must declare all components in the application and should also declare
-all application requirements, such as the minimum version of Android required and any hardware
-configurations required</li>
- <li>Non-code application resources (images, strings, layout files, etc.) should include
-alternatives for different device configurations (such as different strings for different
-languages and different layouts for different screen sizes)</li>
-</ul>
-
-
-<h2>In this document</h2>
-<ol>
-<li><a href="#Components">Application Components</a>
- <ol>
- <li><a href="#ActivatingComponents">Activating components</a></li>
- </ol>
-</li>
-<li><a href="#Manifest">The Manifest File</a>
- <ol>
- <li><a href="#DeclaringComponents">Declaring components</a></li>
- <li><a href="#DeclaringRequirements">Declaring application requirements</a></li>
- </ol>
-</li>
-<li><a href="#Resources">Application Resources</a></li>
-</ol>
-</div>
-</div>
-
-<p>Android applications are written in the Java programming language. The Android SDK tools compile
-the code—along with any data and resource files—into an <i>Android package</i>, an
-archive file with an {@code .apk} suffix. All the code in a single {@code .apk} file is considered
-to be one application and is the file that Android-powered devices use to install the
-application.</p>
-
-<p>Once installed on a device, each Android application lives in its own security sandbox: </p>
-
-<ul>
- <li>The Android operating system is a multi-user Linux system in which each application is a
-different user.</li>
-
-<li>By default, the system assigns each application a unique Linux user ID (the ID is used only by
-the system and is unknown to the application). The system sets permissions for all the files in an
-application so that only the user ID assigned to that application can access them. </li>
-
-<li>Each process has its own virtual machine (VM), so an application's code runs in isolation from
-other applications.</li>
-
-<li>By default, every application runs in its own Linux process. Android starts the process when any
-of the application's components need to be executed, then shuts down the process when it's no longer
-needed or when the system must recover memory for other applications.</li>
-</ul>
-
-<p>In this way, the Android system implements the <em>principle of least privilege</em>. That is,
-each application, by default, has access only to the components that it requires to do its work and
-no more. This creates a very secure environment in which an application cannot access parts of
-the system for which it is not given permission.</p>
-
-<p>However, there are ways for an application to share data with other applications and for an
-application to access system services:</p>
-
-<ul>
- <li>It's possible to arrange for two applications to share the same Linux user ID, in which case
-they are able to access each other's files. To conserve system resources, applications with the
-same user ID can also arrange to run in the same Linux process and share the same VM (the
-applications must also be signed with the same certificate).</li>
- <li>An application can request permission to access device data such as the user's
-contacts, SMS messages, the mountable storage (SD card), camera, Bluetooth, and more. All
-application permissions must be granted by the user at install time.</li>
-</ul>
-
-<p>That covers the basics regarding how an Android application exists within the system. The rest of
-this document introduces you to:</p>
-<ul>
- <li>The core framework components that define your application.</li>
- <li>The manifest file in which you declare components and required device features for your
-application.</li>
- <li>Resources that are separate from the application code and allow your application to
-gracefully optimize its behavior for a variety of device configurations.</li>
-</ul>
-
-<p class="note"><strong>Tip:</strong> If you're new to Android development, we suggest that you
-follow the Beginner's Path link at the bottom of this page. For each document in the Application
-Fundamentals, the Beginner's Path points you to the document we suggest you read next, in order
-to get up to speed on the core Android concepts.</p>
-
-
-
-<h2 id="Components">Application Components</h2>
-
-<p>Application components are the essential building blocks of an Android application. Each
-component is a different point through which the system can enter your application. Not all
-components are actual entry points for the user and some depend on each other, but each one exists
-as its own entity and plays a specific role—each one is a unique building block that
-helps define your application's overall behavior.</p>
-
-<p>There are four different types of application components. Each type serves a distinct purpose
-and has a distinct lifecycle that defines how the component is created and destroyed.</p>
-
-<p>Here are the four types of application components:</p>
-
-<dl>
-
-<dt><b>Activities</b></dt>
-
-<dd>An <i>activity</i> represents a single screen with a user interface. For example,
-an email application might have one activity that shows a list of new
-emails, another activity to compose an email, and another activity for reading emails. Although
-the activities work together to form a cohesive user experience in the email application, each one
-is independent of the others. As such, a different application can start any one of these
-activities (if the email application allows it). For example, a camera application can start the
-activity in the email application that composes new mail, in order for the user to share a picture.
-
-<p>An activity is implemented as a subclass of {@link android.app.Activity} and you can learn more
-about it in the <a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a>
-developer guide.</p>
-</dd>
-
-
-<dt><b>Services</b></dt>
-
-<dd>A <i>service</i> is a component that runs in the background to perform long-running
-operations or to perform work for remote processes. A service
-does not provide a user interface. For example, a service might play music in the background while
-the user is in a different application, or it might fetch data over the network without
-blocking user interaction with an activity. Another component, such as an activity, can start the
-service and let it run or bind to it in order to interact with it.
-
-<p>A service is implemented as a subclass of {@link android.app.Service} and you can learn more
-about it in the <a href="{@docRoot}guide/topics/fundamentals/services.html">Services</a> developer
-guide.</p>
-</dd>
-
-
-<dt><b>Content providers</b></dt>
-
-<dd>A <i>content provider</i> manages a shared set of application data. You can store the data in
-the file system, an SQLite database, on the web, or any other persistent storage location your
-application can access. Through the content provider, other applications can query or even modify
-the data (if the content provider allows it). For example, the Android system provides a content
-provider that manages the user's contact information. As such, any application with the proper
-permissions can query part of the content provider (such as {@link
-android.provider.ContactsContract.Data}) to read and write information about a particular person.
-
-<p>Content providers are also useful for reading and writing data that is private to your
-application and not shared. For example, the <a
-href="{@docRoot}resources/samples/NotePad/index.html">Note Pad</a> sample application uses a
-content provider to save notes.</p>
-
-<p>A content provider is implemented as a subclass of {@link android.content.ContentProvider}
-and must implement a standard set of APIs that enable other applications to perform
-transactions. For more information, see the <a
-href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a> developer
-guide.</p>
-</dd>
-
-
-<dt><b>Broadcast receivers</b></dt>
-
-<dd>A <i>broadcast receiver</i> is a component that responds to system-wide broadcast
-announcements. Many broadcasts originate from the system—for example, a broadcast announcing
-that the screen has turned off, the battery is low, or a picture was captured.
-Applications can also initiate broadcasts—for example, to let other applications know that
-some data has been downloaded to the device and is available for them to use. Although broadcast
-receivers don't display a user interface, they may <a
-href="{@docRoot}guide/topics/ui/notifiers/notifications.html">create a status bar notification</a>
-to alert the user when a broadcast event occurs. More commonly, though, a broadcast receiver is
-just a "gateway" to other components and is intended to do a very minimal amount of work. For
-instance, it might initiate a service to perform some work based on the event.
-
-<p>A broadcast receiver is implemented as a subclass of {@link android.content.BroadcastReceiver}
-and each broadcast is delivered as an {@link android.content.Intent} object. For more information,
-see the {@link android.content.BroadcastReceiver} class.</p>
-</dd>
-
-</dl>
-
-
-
-<p>A unique aspect of the Android system design is that any application can start another
-application’s component. For example, if you want the user to capture a
-photo with the device camera, there's probably another application that does that and your
-application can use it, instead of developing an activity to capture a photo yourself. You don't
-need to incorporate or even link to the code from the camera application.
-Instead, you can simply start the activity in the camera application that captures a
-photo. When complete, the photo is even returned to your application so you can use it. To the user,
-it seems as if the camera is actually a part of your application.</p>
-
-<p>When the system starts a component, it starts the process for that application (if it's not
-already running) and instantiates the classes needed for the component. For example, if your
-application starts the activity in the camera application that captures a photo, that activity
-runs in the process that belongs to the camera application, not in your application's process.
-Therefore, unlike applications on most other systems, Android applications don't have a single entry
-point (there's no {@code main()} function, for example).</p>
-
-<p>Because the system runs each application in a separate process with file permissions that
-restrict access to other applications, your application cannot directly activate a component from
-another application. The Android system, however, can. So, to activate a component in
-another application, you must deliver a message to the system that specifies your <em>intent</em> to
-start a particular component. The system then activates the component for you.</p>
-
-
-<h3 id="ActivatingComponents">Activating Components</h3>
-
-<p>Three of the four component types—activities, services, and
-broadcast receivers—are activated by an asynchronous message called an <em>intent</em>.
-Intents bind individual components to each other at runtime (you can think of them
-as the messengers that request an action from other components), whether the component belongs
-to your application or another.</p>
-
-<p>An intent is created with an {@link android.content.Intent} object, which defines a message to
-activate either a specific component or a specific <em>type</em> of component—an intent
-can be either explicit or implicit, respectively.</p>
-
-<p>For activities and services, an intent defines the action to perform (for example, to "view" or
-"send" something) and may specify the URI of the data to act on (among other things that the
-component being started might need to know). For example, an intent might convey a request for an
-activity to show an image or to open a web page. In some cases, you can start an
-activity to receive a result, in which case, the activity also returns
-the result in an {@link android.content.Intent} (for example, you can issue an intent to let
-the user pick a personal contact and have it returned to you—the return intent includes a
-URI pointing to the chosen contact).</p>
-
-<p>For broadcast receivers, the intent simply defines the
-announcement being broadcast (for example, a broadcast to indicate the device battery is low
-includes only a known action string that indicates "battery is low").</p>
-
-<p>The other component type, content provider, is not activated by intents. Rather, it is
-activated when targeted by a request from a {@link android.content.ContentResolver}. The content
-resolver handles all direct transactions with the content provider so that the component that's
-performing transactions with the provider doesn't need to and instead calls methods on the {@link
-android.content.ContentResolver} object. This leaves a layer of abstraction between the content
-provider and the component requesting information (for security).</p>
-
-<p>There are separate methods for activiting each type of component:</p>
-<ul>
- <li>You can start an activity (or give it something new to do) by
-passing an {@link android.content.Intent} to {@link android.content.Context#startActivity
-startActivity()} or {@link android.app.Activity#startActivityForResult startActivityForResult()}
-(when you want the activity to return a result).</li>
- <li>You can start a service (or give new instructions to an ongoing service) by
-passing an {@link android.content.Intent} to {@link android.content.Context#startService
-startService()}. Or you can bind to the service by passing an {@link android.content.Intent} to
-{@link android.content.Context#bindService bindService()}.</li>
- <li>You can initiate a broadcast by passing an {@link android.content.Intent} to methods like
-{@link android.content.Context#sendBroadcast(Intent) sendBroadcast()}, {@link
-android.content.Context#sendOrderedBroadcast(Intent, String) sendOrderedBroadcast()}, or {@link
-android.content.Context#sendStickyBroadcast sendStickyBroadcast()}.</li>
- <li>You can perform a query to a content provider by calling {@link
-android.content.ContentProvider#query query()} on a {@link android.content.ContentResolver}.</li>
-</ul>
-
-<p>For more information about using intents, see the <a
-href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and
-Intent Filters</a> document. More information about activating specific components is also provided
-in the following documents: <a
-href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a>, <a
-href="{@docRoot}guide/topics/fundamentals/services.html">Services</a>, {@link
-android.content.BroadcastReceiver} and <a
-href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>.</p>
-
-
-<h2 id="Manifest">The Manifest File</h2>
-
-<p>Before the Android system can start an application component, the system must know that the
-component exists by reading the application's {@code AndroidManifest.xml} file (the "manifest"
-file). Your application must declare all its components in this file, which must be at the root of
-the application project directory.</p>
-
-<p>The manifest does a number of things in addition to declaring the application's components,
-such as:</p>
-<ul>
- <li>Identify any user permissions the application requires, such as Internet access or
-read-access to the user's contacts.</li>
- <li>Declare the minimum <a href="{@docRoot}guide/appendix/api-levels.html">API Level</a>
-required by the application, based on which APIs the application uses.</li>
- <li>Declare hardware and software features used or required by the application, such as a camera,
-bluetooth services, or a multitouch screen.</li>
- <li>API libraries the application needs to be linked against (other than the Android framework
-APIs), such as the <a
-href="http://code.google.com/android/add-ons/google-apis/maps-overview.html">Google Maps
-library</a>.</li>
- <li>And more</li>
-</ul>
-
-
-<h3 id="DeclaringComponents">Declaring components</h3>
-
-<p>The primary task of the manifest is to inform the system about the application's components. For
-example, a manifest file can declare an activity as follows: </p>
-
-<pre>
-<?xml version="1.0" encoding="utf-8"?>
-<manifest ... >
- <application android:icon="@drawable/app_icon.png" ... >
- <activity android:name="com.example.project.ExampleActivity"
- android:label="@string/example_label" ... >
- </activity>
- ...
- </application>
-</manifest></pre>
-
-<p>In the <code><a
-href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-element, the {@code android:icon} attribute points to resources for an icon that identifies the
-application.</p>
-
-<p>In the <code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> element,
-the {@code android:name} attribute specifies the fully qualified class name of the {@link
-android.app.Activity} subclass and the {@code android:label} attributes specifies a string
-to use as the user-visible label for the activity.</p>
-
-<p>You must declare all application components this way:</p>
-<ul>
- <li><code><a
-href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> elements
-for activities</li>
- <li><code><a
-href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> elements for
-services</li>
- <li><code><a
-href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code> elements
-for broadcast receivers</li>
- <li><code><a
-href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> elements
-for content providers</li>
-</ul>
-
-<p>Activities, services, and content providers that you include in your source but do not declare
-in the manifest are not visible to the system and, consequently, can never run. However,
-broadcast
-receivers can be either declared in the manifest or created dynamically in code (as
-{@link android.content.BroadcastReceiver} objects) and registered with the system by calling
-{@link android.content.Context#registerReceiver registerReceiver()}.</p>
-
-<p>For more about how to structure the manifest file for your application, see the <a
-href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a>
-documentation. </p>
-
-
-
-<h3 id="DeclaringComponentCapabilities">Declaring component capabilities</h3>
-
-<p>As discussed above, in <a href="#ActivatingComponents">Activating Components</a>, you can use an
-{@link android.content.Intent} to start activities, services, and broadcast receivers. You can do so
-by explicitly naming the target component (using the component class name) in the intent. However,
-the real power of intents lies in the concept of intent actions. With intent actions, you simply
-describe the type of action you want to perform (and optionally, the data upon which you’d like to
-perform the action) and allow the system to find a component on the device that can perform the
-action and start it. If there are multiple components that can perform the action described by the
-intent, then the user selects which one to use.</p>
-
-<p>The way the system identifies the components that can respond to an intent is by comparing the
-intent received to the <i>intent filters</i> provided in the manifest file of other applications on
-the device.</p>
-
-<p>When you declare a component in your application's manifest, you can optionally include
-intent filters that declare the capabilities of the component so it can respond to intents
-from other applications. You can declare an intent filter for your component by
-adding an <a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">{@code
-<intent-filter>}</a> element as a child of the component's declaration element.</p>
-
-<p>For example, an email application with an activity for composing a new email might declare an
-intent filter in its manifest entry to respond to "send" intents (in order to send email). An
-activity in your application can then create an intent with the “send” action ({@link
-android.content.Intent#ACTION_SEND}), which the system matches to the email application’s “send”
-activity and launches it when you invoke the intent with {@link android.app.Activity#startActivity
-startActivity()}.</p>
-
-<p>For more about creating intent filters, see the <a
-href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and Intent Filters</a> document.
-</p>
-
-
-
-<h3 id="DeclaringRequirements">Declaring application requirements</h3>
-
-<p>There are a variety of devices powered by Android and not all of them provide the
-same features and capabilities. In order to prevent your application from being installed on devices
-that lack features needed by your application, it's important that you clearly define a profile for
-the types of devices your application supports by declaring device and software requirements in your
-manifest file. Most of these declarations are informational only and the system does not read
-them, but external services such as Android Market do read them in order to provide filtering
-for users when they search for applications from their device.</p>
-
-<p>For example, if your application requires a camera and uses APIs introduced in Android 2.1 (<a
-href="{@docRoot}guide/appendix/api-levels.html">API Level</a> 7), you should declare these as
-requirements in your manifest file. That way, devices that do <em>not</em> have a camera and have an
-Android version <em>lower</em> than 2.1 cannot install your application from Android Market.</p>
-
-<p>However, you can also declare that your applicaiton uses the camera, but does not
-<em>require</em> it. In that case, your application must perform a check at runtime to determine
-if the device has a camera and disable any features that use the camera if one is not available.</p>
-
-<p>Here are some of the important device characteristics that you should consider as you design and
-develop your application:</p>
-
-<dl>
- <dt>Screen size and density</dt>
- <dd>In order to categorize devices by their screen type, Android defines two characteristics for
-each device: screen size (the physical dimensions of the screen) and screen density (the physical
-density of the pixels on the screen, or dpi—dots per inch). To simplify all the different
-types of screen configurations, the Android system generalizes them into select groups that make
-them easier to target.
-<p>The screen sizes are: small, normal, large, and extra large.<br/>
-The screen densities are: low density, medium density, high density, and extra high density.</p>
-
-<p>By default, your application is compatible with all screen sizes and densities,
-because the Android system makes the appropriate adjustments to your UI layout and image
-resources. However, you should create specialized layouts for certain screen sizes and provide
-specialized images for certain densities, using alternative layout resources, and by declaring in
-your manifest exactly which screen sizes your application supports with the <a
-href="{@docRoot}guide/topics/manifest/supports-screens.html">{@code
-<supports-screens>}</a> element.</p>
-<p>For more information, see the <a
-href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>
-document.</p></dd>
-
- <dt>Input configurations</dt>
- <dd>Many devices provide a different type of user input mechanism, such as a hardware keyboard, a
-trackball, or a five-way navigation pad. If your application requires a particular kind of input
-hardware, then you should declare it in your manifest with the <a
-href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">{@code
-<uses-configuration>}</a> element. However, it is rare that an application should require
-a certain input configuration.</dd>
-
- <dt>Device features</dt>
- <dd>There are many hardware and software features that may or may not exist on a given
-Android-powered device, such as a camera, a light sensor, bluetooth, a certain
-version of OpenGL, or the fidelity of the touchscreen. You should never assume that a certain
-feature is available on all Android-powered devices (other than the availability of the standard
-Android library), so you should declare any features used by your application with the <a
-href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code <uses-feature>}</a>
-element.</dd>
-
- <dt>Platform Version</dt>
- <dd>Different Android-powered devices often run different versions of the Android platform,
-such as Android 1.6 or Android 2.3. Each successive version often includes additional APIs not
-available in the previous version. In order to indicate which set of APIs are available, each
-platform version specifies an <a
-href="{@docRoot}guide/appendix/api-levels.html">API Level</a> (for example, Android 1.0 is API Level
-1 and Android 2.3 is API Level 9). If you use any APIs that were added to the platform after
-version 1.0, you should declare the minimum API Level in which those APIs were introduced using the
-<a href="{@docRoot}guide/topics/manifest/uses-sdk.html">{@code <uses-sdk>}</a> element.</dd>
-</dl>
-
-<p>It's important that you declare all such requirements for your application, because, when you
-distribute your application on Android Market, Market uses these declarations to filter which
-applications are available on each device. As such, your application should be available only to
-devices that meet all your application requirements.</p>
-
-<p>For more information about how Android Market filters applications based on these (and other)
-requirements, see the <a href="{@docRoot}guide/appendix/market-filters.html">Market Filters</a>
-document.</p>
-
-
-
-<h2 id="Resources">Application Resources</h2>
-
-<p>An Android application is composed of more than just code—it requires resources that are
-separate from the source code, such as images, audio files, and anything relating to the visual
-presentation of the application. For example, you should define animations, menus, styles, colors,
-and the layout of activity user interfaces with XML files. Using application resources makes it easy
-to update various characteristics of your application without modifying code and—by providing
-sets of alternative resources—enables you to optimize your application for a variety of
-device configurations (such as different languages and screen sizes).</p>
-
-<p>For every resource that you include in your Android project, the SDK build tools define a unique
-integer ID, which you can use to reference the resource from your application code or from
-other resources defined in XML. For example, if your application contains an image file named {@code
-logo.png} (saved in the {@code res/drawable/} directory), the SDK tools generate a resource ID
-named {@code R.drawable.logo}, which you can use to reference the image and insert it in your
-user interface.</p>
-
-<p>One of the most important aspects of providing resources separate from your source code
-is the ability for you to provide alternative resources for different device
-configurations. For example, by defining UI strings in XML, you can translate the strings into other
-languages and save those strings in separate files. Then, based on a language <em>qualifier</em>
-that you append to the resource directory's name (such as {@code res/values-fr/} for French string
-values) and the user's language setting, the Android system applies the appropriate language strings
-to your UI.</p>
-
-<p>Android supports many different <em>qualifiers</em> for your alternative resources. The
-qualifier is a short string that you include in the name of your resource directories in order to
-define the device configuration for which those resources should be used. As another
-example, you should often create different layouts for your activities, depending on the
-device's screen orientation and size. For example, when the device screen is in portrait
-orientation (tall), you might want a layout with buttons to be vertical, but when the screen is in
-landscape orientation (wide), the buttons should be aligned horizontally. To change the layout
-depending on the orientation, you can define two different layouts and apply the appropriate
-qualifier to each layout's directory name. Then, the system automatically applies the appropriate
-layout depending on the current device orientation.</p>
-
-<p>For more about the different kinds of resources you can include in your application and how
-to create alternative resources for various device configurations, see the <a
-href="{@docRoot}guide/topics/resources/index.html">Application Resources</a> developer guide.</p>
-
-
-<h2>Beginner's Path</h2>
-
-<p>For a close look at implementing activities—the components your users use to
-interact with your application—continue with the <b><a
-href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a></b> document.</p>
-
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd
index 2648cb7..5e0b536 100644
--- a/docs/html/guide/topics/manifest/activity-element.jd
+++ b/docs/html/guide/topics/manifest/activity-element.jd
@@ -458,9 +458,7 @@
<p>For more information on launch modes and their interaction with Intent
flags, see the
-<a href="{@docRoot}guide/topics/fundamentals.html#acttask">Activities and
-Tasks</a> section of the
-<a href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a>
+<a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back Stack</a>
document.
</p>
</dd>
diff --git a/docs/html/guide/topics/network/sip.jd b/docs/html/guide/topics/network/sip.jd
new file mode 100644
index 0000000..276adb6
--- /dev/null
+++ b/docs/html/guide/topics/network/sip.jd
@@ -0,0 +1,490 @@
+page.title=Session Initiation Protocol
+@jd:body
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>In this document</h2>
+ <ol>
+
+ <li><a href="#requirements">Requirements and Limitations</a></li>
+ <li><a href="#classes">Classes and Interfaces</a></li>
+ <li><a href="#manifest">Creating the Manifest</a></li>
+ <li><a href="#manager">Creating a SIP Manager</a></li>
+ <li><a href="#profiles">Registering with a SIP Server</a></li>
+ <li><a href="#audio">Making an Audio Call</a></li>
+ <li><a href="#receiving">Receiving Calls</a></li>
+ <li><a href="#testing">Testing SIP Applications</a></li>
+ </ol>
+
+ <h2>Key classes</h2>
+ <ol>
+ <li>{@link android.net.sip.SipManager}</li>
+ <li>{@link android.net.sip.SipProfile}</li>
+ <li>{@link android.net.sip.SipAudioCall}</li>
+
+ </ol>
+
+ <h2>Related samples</h2>
+ <ol>
+ <li> <a href="{@docRoot}resources/samples/SipDemo/index.html"> SipDemo</a></li>
+ </ol>
+ </div>
+</div>
+
+<p>Android provides an API that supports the Session Initiation Protocol (SIP).
+This lets you add SIP-based internet telephony features to your applications.
+Android includes a full SIP protocol stack and integrated call management
+services that let applications easily set up outgoing and incoming voice calls,
+without having to manage sessions, transport-level communication, or audio
+record or playback directly.</p>
+
+<p>Here are examples of the types of applications that might use the SIP API:</p>
+<ul>
+ <li>Video conferencing.</li>
+ <li>Instant messaging.</li>
+</ul>
+<h2 id="requirements">Requirements and Limitations</h2>
+<p>Here are the requirements for developing a SIP application:</p>
+<ul>
+
+ <li>You must have a mobile device that is running Android 2.3 or higher. </li>
+
+ <li>SIP runs over a wireless data connection, so your device must have a data
+connection (with a mobile data service or Wi-Fi)</span>. This means that you
+can't test on AVD—you can only test on a physical device. For details, see
+<a href="#testing">Testing SIP Applications</a>.</li>
+
+ <li>Each participant in the application's communication session must have a
+SIP account. There are many different SIP providers that offer SIP accounts.</li>
+</ul>
+
+
+<h2 id="classes">SIP API Classes and Interfaces</h2>
+
+<p>Here is a summary of the classes and one interface
+(<code>SipRegistrationListener</code>) that are included in the Android SIP
+API:</p>
+
+<table>
+ <thead>
+ <tr>
+ <th>Class/Interface</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{@link android.net.sip.SipAudioCall}</td>
+ <td>Handles an Internet audio call over SIP.</td>
+ </tr>
+ <tr>
+ <td>{@link android.net.sip.SipAudioCall.Listener}</td>
+ <td>Listener for events relating to a SIP call, such as when a call is being
+received ("on ringing") or a call is outgoing ("on calling").</td>
+ </tr>
+ <tr>
+ <td>{@link android.net.sip.SipErrorCode}</td>
+ <td>Defines error codes returned during SIP actions.</td>
+ </tr>
+ <tr>
+ <td>{@link android.net.sip.SipManager}</td>
+ <td>Provides APIs for SIP tasks, such as initiating SIP connections, and provides access
+to related SIP services.</td>
+ </tr>
+ <tr>
+ <td>{@link android.net.sip.SipProfile}</td>
+ <td>Defines a SIP profile, including a SIP account, domain and server information.
+</td>
+ </tr>
+ <tr>
+ <td>{@link android.net.sip.SipProfile.Builder}</td>
+ <td>Helper class for creating a SipProfile.</td>
+ </tr>
+ <tr>
+ <td>{@link android.net.sip.SipSession}</td>
+ <td>Represents a SIP session that is associated with a SIP dialog or a standalone transaction
+not within a dialog.</td>
+ </tr>
+ <tr>
+ <td>{@link android.net.sip.SipSession.Listener}</td>
+ <td>Listener for events relating to a SIP session, such as when a session is being registered
+("on registering") or a call is outgoing ("on calling"). </td>
+ </tr>
+ <tr>
+ <td>{@link android.net.sip.SipSession.State}</td>
+ <td>Defines SIP session states, such as "registering", "outgoing call", and "in call". </td>
+ </tr>
+ <tr>
+ <td>{@link android.net.sip.SipRegistrationListener}</td>
+ <td>An interface that is a listener for SIP registration events.</td>
+ </tr>
+ </tbody>
+</table>
+
+<h2 id="manifest">Creating the Manifest</h2>
+
+<p>If you are developing an application that uses the SIP API, remember that the
+feature is supported only on Android 2.3 (API level 9) and higher versions of
+the platform. Also, among devices running Android 2.3 (API level 9) or higher,
+not all devices will offer SIP support.</p>
+
+<p>To use SIP, add the following permissions to your application's manifest:</p>
+<ul>
+ <li><code>android.permission.USE_SIP</code></li>
+ <li><code>android.permission.INTERNET</code></li>
+</ul>
+
+<p> To ensure that your application can only be installed on devices that are
+capable of supporting SIP, add the following to your application's
+manifest:</p>
+
+<ul>
+ <li><code><uses-sdk android:minSdkVersion="9" /></code>. This
+ indicates that your application requires Android 2.3 or higher. For more
+information, see <a href="{@docRoot}guide/appendix/api-levels.html">API
+Levels</a> and the documentation for the <a
+href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a
+> element.</li>
+</ul>
+
+<p>To control how your application is filtered from devices that do not support
+SIP (for example, in Android Market), add the following to your application's
+manifest:</p>
+
+<ul>
+
+ <li><code><uses-feature android:name="android.hardware.sip.voip"
+/></code>. This states that your application uses the SIP API. The
+declaration should include an <code>android:required</code> attribute that
+indicates whether you want the application to be filtered from devices that do
+not offer SIP support. Other <code><uses-feature></code> declarations
+may also be needed, depending on your implementation. For more information,
+see the documentation for the <a
+href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-
+feature></a> element.</li>
+
+</ul>
+<p>If your application is designed to receive calls, you must also define a receiver ({@link android.content.BroadcastReceiver} subclass) in the application's manifest: </p>
+
+<ul>
+ <li><code><receiver android:name=".IncomingCallReceiver" android:label="Call Receiver"/></code></li>
+</ul>
+<p>Here are excerpts from the <strong>SipDemo</strong> manifest:</p>
+
+
+
+<pre><?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.example.android.sip">
+ ...
+ <receiver android:name=".IncomingCallReceiver" android:label="Call Receiver"/>
+ ...
+ <uses-sdk android:minSdkVersion="9" />
+ <uses-permission android:name="android.permission.USE_SIP" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ ...
+ <uses-feature android:name="android.hardware.sip.voip" android:required="true" />
+ <uses-feature android:name="android.hardware.wifi" android:required="true" />
+ <uses-feature android:name="android.hardware.microphone" android:required="true" />
+</manifest>
+</pre>
+
+
+<h2 id="manager">Creating a SipManager</h2>
+
+<p>To use the SIP API, your application must create a {@link
+android.net.sip.SipManager} object. The {@link android.net.sip.SipManager} takes
+care of the following in your application:</p>
+
+<ul>
+ <li>Initiating SIP sessions.</li>
+ <li>Initiating and receiving calls.</li>
+ <li>Registering and unregistering with a SIP provider.</li>
+ <li>Verifying session connectivity.</li>
+</ul>
+<p>You instantiate a new {@link android.net.sip.SipManager} as follows:</p>
+<pre>public SipManager mSipManager = null;
+...
+if(mSipManager == null) {
+ mSipManager = SipManager.newInstance(this);
+}</pre>
+<h2 id="profiles">Registering with a SIP Server</h2>
+
+<p>A typical Android SIP application involves one or more users, each of whom
+has a SIP account. In an Android SIP application, each SIP account is
+represented by a {@link android.net.sip.SipProfile} object.</p>
+
+<p>A {@link android.net.sip.SipProfile} defines a SIP profile, including a SIP
+account, and domain and server information. The profile associated with the SIP
+account on the device running the application is called the <em>local
+profile</em>. The profile that the session is connected to is called the
+<em>peer profile</em>. When your SIP application logs into the SIP server with
+the local {@link android.net.sip.SipProfile}, this effectively registers the
+device as the location to send SIP calls to for your SIP address.</p>
+
+<p>This section shows how to create a {@link android.net.sip.SipProfile},
+register it with a SIP server, and track registration events.</p>
+
+<p>You create a {@link android.net.sip.SipProfile} object as follows:</p>
+<pre>
+public SipProfile mSipProfile = null;
+...
+
+SipProfile.Builder builder = new SipProfile.Builder(username, domain);
+builder.setPassword(password);
+mSipProfile = builder.build();</pre>
+
+<p>The following code excerpt opens the local profile for making calls and/or
+receiving generic SIP calls. The caller can make subsequent calls through
+<code>mSipManager.makeAudioCall</code>. This excerpt also sets the action
+<code>android.SipDemo.INCOMING_CALL</code>, which will be used by an intent
+filter when the device receives a call (see <a href="#intent_filter">Setting up
+an intent filter to receive calls</a>). This is the registration step:</p>
+
+<pre>Intent intent = new Intent();
+intent.setAction("android.SipDemo.INCOMING_CALL");
+PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, Intent.FILL_IN_DATA);
+mSipManager.open(mSipProfile, pendingIntent, null);</pre>
+
+<p>Finally, this code sets a <code>SipRegistrationListener</code> on the {@link
+android.net.sip.SipManager}. This tracks whether the {@link
+android.net.sip.SipProfile} was successfully registered with your SIP service
+provider:<br>
+</p>
+
+<pre>mSipManager.setRegistrationListener(mSipProfile.getUriString(), new SipRegistrationListener() {
+
+public void onRegistering(String localProfileUri) {
+ updateStatus("Registering with SIP Server...");
+}
+
+public void onRegistrationDone(String localProfileUri, long expiryTime) {
+ updateStatus("Ready");
+}
+
+public void onRegistrationFailed(String localProfileUri, int errorCode,
+ String errorMessage) {
+ updateStatus("Registration failed. Please check settings.");
+}</pre>
+
+
+<p>When your application is done using a profile, it should close it to free
+associated objects into memory and unregister the device from the server. For
+example:</p>
+
+<pre>public void closeLocalProfile() {
+ if (mSipManager == null) {
+ return;
+ }
+ try {
+ if (mSipProfile != null) {
+ mSipManager.close(mSipProfile.getUriString());
+ }
+ } catch (Exception ee) {
+ Log.d("WalkieTalkieActivity/onDestroy", "Failed to close local profile.", ee);
+ }
+}</pre>
+
+<h2 id="audio">Making an Audio Call</h2>
+<p>To make an audio call, you must have the following in place:</p>
+<ul>
+
+ <li>A {@link android.net.sip.SipProfile} that is making the call (the
+"local profile"), and a valid SIP address to receive the call (the
+"peer profile").
+
+ <li>A {@link android.net.sip.SipManager} object. </li>
+</ul>
+
+<p>To make an audio call, you should set up a {@link
+android.net.sip.SipAudioCall.Listener}. Much of the client's interaction with
+the SIP stack happens through listeners. In this snippet, you see how the {@link
+android.net.sip.SipAudioCall.Listener} sets things up after the call is
+established:</p>
+
+<pre>
+SipAudioCall.Listener listener = new SipAudioCall.Listener() {
+
+ @Override
+ public void onCallEstablished(SipAudioCall call) {
+ call.startAudio();
+ call.setSpeakerMode(true);
+ call.toggleMute();
+ ...
+ }
+
+ @Override
+ public void onCallEnded(SipAudioCall call) {
+ // Do something.
+ }
+};</pre>
+
+<p>Once you've set up the {@link android.net.sip.SipAudioCall.Listener}, you can
+make the call. The {@link android.net.sip.SipManager} method
+<code>makeAudioCall</code> takes the following parameters:</p>
+
+<ul>
+ <li>A local SIP profile (the caller).</li>
+ <li>A peer SIP profile (the user being called).</li>
+
+ <li>A {@link android.net.sip.SipAudioCall.Listener} to listen to the call
+events from {@link android.net.sip.SipAudioCall}. This can be <code>null</code>,
+but as shown above, the listener is used to set things up once the call is
+established.</li>
+
+ <li>The timeout value, in seconds.</li>
+</ul>
+<p>For example:</p>
+<pre> call = mSipManager.makeAudioCall(mSipProfile.getUriString(), sipAddress, listener, 30);</pre>
+
+<h2 id="receiving">Receiving Calls</h2>
+
+<p>To receive calls, a SIP application must include a subclass of {@link
+android.content.BroadcastReceiver} that has the ability to respond to an intent
+indicating that there is an incoming call. Thus, you must do the following in
+your application:</p>
+
+<ul>
+ <li>In <code>AndroidManifest.xml</code>, declare a
+<code><receiver></code>. In <strong>SipDemo</strong>, this is
+<code><receiver android:name=".IncomingCallReceiver"
+android:label="Call Receiver"/></code>.</li>
+
+ <li>Implement the receiver, which is a subclass of {@link
+android.content.BroadcastReceiver}. In <strong>SipDemo</strong>, this is
+<code>IncomingCallReceiver</code>.</li>
+
+ <li>Initialize the local profile ({@link android.net.sip.SipProfile}) with a
+pending intent that fires your receiver when someone calls the local profile.
+</li>
+
+ <li>Set up an intent filter that filters by the action that represents an
+incoming call. In <strong>SipDemo</strong>, this action is
+<code>android.SipDemo.INCOMING_CALL</code>. </li>
+</ul>
+<h4 id="BroadcastReceiver">Subclassing BroadcastReceiver</h4>
+
+<p>To receive calls, your SIP application must subclass {@link
+android.content.BroadcastReceiver}. <span id="internal-source-marker_0.">The
+Android system handles incoming SIP calls and broadcasts an "incoming
+call"<code></code> intent (as defined by the application) when it receives
+a call.</span> Here is the subclassed {@link android.content.BroadcastReceiver}
+code from <strong>SipDemo</strong>. To see the full example, go to <a
+href="{@docRoot}resources/samples/SipDemo/index.html">SipDemo sample</a>, which
+is included in the SDK samples. For information on downloading and installing
+the SDK samples, see <a
+href="{@docRoot}resources/samples/get.html">
+Getting the Samples</a>. </p>
+
+<pre>/*** Listens for incoming SIP calls, intercepts and hands them off to WalkieTalkieActivity.
+ */
+public class IncomingCallReceiver extends BroadcastReceiver {
+ /**
+ * Processes the incoming call, answers it, and hands it over to the
+ * WalkieTalkieActivity.
+ * @param context The context under which the receiver is running.
+ * @param intent The intent being received.
+ */
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ SipAudioCall incomingCall = null;
+ try {
+ SipAudioCall.Listener listener = new SipAudioCall.Listener() {
+ @Override
+ public void onRinging(SipAudioCall call, SipProfile caller) {
+ try {
+ call.answerCall(30);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ };
+ WalkieTalkieActivity wtActivity = (WalkieTalkieActivity) context;
+ incomingCall = wtActivity.mSipManager.takeAudioCall(intent, listener);
+ incomingCall.answerCall(30);
+ incomingCall.startAudio();
+ incomingCall.setSpeakerMode(true);
+ if(incomingCall.isMuted()) {
+ incomingCall.toggleMute();
+ }
+ wtActivity.call = incomingCall;
+ wtActivity.updateStatus(incomingCall);
+ } catch (Exception e) {
+ if (incomingCall != null) {
+ incomingCall.close();
+ }
+ }
+ }
+}
+</pre>
+
+<h4 id="intent_filter">Setting up an intent filter to receive calls</h4>
+
+<p>When the SIP service receives a new call, it sends out an intent with the
+action string provided by the application. In SipDemo, this action string is
+<code>android.SipDemo.INCOMING_CALL</code>. </p>
+<p>This code excerpt from <strong>SipDemo</strong> shows how the {@link
+android.net.sip.SipProfile} object gets created with a pending intent based on
+the action string <code>android.SipDemo.INCOMING_CALL</code>. The
+<code>PendingIntent</code> object will perform a broadcast when the {@link
+android.net.sip.SipProfile} receives a call:</p>
+
+<pre>
+public SipManager mSipManager = null;
+public SipProfile mSipProfile = null;
+...
+
+Intent intent = new Intent();
+intent.setAction("android.SipDemo.INCOMING_CALL");
+PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, Intent.FILL_IN_DATA);
+mSipManager.open(mSipProfile, pendingIntent, null);</pre>
+
+<p>The broadcast will be intercepted by the intent filter, which will then fire
+the receiver (<code>IncomingCallReceiver</code>). You can specify an intent
+filter in your application's manifest file, or do it in code as in the <strong>SipDemo</strong>
+sample application's <code>onCreate()</code> method
+of the application's <code>Activity</code>:</p>
+
+<pre>
+public class WalkieTalkieActivity extends Activity implements View.OnTouchListener {
+...
+ public IncomingCallReceiver callReceiver;
+ ...
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+
+ IntentFilter filter = new IntentFilter();
+ filter.addAction("android.SipDemo.INCOMING_CALL");
+ callReceiver = new IncomingCallReceiver();
+ this.registerReceiver(callReceiver, filter);
+ ...
+ }
+ ...
+}
+</pre>
+
+
+<h2 id="testing">Testing SIP Applications</h2>
+
+<p>To test SIP applications, you need the following:</p>
+<ul>
+<li>A mobile device that is running Android 2.3 or higher. SIP runs over
+wireless, so you must test on an actual device. Testing on AVD won't work.</li>
+<li>A SIP account. There are many different SIP providers that offer SIP accounts.</li>
+<li>If you are placing a call, it must also be to a valid SIP account. </li>
+</ul>
+<p>To test a SIP application:</p>
+<ol>
+
+<li>On your device, connect to wireless (<strong>Settings > Wireless & networks
+> Wi-Fi > Wi-Fi settings</strong>)</li>
+<li>Set up your mobile device for testing, as described in <a
+href="{@docRoot}guide/developing/device.html">Developing on a Device</a>.</li>
+<li>Run your application on your mobile device, as described in <a
+href="{@docRoot}guide/developing/device.html">Developing on a Device</a>.</li>
+
+<li>If you are using Eclipse, you can view the application log output in Eclipse
+using LogCat (<strong>Window > Show View > Other > Android >
+LogCat</strong>).</li>
+</ol>
+
diff --git a/docs/html/guide/topics/resources/runtime-changes.jd b/docs/html/guide/topics/resources/runtime-changes.jd
index e685c9b..74a9073 100644
--- a/docs/html/guide/topics/resources/runtime-changes.jd
+++ b/docs/html/guide/topics/resources/runtime-changes.jd
@@ -31,7 +31,8 @@
alternative resources.</p>
<p>To properly handle a restart, it is important that your Activity restores its previous
-state through the normal <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Activity
+state through the normal <a
+href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activity
lifecycle</a>, in which Android calls
{@link android.app.Activity#onSaveInstanceState(Bundle) onSaveInstanceState()} before it destroys
your Activity so that you can save data about the application state. You can then restore the state
@@ -44,7 +45,7 @@
<p>Your application should be able to restart at any time without loss of user data or
state in order to handle events such as when the user receives an incoming phone call and then
returns to your application (read about the
-<a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Activity lifecycle</a>).</p>
+<a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activity lifecycle</a>).</p>
<p>However, you might encounter a situation in which restarting your application and
restoring significant amounts of data can be costly and create a poor user experience. In such a
diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd
index ea8dc1c..6699fe1 100644
--- a/docs/html/guide/topics/search/search-dialog.jd
+++ b/docs/html/guide/topics/search/search-dialog.jd
@@ -423,8 +423,8 @@
<p>If the current Activity is not the searchable Activity, then the normal Activity lifecycle
events are triggered once the user executes a search (the current Activity receives {@link
android.app.Activity#onPause()} and so forth, as
-described in <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Application
-Fundamentals</a>). If, however, the current Activity is the searchable Activity, then one of two
+described in <a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activities</a>
+document). If, however, the current Activity is the searchable Activity, then one of two
things happens:</p>
<ol type="a">
diff --git a/docs/html/guide/topics/testing/service_testing.jd b/docs/html/guide/topics/testing/service_testing.jd
index 3979f3c..77884779 100644
--- a/docs/html/guide/topics/testing/service_testing.jd
+++ b/docs/html/guide/topics/testing/service_testing.jd
@@ -56,8 +56,8 @@
</p>
<p>
This document describes techniques for testing Service objects. If you aren't familiar with the
- Service class, please read <a href="{@docRoot}guide/topics/fundamentals.html">
- Application Fundamentals</a>. If you aren't familiar with Android testing, please read
+ Service class, please read the <a href="{@docRoot}guide/topics/fundamentals/services.html">
+ Services</a> document. If you aren't familiar with Android testing, please read
<a href="{@docRoot}guide/topics/testing/testing_android.html">Testing Fundamentals</a>,
the introduction to the Android testing and instrumentation framework.
</p>
diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd
index c348767..2da022c 100644
--- a/docs/html/guide/topics/ui/declaring-layout.jd
+++ b/docs/html/guide/topics/ui/declaring-layout.jd
@@ -124,8 +124,9 @@
</pre>
<p>The <code>onCreate()</code> callback method in your Activity is called by the Android framework when
-your Activity is launched (see the discussion on Lifecycles, in the
-<a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Application Fundamentals</a>, for more on this).</p>
+your Activity is launched (see the discussion about lifecycles, in the
+<a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activities</a>
+document).</p>
<h2 id="attributes">Attributes</h2>
diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd
index d50e1cb..c1272b6 100644
--- a/docs/html/guide/topics/ui/dialogs.jd
+++ b/docs/html/guide/topics/ui/dialogs.jd
@@ -301,7 +301,7 @@
<p class="note"><strong>Note:</strong> To save the selection when the user leaves or
pauses the Activity, you must properly save and restore the setting throughout
-the <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Activity Lifecycle</a>.
+the <a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">activity lifecycle</a>.
To permanently save the selections, even when the Activity process is completely shutdown,
you need to save the settings
with one of the <a href="{@docRoot}guide/topics/data/data-storage.html">Data
diff --git a/docs/html/guide/topics/ui/themes.jd b/docs/html/guide/topics/ui/themes.jd
index de699f2..57c9f2e 100644
--- a/docs/html/guide/topics/ui/themes.jd
+++ b/docs/html/guide/topics/ui/themes.jd
@@ -17,6 +17,7 @@
<ol>
<li><a href="#ApplyAStyle">Apply a style to a View</a></li>
<li><a href="#ApplyATheme">Apply a theme to an Activity or application</a></li>
+ <li><a href="#SelectATheme">Select a theme based on platform version</a></li>
</ol>
</li>
<li><a href="#PlatformStyles">Using Platform Styles and Themes</a></li>
@@ -303,21 +304,57 @@
</pre>
<p>If you like a theme, but want to tweak it, just add the theme as the <code>parent</code>
-of your custom theme. For example, you can modify the traditional dialog theme to use your own
-background image like this:</p>
+of your custom theme. For example, you can modify the traditional light theme to use your own
+color like this:</p>
<pre>
-<style name="CustomDialogTheme" parent="@android:style/Theme.Dialog">
- <item name="android:windowBackground">@drawable/custom_dialog_background</item>
+<color name="custom_theme_color">#b0b0ff</color>
+<style name="CustomTheme" parent="android:Theme.Light">
+ <item name="android:windowBackground">@color/custom_theme_color</item>
+ <item name="android:colorBackground">@color/custom_theme_color</item>
</style>
</pre>
-<p>Now use {@code CustomDialogTheme} instead of {@code Theme.Dialog} inside the Android
+<p>(Note that the color needs to supplied as a separate resource here because
+the <code>android:windowBackground</code> attribute only supports a reference to
+another resource; unlike <code>android:colorBackground</code>, it can not be given
+a color literal.)</p>
+
+<p>Now use {@code CustomTheme} instead of {@code Theme.Light} inside the Android
Manifest:</p>
<pre>
-<activity android:theme="@style/CustomDialogTheme">
+<activity android:theme="@style/CustomTheme">
</pre>
+<h3 id="SelectATheme">Select a theme based on platform version</h3>
+
+<p>Newer versions of Android have additional themes available to applications,
+and you may want to use these while running on those platforms while still being
+compatible with older versions. You can accomplish this through a custom theme
+that uses resource selection to switch between different parent themes.</p>
+
+<p>For example, here is the declaration for a custom theme which is simply
+the standard platforms default light theme. It would go in an XML file under
+<code>res/values</code> (typically <code>res/values/styles.xml</code>):
+<pre>
+<style name="LightThemeSelector" parent="android:Theme.Light">
+</style>
+</pre>
+
+<p>To have this theme use the newer "holo" theme when the application is running
+on {@link android.os.Build.VERSION_CODES#HONEYCOMB}, you can place another
+declaration for it in a file in <code>res/values-11</code>:</p>
+<pre>
+<style name="LightThemeSelector" parent="android:Theme.Holo.Light">
+</style>
+</pre>
+
+<p>Now use this theme like you would any other, and your application will
+automatically switch to the holo theme if running on
+{@link android.os.Build.VERSION_CODES#HONEYCOMB} or later.</p>
+
+<p>A list of the standard attributes that you can use in themes can be
+found at {@link android.R.styleable#Theme R.styleable.Theme}.</p>
<!-- This currently has some bugs
diff --git a/docs/html/guide/tutorials/notepad/notepad-ex3.jd b/docs/html/guide/tutorials/notepad/notepad-ex3.jd
index 573500f..557738e 100644
--- a/docs/html/guide/tutorials/notepad/notepad-ex3.jd
+++ b/docs/html/guide/tutorials/notepad/notepad-ex3.jd
@@ -203,7 +203,8 @@
have to store enough state to come back up later, preferably in the same
state it was in when it was killed.</p>
<p>
- Android has a <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">well-defined life
+ Activities have a <a
+href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">well-defined life
cycle</a>.
Lifecycle events can happen even if you are not handing off control to
another Activity explicitly. For example, perhaps a call comes in to the
diff --git a/docs/html/resources/faq/commontasks.jd b/docs/html/resources/faq/commontasks.jd
index 807df08..a5f5177 100644
--- a/docs/html/resources/faq/commontasks.jd
+++ b/docs/html/resources/faq/commontasks.jd
@@ -124,8 +124,9 @@
<h2>Implementing Activity Callbacks</h2>
<p>Android calls a number of callbacks to let you draw your screen, store data before
pausing, and refresh data after closing. You must implement at least some of
- these methods. See <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Lifecycles</a>
- discussion in Application Fundamentals to learn when and in what order these methods
+ these methods. Read the <a
+href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activities</a>
+ document to learn when and in what order these methods
are called. Here are some of the standard types of screen classes that Android provides:</p>
<ul>
<li>{@link android.app.Activity android.app.Activity} - This is a standard screen,
@@ -150,9 +151,9 @@
<p>When you open a new screen you can decide whether to make it transparent or floating,
or full-screen. The choice of new screen affects the event sequence of events
in the old screen (if the new screen obscures the old screen, a different
- series of events is called in the old screen). See <a
- href="{@docRoot}guide/topics/fundamentals.html#lcycles">Lifecycles</a> discussion
- in Application Fundamentals for details. </p>
+ series of events is called in the old screen). See the <a
+ href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activities</a> document for
+details. </p>
<p>Transparent or floating windows are implemented in three
standard ways: </p>
<ul>
@@ -309,7 +310,8 @@
the application is finalized. See the topics for {@link android.app.Activity#onSaveInstanceState} and
{@link android.app.Activity#onCreate} for
examples of storing and retrieving state.</p>
-<p>Read more about the lifecycle of an application in <a href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a>.</p>
+<p>Read more about the lifecycle of an activity in <a
+href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a> document.</p>
<h3>Storing and Retrieving Larger or More Complex Persistent Data<a name="storingandretrieving" id="storingandretrieving"></a></h3>
<p>Your application can store files or complex collection objects, and reserve them
for private use by itself or other activities in the application, or it can expose
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 11964da..5a3145b 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -180,7 +180,7 @@
}
},
{
- tags: ['article', 'ui', 'newfeature'],
+ tags: ['article', 'ui'],
path: 'articles/live-folders.html',
title: {
en: 'Live Folders'
@@ -190,7 +190,7 @@
}
},
{
- tags: ['article', 'ui', 'newfeature'],
+ tags: ['article', 'ui'],
path: 'articles/live-wallpapers.html',
title: {
en: 'Live Wallpapers'
@@ -250,7 +250,7 @@
}
},
{
- tags: ['article', 'newfeature'],
+ tags: ['article'],
path: 'articles/ui-1.5.html',
title: {
en: 'UI Framework Changes in Android 1.5'
@@ -260,7 +260,7 @@
}
},
{
- tags: ['article', 'newfeature'],
+ tags: ['article'],
path: 'articles/ui-1.6.html',
title: {
en: 'UI Framework Changes in Android 1.6'
@@ -435,13 +435,13 @@
}
},
{
- tags: ['sample', 'new'],
- path: 'samples/Honeycomb-Gallery/index.html',
+ tags: ['sample', 'new', 'newfeature', 'ui'],
+ path: 'samples/HoneycombGallery/index.html',
title: {
en: 'Honeycomb Gallery'
},
description: {
- en: 'An image gallery application using Honeycomb-specific APIs.'
+ en: 'An image gallery application using APIs that are new in Android 3.0 (a.k.a. Honeycomb).'
}
},
{
diff --git a/docs/html/resources/samples/images/hcgallery.png b/docs/html/resources/samples/images/hcgallery.png
index 9a80fd7..42b0183 100644
--- a/docs/html/resources/samples/images/hcgallery.png
+++ b/docs/html/resources/samples/images/hcgallery.png
Binary files differ
diff --git a/docs/html/resources/tutorials/notepad/notepad-ex3.jd b/docs/html/resources/tutorials/notepad/notepad-ex3.jd
index 573500f..557738e 100644
--- a/docs/html/resources/tutorials/notepad/notepad-ex3.jd
+++ b/docs/html/resources/tutorials/notepad/notepad-ex3.jd
@@ -203,7 +203,8 @@
have to store enough state to come back up later, preferably in the same
state it was in when it was killed.</p>
<p>
- Android has a <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">well-defined life
+ Activities have a <a
+href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">well-defined life
cycle</a>.
Lifecycle events can happen even if you are not handing off control to
another Activity explicitly. For example, perhaps a call comes in to the
diff --git a/docs/html/resources/tutorials/testing/activity_test.jd b/docs/html/resources/tutorials/testing/activity_test.jd
index afb9e3c..c94e8ab 100644
--- a/docs/html/resources/tutorials/testing/activity_test.jd
+++ b/docs/html/resources/tutorials/testing/activity_test.jd
@@ -787,8 +787,8 @@
<p>
<strong>Note:</strong> If you would like to learn more about the difference between losing
focus/pausing and killing an application,
- refer to the <a href="{@docRoot}guide/topics/fundamentals.html#actlife">Activity Lifecycle</a>
- section.
+ read about the <a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">activity
+lifecycle</a>.
</p>
<p>
The first test verifies that the spinner selection is maintained after the entire application is shut down and then restarted. The test uses instrumentation to
diff --git a/docs/html/sdk/1.6_r1/upgrading.jd b/docs/html/sdk/1.6_r1/upgrading.jd
index ebe6a95..49535c9 100644
--- a/docs/html/sdk/1.6_r1/upgrading.jd
+++ b/docs/html/sdk/1.6_r1/upgrading.jd
@@ -1,6 +1,5 @@
page.title=Upgrading the SDK
sdk.version=1.6
-sdk.preview=0
@jd:body
diff --git a/docs/html/sdk/android-3.0-highlights.jd b/docs/html/sdk/android-3.0-highlights.jd
index ed49307..0378c35 100644
--- a/docs/html/sdk/android-3.0-highlights.jd
+++ b/docs/html/sdk/android-3.0-highlights.jd
@@ -129,7 +129,7 @@
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Camera and Gallery</strong></p>
-<p>The Camera application has been redesigned to take advantage of a larger screen for quick access to exposure, focus, flash, zoom, front-facing camera, and more. To let users capture scenes in new ways, it adds built-in support for time-lapse video recording. Gallery application lets users view albums and other collections in full-screen mode, with easy access to thumbnails for other photos in the collection. </p>
+<p>The Camera application has been redesigned to take advantage of a larger screen for quick access to exposure, focus, flash, zoom, front-facing camera, and more. To let users capture scenes in new ways, it adds built-in support for time-lapse video recording. The Gallery application lets users view albums and other collections in full-screen mode, with easy access to thumbnails for other photos in the collection. </p>
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Contacts</strong></p>
diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd
index 2c3fd6a..2f53305 100644
--- a/docs/html/sdk/ndk/index.jd
+++ b/docs/html/sdk/ndk/index.jd
@@ -1,16 +1,16 @@
ndk=true
-ndk.win_download=android-ndk-r5-windows.zip
-ndk.win_bytes=62217450
-ndk.win_checksum=59cbb02d91d74e9c5c7278d94c989e80
+ndk.win_download=android-ndk-r5b-windows.zip
+ndk.win_bytes=61299831
+ndk.win_checksum=87745ada305ab639399161ab4faf684c
-ndk.mac_download=android-ndk-r5-darwin-x86.tar.bz2
+ndk.mac_download=android-ndk-r5b-darwin-x86.tar.bz2
ndk.mac_bytes=50210863
-ndk.mac_checksum=9dee8e4cb529a5619e9b8d1707478c32
+ndk.mac_checksum=019a14622a377b3727ec789af6707037
-ndk.linux_download=android-ndk-r5-linux-x86.tar.bz2
-ndk.linux_bytes=44362746
-ndk.linux_checksum=49d5c35ec02bafc074842542c58b7eb3
+ndk.linux_download=android-ndk-r5b-linux-x86.tar.bz2
+ndk.linux_bytes=44138539
+ndk.linux_checksum=4c0045ddc2bfd657be9d5177d0e0b7e7
page.title=Android NDK
@jd:body
diff --git a/include/media/stagefright/DataSource.h b/include/media/stagefright/DataSource.h
index d4f1733..f95e56a 100644
--- a/include/media/stagefright/DataSource.h
+++ b/include/media/stagefright/DataSource.h
@@ -75,7 +75,7 @@
static void RegisterDefaultSniffers();
// for DRM
- virtual DecryptHandle* DrmInitialization(DrmManagerClient *client) {
+ virtual DecryptHandle* DrmInitialization() {
return NULL;
}
virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client) {};
diff --git a/include/media/stagefright/FileSource.h b/include/media/stagefright/FileSource.h
index 72a0403..51a4343 100644
--- a/include/media/stagefright/FileSource.h
+++ b/include/media/stagefright/FileSource.h
@@ -38,7 +38,7 @@
virtual status_t getSize(off64_t *size);
- virtual DecryptHandle* DrmInitialization(DrmManagerClient *client);
+ virtual DecryptHandle* DrmInitialization();
virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client);
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 99a047a..5a43c6a 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -392,7 +392,6 @@
if (mDecryptHandle != NULL) {
mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
Playback::STOP, 0);
- mDrmManagerClient->closeDecryptSession(mDecryptHandle);
mDecryptHandle = NULL;
mDrmManagerClient = NULL;
}
diff --git a/media/libstagefright/DRMExtractor.cpp b/media/libstagefright/DRMExtractor.cpp
index 3c98932..4b83568 100644
--- a/media/libstagefright/DRMExtractor.cpp
+++ b/media/libstagefright/DRMExtractor.cpp
@@ -38,12 +38,12 @@
namespace android {
-DrmManagerClient* gDrmManagerClient = NULL;
-
class DRMSource : public MediaSource {
public:
DRMSource(const sp<MediaSource> &mediaSource,
- DecryptHandle* decryptHandle, int32_t trackId, DrmBuffer* ipmpBox);
+ DecryptHandle *decryptHandle,
+ DrmManagerClient *managerClient,
+ int32_t trackId, DrmBuffer *ipmpBox);
virtual status_t start(MetaData *params = NULL);
virtual status_t stop();
@@ -57,6 +57,7 @@
private:
sp<MediaSource> mOriginalMediaSource;
DecryptHandle* mDecryptHandle;
+ DrmManagerClient* mDrmManagerClient;
size_t mTrackId;
mutable Mutex mDRMLock;
size_t mNALLengthSize;
@@ -69,13 +70,16 @@
////////////////////////////////////////////////////////////////////////////////
DRMSource::DRMSource(const sp<MediaSource> &mediaSource,
- DecryptHandle* decryptHandle, int32_t trackId, DrmBuffer* ipmpBox)
+ DecryptHandle *decryptHandle,
+ DrmManagerClient *managerClient,
+ int32_t trackId, DrmBuffer *ipmpBox)
: mOriginalMediaSource(mediaSource),
mDecryptHandle(decryptHandle),
+ mDrmManagerClient(managerClient),
mTrackId(trackId),
mNALLengthSize(0),
mWantsNALFragments(false) {
- gDrmManagerClient->initializeDecryptUnit(
+ mDrmManagerClient->initializeDecryptUnit(
mDecryptHandle, trackId, ipmpBox);
const char *mime;
@@ -100,7 +104,7 @@
DRMSource::~DRMSource() {
Mutex::Autolock autoLock(mDRMLock);
- gDrmManagerClient->finalizeDecryptUnit(mDecryptHandle, mTrackId);
+ mDrmManagerClient->finalizeDecryptUnit(mDecryptHandle, mTrackId);
}
status_t DRMSource::start(MetaData *params) {
@@ -140,7 +144,7 @@
decryptedDrmBuffer.data = new char[len];
DrmBuffer *pDecryptedDrmBuffer = &decryptedDrmBuffer;
- if ((err = gDrmManagerClient->decrypt(mDecryptHandle, mTrackId,
+ if ((err = mDrmManagerClient->decrypt(mDecryptHandle, mTrackId,
&encryptedDrmBuffer, &pDecryptedDrmBuffer)) != DRM_NO_ERROR) {
if (decryptedDrmBuffer.data) {
@@ -234,12 +238,12 @@
DRMExtractor::DRMExtractor(const sp<DataSource> &source, const char* mime)
: mDataSource(source),
- mDecryptHandle(NULL) {
+ mDecryptHandle(NULL),
+ mDrmManagerClient(NULL) {
mOriginalExtractor = MediaExtractor::Create(source, mime);
mOriginalExtractor->setDrmFlag(true);
- DrmManagerClient *client;
- source->getDrmInfo(&mDecryptHandle, &client);
+ source->getDrmInfo(&mDecryptHandle, &mDrmManagerClient);
}
DRMExtractor::~DRMExtractor() {
@@ -260,7 +264,8 @@
ipmpBox.data = mOriginalExtractor->getDrmTrackInfo(trackID, &(ipmpBox.length));
CHECK(ipmpBox.length > 0);
- return new DRMSource(originalMediaSource, mDecryptHandle, trackID, &ipmpBox);
+ return new DRMSource(originalMediaSource, mDecryptHandle, mDrmManagerClient,
+ trackID, &ipmpBox);
}
sp<MetaData> DRMExtractor::getTrackMetaData(size_t index, uint32_t flags) {
@@ -271,22 +276,10 @@
return mOriginalExtractor->getMetaData();
}
-static Mutex gDRMSnifferMutex;
bool SniffDRM(
const sp<DataSource> &source, String8 *mimeType, float *confidence,
sp<AMessage> *) {
- {
- Mutex::Autolock autoLock(gDRMSnifferMutex);
- if (gDrmManagerClient == NULL) {
- gDrmManagerClient = new DrmManagerClient();
- }
-
- if (gDrmManagerClient == NULL) {
- return false;
- }
- }
-
- DecryptHandle *decryptHandle = source->DrmInitialization(gDrmManagerClient);
+ DecryptHandle *decryptHandle = source->DrmInitialization();
if (decryptHandle != NULL) {
if (decryptHandle->decryptApiType == DecryptApiType::CONTAINER_BASED) {
diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp
index 98d5b50..b8e75fd 100644
--- a/media/libstagefright/FileSource.cpp
+++ b/media/libstagefright/FileSource.cpp
@@ -60,6 +60,17 @@
delete[] mDrmBuf;
mDrmBuf = NULL;
}
+
+ if (mDecryptHandle != NULL) {
+ // To release mDecryptHandle
+ mDrmManagerClient->closeDecryptSession(mDecryptHandle);
+ mDecryptHandle = NULL;
+ }
+
+ if (mDrmManagerClient != NULL) {
+ delete mDrmManagerClient;
+ mDrmManagerClient = NULL;
+ }
}
status_t FileSource::initCheck() const {
@@ -113,11 +124,14 @@
return OK;
}
-DecryptHandle* FileSource::DrmInitialization(DrmManagerClient* client) {
- if (client == NULL) {
+DecryptHandle* FileSource::DrmInitialization() {
+ if (mDrmManagerClient == NULL) {
+ mDrmManagerClient = new DrmManagerClient();
+ }
+
+ if (mDrmManagerClient == NULL) {
return NULL;
}
- mDrmManagerClient = client;
if (mDecryptHandle == NULL) {
mDecryptHandle = mDrmManagerClient->openDecryptSession(
@@ -125,6 +139,7 @@
}
if (mDecryptHandle == NULL) {
+ delete mDrmManagerClient;
mDrmManagerClient = NULL;
}
diff --git a/media/libstagefright/NuCachedSource2.cpp b/media/libstagefright/NuCachedSource2.cpp
index 741aa1c..c7b99b9 100644
--- a/media/libstagefright/NuCachedSource2.cpp
+++ b/media/libstagefright/NuCachedSource2.cpp
@@ -477,8 +477,8 @@
restartPrefetcherIfNecessary_l(true /* ignore low water threshold */);
}
-DecryptHandle* NuCachedSource2::DrmInitialization(DrmManagerClient* client) {
- return mSource->DrmInitialization(client);
+DecryptHandle* NuCachedSource2::DrmInitialization() {
+ return mSource->DrmInitialization();
}
void NuCachedSource2::getDrmInfo(DecryptHandle **handle, DrmManagerClient **client) {
diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp
index 653c85e..af04f93 100644
--- a/media/libstagefright/NuHTTPDataSource.cpp
+++ b/media/libstagefright/NuHTTPDataSource.cpp
@@ -79,6 +79,16 @@
}
NuHTTPDataSource::~NuHTTPDataSource() {
+ if (mDecryptHandle != NULL) {
+ // To release mDecryptHandle
+ mDrmManagerClient->closeDecryptSession(mDecryptHandle);
+ mDecryptHandle = NULL;
+ }
+
+ if (mDrmManagerClient != NULL) {
+ delete mDrmManagerClient;
+ mDrmManagerClient = NULL;
+ }
}
status_t NuHTTPDataSource::connect(
@@ -486,11 +496,14 @@
}
}
-DecryptHandle* NuHTTPDataSource::DrmInitialization(DrmManagerClient* client) {
- if (client == NULL) {
+DecryptHandle* NuHTTPDataSource::DrmInitialization() {
+ if (mDrmManagerClient == NULL) {
+ mDrmManagerClient = new DrmManagerClient();
+ }
+
+ if (mDrmManagerClient == NULL) {
return NULL;
}
- mDrmManagerClient = client;
if (mDecryptHandle == NULL) {
/* Note if redirect occurs, mUri is the redirect uri instead of the
@@ -500,6 +513,7 @@
}
if (mDecryptHandle == NULL) {
+ delete mDrmManagerClient;
mDrmManagerClient = NULL;
}
diff --git a/media/libstagefright/include/DRMExtractor.h b/media/libstagefright/include/DRMExtractor.h
index cafc812..9881cc1 100644
--- a/media/libstagefright/include/DRMExtractor.h
+++ b/media/libstagefright/include/DRMExtractor.h
@@ -46,6 +46,7 @@
sp<MediaExtractor> mOriginalExtractor;
DecryptHandle* mDecryptHandle;
+ DrmManagerClient* mDrmManagerClient;
DRMExtractor(const DRMExtractor &);
DRMExtractor &operator=(const DRMExtractor &);
diff --git a/media/libstagefright/include/NuCachedSource2.h b/media/libstagefright/include/NuCachedSource2.h
index 28840be..022804c 100644
--- a/media/libstagefright/include/NuCachedSource2.h
+++ b/media/libstagefright/include/NuCachedSource2.h
@@ -37,7 +37,7 @@
virtual status_t getSize(off64_t *size);
virtual uint32_t flags();
- virtual DecryptHandle* DrmInitialization(DrmManagerClient *client);
+ virtual DecryptHandle* DrmInitialization();
virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client);
virtual String8 getUri();
////////////////////////////////////////////////////////////////////////////
diff --git a/media/libstagefright/include/NuHTTPDataSource.h b/media/libstagefright/include/NuHTTPDataSource.h
index c8e93be..a99e84a 100644
--- a/media/libstagefright/include/NuHTTPDataSource.h
+++ b/media/libstagefright/include/NuHTTPDataSource.h
@@ -31,7 +31,7 @@
// false otherwise.
bool estimateBandwidth(int32_t *bandwidth_bps);
- virtual DecryptHandle* DrmInitialization(DrmManagerClient *client);
+ virtual DecryptHandle* DrmInitialization();
virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client);
virtual String8 getUri();
diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml
index 2253eb2..c9d2628b 100644
--- a/media/tests/MediaFrameworkTest/AndroidManifest.xml
+++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml
@@ -58,4 +58,9 @@
android:label="Media Power tests InstrumentationRunner">
</instrumentation>
+ <instrumentation android:name=".MediaPlayerStressTestRunner"
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="Media Power tests InstrumentationRunner">
+ </instrumentation>
+
</manifest>
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaPlayerStressTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaPlayerStressTestRunner.java
new file mode 100755
index 0000000..5438061
--- /dev/null
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaPlayerStressTestRunner.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ * 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.mediaframeworktest;
+
+import android.test.InstrumentationTestRunner;
+import android.test.InstrumentationTestSuite;
+import com.android.mediaframeworktest.stress.MediaPlayerStressTest;
+
+import junit.framework.TestSuite;
+
+public class MediaPlayerStressTestRunner extends InstrumentationTestRunner {
+
+ @Override
+ public TestSuite getAllTests() {
+ TestSuite suite = new InstrumentationTestSuite(this);
+ suite.addTestSuite(MediaPlayerStressTest.class);
+ return suite;
+ }
+
+ @Override
+ public ClassLoader getLoader() {
+ return MediaPlayerStressTestRunner.class.getClassLoader();
+ }
+}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
index 3e46e27..0b0d0ce 100755
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
@@ -21,7 +21,6 @@
import android.test.InstrumentationTestRunner;
import android.test.InstrumentationTestSuite;
import com.android.mediaframeworktest.stress.MediaRecorderStressTest;
-import com.android.mediaframeworktest.stress.MediaPlayerStressTest;
import junit.framework.TestSuite;
@@ -42,7 +41,6 @@
public TestSuite getAllTests() {
TestSuite suite = new InstrumentationTestSuite(this);
suite.addTestSuite(MediaRecorderStressTest.class);
- suite.addTestSuite(MediaPlayerStressTest.class);
return suite;
}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
index 2eea206..cad7e53 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
@@ -45,7 +45,7 @@
*/
public class CodecTest {
- private static String TAG = "MediaPlayerApiTest";
+ private static String TAG = "CodecTest";
private static MediaPlayer mMediaPlayer;
private MediaPlayer.OnPreparedListener mOnPreparedListener;
@@ -58,7 +58,13 @@
private static final Object videoSizeChanged = new Object();
private static final Object onCompletion = new Object();
private static boolean onPrepareSuccess = false;
- private static boolean onCompleteSuccess = false;
+ public static boolean onCompleteSuccess = false;
+ public static boolean mPlaybackError = false;
+ public static boolean mIsMediaInfoUnknown = false;
+ public static boolean mIsMediaInfoVideoTrackLagging = false;
+ public static boolean mIsMediaInfoBadInterleaving = false;
+ public static boolean mIsMediaInfoNotSeekable = false;
+ public static boolean mIsMediaInfoMetdataUpdate = false;
public static String printCpuInfo(){
String cm = "dumpsys cpuinfo";
@@ -747,13 +753,52 @@
}
};
+ static MediaPlayer.OnErrorListener mOnErrorListener = new MediaPlayer.OnErrorListener() {
+ public boolean onError(MediaPlayer mp, int framework_err, int impl_err) {
+ mPlaybackError = true;
+ mp.reset();
+ return true;
+ }
+ };
+
+ static MediaPlayer.OnInfoListener mInfoListener = new MediaPlayer.OnInfoListener() {
+ public boolean onInfo(MediaPlayer mp, int what, int extra) {
+ switch (what){
+ case MediaPlayer.MEDIA_INFO_UNKNOWN:
+ mIsMediaInfoUnknown = true;
+ break;
+ case MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING:
+ mIsMediaInfoVideoTrackLagging = true;
+ break;
+ case MediaPlayer.MEDIA_INFO_BAD_INTERLEAVING:
+ mIsMediaInfoBadInterleaving = true;
+ break;
+ case MediaPlayer.MEDIA_INFO_NOT_SEEKABLE:
+ mIsMediaInfoNotSeekable = true;
+ break;
+ case MediaPlayer.MEDIA_INFO_METADATA_UPDATE:
+ mIsMediaInfoMetdataUpdate = true;
+ break;
+ }
+ return true;
+ }
+ };
+
// For each media file, forward twice and backward once, then play to the end
public static boolean playMediaSamples(String filePath) throws Exception {
int duration = 0;
int curPosition = 0;
int nextPosition = 0;
int waittime = 0;
- Random r = new Random();
+ onCompleteSuccess = false;
+ mIsMediaInfoUnknown = false;
+ mIsMediaInfoVideoTrackLagging = false;
+ mIsMediaInfoBadInterleaving = false;
+ mIsMediaInfoNotSeekable = false;
+ mIsMediaInfoMetdataUpdate = false;
+ mPlaybackError = false;
+ String testResult;
+
initializeMessageLooper();
synchronized (lock) {
try {
@@ -765,37 +810,18 @@
}
try {
mMediaPlayer.setOnCompletionListener(mCompletionListener);
+ mMediaPlayer.setOnErrorListener(mOnErrorListener);
Log.v(TAG, "playMediaSamples: sample file name " + filePath);
mMediaPlayer.setDataSource(filePath);
mMediaPlayer.setDisplay(MediaFrameworkTest.mSurfaceView.getHolder());
mMediaPlayer.prepare();
duration = mMediaPlayer.getDuration();
- Log.v(TAG, "playMediaSamples: duration = " + duration);
// start to play
mMediaPlayer.start();
- // randomly play for time within (0, duration/3)
- Thread.sleep(r.nextInt(duration/3));
- mMediaPlayer.pause();
- Log.v(TAG, "playMediaSamples: current position after pause: "
- + mMediaPlayer.getCurrentPosition());
- // seek to position (0, 2/3*duration)
- nextPosition = mMediaPlayer.getCurrentPosition() + r.nextInt(duration/3);
- mMediaPlayer.seekTo(nextPosition);
- Log.v(TAG, "playMediaSamples: current position after the first seek:"
- + mMediaPlayer.getCurrentPosition());
- // play for another short time
- mMediaPlayer.start();
- Thread.sleep(r.nextInt(duration/6));
- Log.v(TAG, "playMediaSamples: position after the second play:"
- + mMediaPlayer.getCurrentPosition());
- // seek to a random position (0, duration)
- mMediaPlayer.seekTo(r.nextInt(duration));
- Log.v(TAG, "playMediaSamples: current position after the second seek:"
- + mMediaPlayer.getCurrentPosition());
waittime = duration - mMediaPlayer.getCurrentPosition();
synchronized(onCompletion){
try {
- onCompletion.wait(waittime + 30000);
+ onCompletion.wait(waittime + 2000);
}catch (Exception e) {
Log.v(TAG, "playMediaSamples are interrupted");
return false;
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
index 64ffa4e..d22025c 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
@@ -483,29 +483,4 @@
CodecTest.prepareAsyncCallback(MediaNames.STREAM_H264_480_360_1411k, true);
assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess);
}
-
- //Provide a tool to play all kinds of media files in a directory
- @Suppress
- @LargeTest
- public void testMediaSamples() throws Exception {
- // load directory files
- boolean onCompleteSuccess = false;
- File dir = new File(MediaNames.MEDIA_SAMPLE_POOL);
- String[] children = dir.list();
- if (children == null) {
- Log.v("MediaPlayerApiTest:testMediaSamples", "dir is empty");
- return;
- } else {
- for (int i = 0; i < children.length; i++) {
- //Get filename of directory
- String filename = children[i];
- Log.v("MediaPlayerApiTest",
- "testMediaSamples: file to be played: "
- + dir + "/" + filename);
- onCompleteSuccess =
- CodecTest.playMediaSamples(dir + "/" + filename);
- assertTrue("testMediaSamples", onCompleteSuccess);
- }
- }
- }
}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
index 95b7386..b694d16 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
@@ -18,6 +18,9 @@
import com.android.mediaframeworktest.MediaFrameworkTest;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Intent;
import android.hardware.Camera;
import android.media.MediaPlayer;
import android.media.MediaRecorder;
@@ -27,121 +30,132 @@
import android.view.SurfaceHolder;
import com.android.mediaframeworktest.MediaNames;
+import com.android.mediaframeworktest.functional.CodecTest;
-import java.util.Random;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.Writer;
+
+import android.test.AndroidTestCase;
+import android.test.InstrumentationTestCase;
/**
* Junit / Instrumentation test case for the media player
*/
-public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<MediaFrameworkTest> {
+public class MediaPlayerStressTest extends InstrumentationTestCase {
private String TAG = "MediaPlayerStressTest";
- private MediaRecorder mRecorder;
- private Camera mCamera;
-
- private static final int NUMBER_OF_RANDOM_REPOSITION_AND_PLAY = 10;
- private static final int NUMBER_OF_RANDOM_REPOSITION_AND_PLAY_SHORT = 5;
- private static final int NUMBER_OF_STRESS_LOOPS = 500;
- private static final int PLAYBACK_END_TOLERANCE = 30000;
- private static final int WAIT_UNTIL_PLAYBACK_FINISH = 515000 ;
public MediaPlayerStressTest() {
- super("com.android.mediaframeworktest", MediaFrameworkTest.class);
}
protected void setUp() throws Exception {
- getActivity();
super.setUp();
}
- @LargeTest
- public void testStressHWDecoderRelease() throws Exception {
- SurfaceHolder mSurfaceHolder;
- long randomseed = System.currentTimeMillis();
- Random generator = new Random(randomseed);
- Log.v(TAG, "Random seed: " + randomseed);
- int video_duration = MediaNames.STREAM_H264_480_360_1411k_DURATION;
- int random_play_time;
+ private int mTotalPlaybackError = 0;
+ private int mTotalComplete = 0;
+ private int mTotalInfoUnknown = 0;
+ private int mTotalVideoTrackLagging = 0;
+ private int mTotalBadInterleaving = 0;
+ private int mTotalNotSeekable = 0;
+ private int mTotalMetaDataUpdate = 0;
- mSurfaceHolder = MediaFrameworkTest.mSurfaceView.getHolder();
- try {
- //assertTrue(MediaFrameworkTest.checkStreamingServer());
- for (int i = 0; i < NUMBER_OF_STRESS_LOOPS; i++) {
- MediaPlayer mp = new MediaPlayer();
- mp.setDataSource(MediaNames.STREAM_H264_480_360_1411k);
- mp.setDisplay(MediaFrameworkTest.mSurfaceView.getHolder());
- mp.prepare();
- mp.start();
- // seek and play
- for (int j = 0; j < generator.nextInt(10); j++) {
- random_play_time =
- generator.nextInt(MediaNames.STREAM_H264_480_360_1411k_DURATION / 2);
- Log.v(TAG, "Play time = " + random_play_time);
- Thread.sleep(random_play_time);
- int seek_time = MediaNames.STREAM_H264_480_360_1411k_DURATION / 2;
- Log.v(TAG, "Seek time = " + seek_time);
- mp.seekTo(seek_time);
- }
- mp.release();
- }
+ private void writeTestOutput(String filename, Writer output) throws Exception{
+ output.write("File Name: " + filename);
+ output.write(" Complete: " + CodecTest.onCompleteSuccess);
+ output.write(" Error: " + CodecTest.mPlaybackError);
+ output.write(" Unknown Info: " + CodecTest.mIsMediaInfoUnknown);
+ output.write(" Track Lagging: " + CodecTest.mIsMediaInfoVideoTrackLagging);
+ output.write(" BadInterleaving: " + CodecTest.mIsMediaInfoBadInterleaving);
+ output.write(" Not Seekable: " + CodecTest.mIsMediaInfoNotSeekable);
+ output.write(" Info Meta data update: " + CodecTest.mIsMediaInfoMetdataUpdate);
+ output.write("\n");
+ }
- } catch (Exception e) {
- Log.v(TAG, e.toString());
- assertTrue("testStressHWDecoderRelease", false);
+ private void writeTestSummary(Writer output) throws Exception{
+ output.write("Total Result:\n");
+ output.write(" Complete: " + mTotalComplete);
+ output.write(" Error: " + mTotalPlaybackError);
+ output.write(" Unknown Info: " + mTotalInfoUnknown);
+ output.write(" Track Lagging: " + mTotalVideoTrackLagging );
+ output.write(" BadInterleaving: " + mTotalBadInterleaving);
+ output.write(" Not Seekable: " + mTotalNotSeekable);
+ output.write(" Info Meta data update: " + mTotalMetaDataUpdate);
+ output.write("\n");
+ }
+
+ private void updateTestResult(){
+ if (CodecTest.onCompleteSuccess){
+ mTotalComplete++;
+ }
+ else if (CodecTest.mPlaybackError){
+ mTotalPlaybackError++;
+ }
+ else if (CodecTest.mIsMediaInfoUnknown){
+ mTotalInfoUnknown++;
+ }
+ else if (CodecTest.mIsMediaInfoVideoTrackLagging){
+ mTotalVideoTrackLagging++;
+ }
+ else if (CodecTest.mIsMediaInfoBadInterleaving){
+ mTotalBadInterleaving++;
+ }
+ else if (CodecTest.mIsMediaInfoNotSeekable){
+ mTotalNotSeekable++;
+ }
+ else if (CodecTest.mIsMediaInfoMetdataUpdate){
+ mTotalMetaDataUpdate++;
}
}
+ //Test that will start the playback for all the videos
+ //under the samples folder
@LargeTest
- public void testStressGetCurrentPosition() throws Exception {
- SurfaceHolder mSurfaceHolder;
- long randomseed = System.currentTimeMillis();
- Random generator = new Random(randomseed);
- Log.v(TAG, "Random seed: " + randomseed);
- int video_duration = MediaNames.VIDEO_H263_AMR_DURATION;
- int random_play_time = 0;
- int random_seek_time = 0;
- int random_no_of_seek = 0;
+ public void testVideoPlayback() throws Exception {
+ String fileWithError = "Filename:\n";
+ File playbackOutput = new File("/sdcard/PlaybackTestResult.txt");
+ Writer output = new BufferedWriter(new FileWriter(playbackOutput, true));
- mSurfaceHolder = MediaFrameworkTest.mSurfaceView.getHolder();
- try {
- for (int i = 0; i < NUMBER_OF_STRESS_LOOPS; i++) {
- MediaPlayer mp = new MediaPlayer();
- mp.setDataSource(MediaNames.VIDEO_H263_AMR);
- mp.setDisplay(MediaFrameworkTest.mSurfaceView.getHolder());
- mp.prepare();
- mp.start();
- random_no_of_seek = generator.nextInt(10);
- // make sure the seek at least run once.
- if (random_no_of_seek == 0) {
- random_no_of_seek = 1;
+ boolean testResult = true;
+ // load directory files
+ boolean onCompleteSuccess = false;
+ File dir = new File(MediaNames.MEDIA_SAMPLE_POOL);
+
+ Instrumentation inst = getInstrumentation();
+ Intent intent = new Intent();
+
+ intent.setClass(getInstrumentation().getTargetContext(), MediaFrameworkTest.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+ String[] children = dir.list();
+ if (children == null) {
+ Log.v("MediaPlayerApiTest:testMediaSamples", "dir is empty");
+ return;
+ } else {
+ for (int i = 0; i < children.length; i++) {
+ Activity act = inst.startActivitySync(intent);
+ //Get filename of directory
+ String filename = children[i];
+ onCompleteSuccess =
+ CodecTest.playMediaSamples(dir + "/" + filename);
+ if (!onCompleteSuccess){
+ //Don't fail the test right away, print out the failure file.
+ fileWithError += filename + '\n';
+ Log.v(TAG, "Failure File : " + fileWithError);
+ testResult = false;
}
- Log.v(TAG, "random_seek = " + random_no_of_seek);
- // Play for 10 seconds then random seekTo
- for (int j = 0; j < random_no_of_seek; j++) {
- random_play_time =
- generator.nextInt(video_duration / 100);
- Log.v(TAG, "Play time = " + random_play_time);
- Thread.sleep(random_play_time);
- random_seek_time =
- generator.nextInt(video_duration / 2);
- Log.v(TAG, "Seek time = " + random_seek_time);
- mp.seekTo(random_seek_time);
- }
- //Seek to 10s from the end of the video
- mp.seekTo(video_duration - 10000);
- //After reposition, play 30 seconds the video should be finished.
- Thread.sleep(PLAYBACK_END_TOLERANCE);
- Log.v(TAG, "CurrentPosition = " + mp.getCurrentPosition());
- if ( mp.isPlaying() || mp.getCurrentPosition()
- > (video_duration)){
- assertTrue("Current PlayTime greater than duration", false);
- }
- mp.release();
+ Thread.sleep(3000);
+ //Call onCreat to recreate the surface
+ act.finish();
+ //Write test result to an output file
+ writeTestOutput(filename,output);
+ //Get the summary
+ updateTestResult();
}
-
- } catch (Exception e) {
- Log.v(TAG, e.toString());
- assertTrue("testStressGetCurrentPosition", false);
- }
+ writeTestSummary(output);
+ output.close();
+ assertTrue("testMediaSamples", testResult);
+ }
}
-}
-
+}
\ No newline at end of file
