diff options
26 files changed, 98 insertions, 136 deletions
@@ -27104,7 +27104,6 @@ package android.widget { ctor public CheckedTextView(android.content.Context, android.util.AttributeSet, int); method public android.graphics.drawable.Drawable getCheckMarkDrawable(); method public boolean isChecked(); - method public void onPaddingChanged(int); method public void setCheckMarkDrawable(int); method public void setCheckMarkDrawable(android.graphics.drawable.Drawable); method public void setChecked(boolean); diff --git a/api/current.txt b/api/current.txt index 1de68ed..a0c1f01 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4486,9 +4486,8 @@ package android.appwidget { field public static final int RESIZE_VERTICAL = 2; // 0x2 field public static final int WIDGET_CATEGORY_HOME_SCREEN = 1; // 0x1 field public static final int WIDGET_CATEGORY_KEYGUARD = 2; // 0x2 - field public static final int WIDGET_FEATURES_CLOCK = 1; // 0x1 field public static final int WIDGET_FEATURES_NONE = 0; // 0x0 - field public static final int WIDGET_FEATURES_STATUS = 2; // 0x2 + field public static final int WIDGET_FEATURES_STATUS = 1; // 0x1 field public int autoAdvanceViewId; field public android.content.ComponentName configure; field public int icon; @@ -25093,10 +25092,9 @@ package android.view { method protected void onLayout(boolean, int, int, int, int); method protected void onMeasure(int, int); method protected void onOverScrolled(int, int, boolean, boolean); - method public void onPaddingChanged(int); method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent); method protected void onRestoreInstanceState(android.os.Parcelable); - method public void onRtlPropertiesChanged(); + method public void onRtlPropertiesChanged(int); method protected android.os.Parcelable onSaveInstanceState(); method public void onScreenStateChanged(int); method protected void onScrollChanged(int, int, int, int); diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java index 5074480..8b62931 100644 --- a/core/java/android/appwidget/AppWidgetProviderInfo.java +++ b/core/java/android/appwidget/AppWidgetProviderInfo.java @@ -59,17 +59,11 @@ public class AppWidgetProviderInfo implements Parcelable { public static final int WIDGET_FEATURES_NONE = 0; /** - * Indicates that the widget displays the current time. The host may use this as a hint to not - * display the time in other places. - */ - public static final int WIDGET_FEATURES_CLOCK = 1; - - /** * Indicates that the widget is output only, ie. has nothing clickable. This may be enforced by * the host. Presently, this flag is used by the keyguard to indicate that it can be placed * in the first position. */ - public static final int WIDGET_FEATURES_STATUS = 2; + public static final int WIDGET_FEATURES_STATUS = 1; /** * Identity of this AppWidget component. This component should be a {@link @@ -215,8 +209,7 @@ public class AppWidgetProviderInfo implements Parcelable { /** * A field which specifies any special features that this widget supports. See - * {@link #WIDGET_FEATURES_NONE}, {@link #WIDGET_FEATURES_CLOCK}, - * {@link #WIDGET_FEATURES_STATUS}. + * {@link #WIDGET_FEATURES_NONE}, {@link #WIDGET_FEATURES_STATUS}. * * <p>This field corresponds to the <code>widgetFeatures</code> attribute in * the AppWidget meta-data file. diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 492e5e9..b316f23 100755 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -1554,8 +1554,6 @@ public class Resources { public static void updateSystemConfiguration(Configuration config, DisplayMetrics metrics, CompatibilityInfo compat) { if (mSystem != null) { - // TODO: Remove once b/7094175 is fixed - Slog.v(TAG, "updateSystemConfiguration: b/7094175 config=" + config); mSystem.updateConfiguration(config, metrics, compat); //Log.i(TAG, "Updated system resources " + mSystem // + ": " + mSystem.getConfiguration()); diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index eec19cb..8bfefd4 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -44,7 +44,6 @@ interface IPowerManager void setPokeLock(int pokey, IBinder lock, String tag); void setStayOnSetting(int val); void setMaximumScreenOffTimeoutFromDeviceAdmin(int timeMs); - void preventScreenOn(boolean prevent); // temporarily overrides the screen brightness settings to allow the user to // see the effect of a settings change without applying it immediately diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 1c12738..6eca8fd 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -11560,7 +11560,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } requestLayout(); invalidate(true); - onRtlPropertiesChanged(); + onRtlPropertiesChanged(getLayoutDirection()); } // Reset resolution of all RTL related properties. @@ -11622,8 +11622,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * resolved layout direction, or to inform child views that inherit their layout direction. * * The default implementation does nothing. + * + * @param layoutDirection the direction of the layout + * + * @see #LAYOUT_DIRECTION_LTR + * @see #LAYOUT_DIRECTION_RTL */ - public void onRtlPropertiesChanged() { + public void onRtlPropertiesChanged(int layoutDirection) { } /** @@ -11768,7 +11773,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, internalSetPadding(mUserPaddingLeft, mPaddingTop, mUserPaddingRight, mUserPaddingBottom); - onPaddingChanged(resolvedLayoutDirection); + onRtlPropertiesChanged(resolvedLayoutDirection); } mPrivateFlags2 |= PFLAG2_PADDING_RESOLVED; @@ -11784,19 +11789,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** - * Resolve padding depending on the layout direction. Subclasses that care about - * padding resolution should override this method. The default implementation does - * nothing. - * - * @param layoutDirection the direction of the layout - * - * @see #LAYOUT_DIRECTION_LTR - * @see #LAYOUT_DIRECTION_RTL - */ - public void onPaddingChanged(int layoutDirection) { - } - - /** * This is called when the view is detached from a window. At this point it * no longer has a surface for drawing. * @@ -11827,7 +11819,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mCurrentAnimation = null; resetRtlProperties(); - onRtlPropertiesChanged(); + onRtlPropertiesChanged(LAYOUT_DIRECTION_DEFAULT); resetAccessibilityStateChanged(); } @@ -12819,8 +12811,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, final boolean opaque = drawingCacheBackgroundColor != 0 || isOpaque(); final boolean use32BitCache = attachInfo != null && attachInfo.mUse32BitDrawingCache; - final int projectedBitmapSize = width * height * (opaque && !use32BitCache ? 2 : 4); - final int drawingCacheSize = + final long projectedBitmapSize = width * height * (opaque && !use32BitCache ? 2 : 4); + final long drawingCacheSize = ViewConfiguration.get(mContext).getScaledMaximumDrawingCacheSize(); if (width <= 0 || height <= 0 || projectedBitmapSize > drawingCacheSize) { if (width > 0 && height > 0) { @@ -14786,6 +14778,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ + public void resetPaddingToInitialValues() { + mPaddingLeft = mUserPaddingLeftInitial; + mPaddingRight = mUserPaddingRightInitial; + } + + /** + * @hide + */ public Insets getOpticalInsets() { if (mLayoutInsets == null) { mLayoutInsets = (mBackground == null) ? Insets.NONE : mBackground.getLayoutInsets(); @@ -16618,7 +16618,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, // Do resolution resolveTextDirection(); // Notify change - onRtlPropertiesChanged(); + onRtlPropertiesChanged(getLayoutDirection()); // Refresh requestLayout(); invalidate(true); @@ -16812,7 +16812,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, // Do resolution resolveTextAlignment(); // Notify change - onRtlPropertiesChanged(); + onRtlPropertiesChanged(getLayoutDirection()); // Refresh requestLayout(); invalidate(true); diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java index cea1fd5..d6fd4ff 100644 --- a/core/java/android/widget/CheckedTextView.java +++ b/core/java/android/widget/CheckedTextView.java @@ -46,9 +46,6 @@ public class CheckedTextView extends TextView implements Checkable { private int mCheckMarkWidth; private boolean mNeedRequestlayout; - private int initialPaddingLeft = -1; - private int initialPaddingRight = -1; - private static final int[] CHECKED_STATE_SET = { R.attr.state_checked }; @@ -104,7 +101,7 @@ public class CheckedTextView extends TextView implements Checkable { /** * Set the checkmark to a given Drawable, identified by its resourece id. This will be drawn * when {@link #isChecked()} is true. - * + * * @param resid The Drawable to use for the checkmark. * * @see #setCheckMarkDrawable(Drawable) @@ -147,7 +144,7 @@ public class CheckedTextView extends TextView implements Checkable { d.setVisible(getVisibility() == VISIBLE, false); d.setState(CHECKED_STATE_SET); setMinHeight(d.getIntrinsicHeight()); - + mCheckMarkWidth = d.getIntrinsicWidth(); d.setState(getDrawableState()); } else { @@ -179,22 +176,16 @@ public class CheckedTextView extends TextView implements Checkable { protected void internalSetPadding(int left, int top, int right, int bottom) { super.internalSetPadding(left, top, right, bottom); setBasePadding(isLayoutRtl()); - initialPaddingLeft = mPaddingLeft; - initialPaddingRight = mPaddingRight; - } - - @Override - public void onPaddingChanged(int layoutDirection) { - updatePadding(); } @Override - public void onRtlPropertiesChanged() { - super.onRtlPropertiesChanged(); + public void onRtlPropertiesChanged(int layoutDirection) { + super.onRtlPropertiesChanged(layoutDirection); updatePadding(); } private void updatePadding() { + resetPaddingToInitialValues(); int newPadding = (mCheckMarkDrawable != null) ? mCheckMarkWidth + mBasePadding : mBasePadding; mNeedRequestlayout |= (mPaddingRight != newPadding); diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index c838973..cd8638d 100644 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -1354,8 +1354,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { }; @Override - public void onRtlPropertiesChanged() { - mQueryTextView.setLayoutDirection(getLayoutDirection()); + public void onRtlPropertiesChanged(int layoutDirection) { + mQueryTextView.setLayoutDirection(layoutDirection); } /** diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 2937166..410a0ca 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -5635,7 +5635,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } @Override - public void onRtlPropertiesChanged() { + public void onRtlPropertiesChanged(int layoutDirection) { if (mLayoutAlignment != null) { if (mResolvedTextAlignment == TEXT_ALIGNMENT_VIEW_START || mResolvedTextAlignment == TEXT_ALIGNMENT_VIEW_END) { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 9801d98..c794c51 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2103,7 +2103,7 @@ <activity android:name="android.accounts.ChooseAccountTypeActivity" android:excludeFromRecents="true" - android:theme="@android:style/Theme.Holo.DialogWhenLarge.NoActionBar" + android:theme="@android:style/Theme.Holo.Dialog" android:label="@string/choose_account_label" android:process=":ui"> </activity> diff --git a/core/res/res/drawable/kg_avatar_overlay.xml b/core/res/res/drawable/kg_avatar_overlay.xml deleted file mode 100644 index 781c1df..0000000 --- a/core/res/res/drawable/kg_avatar_overlay.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" - android:drawable="@drawable/activity_picker_bg_activated" /> -</selector>
\ No newline at end of file diff --git a/core/res/res/layout/choose_account_type.xml b/core/res/res/layout/choose_account_type.xml index 769d80b..87d1dde 100644 --- a/core/res/res/layout/choose_account_type.xml +++ b/core/res/res/layout/choose_account_type.xml @@ -20,20 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:paddingStart="16dip" - android:paddingEnd="16dip"> - - <TextView android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_gravity="start" - android:text="@string/add_account_label" - android:paddingTop="16dip" - android:paddingBottom="16dip" - android:textColor="@android:color/holo_blue_light" - /> + android:orientation="vertical"> <View android:layout_height="3dip" android:layout_width="match_parent" diff --git a/core/res/res/layout/keyguard_multi_user_avatar.xml b/core/res/res/layout/keyguard_multi_user_avatar.xml index 23f9b6d..a3621c0 100644 --- a/core/res/res/layout/keyguard_multi_user_avatar.xml +++ b/core/res/res/layout/keyguard_multi_user_avatar.xml @@ -22,9 +22,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="125dp" android:layout_height="125dp" - android:background="#550000ff" - android:gravity="center_horizontal" - android:foreground="@drawable/kg_avatar_overlay"> + android:gravity="center_horizontal"> <ImageView android:id="@+id/keyguard_user_avatar" android:scaleType="centerCrop" diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 678f6b3..48f0cf9 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -324,7 +324,7 @@ <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"wys ongemagtigde vensters"</string> <string name="permdesc_internalSystemWindow" msgid="7458387759461466397">"Laat die program toe om vensters te skep wat bedoel is om deur die interne stelsel se gebruikerkoppelvlak gebruik te word. Nie vir gebruik deur normale programme nie."</string> <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"teken oor ander programme"</string> - <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"Laat die program toe om bo-oor ande programme of dele van die gebruikerkoppelvlak te teken. Hulle kan met jou gebruik van die koppelvlak in enige program inmeng, of verander wat jy dink jy in ander programme sien."</string> + <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"Laat die program toe om bo-oor ande programme of dele van die gebruikerkoppelvlak te teken. Hulle kan met jou gebruik van die koppelvlak in enige program inmeng, of verander wat jy dink jy in ander programme sien."</string> <string name="permlab_setAnimationScale" msgid="2805103241153907174">"verander globale animasiespoed"</string> <string name="permdesc_setAnimationScale" msgid="7690063428924343571">"Laat die program toe om die globale animasiespoed te eniger tyd te verander (vinniger of stadiger animasie)."</string> <string name="permlab_manageAppTokens" msgid="1286505717050121370">"bestuur programtokens"</string> @@ -372,8 +372,8 @@ <string name="permlab_installPackages" msgid="2199128482820306924">"installeer programme direk"</string> <string name="permdesc_installPackages" msgid="5628530972548071284">"Laat die program toe om nuwe of opgedateerde Android-pakkette te installeer. Kwaadwillige programme kan dit dalk gebruik om nuwe programme by te voeg met arbitrêr kragtige toestemmings."</string> <string name="permlab_clearAppCache" msgid="7487279391723526815">"vee alle programkasdata uit"</string> - <string name="permdesc_clearAppCache" product="tablet" msgid="8974640871945434565">"Laat die program toe om tabletberging vry te stel deur lêers in die cache-gidse van ander programme uit te vee. Dit kan veroorsaak dat ander programme stadiger begin omdat hulle hulle data moet herophaal."</string> - <string name="permdesc_clearAppCache" product="default" msgid="2459441021956436779">"Laat die program toe om foonberging vry te stel deur lêers in die cache-gidse van ander programme uit te vee. Dit kan veroorsaak dat ander programme stadiger begin omdat hulle hulle data moet herophaal."</string> + <string name="permdesc_clearAppCache" product="tablet" msgid="8974640871945434565">"Laat die program toe om tabletberging oop te maak deur lêers in die kas-gidse van ander programme uit te vee. Dit kan veroorsaak dat ander programme stadiger begin omdat hulle hulle data moet herophaal."</string> + <string name="permdesc_clearAppCache" product="default" msgid="2459441021956436779">"Laat die program toe om foonberging oop te maak deur lêers in die kas-gidse van ander programme uit te vee. Dit kan veroorsaak dat ander programme stadiger begin omdat hulle hulle data moet herophaal."</string> <string name="permlab_movePackage" msgid="3289890271645921411">"skuif programhulpbronne"</string> <string name="permdesc_movePackage" msgid="319562217778244524">"Laat die program toe om hulpbronne van interne na eksterne media te skuif, en omgekeerd."</string> <string name="permlab_readLogs" msgid="6615778543198967614">"lees sensitiewe logdata"</string> @@ -437,7 +437,7 @@ <string name="permlab_accessFineLocation" msgid="1191898061965273372">"presiese ligging (GPS en netwerkgebaseer)"</string> <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"Laat die program toe om jou presiese ligging te kry met behulp van die globaleposisioneringstelsel (GPS) of netwerkliggingbronne soos seltorings en Wi-Fi. Hierdie liggingdienste moet aangeskakel en beskikbaar wees aan jou toestel vir die program om dit te gebruik. Programme kan dit gebruik om te bepaal waar jy is en kan batterylewe opgebruik."</string> <string name="permlab_accessCoarseLocation" msgid="4887895362354239628">"benaderde ligging (netwerkgebaseer)"</string> - <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"Laat die program toe om jou benaderde ligging te kry. Hierdie plek is verkry deur liggingdienste met gebruik van netwerkliggingbronne soos seltorings en Wi-Fie. Hierdie liggingdienste moet aangeskakel en beskikbaar wees aan jou toestel vir die program om dit te gebruik. Programme kan dit gebruik om te bepaal waar omtrent jy is."</string> + <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"Laat die program toe om jou benaderde ligging te kry. Hierdie ligging word verkry deur liggingdienste met gebruik van netwerkliggingbronne soos seltorings en Wi-Fi. Hierdie liggingdienste moet aangeskakel en beskikbaar wees aan jou toestel vir die program om dit te gebruik. Programme kan dit gebruik om te bepaal waar omtrent jy is."</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"kry toegang tot SurfaceFlinger"</string> <string name="permdesc_accessSurfaceFlinger" msgid="1041619516733293551">"Laat die program toe om SurfaceFlinger se laevlak-kenmerke te gebruik."</string> <string name="permlab_readFrameBuffer" msgid="6690504248178498136">"lees raambuffer"</string> @@ -559,7 +559,7 @@ <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"gaan in by Bluetooth-instellings"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"Laat die program toe om die plaaslike Bluetooth-tablet op te stel, en om met afstandbeheer toestelle saam te bind."</string> <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"Laat die program toe om die plaaslike Bluetooth-foon op te stel en te ontdek en met afgeleë toestelle saam te bind."</string> - <string name="permlab_accessWimaxState" msgid="4195907010610205703">"koppel en ontkoppel van WiMAX"</string> + <string name="permlab_accessWimaxState" msgid="4195907010610205703">"koppel aan en ontkoppel van WiMAX"</string> <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Laat die program toe om te bepaal of WiMAX geaktiveer is en of enige WiMAX-netwerke gekoppel is."</string> <string name="permlab_changeWimaxState" msgid="2405042267131496579">"Verander WiMAX-status"</string> <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"Laat die program toe om die tablet aan WiMAX-netwerke te koppel en daarvan te ontkoppel."</string> @@ -1107,7 +1107,7 @@ <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Kanselleer"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Onthou my keuse"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Laat altyd toe"</string> - <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Moet nooit toelaat dat"</string> + <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Moet nooit toelaat nie"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kaart verwyder"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Die mobielnetwerk sal nie beskikbaar wees nie totdat jy weer begin met \'n geldige SIM-kaart."</string> <string name="sim_done_button" msgid="827949989369963775">"Klaar"</string> @@ -1121,7 +1121,7 @@ <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"NUUT: "</font></string> <string name="perms_description_app" msgid="5139836143293299417">"Verskaf deur <xliff:g id="APP_NAME">%1$s</xliff:g>."</string> <string name="no_permissions" msgid="7283357728219338112">"Geen toestemmings benodig nie"</string> - <string name="perm_costs_money" msgid="4902470324142151116">"dit kan jou geld kos"</string> + <string name="perm_costs_money" msgid="4902470324142151116">"dit kan jou dalk geld kos"</string> <string name="usb_storage_activity_title" msgid="4465055157209648641">"USB-geheue"</string> <string name="usb_storage_title" msgid="5901459041398751495">"USB gekoppel"</string> <string name="usb_storage_message" product="nosdcard" msgid="3308538094316477839">"Jy het via USB aan jou rekenaar gekoppel. Raak die knoppie hier onder as jy lêers tussen jou rekenaar en jou Android se USB-geheue wil kopieer."</string> @@ -1409,7 +1409,7 @@ <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"Jy het <xliff:g id="NUMBER">%d</xliff:g> keer verkeerdelik gepoog om die foon te ontsluit. Die foon sal nou na fabrieksverstek teruggestel word."</string> <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Jy het jou ontsluitpatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer verkeerdelik geteken. Na nog <xliff:g id="NUMBER_1">%d</xliff:g> onsuksesvolle pogings, sal jy gevra word om jou tablet te ontsluit deur middel van \'n e-posrekening."\n\n" Probeer weer oor <xliff:g id="NUMBER_2">%d</xliff:g> sekondes."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Jy het jou ontsluitpatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer verkeerdelik geteken. Na nog <xliff:g id="NUMBER_1">%d</xliff:g> onsuksesvolle pogings, sal jy gevra word om jou foon te ontsluit deur middel van \'n e-posrekening."\n\n" Probeer weer oor <xliff:g id="NUMBER_2">%d</xliff:g> sekondes."</string> - <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Verhoog volume bo veilige vlak?"\n"Deur vir lang tydperke na hoë volume te luister, kan jou gehoor beskadig word."</string> + <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Moet volume bo veilige vlak verhoog word?"\n"Deur vir lang tydperke op hoë volume te luister, kan jou gehoor beskadig."</string> <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> <skip /> <!-- no translation found for accessibility_enabled (1381972048564547685) --> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 7711e11..8e05c03 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1121,7 +1121,7 @@ <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"NOVÉ: "</font></string> <string name="perms_description_app" msgid="5139836143293299417">"Poskytuje: <xliff:g id="APP_NAME">%1$s</xliff:g>."</string> <string name="no_permissions" msgid="7283357728219338112">"Nejsou vyžadována žádná oprávnění"</string> - <string name="perm_costs_money" msgid="4902470324142151116">"může vás to stát peníze"</string> + <string name="perm_costs_money" msgid="4902470324142151116">"může vás to něco stát"</string> <string name="usb_storage_activity_title" msgid="4465055157209648641">"Velkokapacitní úložiště USB"</string> <string name="usb_storage_title" msgid="5901459041398751495">"USB připojeno"</string> <string name="usb_storage_message" product="nosdcard" msgid="3308538094316477839">"Připojili jste se k počítači pomocí rozhraní USB. Chcete-li kopírovat soubory z počítače do úložiště USB v zařízení Android či obráceně, klepněte na tlačítko níže."</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 077d39c..f46f313 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -569,7 +569,7 @@ <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"Ermöglicht der App, die Bluetooth-Konfiguration des Telefons einzusehen und Verbindungen mit gekoppelten Geräten herzustellen und zu akzeptieren."</string> <string name="permlab_nfc" msgid="4423351274757876953">"Nahfeldkommunikation steuern"</string> <string name="permdesc_nfc" msgid="7120611819401789907">"Ermöglicht der App die Kommunikation mit Tags für die Nahfeldkommunikation, Karten und Readern"</string> - <string name="permlab_disableKeyguard" msgid="3598496301486439258">"Bildschirmsperre deaktivieren"</string> + <string name="permlab_disableKeyguard" msgid="3598496301486439258">"Display-Sperre deaktivieren"</string> <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Ermöglicht der App, die Tastensperre sowie den damit verbundenen Passwortschutz zu deaktivieren. Das Telefon deaktiviert die Tastensperre beispielsweise, wenn ein Anruf eingeht, und aktiviert sie wieder, nachdem das Gespräch beendet wurde."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"Synchronisierungseinstellungen lesen"</string> <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"Ermöglicht der App, die Synchronisierungseinstellungen eines Kontos zu lesen. Beispielsweise kann damit festgestellt werden, ob Kontakte mit einem Konto synchronisiert werden."</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 99e5600..7ad60f1 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1094,7 +1094,7 @@ <string name="wifi_p2p_to_message" msgid="248968974522044099">"Naar:"</string> <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Voer de gewenste pincode in:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"Pincode"</string> - <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"De verbinding met het wifi-netwerk wordt tijdelijk uitgeschakeld terwijl de telefoon is verbonden met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> + <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"De verbinding met het wifi-netwerk wordt tijdelijk uitgeschakeld terwijl de telefoon verbonden is met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> <string name="select_character" msgid="3365550120617701745">"Teken invoegen"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMS-berichten verzenden"</string> <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> verzendt moment een groot aantal sms-berichten. Wilt u toestaan dat deze app berichten blijft verzenden?"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 9f62b99..669d334 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -314,7 +314,7 @@ <string name="permlab_setAlwaysFinish" msgid="550958507798796965">"принудно затварање позадинских апликација"</string> <string name="permdesc_setAlwaysFinish" msgid="7471310652868841499">"Дозвољава апликацији да управља тиме да ли ће се активности увек окончати чим пређу у позадину. Уобичајене апликације је никада не користе."</string> <string name="permlab_batteryStats" msgid="2789610673514103364">"читање статистике о батерији"</string> - <string name="permdesc_batteryStats" msgid="5897346582882915114">"Дозвољава апликацији да чита опште податке о тренутној употреби скоро истрошене батерије. Можда ће апликацији дозволити да сазна детаљне информације о томе које апликације користите."</string> + <string name="permdesc_batteryStats" msgid="5897346582882915114">"Дозвољава апликацији да чита опште податке о тренутној употреби батерије на измаку. Можда ће апликацији дозволити да сазна детаљне информације о томе које апликације користите."</string> <string name="permlab_updateBatteryStats" msgid="3719689764536379557">"измена статистике о батерији"</string> <string name="permdesc_updateBatteryStats" msgid="6862817857178025002">"Дозвољава апликацији да мења прикупљену статистику о батерији. Не користе је обичне апликације."</string> <string name="permlab_backup" msgid="470013022865453920">"контрола резервне копије система и враћање почетних вредности"</string> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 4450ae8..ea89633 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -5215,8 +5215,7 @@ supports. Supports combined values using | operator. --> <attr name="widgetFeatures" format="integer"> <flag name="none" value="0x0" /> - <flag name="clock" value="0x1" /> - <flag name="status" value="0x2" /> + <flag name="status" value="0x1" /> </attr> </declare-styleable> diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index f68f9dc..4170cfe 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -371,12 +371,30 @@ public class Paint { public void reset() { native_reset(mNativePaint); setFlags(DEFAULT_PAINT_FLAGS); + // TODO: Turning off hinting has undesirable side effects, we need to // revisit hinting once we add support for subpixel positioning // setHinting(DisplayMetrics.DENSITY_DEVICE >= DisplayMetrics.DENSITY_TV // ? HINTING_OFF : HINTING_ON); + + mColorFilter = null; + mMaskFilter = null; + mPathEffect = null; + mRasterizer = null; + mShader = null; + mTypeface = null; + mXfermode = null; + mHasCompatScaling = false; - mCompatScaling = mInvCompatScaling = 1; + mCompatScaling = 1; + mInvCompatScaling = 1; + + hasShadow = false; + shadowDx = 0; + shadowDy = 0; + shadowRadius = 0; + shadowColor = 0; + mBidiFlags = BIDI_DEFAULT_LTR; setTextLocale(Locale.getDefault()); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java index 759068d..8c1dfe1 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java @@ -45,6 +45,9 @@ class KeyguardMultiUserAvatar extends FrameLayout { private boolean mInit = true; private KeyguardMultiUserSelectorView mUserSelector; + boolean mPressedStateLocked = false; + boolean mTempPressedStateHolder = false; + public static KeyguardMultiUserAvatar fromXml(int resId, Context context, KeyguardMultiUserSelectorView userSelector, UserInfo info) { KeyguardMultiUserAvatar icon = (KeyguardMultiUserAvatar) @@ -135,25 +138,33 @@ class KeyguardMultiUserAvatar extends FrameLayout { } } - boolean mLockDrawableState = false; - - public void lockDrawableState() { - mLockDrawableState = true; + public void lockPressedState() { + mPressedStateLocked = true; } - public void resetDrawableState() { - mLockDrawableState = false; + public void resetPressedState() { + mPressedStateLocked = false; post(new Runnable() { @Override public void run() { - refreshDrawableState(); + KeyguardMultiUserAvatar.this.setPressed(mTempPressedStateHolder); } }); } - protected void drawableStateChanged() { - if (!mLockDrawableState) { - super.drawableStateChanged(); + @Override + public void setPressed(boolean pressed) { + if (!mPressedStateLocked) { + super.setPressed(pressed); + if (pressed) { + mUserImage.setColorFilter(Color.argb(0, INACTIVE_COLOR, + INACTIVE_COLOR, INACTIVE_COLOR)); + } else if (!mActive) { + mUserImage.setColorFilter(Color.argb(INACTIVE_ALPHA, INACTIVE_COLOR, + INACTIVE_COLOR, INACTIVE_COLOR)); + } + } else { + mTempPressedStateHolder = pressed; } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java index e4096b9..3b45c22 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java @@ -111,7 +111,7 @@ public class KeyguardMultiUserSelectorView extends FrameLayout implements View.O return; } else { // Reset the previously active user to appear inactive - avatar.lockDrawableState(); + avatar.lockPressedState(); mCallback.hideSecurityView(FADE_OUT_ANIMATION_DURATION); mActiveUserAvatar.setActive(false, true, SWITCH_ANIMATION_DURATION, new Runnable() { @Override @@ -120,7 +120,7 @@ public class KeyguardMultiUserSelectorView extends FrameLayout implements View.O ActivityManagerNative.getDefault().switchUser(avatar.getUserInfo().id); WindowManagerGlobal.getWindowManagerService().lockNow(); // Set the new active user, and make it appear active - avatar.resetDrawableState(); + avatar.resetPressedState(); mCallback.showSecurityView(); mActiveUserAvatar = avatar; mActiveUserAvatar.setActive(true, false, 0, null); diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java index 2f57eb0..8193a4f 100644 --- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -1206,9 +1206,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } private void tryDisableTouchExplorationLocked(Service service) { - if (!service.canReceiveEvents()) { - return; - } UserState userState = getUserStateLocked(service.mUserId); if (userState.mIsTouchExplorationEnabled) { final int serviceCount = userState.mServices.size(); diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index 9052e0e..c2d47e5 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -1643,12 +1643,6 @@ public final class PowerManagerService extends IPowerManager.Stub && mMaximumScreenOffTimeoutFromDeviceAdmin < Integer.MAX_VALUE; } - @Override // Binder call - public void preventScreenOn(boolean prevent) { - // TODO Auto-generated method stub - // Only used by phone app, delete this - } - /** * Used by the phone application to make the attention LED flash when ringing. */ diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 23ce52e..782d417 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -2748,7 +2748,10 @@ public class WindowManagerService extends IWindowManager.Stub } } - if (DEBUG_LAYOUT) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility + if (DEBUG_LAYOUT + // TODO: Remove once b/7094175 is fixed + || ((String)win.mAttrs.getTitle()).contains("Keyguard") + ) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility + " " + requestedWidth + "x" + requestedHeight + " " + win.mAttrs); win.mEnforceSizeCompat = (win.mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0; @@ -9255,7 +9258,9 @@ public class WindowManagerService extends IWindowManager.Stub "Reporting new frame to " + win + ": " + win.mCompatFrame); int diff = 0; boolean configChanged = win.isConfigChanged(); - if ((DEBUG_RESIZE || DEBUG_ORIENTATION || DEBUG_CONFIGURATION) + if ((DEBUG_RESIZE || DEBUG_ORIENTATION || DEBUG_CONFIGURATION + // TODO: Remove once b/7094175 is fixed + || ((String)win.mAttrs.getTitle()).contains("Keyguard")) && configChanged) { Slog.i(TAG, "Sending new config to window " + win + ": " + winAnimator.mSurfaceW + "x" + winAnimator.mSurfaceH diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java index 0cf0f21..e882440 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java @@ -65,11 +65,6 @@ public class BridgePowerManager implements IPowerManager { } @Override - public void preventScreenOn(boolean arg0) throws RemoteException { - // pass for now. - } - - @Override public void reboot(String arg0) throws RemoteException { // pass for now. } |