diff options
12 files changed, 78 insertions, 15 deletions
diff --git a/core/java/com/android/internal/policy/IFaceLockCallback.aidl b/core/java/com/android/internal/policy/IFaceLockCallback.aidl index 25adbb6dd41a..a7b01b269509 100644 --- a/core/java/com/android/internal/policy/IFaceLockCallback.aidl +++ b/core/java/com/android/internal/policy/IFaceLockCallback.aidl @@ -22,5 +22,6 @@ oneway interface IFaceLockCallback { void unlock(); void cancel(); void reportFailedAttempt(); + void exposeFallback(); void pokeWakelock(); } 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 99ab8a3c5a8a..ee1ce5faf5db 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml @@ -62,6 +62,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:background="@drawable/lockscreen_password_field_dark" android:textColor="#ffffffff" + android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" /> <!-- Numeric keyboard --> 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 64c002f88532..254dd3e21501 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml @@ -58,6 +58,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:background="@drawable/lockscreen_password_field_dark" android:textColor="#ffffffff" + android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" /> <View diff --git a/core/res/res/layout/keyguard_screen_password_landscape.xml b/core/res/res/layout/keyguard_screen_password_landscape.xml index 803047e16674..62f59f658480 100644 --- a/core/res/res/layout/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout/keyguard_screen_password_landscape.xml @@ -152,6 +152,7 @@ android:background="@null" android:textColor="?android:attr/textColorPrimary" android:imeOptions="flagNoFullscreen|actionDone" + android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" /> <!-- This delete button is only visible for numeric PIN entry --> diff --git a/core/res/res/layout/keyguard_screen_password_portrait.xml b/core/res/res/layout/keyguard_screen_password_portrait.xml index 6b033597f56e..597cfe77571f 100644 --- a/core/res/res/layout/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout/keyguard_screen_password_portrait.xml @@ -117,6 +117,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#ffffffff" android:imeOptions="actionDone" + android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" /> <!-- This delete button is only visible for numeric PIN entry --> diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index e08119fa6109..9ce36492c2b3 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -30,14 +30,9 @@ device directly from Eclipse or from the command line with ADB. If you don't yet have a device, check with the service providers in your area to determine which Android-powered devices are available.</p> -<p>If you want a SIM-unlocked phone, then you might consider either an Android Dev Phone or the -Google Nexus S. These are SIM-unlocked so that you can use them on any GSM network using a SIM -card. The Android Dev Phones also feature an unlocked bootloader so you can install custom system -images (great for developing and installing custom versions of the Android platform). To find a -a place you can purchase the Nexus S, visit <a -href="http://www.google.com/phone/detail/nexus-s">google.com/phone</a>. To purchase an Android -Dev Phone, see the <a href="http://market.android.com/publish">Android Market</a> site -(requires a developer account).</p> +<p>If you want a SIM-unlocked phone, then you might consider the Google Nexus S. To find a place +to purchase the Nexus S and other Android-powered devices, visit <a +href="http://www.google.com/phone/detail/nexus-s">google.com/phone</a>.</p> <p class="note"><strong>Note:</strong> When developing on a device, keep in mind that you should still use the <a diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index 02a8a8e42505..e23fb0ec7e3e 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -34,6 +34,7 @@ parent.link=manifest-intro.html android:<a href="#state">stateNotNeeded</a>=["true" | "false"] android:<a href="#aff">taskAffinity</a>="<i>string</i>" android:<a href="#theme">theme</a>="<i>resource or theme</i>" + android:<a href="#uioptions">uiOptions</a>=["none" | "splitActionBarWhenNarrow"] android:<a href="#wsoft">windowSoftInputMode</a>=["stateUnspecified", "stateUnchanged", "stateHidden", "stateAlwaysHidden", "stateVisible", @@ -749,14 +750,39 @@ match what the activity actually looks like). <p> If this attribute is not set, the activity inherits the theme set for the -application as a whole — see the +application as a whole — from the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#theme">theme</a></code> -attribute. If that attribute is also not set, the default system theme is used. +attribute. If that attribute is also not set, the default system theme is used. For more +information, see the <a +href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a> developer guide. </p> <dd> +<!-- ##api level 14## --> +<dt><a name="uioptions"></a>{@code android:uiOptions}</dt> +<dd>Extra options for an activity's UI. + <p>Must be one of the following values.</p> + + <table> + <tr><th>Value</th><th>Description</th></tr> + <tr><td>{@code "none"}</td><td>No extra UI options. This is the default.</td></tr> + <tr><td>{@code "splitActionBarWhenNarrow"}</td><td>Add a bar at +the bottom of the screen to display action items in the {@link android.app.ActionBar}, when +constrained for horizontal space (such as when in portrait mode on a handset). Instead of a small +number of action items appearing in the action bar at the top of the screen, the action bar is +split into the top navigation section and the bottom bar for action items. This ensures a reasonable +amount of space is made available not only for the action items, but also for navigation and title +elements at the top. Menu items are not split across the two bars; they always appear +together.</td></tr> + </table> + <p>For more information about the action bar, see the <a +href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p> + <p>This attribute was added in API level 14.</p> +</dd> + + <!-- ##api level 3## --> <dt><a name="wsoft"></a>{@code android:windowSoftInputMode}</dt> <dd>How the main window of the activity interacts with the window containing diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd index 41313ed35cc2..4f1964cd4028 100644 --- a/docs/html/guide/topics/manifest/application-element.jd +++ b/docs/html/guide/topics/manifest/application-element.jd @@ -23,7 +23,8 @@ parent.link=manifest-intro.html android:<a href="#proc">process</a>="<i>string</i>" android:<a href="#restoreany">restoreAnyVersion</a>=["true" | "false"] android:<a href="#aff">taskAffinity</a>="<i>string</i>" - android:<a href="#theme">theme</a>="<i>resource or theme</i>" > + android:<a href="#theme">theme</a>="<i>resource or theme</i>" + android:<a href="#uioptions">uiOptions</a>=["none" | "splitActionBarWhenNarrow"] > . . . </application></pre></dd> @@ -276,7 +277,31 @@ set by the <dd>A reference to a style resource defining a default theme for all activities in the application. Individual activities can override the default by setting their own <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#theme">theme</a></code> -attributes; see that attribute for more information.</dd> +attributes. For more information, see the <a +href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a> developer guide. +</dd> + +<!-- ##api level 14## --> +<dt><a name="uioptions"></a>{@code android:uiOptions}</dt> +<dd>Extra options for an activity's UI. + <p>Must be one of the following values.</p> + + <table> + <tr><th>Value</th><th>Description</th></tr> + <tr><td>{@code "none"}</td><td>No extra UI options. This is the default.</td></tr> + <tr><td>{@code "splitActionBarWhenNarrow"}</td><td>Add a bar at +the bottom of the screen to display action items in the {@link android.app.ActionBar}, when +constrained for horizontal space (such as when in portrait mode on a handset). Instead of a small +number of action items appearing in the action bar at the top of the screen, the action bar is +split into the top navigation section and the bottom bar for action items. This ensures a reasonable +amount of space is made available not only for the action items, but also for navigation and title +elements at the top. Menu items are not split across the two bars; they always appear +together.</td></tr> + </table> + <p>For more information about the action bar, see the <a +href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p> + <p>This attribute was added in API level 14.</p> +</dd> </dl></dd> diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index b4db01d424e1..f6ec4140bf43 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -1375,6 +1375,13 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler mKeyguardScreenCallback.pokeWakelock(BACKUP_LOCK_TIMEOUT); } + // Removes the black area that covers the backup unlock method + @Override + public void exposeFallback() { + if (DEBUG) Log.d(TAG, "FaceLock exposeFallback()"); + hideFaceLockArea(); // Expose fallback + } + // Allows the Face Unlock service to poke the wake lock to keep the lockscreen alive @Override public void pokeWakelock() { diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index fd6ecebbeb91..318ad9e89f0d 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -827,8 +827,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // See also hasNavigationBar(). String navBarOverride = SystemProperties.get("qemu.hw.mainkeys"); if (! "".equals(navBarOverride)) { - if (navBarOverride.equals("1")) mHasNavigationBar = true; - else if (navBarOverride.equals("0")) mHasNavigationBar = false; + if (navBarOverride.equals("1")) mHasNavigationBar = false; + else if (navBarOverride.equals("0")) mHasNavigationBar = true; } mNavigationBarHeight = mHasNavigationBar diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index f885fc7fbf71..50b86043d517 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -284,8 +284,8 @@ void Layer::onDraw(const Region& clip) const glMatrixMode(GL_TEXTURE); glLoadMatrixf(mTextureMatrix); glMatrixMode(GL_MODELVIEW); - glEnable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_EXTERNAL_OES); } else { glBindTexture(GL_TEXTURE_2D, mFlinger->getProtectedTexName()); glMatrixMode(GL_TEXTURE); diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java index 4f50d2483f26..8534810d56c7 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMALTEPhone.java @@ -246,6 +246,11 @@ public class CDMALTEPhone extends CDMAPhone { } @Override + public void getAvailableNetworks(Message response) { + mCM.getAvailableNetworks(response); + } + + @Override public void requestIsimAuthentication(String nonce, Message result) { mCM.requestIsimAuthentication(nonce, result); } |