Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
diff --git a/core/java/android/server/BluetoothAdapterStateMachine.java b/core/java/android/server/BluetoothAdapterStateMachine.java
index 8ec79e2..f617d95 100644
--- a/core/java/android/server/BluetoothAdapterStateMachine.java
+++ b/core/java/android/server/BluetoothAdapterStateMachine.java
@@ -528,7 +528,7 @@
}
// we turn all the way to PowerOff with AIRPLANE_MODE_ON
- if (message.what == AIRPLANE_MODE_ON) {
+ if (message.what == AIRPLANE_MODE_ON || mBluetoothService.isAirplaneModeOn()) {
// We inform all the per process callbacks
allProcessesCallback(false);
deferMessage(obtainMessage(AIRPLANE_MODE_ON));
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index 94fbbc8..fecc8f9 100755
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -1706,7 +1706,7 @@
}
/* Returns true if airplane mode is currently on */
- private final boolean isAirplaneModeOn() {
+ /*package*/ final boolean isAirplaneModeOn() {
return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.AIRPLANE_MODE_ON, 0) == 1;
}
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index b94eb76..66fca80 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -1187,11 +1187,19 @@
@Override
public void proceed() {
SslCertLookupTable.getInstance().setIsAllowed(sslError);
- nativeSslCertErrorProceed(handle);
+ post(new Runnable() {
+ public void run() {
+ nativeSslCertErrorProceed(handle);
+ }
+ });
}
@Override
public void cancel() {
- nativeSslCertErrorCancel(handle, certError);
+ post(new Runnable() {
+ public void run() {
+ nativeSslCertErrorCancel(handle, certError);
+ }
+ });
}
};
mCallbackProxy.onReceivedSslError(handler, sslError);
diff --git a/core/java/android/webkit/ClientCertRequestHandler.java b/core/java/android/webkit/ClientCertRequestHandler.java
index 3a71e7e..f862613 100644
--- a/core/java/android/webkit/ClientCertRequestHandler.java
+++ b/core/java/android/webkit/ClientCertRequestHandler.java
@@ -16,6 +16,7 @@
package android.webkit;
+import android.os.Handler;
import java.security.PrivateKey;
import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;
@@ -29,7 +30,7 @@
*
* @hide
*/
-public final class ClientCertRequestHandler {
+public final class ClientCertRequestHandler extends Handler {
private final BrowserFrame mBrowserFrame;
private final int mHandle;
@@ -49,23 +50,35 @@
* Proceed with the specified private key and client certificate chain.
*/
public void proceed(PrivateKey privateKey, X509Certificate[] chain) {
- byte[] privateKeyBytes = privateKey.getEncoded();
- byte[][] chainBytes;
+ final byte[] privateKeyBytes = privateKey.getEncoded();
+ final byte[][] chainBytes;
try {
chainBytes = NativeCrypto.encodeCertificates(chain);
+ mTable.Allow(mHostAndPort, privateKeyBytes, chainBytes);
+ post(new Runnable() {
+ public void run() {
+ mBrowserFrame.nativeSslClientCert(mHandle, privateKeyBytes, chainBytes);
+ }
+ });
} catch (CertificateEncodingException e) {
- mBrowserFrame.nativeSslClientCert(mHandle, null, null);
- return;
+ post(new Runnable() {
+ public void run() {
+ mBrowserFrame.nativeSslClientCert(mHandle, null, null);
+ return;
+ }
+ });
}
- mTable.Allow(mHostAndPort, privateKeyBytes, chainBytes);
- mBrowserFrame.nativeSslClientCert(mHandle, privateKeyBytes, chainBytes);
}
/**
* Igore the request for now, the user may be prompted again.
*/
public void ignore() {
- mBrowserFrame.nativeSslClientCert(mHandle, null, null);
+ post(new Runnable() {
+ public void run() {
+ mBrowserFrame.nativeSslClientCert(mHandle, null, null);
+ }
+ });
}
/**
@@ -73,6 +86,10 @@
*/
public void cancel() {
mTable.Deny(mHostAndPort);
- mBrowserFrame.nativeSslClientCert(mHandle, null, null);
+ post(new Runnable() {
+ public void run() {
+ mBrowserFrame.nativeSslClientCert(mHandle, null, null);
+ }
+ });
}
}
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index d136004..2d15afb 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -2872,6 +2872,6 @@
private native ArrayList<Rect> nativeGetTouchHighlightRects(int x, int y,
int slop);
- private native void nativeAutoFillForm(int queryId);
- private native void nativeScrollLayer(int layer, Rect rect);
+ private native void nativeAutoFillForm(int queryId);
+ private native void nativeScrollLayer(int layer, Rect rect);
}
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index 76d161d..905a171 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -429,14 +429,6 @@
}
/**
- * Save a lock pattern.
- * @param pattern The new pattern to save.
- */
- public void saveLockPattern(List<LockPatternView.Cell> pattern) {
- this.saveLockPattern(pattern, false);
- }
-
- /**
* Calls back SetupFaceLock to delete the temporary gallery file
*/
public void deleteTempGallery() {
@@ -461,6 +453,14 @@
/**
* Save a lock pattern.
* @param pattern The new pattern to save.
+ */
+ public void saveLockPattern(List<LockPatternView.Cell> pattern) {
+ this.saveLockPattern(pattern, false);
+ }
+
+ /**
+ * Save a lock pattern.
+ * @param pattern The new pattern to save.
* @param isFallback Specifies if this is a fallback to biometric weak
*/
public void saveLockPattern(List<LockPatternView.Cell> pattern, boolean isFallback) {
@@ -484,14 +484,16 @@
if (!isFallback) {
deleteGallery();
setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+ dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
+ pattern.size(), 0, 0, 0, 0, 0, 0);
} else {
setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK);
setLong(PASSWORD_TYPE_ALTERNATE_KEY,
DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
finishBiometricWeak();
+ dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,
+ 0, 0, 0, 0, 0, 0, 0);
}
- dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, pattern
- .size(), 0, 0, 0, 0, 0, 0);
} else {
if (keyStore.isEmpty()) {
keyStore.reset();
@@ -602,40 +604,45 @@
if (!isFallback) {
deleteGallery();
setLong(PASSWORD_TYPE_KEY, Math.max(quality, computedQuality));
+ if (computedQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
+ int letters = 0;
+ int uppercase = 0;
+ int lowercase = 0;
+ int numbers = 0;
+ int symbols = 0;
+ int nonletter = 0;
+ for (int i = 0; i < password.length(); i++) {
+ char c = password.charAt(i);
+ if (c >= 'A' && c <= 'Z') {
+ letters++;
+ uppercase++;
+ } else if (c >= 'a' && c <= 'z') {
+ letters++;
+ lowercase++;
+ } else if (c >= '0' && c <= '9') {
+ numbers++;
+ nonletter++;
+ } else {
+ symbols++;
+ nonletter++;
+ }
+ }
+ dpm.setActivePasswordState(Math.max(quality, computedQuality),
+ password.length(), letters, uppercase, lowercase,
+ numbers, symbols, nonletter);
+ } else {
+ // The password is not anything.
+ dpm.setActivePasswordState(
+ DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
+ 0, 0, 0, 0, 0, 0, 0);
+ }
} else {
+ // Case where it's a fallback for biometric weak
setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK);
setLong(PASSWORD_TYPE_ALTERNATE_KEY, Math.max(quality, computedQuality));
finishBiometricWeak();
- }
- if (computedQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
- int letters = 0;
- int uppercase = 0;
- int lowercase = 0;
- int numbers = 0;
- int symbols = 0;
- int nonletter = 0;
- for (int i = 0; i < password.length(); i++) {
- char c = password.charAt(i);
- if (c >= 'A' && c <= 'Z') {
- letters++;
- uppercase++;
- } else if (c >= 'a' && c <= 'z') {
- letters++;
- lowercase++;
- } else if (c >= '0' && c <= '9') {
- numbers++;
- nonletter++;
- } else {
- symbols++;
- nonletter++;
- }
- }
- dpm.setActivePasswordState(Math.max(quality, computedQuality), password
- .length(), letters, uppercase, lowercase, numbers, symbols, nonletter);
- } else {
- // The password is not anything.
- dpm.setActivePasswordState(
- DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0, 0, 0, 0, 0, 0);
+ dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,
+ 0, 0, 0, 0, 0, 0, 0);
}
// Add the password to the password history. We assume all
// password
diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml
index 7a5bb6a..568933c 100644
--- a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml
+++ b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml
@@ -63,7 +63,7 @@
</RelativeLayout>
<!-- right side: password -->
- <LinearLayout
+ <RelativeLayout
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="match_parent"
@@ -72,6 +72,7 @@
<LinearLayout
android:orientation="vertical"
+ android:layout_centerInParent="true"
android:layout_width="330dip"
android:layout_height="wrap_content">
@@ -152,6 +153,15 @@
</LinearLayout>
- </LinearLayout>
+ <!-- Area to overlay FaceLock -->
+ <View android:id="@+id/faceLockAreaView"
+ android:visibility="invisible"
+ android:layout_width="512dip"
+ android:layout_height="512dip"
+ android:layout_centerInParent="true"
+ android:background="@color/facelock_color_background"
+ />
+
+ </RelativeLayout>
</LinearLayout>
diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml
index 6df22ca..335a641 100644
--- a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml
+++ b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml
@@ -61,92 +61,109 @@
</RelativeLayout>
<!-- bottom: password -->
- <LinearLayout
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
- android:orientation="vertical"
android:gravity="center">
- <!-- Password entry field -->
<LinearLayout
- android:orientation="horizontal"
- android:layout_width="330dip"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginTop="120dip"
- android:layout_marginBottom="5dip"
- android:background="@drawable/lockscreen_password_field_dark">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerInParent="true"
+ android:orientation="vertical"
+ android:gravity="center">
- <EditText android:id="@+id/passwordEntry"
+ <!-- Password entry field -->
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="330dip"
android:layout_height="wrap_content"
- android:layout_width="0dip"
+ android:layout_gravity="center"
+ android:layout_marginTop="120dip"
+ android:layout_marginBottom="5dip"
+ android:background="@drawable/lockscreen_password_field_dark">
+
+ <EditText android:id="@+id/passwordEntry"
+ android:layout_height="wrap_content"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:singleLine="true"
+ android:textStyle="normal"
+ android:inputType="textPassword"
+ android:gravity="center"
+ android:layout_gravity="center"
+ android:layout_marginLeft="@dimen/keyguard_lockscreen_pin_margin_left"
+ android:textSize="24sp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:background="@null"
+ android:textColor="#ffffffff"
+ android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"
+ />
+
+ <!-- This delete button is only visible for numeric PIN entry -->
+ <ImageButton android:id="@+id/pinDel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@android:drawable/ic_input_delete"
+ android:clickable="true"
+ android:padding="8dip"
+ android:layout_gravity="center"
+ android:background="?android:attr/selectableItemBackground"
+ android:visibility="gone"
+ />
+
+ <ImageView android:id="@+id/switch_ime_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_lockscreen_ime"
+ android:clickable="true"
+ android:padding="8dip"
+ android:layout_gravity="center"
+ android:background="?android:attr/selectableItemBackground"
+ android:visibility="gone"
+ />
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
android:layout_weight="1"
- android:singleLine="true"
- android:textStyle="normal"
- android:inputType="textPassword"
- android:gravity="center"
- android:layout_gravity="center"
- android:layout_marginLeft="@dimen/keyguard_lockscreen_pin_margin_left"
- android:textSize="24sp"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:background="@null"
- android:textColor="#ffffffff"
- android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"
- />
+ />
- <!-- This delete button is only visible for numeric PIN entry -->
- <ImageButton android:id="@+id/pinDel"
+ <!-- Numeric keyboard -->
+ <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+ android:layout_width="330dip"
+ android:layout_height="260dip"
+ android:background="#40000000"
+ android:keyBackground="@drawable/btn_keyboard_key_ics"
+ android:layout_marginBottom="80dip"
+ android:clickable="true"
+ />
+
+ <!-- emergency call button -->
+ <Button android:id="@+id/emergencyCallButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@android:drawable/ic_input_delete"
- android:clickable="true"
- android:padding="8dip"
- android:layout_gravity="center"
- android:background="?android:attr/selectableItemBackground"
+ android:drawableLeft="@drawable/ic_emergency"
+ android:drawablePadding="8dip"
+ android:text="@string/lockscreen_emergency_call"
android:visibility="gone"
- />
-
- <ImageView android:id="@+id/switch_ime_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_lockscreen_ime"
- android:clickable="true"
- android:padding="8dip"
- android:layout_gravity="center"
- android:background="?android:attr/selectableItemBackground"
- android:visibility="gone"
- />
+ style="@style/Widget.Button.Transparent"
+ />
</LinearLayout>
- <View
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
+ <!-- Area to overlay FaceLock -->
+ <View android:id="@+id/faceLockAreaView"
+ android:visibility="invisible"
+ android:layout_width="512dip"
+ android:layout_height="512dip"
+ android:layout_centerInParent="true"
+ android:background="@color/facelock_color_background"
/>
- <!-- Numeric keyboard -->
- <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
- android:layout_width="330dip"
- android:layout_height="260dip"
- android:background="#40000000"
- android:keyBackground="@drawable/btn_keyboard_key_ics"
- android:layout_marginBottom="80dip"
- android:clickable="true"
- />
+ </RelativeLayout>
- <!-- emergency call button -->
- <Button
- android:id="@+id/emergencyCallButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawableLeft="@drawable/ic_emergency"
- android:drawablePadding="8dip"
- android:text="@string/lockscreen_emergency_call"
- android:visibility="gone"
- style="@style/Widget.Button.Transparent"
- />
-
- </LinearLayout>
</LinearLayout>
diff --git a/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml
index 70d18cc..802ef82 100644
--- a/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml
+++ b/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml
@@ -72,48 +72,65 @@
android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal">
- <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
- android:layout_width="354dip"
- android:layout_height="354dip"
- android:layout_gravity="center_vertical"
- />
-
- <!-- Emergency and forgot pattern buttons. -->
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="match_parent"
+ <RelativeLayout
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@id/lockPattern"
- android:layout_alignLeft="@id/lockPattern"
- android:layout_alignRight="@id/lockPattern"
- android:layout_marginTop="28dip"
- android:gravity="center"
- style="?android:attr/buttonBarStyle"
- android:weightSum="2">
+ android:layout_centerInParent="true"
+ android:gravity="center_vertical|center_horizontal">
- <Button android:id="@+id/forgotPatternButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- style="?android:attr/buttonBarButtonStyle"
- android:drawableLeft="@drawable/lockscreen_forgot_password_button"
- android:drawablePadding="8dip"
- android:text="@string/lockscreen_forgot_pattern_button_text"
- android:visibility="gone"
+ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+ android:layout_width="354dip"
+ android:layout_height="354dip"
+ android:layout_gravity="center_vertical"
/>
- <Button android:id="@+id/emergencyCallButton"
- android:layout_width="wrap_content"
+ <!-- Emergency and forgot pattern buttons. -->
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- style="?android:attr/buttonBarButtonStyle"
- android:drawableLeft="@drawable/ic_emergency"
- android:drawablePadding="8dip"
- android:text="@string/lockscreen_emergency_call"
- android:visibility="gone"
- />
+ android:orientation="horizontal"
+ android:layout_below="@id/lockPattern"
+ android:layout_alignLeft="@id/lockPattern"
+ android:layout_alignRight="@id/lockPattern"
+ android:layout_marginTop="28dip"
+ style="?android:attr/buttonBarStyle"
+ android:gravity="center"
+ android:weightSum="2">
- </LinearLayout>
+ <Button android:id="@+id/forgotPatternButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ style="?android:attr/buttonBarButtonStyle"
+ android:drawableLeft="@drawable/lockscreen_forgot_password_button"
+ android:drawablePadding="8dip"
+ android:text="@string/lockscreen_forgot_pattern_button_text"
+ android:visibility="gone"
+ />
+
+ <Button android:id="@+id/emergencyCallButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ style="?android:attr/buttonBarButtonStyle"
+ android:drawableLeft="@drawable/ic_emergency"
+ android:drawablePadding="8dip"
+ android:text="@string/lockscreen_emergency_call"
+ android:visibility="gone"
+ />
+
+ </LinearLayout>
+
+ </RelativeLayout>
+
+ <!-- Area to overlay FaceLock -->
+ <View android:id="@+id/faceLockAreaView"
+ android:visibility="invisible"
+ android:layout_width="512dip"
+ android:layout_height="512dip"
+ android:layout_centerInParent="true"
+ android:background="@color/facelock_color_background"
+ />
</RelativeLayout>
diff --git a/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml b/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml
index 7a623ce..40f2492 100644
--- a/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml
+++ b/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml
@@ -62,52 +62,71 @@
</RelativeLayout>
<!-- bottom: lock pattern, emergency dialer and forgot pattern button -->
- <LinearLayout
+ <RelativeLayout
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dip"
- android:orientation="vertical"
android:gravity="center">
- <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
- android:layout_width="354dip"
- android:layout_height="354dip"
- android:layout_marginTop="50dip"/>
-
- <!-- Emergency and forgot pattern buttons. -->
- <LinearLayout
- android:layout_width="match_parent"
+ <RelativeLayout
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- style="?android:attr/buttonBarStyle"
- android:gravity="center"
- android:weightSum="2">
+ android:layout_centerInParent="true"
+ android:gravity="center">
- <Button android:id="@+id/forgotPatternButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- style="?android:attr/buttonBarButtonStyle"
- android:drawableLeft="@drawable/lockscreen_forgot_password_button"
- android:drawablePadding="8dip"
- android:text="@string/lockscreen_forgot_pattern_button_text"
- android:visibility="gone"
+ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+ android:layout_width="354dip"
+ android:layout_height="354dip"
+ android:layout_marginTop="50dip"
/>
- <Button android:id="@+id/emergencyCallButton"
- android:layout_width="wrap_content"
+ <!-- Emergency and forgot pattern buttons. -->
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- style="?android:attr/buttonBarButtonStyle"
- android:drawableLeft="@drawable/ic_emergency"
- android:drawablePadding="8dip"
- android:text="@string/lockscreen_emergency_call"
- android:visibility="gone"
- />
+ android:orientation="horizontal"
+ android:layout_below="@id/lockPattern"
+ android:layout_alignLeft="@id/lockPattern"
+ android:layout_alignRight="@id/lockPattern"
+ style="?android:attr/buttonBarStyle"
+ android:gravity="center"
+ android:weightSum="2">
- </LinearLayout>
+ <Button android:id="@+id/forgotPatternButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ style="?android:attr/buttonBarButtonStyle"
+ android:drawableLeft="@drawable/lockscreen_forgot_password_button"
+ android:drawablePadding="8dip"
+ android:text="@string/lockscreen_forgot_pattern_button_text"
+ android:visibility="gone"
+ />
- </LinearLayout>
+ <Button android:id="@+id/emergencyCallButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ style="?android:attr/buttonBarButtonStyle"
+ android:drawableLeft="@drawable/ic_emergency"
+ android:drawablePadding="8dip"
+ android:text="@string/lockscreen_emergency_call"
+ android:visibility="gone"
+ />
+
+ </LinearLayout>
+
+ </RelativeLayout>
+
+ <!-- Area to overlay FaceLock -->
+ <View android:id="@+id/faceLockAreaView"
+ android:visibility="invisible"
+ android:layout_width="512dip"
+ android:layout_height="512dip"
+ android:layout_centerInParent="true"
+ android:background="@color/facelock_color_background"
+ />
+
+ </RelativeLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
index 0580ebc..d375d4c 100644
--- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
+++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
@@ -249,8 +249,6 @@
sleep(SHORT_TIMEOUT);
removeConfiguredNetworksAndDisableWifi();
mWifiRegexs = mCM.getTetherableWifiRegexs();
- // after wifi is shutdown, wait for 2 minute to enable wifi
- sleep(WIFI_STOP_START_INTERVAL);
}
public List<WifiConfiguration> loadNetworkConfigurations() throws Exception {
diff --git a/docs/html/design/building-blocks/buttons.html b/docs/html/design/building-blocks/buttons.html
index 94df548..cc43fcb 100644
--- a/docs/html/design/building-blocks/buttons.html
+++ b/docs/html/design/building-blocks/buttons.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -157,16 +157,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/dialogs.html b/docs/html/design/building-blocks/dialogs.html
index e0c5f52..fc00780 100644
--- a/docs/html/design/building-blocks/dialogs.html
+++ b/docs/html/design/building-blocks/dialogs.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -231,16 +231,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/grid-lists.html b/docs/html/design/building-blocks/grid-lists.html
index 9ce7214..b4cfdcb 100644
--- a/docs/html/design/building-blocks/grid-lists.html
+++ b/docs/html/design/building-blocks/grid-lists.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -199,16 +199,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/index.html b/docs/html/design/building-blocks/index.html
index f8003e1..c99d85c 100644
--- a/docs/html/design/building-blocks/index.html
+++ b/docs/html/design/building-blocks/index.html
@@ -94,7 +94,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -137,16 +137,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/lists.html b/docs/html/design/building-blocks/lists.html
index 3b978e1..914ae9e 100644
--- a/docs/html/design/building-blocks/lists.html
+++ b/docs/html/design/building-blocks/lists.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -150,16 +150,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/pickers.html b/docs/html/design/building-blocks/pickers.html
index ecb6b05..4c95a9f 100644
--- a/docs/html/design/building-blocks/pickers.html
+++ b/docs/html/design/building-blocks/pickers.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -153,16 +153,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/progress.html b/docs/html/design/building-blocks/progress.html
index 7fa830d..7aae913 100644
--- a/docs/html/design/building-blocks/progress.html
+++ b/docs/html/design/building-blocks/progress.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -199,16 +199,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/scrolling.html b/docs/html/design/building-blocks/scrolling.html
index db8018e..3f1167c 100644
--- a/docs/html/design/building-blocks/scrolling.html
+++ b/docs/html/design/building-blocks/scrolling.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -154,16 +154,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/seek-bars.html b/docs/html/design/building-blocks/seek-bars.html
index 070ae52..84cf5d2 100644
--- a/docs/html/design/building-blocks/seek-bars.html
+++ b/docs/html/design/building-blocks/seek-bars.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -156,16 +156,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/spinners.html b/docs/html/design/building-blocks/spinners.html
index 4ae5fd1..bf21fe8 100644
--- a/docs/html/design/building-blocks/spinners.html
+++ b/docs/html/design/building-blocks/spinners.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -156,16 +156,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/switches.html b/docs/html/design/building-blocks/switches.html
index 2c4b3d4..3d7bc9c 100644
--- a/docs/html/design/building-blocks/switches.html
+++ b/docs/html/design/building-blocks/switches.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -147,16 +147,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/tabs.html b/docs/html/design/building-blocks/tabs.html
index 39e933c..c094cce 100644
--- a/docs/html/design/building-blocks/tabs.html
+++ b/docs/html/design/building-blocks/tabs.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -179,16 +179,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/building-blocks/text-fields.html b/docs/html/design/building-blocks/text-fields.html
index eac472f..6496fa5 100644
--- a/docs/html/design/building-blocks/text-fields.html
+++ b/docs/html/design/building-blocks/text-fields.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -189,16 +189,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/get-started/creative-vision.html b/docs/html/design/get-started/creative-vision.html
index 14b7249..11783c4 100644
--- a/docs/html/design/get-started/creative-vision.html
+++ b/docs/html/design/get-started/creative-vision.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -167,16 +167,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/get-started/principles.html b/docs/html/design/get-started/principles.html
index cb1a0b4..ab1fe5c 100644
--- a/docs/html/design/get-started/principles.html
+++ b/docs/html/design/get-started/principles.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -147,8 +147,9 @@
<div class="layout-content-col span-7">
<h4>Let me make it mine</h4>
-<p>Let people add a personal touch because it helps them feel at home and in control. Think about
-subtle ways to offer personalization while providing sensible and beautiful default functionality.</p>
+<p>People love to add personal touches because it helps them feel at home and in control. Provide
+sensible, beautiful defaults, but also consider fun, optional customizations that don’t hinder
+primary tasks.</p>
</div>
<div class="layout-content-col span-6">
@@ -418,16 +419,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/get-started/ui-overview.html b/docs/html/design/get-started/ui-overview.html
index 0fc85a4..b08c743 100644
--- a/docs/html/design/get-started/ui-overview.html
+++ b/docs/html/design/get-started/ui-overview.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -267,16 +267,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/index.html b/docs/html/design/index.html
index 5e74877..14d7b63 100644
--- a/docs/html/design/index.html
+++ b/docs/html/design/index.html
@@ -94,7 +94,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../index.html">Developers</a></div>
</li>
</ul>
@@ -130,16 +130,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/actionbar.html b/docs/html/design/patterns/actionbar.html
index 84fbcc4..99ae2d7 100644
--- a/docs/html/design/patterns/actionbar.html
+++ b/docs/html/design/patterns/actionbar.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -453,16 +453,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/app-structure.html b/docs/html/design/patterns/app-structure.html
index 7a6fe05..b87f402 100644
--- a/docs/html/design/patterns/app-structure.html
+++ b/docs/html/design/patterns/app-structure.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -368,16 +368,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/compatibility.html b/docs/html/design/patterns/compatibility.html
index 07b1c8e..f18c62d 100644
--- a/docs/html/design/patterns/compatibility.html
+++ b/docs/html/design/patterns/compatibility.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -180,16 +180,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/gestures.html b/docs/html/design/patterns/gestures.html
index 968cb7d..f8585e4 100644
--- a/docs/html/design/patterns/gestures.html
+++ b/docs/html/design/patterns/gestures.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -234,16 +234,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/index.html b/docs/html/design/patterns/index.html
index b5a855e..ff797db 100644
--- a/docs/html/design/patterns/index.html
+++ b/docs/html/design/patterns/index.html
@@ -94,7 +94,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -137,16 +137,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/multi-pane-layouts.html b/docs/html/design/patterns/multi-pane-layouts.html
index 693d0a4..af05e31 100644
--- a/docs/html/design/patterns/multi-pane-layouts.html
+++ b/docs/html/design/patterns/multi-pane-layouts.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -226,16 +226,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/navigation.html b/docs/html/design/patterns/navigation.html
index d2c35d8..aabfc39 100644
--- a/docs/html/design/patterns/navigation.html
+++ b/docs/html/design/patterns/navigation.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -233,16 +233,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/new-4-0.html b/docs/html/design/patterns/new-4-0.html
index 47056041..272b079 100644
--- a/docs/html/design/patterns/new-4-0.html
+++ b/docs/html/design/patterns/new-4-0.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -190,16 +190,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/notifications.html b/docs/html/design/patterns/notifications.html
index c1f4718..acec306 100644
--- a/docs/html/design/patterns/notifications.html
+++ b/docs/html/design/patterns/notifications.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -356,16 +356,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/pure-android.html b/docs/html/design/patterns/pure-android.html
index 81a1c40..507558a 100644
--- a/docs/html/design/patterns/pure-android.html
+++ b/docs/html/design/patterns/pure-android.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -254,16 +254,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/selection.html b/docs/html/design/patterns/selection.html
index fbe2d42..37dcab5 100644
--- a/docs/html/design/patterns/selection.html
+++ b/docs/html/design/patterns/selection.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -218,16 +218,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/patterns/swipe-views.html b/docs/html/design/patterns/swipe-views.html
index 1936d89..4e8cd03 100644
--- a/docs/html/design/patterns/swipe-views.html
+++ b/docs/html/design/patterns/swipe-views.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -191,16 +191,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/static/content/principles_decide_for_me.png b/docs/html/design/static/content/principles_decide_for_me.png
index 65911bc..9f4159f 100644
--- a/docs/html/design/static/content/principles_decide_for_me.png
+++ b/docs/html/design/static/content/principles_decide_for_me.png
Binary files differ
diff --git a/docs/html/design/static/content/principles_make_it_mine.png b/docs/html/design/static/content/principles_make_it_mine.png
index 3b63238..6380277 100644
--- a/docs/html/design/static/content/principles_make_it_mine.png
+++ b/docs/html/design/static/content/principles_make_it_mine.png
Binary files differ
diff --git a/docs/html/design/static/ico_styleguide.png b/docs/html/design/static/ico_styleguide.png
new file mode 100644
index 0000000..c12907c
--- /dev/null
+++ b/docs/html/design/static/ico_styleguide.png
Binary files differ
diff --git a/docs/html/design/style/color.html b/docs/html/design/style/color.html
index 16337a9..893e09e 100644
--- a/docs/html/design/style/color.html
+++ b/docs/html/design/style/color.html
@@ -174,7 +174,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -244,16 +244,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/style/devices-displays.html b/docs/html/design/style/devices-displays.html
index 6c8d3fc..9fba719 100644
--- a/docs/html/design/style/devices-displays.html
+++ b/docs/html/design/style/devices-displays.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -164,16 +164,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/style/iconography.html b/docs/html/design/style/iconography.html
index 31028ab..663770b 100644
--- a/docs/html/design/style/iconography.html
+++ b/docs/html/design/style/iconography.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -442,16 +442,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/style/index.html b/docs/html/design/style/index.html
index aa3dac1..5ecbafa 100644
--- a/docs/html/design/style/index.html
+++ b/docs/html/design/style/index.html
@@ -94,7 +94,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -137,16 +137,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/style/metrics-grids.html b/docs/html/design/style/metrics-grids.html
index 30316ef..17d4937 100644
--- a/docs/html/design/style/metrics-grids.html
+++ b/docs/html/design/style/metrics-grids.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -180,16 +180,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/style/themes.html b/docs/html/design/style/themes.html
index 67bfdc5..ada974d 100644
--- a/docs/html/design/style/themes.html
+++ b/docs/html/design/style/themes.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -161,16 +161,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/style/touch-feedback.html b/docs/html/design/style/touch-feedback.html
index 153b189..0d49832 100644
--- a/docs/html/design/style/touch-feedback.html
+++ b/docs/html/design/style/touch-feedback.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -186,16 +186,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/style/typography.html b/docs/html/design/style/typography.html
index a5d4016..d3cc769 100644
--- a/docs/html/design/style/typography.html
+++ b/docs/html/design/style/typography.html
@@ -81,7 +81,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -176,16 +176,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/design/style/writing.html b/docs/html/design/style/writing.html
index 568ca25..e5f1ea8 100644
--- a/docs/html/design/style/writing.html
+++ b/docs/html/design/style/writing.html
@@ -133,7 +133,7 @@
</li>
<li>
- <div id="back-dac-section"><a href="../../index.html" target="_blank">Developers</a></div>
+ <div id="back-dac-section"><a href="../../index.html">Developers</a></div>
</li>
</ul>
@@ -449,16 +449,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="http://creativecommons.org/licenses/by/2.5/" target="_blank">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="http://developer.android.com/license.html" target="_blank">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="http://www.android.com/terms.html" target="_blank">Site Terms of Service</a> –
- <a href="http://www.android.com/privacy.html" target="_blank">Privacy Policy</a> –
- <a href="http://www.android.com/branding.html" target="_blank">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index a9c4d30..7f3894d 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -751,20 +751,20 @@
<li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design.html">
<span class="en">Icon Design</span>
- </a> <span class="new">updated</span></div>
+ </a></div>
<ul>
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_launcher.html">
<span class="en">Launcher Icons</span>
- </a> <span class="new">updated</span></li>
+ </a></li>
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_menu.html">
<span class="en">Menu Icons</span>
</a></li>
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_action_bar.html">
<span class="en">Action Bar Icons</span>
- </a> <span class="new">new!</span></li>
+ </a></li>
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_status_bar.html">
<span class="en">Status Bar Icons</span>
- </a> <span class="new">updated</span></li>
+ </a></li>
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_tab.html">
<span class="en">Tab Icons</span>
</a></li>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design.jd b/docs/html/guide/practices/ui_guidelines/icon_design.jd
index 07b73bb..96aecf5 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design.jd
@@ -57,6 +57,16 @@
</div>
</div>
+
+<div class="design-announce">
+<p><strong>New Guides for App Designers!</strong></p>
+<p>Check out the new documents for designers at <strong><a
+href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
+for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
+</div>
+
+
+
<p>Creating a unified look and feel throughout a user interface adds value to
your product. Streamlining the graphic style will also make the UI seem more
professional to users.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd b/docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd
index 449c27f..2476255 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd
@@ -29,6 +29,12 @@
</div>
</div>
+<div class="design-announce">
+<p><strong>New Guides for App Designers!</strong></p>
+<p>Check out the new documents for designers at <strong><a
+href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
+for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
+</div>
<p>Action Bar icons are graphical elements placed in the <a
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd b/docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd
index f78bd86..9b8cce7 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd
@@ -27,6 +27,12 @@
</div>
</div>
+<div class="design-announce">
+<p><strong>New Guides for App Designers!</strong></p>
+<p>Check out the new documents for designers at <strong><a
+href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
+for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
+</div>
<p>Dialog icons are shown in pop-up dialog boxes that prompt the user for
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd b/docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd
index 3f6061c..6b686b1 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd
@@ -26,6 +26,15 @@
</div>
+<div class="design-announce">
+<p><strong>New Guides for App Designers!</strong></p>
+<p>Check out the new documents for designers at <strong><a
+href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
+for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
+</div>
+
+
+
<p>A launcher icon is a graphic that represents your application. Launcher icons are used by
Launcher applications and appear on the user’s Home screen. Launcher icons can also be used to
represent shortcuts into your application (for example, a contact shortcut icon that opens detail
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_list.jd b/docs/html/guide/practices/ui_guidelines/icon_design_list.jd
index 7bf34cc..fd4dc6b 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_list.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_list.jd
@@ -28,6 +28,13 @@
</div>
+<div class="design-announce">
+<p><strong>New Guides for App Designers!</strong></p>
+<p>Check out the new documents for designers at <strong><a
+href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
+for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
+</div>
+
<p>List view icons look a lot like dialog icons, but they use an inner shadow
effect where the light source is above the object. They are also designed to be
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_menu.jd b/docs/html/guide/practices/ui_guidelines/icon_design_menu.jd
index 974e48f..e267013 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_menu.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_menu.jd
@@ -32,6 +32,13 @@
</div>
+<div class="design-announce">
+<p><strong>New Guides for App Designers!</strong></p>
+<p>Check out the new documents for designers at <strong><a
+href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
+for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
+</div>
+
<p>Menu icons are graphical elements placed in the options menu shown to users
when they press the Menu button. They are drawn in a flat-front perspective and
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_status_bar.jd b/docs/html/guide/practices/ui_guidelines/icon_design_status_bar.jd
index b8e07b5..a20c1ee 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_status_bar.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_status_bar.jd
@@ -40,6 +40,13 @@
</div>
+<div class="design-announce">
+<p><strong>New Guides for App Designers!</strong></p>
+<p>Check out the new documents for designers at <strong><a
+href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
+for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
+</div>
+
<p>Status bar icons are used to represent notifications from your application in
the status bar.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/icon_design_tab.jd b/docs/html/guide/practices/ui_guidelines/icon_design_tab.jd
index 271bd85..f85398d 100644
--- a/docs/html/guide/practices/ui_guidelines/icon_design_tab.jd
+++ b/docs/html/guide/practices/ui_guidelines/icon_design_tab.jd
@@ -32,6 +32,13 @@
</div>
+<div class="design-announce">
+<p><strong>New Guides for App Designers!</strong></p>
+<p>Check out the new documents for designers at <strong><a
+href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
+for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
+</div>
+
<p>Tab icons are graphical elements used to represent individual tabs in a
multi-tab interface. Each tab icon has two states: unselected and selected.</p>
diff --git a/docs/html/guide/practices/ui_guidelines/index.jd b/docs/html/guide/practices/ui_guidelines/index.jd
index 0e42788..3255275 100644
--- a/docs/html/guide/practices/ui_guidelines/index.jd
+++ b/docs/html/guide/practices/ui_guidelines/index.jd
@@ -2,18 +2,28 @@
@jd:body
-<img src="{@docRoot}assets/images/uiguidelines1.png" alt="" align="right">
+
+<div class="design-announce" style="background:none;overflow:auto;padding:10px 5px">
+ <a href="{@docRoot}design/index.html"><img src="{@docRoot}images/home/android-design.png" alt=""
+style="float:left;margin:0 1em 0 0;"/></a>
+<p><strong>New Guides for App Designers!</strong></p>
+<p>The Android UX team has put together a set of guidelines for the interaction and
+visual design of Android applications. The new collection provides an overview of
+Android styles, design patterns, building blocks for exceptional Android designs, and more.</p>
+<p><strong><a href="{@docRoot}design/index.html">Android Design</a></strong></p>
+
+<p>Over time, the documents below will be deprecated as more design information is published at
+the new location.</p>
+</div>
-<p>The Android UI team has begun developing guidelines for the interaction and
-visual design of Android applications. Look here for articles that describe
-these guidelines as we release them.</p>
+
<dl>
<dt><a href="{@docRoot}guide/practices/ui_guidelines/icon_design.html">Icon
Design Guidelines</a> and <a
href="{@docRoot}shareables/icon_templates-v4.0.zip">Android Icon Templates Pack
-» </a> <span class="new">updated</span></dt>
+» </a></dt>
<dd>Your applications need a wide variety of icons, from a launcher icon to
icons in menus, dialogs, tabs, the status bar, and lists. The Icon Guidelines
describe each kind of icon in detail, with specifications for the size, color,
@@ -22,7 +32,8 @@
filters that make it much simpler to create conforming icons.</dd>
</dl>
<dl>
- <dt><a href="{@docRoot}guide/practices/ui_guidelines/widget_design.html">Widget Design Guidelines</a> <span class="new">updated</span></dt>
+ <dt><a href="{@docRoot}guide/practices/ui_guidelines/widget_design.html">Widget Design
+Guidelines</a> </dt>
<dd>A widget displays an application's most important or timely information
at a glance, on a user's Home screen. These design guidelines describe how to
design widgets that fit with others on the Home screen. They include links to
@@ -43,7 +54,7 @@
<dd>Android applications make use of Option menus and Context menus
that enable users to perform operations and navigate to other parts
of your application or to other applications. These guidelines describe
- the difference between Options and Context menus, how to arrange
+ the difference between Options anontext menus, how to arrange
menu items, when to put commands on-screen, and other details about
menu design.
</dd>
diff --git a/docs/html/guide/practices/ui_guidelines/widget_design.jd b/docs/html/guide/practices/ui_guidelines/widget_design.jd
index f63f3c4..d789407 100644
--- a/docs/html/guide/practices/ui_guidelines/widget_design.jd
+++ b/docs/html/guide/practices/ui_guidelines/widget_design.jd
@@ -44,6 +44,13 @@
</div>
+<div class="design-announce">
+<p><strong>New Guides for App Designers!</strong></p>
+<p>Check out the new documents for designers at <strong><a
+href="{@docRoot}design/index.html">Android Design</a></strong>.</p>
+</div>
+
+
<p>App widgets (sometimes just "widgets") are a feature introduced in Android 1.5 and vastly
improved in Android 3.0 and 3.1. A widget can display an application's most timely or otherwise
relevant information at a glance, on a user's Home screen. The standard Android system image
diff --git a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
index 5a1f7a2..086ba71 100644
--- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
+++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd
@@ -34,7 +34,9 @@
<h2>See also</h2>
<ol>
- <li><a><a href="{@docRoot}videos/index.html#v=fL6gSd4ugSI">Application Lifecycle video</a></li>
+ <li><a href="{@docRoot}design/patterns/navigation.html">Android Design:
+Navigation</a></li>
+ <li><a href="{@docRoot}videos/index.html#v=fL6gSd4ugSI">Application Lifecycle video</a></li>
<li><a
href="{@docRoot}guide/topics/manifest/activity-element.html">{@code <activity>} manifest
element</a></li>
@@ -172,6 +174,13 @@
</ul>
+<div class="design-announce">
+<p><strong>Navigation Design</strong></p>
+ <p>For more about how app navigation works on Android, read Android Design's <a
+href="{@docRoot}design/patterns/navigation.html">Navigation</a> guide.</p>
+</div>
+
+
<h2 id="ActivityState">Saving Activity State</h2>
<p>As discussed above, the system's default behavior preserves the state of an activity when it is
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd
index b371f34..99c91f6 100644
--- a/docs/html/guide/topics/manifest/uses-sdk-element.jd
+++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd
@@ -60,7 +60,7 @@
attribute, the system assumes a default value of "1", which indicates that your
application is compatible with all versions of Android. If your application is
<em>not</em> compatible with all versions (for instance, it uses APIs introduced
- in API Level 3) and you have not declared the proper <code>android:minSdkVersion</code>,
+ in API Level 3) and you have not declared the proper <code>minSdkVersion</code>,
then when installed on a system with an API Level less than 3, the application
will crash during runtime when attempting to access the unavailable APIs. For
this reason, be certain to declare the appropriate API Level in the
@@ -68,18 +68,32 @@
</dd>
<dt><a name="target"></a>{@code android:targetSdkVersion}</dt>
- <dd>An integer designating the API Level that the application is targetting.
+ <dd>An integer designating the API Level that the application targets. If not set, the default
+value equals that given to {@code minSdkVersion}.
- <p>With this attribute set, the application says that it is able to run on
- older versions (down to {@code minSdkVersion}), but was explicitly tested to
- work with the version specified here. Specifying this target version allows the
- platform to disable compatibility settings that are not required for the target
- version (which may otherwise be turned on in order to maintain
- forward-compatibility) or enable newer features that are not available to older
- applications. This does not mean that you can program different features for
- different versions of the platform—it simply informs the platform that you
- have tested against the target version and the platform should not perform any
- extra work to maintain forward-compatibility with the target version.</p>
+ <p>This attribute informs the system that you have tested against the target version and the
+system should not enable any compatibility behaviors to maintain your app's forward-compatibility
+with the target version. The application is still able to run on older versions (down to {@code
+minSdkVersion}).</p>
+
+ <p>As Android evolves with each new version, some behaviors and even appearances might change.
+However, if the API level of the platform is higher than the version declared by your app's {@code
+targetSdkVersion}, the system may enable compatibility behaviors to ensure that your app
+continues to work the way you expect. You can disable such compatibility
+behaviors by specifying {@code targetSdkVersion} to match the API
+level of the platform on which it's running. For example, setting this value to "11" or higher
+allows the system to apply a new default theme (Holo) to your app when running on Android 3.0 or
+higher and also disables <a href="{@docRoot}guide/practices/screen-compat-mode.html">screen
+compatibility mode</a> when running on larger screens (because support for API level 11 implicitly
+supports larger screens).</p>
+
+ <p>There are many compatibility behaviors that the system may enable based on the value you set
+for this attribute. Several of these behaviors are described by the corresponding platform versions
+in the {@link android.os.Build.VERSION_CODES} reference.</p>
+
+ <p>To maintain your application along with each Android release, you should increase
+the value of this attribute to match the latest API level, then thoroughly test your application on
+the corresponding platform version.</p>
<p>Introduced in: API Level 4</p>
</dd>
@@ -89,25 +103,25 @@
designed to run.
<p>In Android 1.5, 1.6, 2.0, and 2.0.1, the system checks the value of this
- attribute when installing an application and when revalidating the application
+ attribute when installing an application and when re-validating the application
after a system update. In either case, if the application's
- <code>android:maxSdkVersion</code> attribute is lower than the API Level used by
+ <code>maxSdkVersion</code> attribute is lower than the API Level used by
the system itself, then the system will not allow the application to be
- installed. In the case of revalidation after system update, this effectively
+ installed. In the case of re-validation after system update, this effectively
removes your application from the device.
<p>To illustrate how this attribute can affect your application after system
updates, consider the following example: </p>
- <p>An application declaring <code>android:maxSdkVersion="5"</code> in its
+ <p>An application declaring <code>maxSdkVersion="5"</code> in its
manifest is published on Android Market. A user whose device is running Android
1.6 (API Level 4) downloads and installs the app. After a few weeks, the user
receives an over-the-air system update to Android 2.0 (API Level 5). After the
update is installed, the system checks the application's
- <code>android:maxSdkVersion</code> and successfully revalidates it. The
+ <code>maxSdkVersion</code> and successfully re-validates it. The
application functions as normal. However, some time later, the device receives
another system update, this time to Android 2.0.1 (API Level 6). After the
- update, the system can no longer revalidate the application because the system's
+ update, the system can no longer re-validate the application because the system's
own API Level (6) is now higher than the maximum supported by the application
(5). The system prevents the application from being visible to the user, in
effect removing it from the device.</p>
@@ -120,7 +134,7 @@
provided it uses only standard APIs and follows development best practices.
Second, note that in some cases, declaring the attribute can <strong>result in
your application being removed from users' devices after a system
- update</strong> to a higher API Level. Most devices on which your appplication
+ update</strong> to a higher API Level. Most devices on which your application
is likely to be installed will receive periodic system updates over the air, so
you should consider their effect on your application before setting this
attribute.</p>
@@ -128,8 +142,8 @@
<p style="margin-bottom:1em;">Introduced in: API Level 4</p>
<div class="special">Future versions of Android (beyond Android 2.0.1) will no
-longer check or enforce the <code>android:maxSdkVersion</code> attribute during
-installation or revalidation. Android Market will continue to use the attribute
+longer check or enforce the <code>maxSdkVersion</code> attribute during
+installation or re-validation. Android Market will continue to use the attribute
as a filter, however, when presenting users with applications available for
download. </div>
</dd>
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd
index 1bb4fa4..b83bde7 100644
--- a/docs/html/guide/topics/ui/actionbar.jd
+++ b/docs/html/guide/topics/ui/actionbar.jd
@@ -73,8 +73,10 @@
API Demos</a></li>
</ol>
- <h2>See also</h2>item
+ <h2>See also</h2>
<ol>
+ <li><a
+href="{@docRoot}design/patterns/actionbar.html">Android Design: Action Bar</a></li>
<li><a href="{@docRoot}guide/topics/ui/menus.html">Menus</a></li>
<li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">Supporting Tablets
and Handsets</a></li>
@@ -124,6 +126,14 @@
right (plus the overflow menu button).</p>
+<div class="design-announce">
+<p><strong>Action Bar Design</strong></p>
+ <p>For design guidelines, read Android Design's <a
+href="{@docRoot}design/patterns/actionbar.html">Action Bar</a> guide.</p>
+</div>
+
+
+
<div class="sidebox-wrapper">
<div class="sidebox">
<h2>Remaining backward-compatible</h2>
@@ -536,6 +546,12 @@
<p class="img-caption"><strong>Figure 6.</strong> Example behavior for UP navigation after
entering the Email app from the People app.</p>
+<div class="design-announce">
+<p><strong>Navigation Design</strong></p>
+ <p>For more about how <em>Up</em> and <em>Back</em> navigation differ, read Android Design's <a
+href="{@docRoot}design/patterns/navigation.html">Navigation</a> guide.</p>
+</div>
+
<p>To enable the icon for up navigation (which displays the "up" indicator next to the icon), call
{@link android.app.ActionBar#setDisplayHomeAsUpEnabled setDisplayHomeAsUpEnabled(true)} on your
{@link android.app.ActionBar}:</p>
diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd
index 16f14cb..82cbfd1 100644
--- a/docs/html/guide/topics/ui/dialogs.jd
+++ b/docs/html/guide/topics/ui/dialogs.jd
@@ -37,6 +37,11 @@
<li><a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Hello
TimePicker</a></li>
</ol>
+
+ <h2>See also</h2>
+ <ol>
+ <li><a href="{@docRoot}design/building-blocks/dialogs.html">Android Design: Dialogs</a></li>
+ </ol>
</div>
</div>
@@ -70,6 +75,13 @@
base {@link android.app.Dialog} object or any of the subclasses listed above and define a new layout.
See the section on <a href="#CustomDialog">Creating a Custom Dialog</a> below.</p>
+<div class="design-announce">
+<p><strong>Dialog Design</strong></p>
+ <p>For design guidelines, read Android Design's <a
+href="{@docRoot}design/building-blocks/dialogs.html">Dialogs</a> guide.</p>
+</div>
+
+
<h2 id="ShowingADialog">Showing a Dialog</h2>
diff --git a/docs/html/guide/topics/ui/notifiers/notifications.jd b/docs/html/guide/topics/ui/notifiers/notifications.jd
index 7bc1cde..71aa2fe 100644
--- a/docs/html/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html/guide/topics/ui/notifiers/notifications.jd
@@ -33,6 +33,12 @@
<li>{@link android.app.Notification}</li>
<li>{@link android.app.NotificationManager}</li>
</ol>
+
+ <h2>See also</h2>
+ <ol>
+ <li><a href="{@docRoot}design/patterns/notifications.html">Android
+Design: Notifications</a></li>
+ </ol>
</div>
</div>
@@ -61,6 +67,14 @@
<p class="img-caption"><strong>Figure 2.</strong> The notifications window.</p>
+<div class="design-announce">
+<p><strong>Notification Design</strong></p>
+ <p>For design guidelines, read Android Design's <a
+href="{@docRoot}design/patterns/notifications.html">Notifications</a> guide.</p>
+</div>
+
+
+
<h2 id="Basics">The Basics</h2>
<p>An {@link android.app.Activity} or {@link android.app.Service} can initiate a status bar
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd
index e4c6e1b..76da08e 100644
--- a/docs/html/guide/topics/wireless/bluetooth.jd
+++ b/docs/html/guide/topics/wireless/bluetooth.jd
@@ -29,6 +29,7 @@
<li><a href="#Profiles">Working with Profiles</a>
<ol>
<li><a href="#AT-Commands">Vendor-specific AT commands</a>
+ <li><a href="#HDP">Health Device Profile</a>
</ol></li>
</ol>
@@ -43,6 +44,7 @@
<h2>Related samples</h2>
<ol>
<li><a href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat</a></li>
+ <li><a href="{@docRoot}resources/samples/BluetoothHDP/index.html">Bluetooth HDP (Health Device Profile)</a></li>
</ol>
</div>
@@ -132,11 +134,27 @@
audio can be streamed from one device to another over a Bluetooth connection.
"A2DP" stands for Advanced Audio Distribution Profile.</dd>
-<dt>{@link android.bluetooth.BluetoothProfile.ServiceListener}</dt>
+<dt>{@link android.bluetooth.BluetoothHealth}</dt>
+<dd> Represents a Health Device Profile proxy that controls the Bluetooth service.</dd>
+
+<dt>{@link android.bluetooth.BluetoothHealthCallback}</dt>
+
+<dd>An abstract class that you use to implement {@link
+android.bluetooth.BluetoothHealth} callbacks. You must extend this class and
+implement the callback methods to receive updates about changes in the
+application’s registration state and Bluetooth channel state.</dd>
+
+<dt>{@link android.bluetooth.BluetoothHealthAppConfiguration}</dt>
+
+<dd>Represents an application configuration that the Bluetooth Health third-party
+application registers to communicate with a remote Bluetooth health
+device.</dd>
+
+<dt>{@link android.bluetooth.BluetoothProfile.ServiceListener}</dt>
<dd>An interface that notifies {@link android.bluetooth.BluetoothProfile} IPC
clients when they have been connected to or disconnected from the service (that
-is, the internal service that runs a particular profile). </dd>
+is, the internal service that runs a particular profile). </dd>
</dl>
@@ -889,7 +907,7 @@
href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#IPC">IPC</a
>). This includes both Bluetooth Headset and Hands-Free (v1.5) profiles. The
{@link android.bluetooth.BluetoothHeadset} class includes support for AT commands.
-For more discussion of this topic, see <a href="#AT-Commands">Vendor-specific AT commands</a></li>
+For more discussion of this topic, see <a href="#AT-Commands">Vendor-specific AT commands</a></li>
<li><strong>A2DP</strong>. The Advanced Audio Distribution Profile (A2DP)
profile defines how high quality audio can be streamed from one device to
@@ -897,6 +915,17 @@
android.bluetooth.BluetoothA2dp} class, which is a proxy for controlling
the Bluetooth A2DP Service via IPC.</li>
+ <li><strong>Health Device</strong>. Android 4.0 (API level 14) introduces
+support for the Bluetooth Health Device Profile (HDP). This lets you create
+applications that use Bluetooth to communicate with health devices that support
+Bluetooth, such as heart-rate monitors, blood meters, thermometers, scales, and
+so on. For a list of supported devices and their corresponding device data
+specialization codes, refer to <strong>Bluetooth Assigned Numbers</strong> at <a
+href="http://www.bluetooth.org">www.bluetooth.org</a>. Note that these values
+are also referenced in the ISO/IEEE 11073-20601 [7] specification as
+MDC_DEV_SPEC_PROFILE_* in the Nomenclature Codes Annex. For more discussion of
+HDP, see <a href="#HDP">Health Device Profile</a>.</li>
+
</ul>
<p>Here are the basic steps for working with a profile:</p>
@@ -926,7 +955,9 @@
state of the connection and perform other operations that are relevant to that
profile.</li>
</ol>
-<p> For example, this code snippet shows how to connect to a {@link android.bluetooth.BluetoothHeadset} proxy object so that you can control the
+
+<p> For example, this code snippet shows how to connect to a {@link
+android.bluetooth.BluetoothHeadset} proxy object so that you can control the
Headset profile:</p>
<pre>BluetoothHeadset mBluetoothHeadset;
@@ -956,6 +987,8 @@
mBluetoothAdapter.closeProfileProxy(mBluetoothHeadset);
</pre>
+
+
<h3 id="AT-Commands">Vendor-specific AT commands</h3>
<p>Starting in Android 3.0, applications can register to receive system
@@ -965,3 +998,81 @@
user or take other action as needed. Create a broadcast receiver for the {@link
android.bluetooth.BluetoothHeadset#ACTION_VENDOR_SPECIFIC_HEADSET_EVENT} intent
to handle vendor-specific AT commands for the headset.</p>
+
+<h3 id="HDP">Health Device Profile</h3>
+
+<p>Android 4.0 (API level 14) introduces support for the Bluetooth Health Device
+Profile (HDP). This lets you create applications that use Bluetooth to
+communicate with health devices that support Bluetooth, such as heart-rate
+monitors, blood meters, thermometers, and scales. The Bluetooth Health API
+includes the classes {@link android.bluetooth.BluetoothHealth}, {@link
+android.bluetooth.BluetoothHealthCallback}, and {@link
+android.bluetooth.BluetoothHealthAppConfiguration}, which are described in <a
+href="#TheBasics">The Basics</a>. </p>
+
+<p>In using the Bluetooth Health API, it's helpful to understand these key HDP concepts:</p>
+<table>
+ <tr>
+ <th>Concept</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td><strong>Source</strong></td>
+
+ <td>A role defined in HDP. A <em>source</em> is a health device that
+transmits medical data (weight scale, glucose meter, thermometer, etc.) to a
+smart device such as an Android phone or tablet. </td>
+ </tr>
+ <tr>
+ <td><strong>Sink</strong></td>
+
+ <td>A role defined in HDP. In HDP, a <em>sink</em> is the smart device that
+receives the medical data. In an Android HDP application, the sink is
+represented by a {@link android.bluetooth.BluetoothHealthAppConfiguration}
+object.</td>
+ </tr>
+ <tr>
+ <td><strong>Registration</strong></td>
+ <td>Refers to registering a sink for a particular health device.</td>
+ </tr>
+ <tr>
+ <td><strong>Connection</strong></td>
+
+ <td>Refers to opening a channel between a health device and a smart device
+such as an Android phone or tablet.</td>
+ </tr>
+</table>
+
+<h4>Creating an HDP Application</h4>
+
+<p>Here are the basic steps involved in creating an Android HDP application:</p>
+<ol>
+
+ <li>Get a reference to the {@link android.bluetooth.BluetoothHealth} proxy
+object. <p>Similar to regular headset and A2DP profile devices, you must call
+{@link android.bluetooth.BluetoothAdapter#getProfileProxy getProfileProxy()}
+with a {@link android.bluetooth.BluetoothProfile.ServiceListener} and the {@link
+android.bluetooth.BluetoothProfile.ServiceListener#HEALTH} profile type to
+establish a connection with the profile proxy object.</p> </li>
+
+ <li>Create a {@link android.bluetooth.BluetoothHealthCallback} and register an
+application configuration
+({@link android.bluetooth.BluetoothHealthAppConfiguration})
+that acts as a health
+sink.</li>
+
+ <li>Establish a connection to a health device. Some devices will initiate the
+connection. It is unnecessary to carry out this step for those devices.</li>
+
+ <li>When connected successfully to a health device, read/write to the health
+device using the file descriptor. <p>The received data needs to be interpreted
+using a health manager which implements the IEEE 11073-xxxxx
+specifications.</p></li>
+
+ <li>When done, close the health channel and unregister the application. The
+channel also closes when there is extended inactivity.</li>
+</ol>
+
+<p>For a complete code sample that illustrates these steps, see <a
+href="{@docRoot}resources/samples/BluetoothHDP/index.html">Bluetooth HDP (Health
+Device Profile)</a>. </p>
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 58108e4..53c59e7 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -16,7 +16,7 @@
<div id="announcement" style="width:275px">
<p>Introducing <b>Android Design</b>: The place to learn about principles, building blocks, and patterns
for creating world-class Android user interfaces. Whether you're a UI professional or a developer
- playing that role, these docs will show you how to make good design decisions, big and small.</p>
+ playing that role, these docs show you how to make good design decisions, big and small.</p>
<p><a href="{@docRoot}design/index.html">Android Design »</a></p>
</div> <!-- end annoucement -->
</div> <!-- end annoucement-block -->
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 50c264e..bc45f83 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1841,6 +1841,10 @@
return;
}
mAudioStatusEventPending = true;
+ // Do not honor delay when looping in order to limit audio gap
+ if (mFlags & (LOOPING | AUTO_LOOPING)) {
+ delayUs = 0;
+ }
mQueue.postEventWithDelay(mCheckAudioStatusEvent, delayUs);
}
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
index 6eff4b6..d1d9e9a 100644
--- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -584,15 +584,20 @@
(failedBackupAttempts >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT);
if (tooManyFaceUnlockTries) Log.i(TAG, "tooManyFaceUnlockTries: " + tooManyFaceUnlockTries);
if (mUpdateMonitor.getPhoneState() == TelephonyManager.CALL_STATE_IDLE
+ && usingFaceLock()
&& !mHasOverlay
&& !tooManyFaceUnlockTries
&& !backupIsTimedOut) {
bindToFaceLock();
+
// Show FaceLock area, but only for a little bit so lockpattern will become visible if
// FaceLock fails to start or crashes
- if (usingFaceLock()) {
- showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_SERVICE_TIMEOUT);
- }
+ showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_SERVICE_TIMEOUT);
+
+ // When switching between portrait and landscape view while FaceLock is running, the
+ // screen will eventually go dark unless we poke the wakelock when FaceLock is
+ // restarted
+ mKeyguardScreenCallback.pokeWakelock();
} else {
hideFaceLockArea();
}
@@ -1292,8 +1297,11 @@
}
if (mFaceLockAreaView != null) {
+ int[] faceLockPosition;
+ faceLockPosition = new int[2];
+ mFaceLockAreaView.getLocationInWindow(faceLockPosition);
startFaceLock(mFaceLockAreaView.getWindowToken(),
- mFaceLockAreaView.getLeft(), mFaceLockAreaView.getTop(),
+ faceLockPosition[0], faceLockPosition[1],
mFaceLockAreaView.getWidth(), mFaceLockAreaView.getHeight());
}
}
@@ -1311,14 +1319,14 @@
};
// Tells the FaceLock service to start displaying its UI and perform recognition
- public void startFaceLock(IBinder windowToken, int x, int y, int h, int w)
+ public void startFaceLock(IBinder windowToken, int x, int y, int w, int h)
{
if (usingFaceLock()) {
synchronized (mFaceLockServiceRunningLock) {
if (!mFaceLockServiceRunning) {
if (DEBUG) Log.d(TAG, "Starting FaceLock");
try {
- mFaceLockService.startUi(windowToken, x, y, h, w);
+ mFaceLockService.startUi(windowToken, x, y, w, h);
} catch (RemoteException e) {
Log.e(TAG, "Caught exception starting FaceLock: " + e.toString());
return;
@@ -1360,7 +1368,7 @@
public void unlock() {
if (DEBUG) Log.d(TAG, "FaceLock unlock()");
showFaceLockArea(); // Keep fallback covered
- stopFaceLock();
+ stopAndUnbindFromFaceLock();
mKeyguardScreenCallback.keyguardDone(true);
mKeyguardScreenCallback.reportSuccessfulUnlockAttempt();
@@ -1372,7 +1380,7 @@
public void cancel() {
if (DEBUG) Log.d(TAG, "FaceLock cancel()");
hideFaceLockArea(); // Expose fallback
- stopFaceLock();
+ stopAndUnbindFromFaceLock();
mKeyguardScreenCallback.pokeWakelock(BACKUP_LOCK_TIMEOUT);
}
@@ -1383,7 +1391,7 @@
if (DEBUG) Log.d(TAG, "FaceLock reportFailedAttempt()");
mFailedFaceUnlockAttempts++;
hideFaceLockArea(); // Expose fallback
- stopFaceLock();
+ stopAndUnbindFromFaceLock();
mKeyguardScreenCallback.pokeWakelock(BACKUP_LOCK_TIMEOUT);
}
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 6e4aca7..97fb0b0 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1431,6 +1431,12 @@
}
mNetTrackers[ConnectivityManager.TYPE_MOBILE].setUserDataEnable(enabled);
}
+ if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) {
+ if (VDBG) {
+ log(mNetTrackers[ConnectivityManager.TYPE_WIMAX].toString() + enabled);
+ }
+ mNetTrackers[ConnectivityManager.TYPE_WIMAX].setUserDataEnable(enabled);
+ }
}
@Override
diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
index 47644de..e8ca3ce 100644
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -831,6 +831,7 @@
static void validateQualityConstant(int quality) {
switch (quality) {
case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED:
+ case DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK:
case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index a88825b..3128592 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -568,10 +568,10 @@
int levelLteRsrp = 0;
if (mLteRsrp == -1) levelLteRsrp = 0;
- else if (mLteRsrp >= -85) levelLteRsrp = SIGNAL_STRENGTH_GREAT;
- else if (mLteRsrp >= -95) levelLteRsrp = SIGNAL_STRENGTH_GOOD;
- else if (mLteRsrp >= -105) levelLteRsrp = SIGNAL_STRENGTH_MODERATE;
- else if (mLteRsrp >= -115) levelLteRsrp = SIGNAL_STRENGTH_POOR;
+ else if (mLteRsrp >= -90) levelLteRsrp = SIGNAL_STRENGTH_GREAT;
+ else if (mLteRsrp >= -100) levelLteRsrp = SIGNAL_STRENGTH_GOOD;
+ else if (mLteRsrp >= -110) levelLteRsrp = SIGNAL_STRENGTH_MODERATE;
+ else if (mLteRsrp >= -118) levelLteRsrp = SIGNAL_STRENGTH_POOR;
else levelLteRsrp = 0;
if (DBG) log("Lte level: "+levelLteRsrp);
diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingTest.java b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingTest.java
index d2298da..f96e68b 100644
--- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingTest.java
+++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingTest.java
@@ -41,6 +41,7 @@
public class ImageProcessingTest extends ActivityInstrumentationTestCase2<ImageProcessingActivity> {
private final String TAG = "ImageProcessingTest";
private final String RESULT_FILE = "image_processing_result.txt";
+ private int ITERATION = 5;
private ImageProcessingActivity mAct;
public ImageProcessingTest() {
@@ -63,9 +64,8 @@
*/
@LargeTest
public void testImageProcessingBench() {
- long t = mAct.getBenchmark();
- Log.v(TAG, "t = " + t);
-
+ long t = 0;
+ long sum = 0;
// write result into a file
File externalStorage = Environment.getExternalStorageDirectory();
if (!externalStorage.canWrite()) {
@@ -75,10 +75,18 @@
File resultFile = new File(externalStorage, RESULT_FILE);
resultFile.setWritable(true, false);
try {
- BufferedWriter results = new BufferedWriter(new FileWriter(resultFile));
- results.write("Renderscript frame time core: " + t + " ms");
- results.close();
+ BufferedWriter rsWriter = new BufferedWriter(new FileWriter(resultFile));
Log.v(TAG, "Saved results in: " + resultFile.getAbsolutePath());
+ for (int i = 0; i < ITERATION; i++ ) {
+ t = mAct.getBenchmark();
+ sum += t;
+ rsWriter.write("Renderscript frame time core: " + t + " ms\n");
+ Log.v(TAG, "RenderScript framew time core: " + t + " ms");
+ }
+ long avgValue = sum/ITERATION;
+ rsWriter.write("Averge frame time: " + avgValue + " ms\n");
+ Log.v(TAG, "Average frame time: " + avgValue + " ms");
+ rsWriter.close();
} catch (IOException e) {
Log.v(TAG, "Unable to write result file " + e.getMessage());
}
