diff options
249 files changed, 3761 insertions, 2323 deletions
diff --git a/Android.mk b/Android.mk index 5bf4d410e6b1..81154726694c 100644 --- a/Android.mk +++ b/Android.mk @@ -442,6 +442,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since $(SRC_API_DIR)/15.txt 15 \ -since $(SRC_API_DIR)/16.txt 16 \ -since $(SRC_API_DIR)/17.txt 17 \ + -since $(SRC_API_DIR)/18.txt 18 \ -werror -hide 113 \ -overview $(LOCAL_PATH)/core/java/overview.html diff --git a/api/current.txt b/api/current.txt index a7ccbdb2ab2a..d1be295516f5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -852,6 +852,7 @@ package android { field public static final int reqNavigation = 16843306; // 0x101022a field public static final int reqTouchScreen = 16843303; // 0x1010227 field public static final int required = 16843406; // 0x101028e + field public static final int requiredAccountType = 16843734; // 0x10103d6 field public static final int requiredForAllUsers = 16843728; // 0x10103d0 field public static final int requiresFadingEdge = 16843685; // 0x10103a5 field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364 @@ -2075,6 +2076,7 @@ package android.accessibilityservice { method public final android.os.IBinder onBind(android.content.Intent); method protected boolean onGesture(int); method public abstract void onInterrupt(); + method protected boolean onKeyEvent(android.view.KeyEvent); method protected void onServiceConnected(); method public final boolean performGlobalAction(int); method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo); @@ -2304,22 +2306,28 @@ package android.accounts { package android.animation { - public abstract class Animator implements java.lang.Cloneable { + public abstract interface Animatable { + method public abstract long getDuration(); + method public abstract android.animation.TimeInterpolator getInterpolator(); + method public abstract long getStartDelay(); + method public abstract android.animation.Animatable setDuration(long); + method public abstract void setInterpolator(android.animation.TimeInterpolator); + method public abstract void setStartDelay(long); + } + + public abstract class Animator implements android.animation.Animatable java.lang.Cloneable { ctor public Animator(); method public void addListener(android.animation.Animator.AnimatorListener); method public void cancel(); method public android.animation.Animator clone(); method public void end(); - method public abstract long getDuration(); + method public android.animation.TimeInterpolator getInterpolator(); method public java.util.ArrayList<android.animation.Animator.AnimatorListener> getListeners(); - method public abstract long getStartDelay(); method public abstract boolean isRunning(); method public boolean isStarted(); method public void removeAllListeners(); method public void removeListener(android.animation.Animator.AnimatorListener); method public abstract android.animation.Animator setDuration(long); - method public abstract void setInterpolator(android.animation.TimeInterpolator); - method public abstract void setStartDelay(long); method public void setTarget(java.lang.Object); method public void setupEndValues(); method public void setupStartValues(); @@ -2510,7 +2518,6 @@ package android.animation { method public long getCurrentPlayTime(); method public long getDuration(); method public static long getFrameDelay(); - method public android.animation.TimeInterpolator getInterpolator(); method public int getRepeatCount(); method public int getRepeatMode(); method public long getStartDelay(); @@ -4189,6 +4196,7 @@ package android.app { method public final boolean performGlobalAction(int); method public void setOnAccessibilityEventListener(android.app.UiAutomation.OnAccessibilityEventListener); method public boolean setRotation(int); + method public void setRunAsMonkey(boolean); method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo); method public android.graphics.Bitmap takeScreenshot(); method public void waitForIdle(long, long) throws java.util.concurrent.TimeoutException; @@ -6650,7 +6658,9 @@ package android.content.pm { field public static final int LAUNCH_SINGLE_TOP = 1; // 0x1 field public static final int SCREEN_ORIENTATION_BEHIND = 3; // 0x3 field public static final int SCREEN_ORIENTATION_FULL_SENSOR = 10; // 0xa + field public static final int SCREEN_ORIENTATION_FULL_USER = 13; // 0xd field public static final int SCREEN_ORIENTATION_LANDSCAPE = 0; // 0x0 + field public static final int SCREEN_ORIENTATION_LOCKED = 14; // 0xe field public static final int SCREEN_ORIENTATION_NOSENSOR = 5; // 0x5 field public static final int SCREEN_ORIENTATION_PORTRAIT = 1; // 0x1 field public static final int SCREEN_ORIENTATION_REVERSE_LANDSCAPE = 8; // 0x8 @@ -6660,6 +6670,8 @@ package android.content.pm { field public static final int SCREEN_ORIENTATION_SENSOR_PORTRAIT = 7; // 0x7 field public static final int SCREEN_ORIENTATION_UNSPECIFIED = -1; // 0xffffffff field public static final int SCREEN_ORIENTATION_USER = 2; // 0x2 + field public static final int SCREEN_ORIENTATION_USER_LANDSCAPE = 11; // 0xb + field public static final int SCREEN_ORIENTATION_USER_PORTRAIT = 12; // 0xc field public static final int UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW = 1; // 0x1 field public int configChanges; field public int flags; @@ -6865,7 +6877,6 @@ package android.content.pm { method public abstract boolean addPermission(android.content.pm.PermissionInfo); method public abstract boolean addPermissionAsync(android.content.pm.PermissionInfo); method public abstract deprecated void addPreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName); - method public android.content.Intent buildPermissionRequestIntent(java.lang.String...); method public abstract java.lang.String[] canonicalToCurrentPackageNames(java.lang.String[]); method public abstract int checkPermission(java.lang.String, java.lang.String); method public abstract int checkSignatures(java.lang.String, java.lang.String); @@ -11806,10 +11817,10 @@ package android.media { method public void seekTo(long, int); method public void selectTrack(int); method public final void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException; - method public final void setDataSource(java.lang.String, java.util.Map<java.lang.String, java.lang.String>); - method public final void setDataSource(java.lang.String); - method public final void setDataSource(java.io.FileDescriptor); - method public final void setDataSource(java.io.FileDescriptor, long, long); + method public final void setDataSource(java.lang.String, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException; + method public final void setDataSource(java.lang.String) throws java.io.IOException; + method public final void setDataSource(java.io.FileDescriptor) throws java.io.IOException; + method public final void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException; method public void unselectTrack(int); field public static final int SAMPLE_FLAG_ENCRYPTED = 2; // 0x2 field public static final int SAMPLE_FLAG_SYNC = 1; // 0x1 @@ -12256,13 +12267,17 @@ package android.media { ctor public RemoteControlClient(android.app.PendingIntent); ctor public RemoteControlClient(android.app.PendingIntent, android.os.Looper); method public android.media.RemoteControlClient.MetadataEditor editMetadata(boolean); + method public void setOnGetPlaybackPositionListener(android.media.RemoteControlClient.OnGetPlaybackPositionListener); + method public void setPlaybackPositionUpdateListener(android.media.RemoteControlClient.OnPlaybackPositionUpdateListener); method public void setPlaybackState(int); + method public void setPlaybackState(int, long, float); method public void setTransportControlFlags(int); field public static final int FLAG_KEY_MEDIA_FAST_FORWARD = 64; // 0x40 field public static final int FLAG_KEY_MEDIA_NEXT = 128; // 0x80 field public static final int FLAG_KEY_MEDIA_PAUSE = 16; // 0x10 field public static final int FLAG_KEY_MEDIA_PLAY = 4; // 0x4 field public static final int FLAG_KEY_MEDIA_PLAY_PAUSE = 8; // 0x8 + field public static final int FLAG_KEY_MEDIA_POSITION_UPDATE = 256; // 0x100 field public static final int FLAG_KEY_MEDIA_PREVIOUS = 1; // 0x1 field public static final int FLAG_KEY_MEDIA_REWIND = 2; // 0x2 field public static final int FLAG_KEY_MEDIA_STOP = 32; // 0x20 @@ -12286,6 +12301,14 @@ package android.media { field public static final int BITMAP_KEY_ARTWORK = 100; // 0x64 } + public static abstract interface RemoteControlClient.OnGetPlaybackPositionListener { + method public abstract long onGetPlaybackPosition(); + } + + public static abstract interface RemoteControlClient.OnPlaybackPositionUpdateListener { + method public abstract void onPlaybackPositionUpdate(long); + } + public class Ringtone { method public int getStreamType(); method public java.lang.String getTitle(android.content.Context); @@ -17044,6 +17067,11 @@ package android.os { method public abstract void released(); } + public final class Trace { + method public static void beginSection(java.lang.String); + method public static void endSection(); + } + public class TransactionTooLargeException extends android.os.RemoteException { ctor public TransactionTooLargeException(); } @@ -17065,18 +17093,20 @@ package android.os { method public java.lang.String getUserName(); method public android.os.Bundle getUserRestrictions(); method public android.os.Bundle getUserRestrictions(android.os.UserHandle); + method public boolean isLinkedUser(); method public boolean isUserAGoat(); - method public boolean isUserRestricted(); method public boolean isUserRunning(android.os.UserHandle); method public boolean isUserRunningOrStopping(android.os.UserHandle); method public void setUserRestriction(java.lang.String, boolean); method public void setUserRestrictions(android.os.Bundle); method public void setUserRestrictions(android.os.Bundle, android.os.UserHandle); field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth"; + field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials"; field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi"; field public static final java.lang.String DISALLOW_INSTALL_APPS = "no_install_apps"; field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources"; field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts"; + field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user"; field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location"; field public static final java.lang.String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps"; field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer"; @@ -19719,6 +19749,7 @@ package android.renderscript { method public deprecated synchronized void resize(int); method public void setFromFieldPacker(int, android.renderscript.FieldPacker); method public void setFromFieldPacker(int, int, android.renderscript.FieldPacker); + method public void setIoInputNotificationHandler(android.renderscript.Allocation.IoInputNotifier); method public void setSurface(android.view.Surface); method public void syncAll(int); field public static final int USAGE_GRAPHICS_CONSTANTS = 8; // 0x8 @@ -19731,6 +19762,10 @@ package android.renderscript { field public static final int USAGE_SHARED = 128; // 0x80 } + public static abstract interface Allocation.IoInputNotifier { + method public abstract void onBufferAvailable(android.renderscript.Allocation); + } + public static final class Allocation.MipmapControl extends java.lang.Enum { method public static android.renderscript.Allocation.MipmapControl valueOf(java.lang.String); method public static final android.renderscript.Allocation.MipmapControl[] values(); @@ -19987,6 +20022,35 @@ package android.renderscript { method public void reset(); method public void reset(int); method public void skip(int); + method public boolean subBoolean(); + method public android.renderscript.Byte2 subByte2(); + method public android.renderscript.Byte3 subByte3(); + method public android.renderscript.Byte4 subByte4(); + method public android.renderscript.Double2 subDouble2(); + method public android.renderscript.Double3 subDouble3(); + method public android.renderscript.Double4 subDouble4(); + method public float subF32(); + method public double subF64(); + method public android.renderscript.Float2 subFloat2(); + method public android.renderscript.Float3 subFloat3(); + method public android.renderscript.Float4 subFloat4(); + method public short subI16(); + method public int subI32(); + method public long subI64(); + method public byte subI8(); + method public android.renderscript.Int2 subInt2(); + method public android.renderscript.Int3 subInt3(); + method public android.renderscript.Int4 subInt4(); + method public android.renderscript.Long2 subLong2(); + method public android.renderscript.Long3 subLong3(); + method public android.renderscript.Long4 subLong4(); + method public android.renderscript.Matrix2f subMatrix2f(); + method public android.renderscript.Matrix3f subMatrix3f(); + method public android.renderscript.Matrix4f subMatrix4f(); + method public android.renderscript.Short2 subShort2(); + method public android.renderscript.Short3 subShort3(); + method public android.renderscript.Short4 subShort4(); + method public void subalign(int); } public class Float2 { @@ -20146,11 +20210,13 @@ package android.renderscript { public class RenderScript { method public void contextDump(); method public static android.renderscript.RenderScript create(android.content.Context); + method public static android.renderscript.RenderScript create(android.content.Context, android.renderscript.RenderScript.ContextType); method public void destroy(); method public void finish(); method public final android.content.Context getApplicationContext(); method public android.renderscript.RenderScript.RSErrorHandler getErrorHandler(); method public android.renderscript.RenderScript.RSMessageHandler getMessageHandler(); + method public void sendMessage(int, int[]); method public void setErrorHandler(android.renderscript.RenderScript.RSErrorHandler); method public void setMessageHandler(android.renderscript.RenderScript.RSMessageHandler); method public void setPriority(android.renderscript.RenderScript.Priority); @@ -20231,6 +20297,12 @@ package android.renderscript { method protected android.renderscript.Script.KernelID createKernelID(int, int, android.renderscript.Element, android.renderscript.Element); method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker); method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker, android.renderscript.Script.LaunchOptions); + method public boolean getVarB(int); + method public double getVarD(int); + method public float getVarF(int); + method public int getVarI(int); + method public long getVarJ(int); + method public void getVarV(int, android.renderscript.FieldPacker); method protected void invoke(int); method protected void invoke(int, android.renderscript.FieldPacker); method public void setTimeZone(java.lang.String); @@ -20307,6 +20379,13 @@ package android.renderscript { public abstract class ScriptIntrinsic extends android.renderscript.Script { } + public final class ScriptIntrinsic3DLUT extends android.renderscript.ScriptIntrinsic { + method public static android.renderscript.ScriptIntrinsic3DLUT create(android.renderscript.RenderScript, android.renderscript.Element); + method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation); + method public android.renderscript.Script.KernelID getKernelID(); + method public void setLUT(android.renderscript.Allocation); + } + public class ScriptIntrinsicBlend extends android.renderscript.ScriptIntrinsic { method public static android.renderscript.ScriptIntrinsicBlend create(android.renderscript.RenderScript, android.renderscript.Element); method public void forEachAdd(android.renderscript.Allocation, android.renderscript.Allocation); @@ -20426,6 +20505,7 @@ package android.renderscript { method public android.renderscript.Element getElement(); method public int getX(); method public int getY(); + method public int getYuv(); method public int getZ(); method public boolean hasFaces(); method public boolean hasMipmaps(); @@ -20438,6 +20518,7 @@ package android.renderscript { method public android.renderscript.Type.Builder setMipmaps(boolean); method public android.renderscript.Type.Builder setX(int); method public android.renderscript.Type.Builder setY(int); + method public android.renderscript.Type.Builder setYuvFormat(int); method public android.renderscript.Type.Builder setZ(int); } @@ -20499,19 +20580,37 @@ package android.sax { package android.security { - public class AndroidKeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { + public final class AndroidKeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { + method public android.content.Context getContext(); + method public java.util.Date getEndDate(); + method public java.lang.String getKeystoreAlias(); + method public java.math.BigInteger getSerialNumber(); + method public java.util.Date getStartDate(); + method public javax.security.auth.x500.X500Principal getSubjectDN(); + method public boolean isEncryptionRequired(); } - public static class AndroidKeyPairGeneratorSpec.Builder { + public static final class AndroidKeyPairGeneratorSpec.Builder { ctor public AndroidKeyPairGeneratorSpec.Builder(android.content.Context); method public android.security.AndroidKeyPairGeneratorSpec build(); method public android.security.AndroidKeyPairGeneratorSpec.Builder setAlias(java.lang.String); + method public android.security.AndroidKeyPairGeneratorSpec.Builder setEncryptionRequired(); method public android.security.AndroidKeyPairGeneratorSpec.Builder setEndDate(java.util.Date); method public android.security.AndroidKeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger); method public android.security.AndroidKeyPairGeneratorSpec.Builder setStartDate(java.util.Date); method public android.security.AndroidKeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal); } + public final class AndroidKeyStoreParameter implements java.security.KeyStore.ProtectionParameter { + method public boolean isEncryptionRequired(); + } + + public static final class AndroidKeyStoreParameter.Builder { + ctor public AndroidKeyStoreParameter.Builder(android.content.Context); + method public android.security.AndroidKeyStoreParameter build(); + method public android.security.AndroidKeyStoreParameter.Builder setEncryptionRequired(); + } + public final class KeyChain { ctor public KeyChain(); method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String); @@ -22561,6 +22660,7 @@ package android.text.bidi { method public java.lang.String dirAttrValue(java.lang.String, android.text.TextDirectionHeuristic); method public java.lang.String dirAttrValue(boolean); method public java.lang.String endEdge(); + method public static android.text.bidi.BidiFormatter getInstance(); method public static android.text.bidi.BidiFormatter getInstance(boolean); method public static android.text.bidi.BidiFormatter getInstance(java.util.Locale); method public boolean getStereoReset(); @@ -25280,6 +25380,7 @@ package android.view { method protected float getBottomFadingEdgeStrength(); method protected int getBottomPaddingOffset(); method public float getCameraDistance(); + method public android.graphics.Rect getClipBounds(); method public java.lang.CharSequence getContentDescription(); method public final android.content.Context getContext(); method protected android.view.ContextMenu.ContextMenuInfo getContextMenuInfo(); @@ -25534,6 +25635,7 @@ package android.view { method public final void setBottom(int); method public void setCameraDistance(float); method public void setClickable(boolean); + method public void setClipBounds(android.graphics.Rect); method public void setContentDescription(java.lang.CharSequence); method public void setDrawingCacheBackgroundColor(int); method public void setDrawingCacheEnabled(boolean); @@ -25959,6 +26061,7 @@ package android.view { method public static int getChildMeasureSpec(int, int, int); method protected boolean getChildStaticTransformation(android.view.View, android.view.animation.Transformation); method public boolean getChildVisibleRect(android.view.View, android.graphics.Rect, android.graphics.Point); + method public boolean getClipChildren(); method public int getDescendantFocusability(); method public android.view.View getFocusedChild(); method public android.view.animation.LayoutAnimationController getLayoutAnimation(); @@ -26120,6 +26223,7 @@ package android.view { method public android.view.ViewPropertyAnimator alphaBy(float); method public void cancel(); method public long getDuration(); + method public android.animation.TimeInterpolator getInterpolator(); method public long getStartDelay(); method public android.view.ViewPropertyAnimator rotation(float); method public android.view.ViewPropertyAnimator rotationBy(float); @@ -27585,7 +27689,7 @@ package android.webkit { method public void onReceivedTouchIconUrl(android.webkit.WebView, java.lang.String, boolean); method public void onRequestFocus(android.webkit.WebView); method public void onShowCustomView(android.view.View, android.webkit.WebChromeClient.CustomViewCallback); - method public void onShowCustomView(android.view.View, int, android.webkit.WebChromeClient.CustomViewCallback); + method public deprecated void onShowCustomView(android.view.View, int, android.webkit.WebChromeClient.CustomViewCallback); } public static abstract interface WebChromeClient.CustomViewCallback { @@ -27951,11 +28055,11 @@ package android.webkit { public class WebViewDatabase { method public void clearFormData(); method public void clearHttpAuthUsernamePassword(); - method public void clearUsernamePassword(); + method public deprecated void clearUsernamePassword(); method public static android.webkit.WebViewDatabase getInstance(android.content.Context); method public boolean hasFormData(); method public boolean hasHttpAuthUsernamePassword(); - method public boolean hasUsernamePassword(); + method public deprecated boolean hasUsernamePassword(); } public class WebViewFragment extends android.app.Fragment { diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index 811b92a5e102..31de98dc1593 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -24,6 +24,7 @@ import android.os.Looper; import android.os.Message; import android.os.RemoteException; import android.util.Log; +import android.view.KeyEvent; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityInteractionClient; import android.view.accessibility.AccessibilityNodeInfo; @@ -348,6 +349,7 @@ public abstract class AccessibilityService extends Service { public void onServiceConnected(); public void onSetConnectionId(int connectionId); public boolean onGesture(int gestureId); + public boolean onKeyEvent(KeyEvent event); } private int mConnectionId; @@ -413,6 +415,32 @@ public abstract class AccessibilityService extends Service { } /** + * Callback that allows an accessibility service to observe the key events + * before they are passed to the rest of the system. This means that the events + * are first delivered here before they are passed to the device policy, the + * input method, or applications. + * <p> + * <strong>Note:</strong> It is important that key events are handled in such + * a way that the event stream that would be passed to the rest of the system + * is well-formed. For example, handling the down event but not the up event + * and vice versa would generate an inconsistent event stream. + * </p> + * <p> + * <strong>Note:</strong> The key events delivered in this method are copies + * and modifying them will have no effect on the events that will be passed + * to the system. This method is intended to perform purely filtering + * functionality. + * <p> + * + * @param event The event to be processed. + * @return If true then the event will be consumed and not delivered to + * applications, otherwise it will be delivered as usual. + */ + protected boolean onKeyEvent(KeyEvent event) { + return false; + } + + /** * Gets the root node in the currently active window if this service * can retrieve window content. * @@ -535,6 +563,11 @@ public abstract class AccessibilityService extends Service { public boolean onGesture(int gestureId) { return AccessibilityService.this.onGesture(gestureId); } + + @Override + public boolean onKeyEvent(KeyEvent event) { + return AccessibilityService.this.onKeyEvent(event); + } }); } @@ -554,11 +587,14 @@ public abstract class AccessibilityService extends Service { private static final int DO_ON_ACCESSIBILITY_EVENT = 30; private static final int DO_ON_GESTURE = 40; private static final int DO_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE = 50; + private static final int DO_ON_KEY_EVENT = 60; private final HandlerCaller mCaller; private final Callbacks mCallback; + private int mConnectionId; + public IAccessibilityServiceClientWrapper(Context context, Looper looper, Callbacks callback) { mCallback = callback; @@ -591,41 +627,65 @@ public abstract class AccessibilityService extends Service { mCaller.sendMessage(message); } + @Override + public void onKeyEvent(KeyEvent event, int sequence) { + Message message = mCaller.obtainMessageIO(DO_ON_KEY_EVENT, sequence, event); + mCaller.sendMessage(message); + } + public void executeMessage(Message message) { switch (message.what) { - case DO_ON_ACCESSIBILITY_EVENT : + case DO_ON_ACCESSIBILITY_EVENT: { AccessibilityEvent event = (AccessibilityEvent) message.obj; if (event != null) { AccessibilityInteractionClient.getInstance().onAccessibilityEvent(event); mCallback.onAccessibilityEvent(event); event.recycle(); } - return; - case DO_ON_INTERRUPT : + } return; + case DO_ON_INTERRUPT: { mCallback.onInterrupt(); - return; - case DO_SET_SET_CONNECTION : - final int connectionId = message.arg1; + } return; + case DO_SET_SET_CONNECTION: { + mConnectionId = message.arg1; IAccessibilityServiceConnection connection = (IAccessibilityServiceConnection) message.obj; if (connection != null) { - AccessibilityInteractionClient.getInstance().addConnection(connectionId, + AccessibilityInteractionClient.getInstance().addConnection(mConnectionId, connection); - mCallback.onSetConnectionId(connectionId); + mCallback.onSetConnectionId(mConnectionId); mCallback.onServiceConnected(); } else { - AccessibilityInteractionClient.getInstance().removeConnection(connectionId); + AccessibilityInteractionClient.getInstance().removeConnection(mConnectionId); AccessibilityInteractionClient.getInstance().clearCache(); mCallback.onSetConnectionId(AccessibilityInteractionClient.NO_ID); } - return; - case DO_ON_GESTURE : + } return; + case DO_ON_GESTURE: { final int gestureId = message.arg1; mCallback.onGesture(gestureId); - return; - case DO_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE: + } return; + case DO_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE: { AccessibilityInteractionClient.getInstance().clearCache(); - return; + } return; + case DO_ON_KEY_EVENT: { + KeyEvent event = (KeyEvent) message.obj; + try { + IAccessibilityServiceConnection connection = AccessibilityInteractionClient + .getInstance().getConnection(mConnectionId); + if (connection != null) { + final boolean result = mCallback.onKeyEvent(event); + final int sequence = message.arg1; + try { + connection.setOnKeyEventResult(result, sequence); + } catch (RemoteException re) { + /* ignore */ + } + } + } finally { + event.recycle(); + } + } return; default : Log.w(LOG_TAG, "Unknown message type " + message.what); } diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl index 5d684e358f56..c5e3d43a527a 100644 --- a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl +++ b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl @@ -18,6 +18,7 @@ package android.accessibilityservice; import android.accessibilityservice.IAccessibilityServiceConnection; import android.view.accessibility.AccessibilityEvent; +import android.view.KeyEvent; /** * Top-level interface to an accessibility service component. @@ -35,4 +36,6 @@ import android.view.accessibility.AccessibilityEvent; void onGesture(int gesture); void clearAccessibilityNodeInfoCache(); + + void onKeyEvent(in KeyEvent event, int sequence); } diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl index 7a29f359678b..3df06b505675 100644 --- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl +++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl @@ -31,144 +31,31 @@ interface IAccessibilityServiceConnection { void setServiceInfo(in AccessibilityServiceInfo info); - /** - * Finds an {@link android.view.accessibility.AccessibilityNodeInfo} by accessibility id. - * - * @param accessibilityWindowId A unique window id. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID} - * to query the currently active window. - * @param accessibilityNodeId A unique view id or virtual descendant id from - * where to start the search. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ROOT_NODE_ID} - * to start from the root. - * @param interactionId The id of the interaction for matching with the callback result. - * @param callback Callback which to receive the result. - * @param flags Additional flags. - * @param threadId The id of the calling thread. - * @return Whether the call succeeded. - */ boolean findAccessibilityNodeInfoByAccessibilityId(int accessibilityWindowId, long accessibilityNodeId, int interactionId, IAccessibilityInteractionConnectionCallback callback, int flags, long threadId); - /** - * Finds {@link android.view.accessibility.AccessibilityNodeInfo}s by View text. - * The match is case insensitive containment. The search is performed in the window - * whose id is specified and starts from the node whose accessibility id is specified. - * - * @param accessibilityWindowId A unique window id. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID} - * to query the currently active window. - * @param accessibilityNodeId A unique view id or virtual descendant id from - * where to start the search. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ROOT_NODE_ID} - * to start from the root. - * @param text The searched text. - * @param interactionId The id of the interaction for matching with the callback result. - * @param callback Callback which to receive the result. - * @param threadId The id of the calling thread. - * @return Whether the call succeeded. - */ boolean findAccessibilityNodeInfosByText(int accessibilityWindowId, long accessibilityNodeId, String text, int interactionId, IAccessibilityInteractionConnectionCallback callback, long threadId); - /** - * Finds an {@link android.view.accessibility.AccessibilityNodeInfo} by View id. The search - * is performed in the window whose id is specified and starts from the node whose - * accessibility id is specified. - * - * @param accessibilityWindowId A unique window id. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID} - * to query the currently active window. - * @param accessibilityNodeId A unique view id or virtual descendant id from - * where to start the search. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ROOT_NODE_ID} - * to start from the root. - * @param viewId The fully qualified resource name of the view id to find. - * @param interactionId The id of the interaction for matching with the callback result. - * @param callback Callback which to receive the result. - * @param threadId The id of the calling thread. - * @return Whether the call succeeded. - */ boolean findAccessibilityNodeInfosByViewId(int accessibilityWindowId, long accessibilityNodeId, String viewId, int interactionId, IAccessibilityInteractionConnectionCallback callback, long threadId); - /** - * Finds the {@link android.view.accessibility.AccessibilityNodeInfo} that has the specified - * focus type. The search is performed in the window whose id is specified and starts from - * the node whose accessibility id is specified. - * - * @param accessibilityWindowId A unique window id. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID} - * to query the currently active window. - * @param accessibilityNodeId A unique view id or virtual descendant id from - * where to start the search. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ROOT_NODE_ID} - * to start from the root. - * @param focusType The type of focus to find. - * @param interactionId The id of the interaction for matching with the callback result. - * @param callback Callback which to receive the result. - * @param threadId The id of the calling thread. - * @return Whether the call succeeded. - */ boolean findFocus(int accessibilityWindowId, long accessibilityNodeId, int focusType, int interactionId, IAccessibilityInteractionConnectionCallback callback, long threadId); - /** - * Finds an {@link android.view.accessibility.AccessibilityNodeInfo} to take accessibility - * focus in the given direction. The search is performed in the window whose id is - * specified and starts from the node whose accessibility id is specified. - * - * @param accessibilityWindowId A unique window id. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID} - * to query the currently active window. - * @param accessibilityNodeId A unique view id or virtual descendant id from - * where to start the search. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ROOT_NODE_ID} - * to start from the root. - * @param direction The direction in which to search for focusable. - * @param interactionId The id of the interaction for matching with the callback result. - * @param callback Callback which to receive the result. - * @param threadId The id of the calling thread. - * @return Whether the call succeeded. - */ boolean focusSearch(int accessibilityWindowId, long accessibilityNodeId, int direction, int interactionId, IAccessibilityInteractionConnectionCallback callback, long threadId); - /** - * Performs an accessibility action on an - * {@link android.view.accessibility.AccessibilityNodeInfo}. - * - * @param accessibilityWindowId A unique window id. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ACTIVE_WINDOW_ID} - * to query the currently active window. - * @param accessibilityNodeId A unique view id or virtual descendant id from - * where to start the search. Use - * {@link android.view.accessibility.AccessibilityNodeInfo#ROOT_NODE_ID} - * to start from the root. - * @param action The action to perform. - * @param arguments Optional action arguments. - * @param interactionId The id of the interaction for matching with the callback result. - * @param callback Callback which to receive the result. - * @param threadId The id of the calling thread. - * @return Whether the action was performed. - */ boolean performAccessibilityAction(int accessibilityWindowId, long accessibilityNodeId, int action, in Bundle arguments, int interactionId, IAccessibilityInteractionConnectionCallback callback, long threadId); - /** - * @return The associated accessibility service info. - */ AccessibilityServiceInfo getServiceInfo(); - /** - * Performs a global action, such as going home, going back, etc. - * - * @param action The action to perform. - * @return Whether the action was performed. - */ boolean performGlobalAction(int action); + + oneway void setOnKeyEventResult(boolean handled, int sequence); } diff --git a/core/java/android/animation/Animatable.java b/core/java/android/animation/Animatable.java new file mode 100644 index 000000000000..f9ccb4d9a7b6 --- /dev/null +++ b/core/java/android/animation/Animatable.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.animation; + +/** + * This interface is implemented by animation-related classes that expose + * the ability to set and get duration, startDelay, and interpolators. + */ +public interface Animatable { + + /** + * The amount of time, in milliseconds, to delay processing the animation + * after the animation is started. The {@link #setDuration(long)} of the + * animation will not begin to elapse until after the startDelay has elapsed. + * + * @return the number of milliseconds to delay running the animation + */ + long getStartDelay(); + + /** + * The amount of time, in milliseconds, to delay processing the animation + * after the animation is started. The {@link #setDuration(long)} of the + * animation will not begin to elapse until after the startDelay has elapsed. + + * @param startDelay The amount of the delay, in milliseconds + */ + void setStartDelay(long startDelay); + + /** + * Sets the length of the animation. + * + * @param duration The length of the animation, in milliseconds. + */ + Animatable setDuration(long duration); + + /** + * Gets the duration of the animation. + * + * @return The length of the animation, in milliseconds. + */ + long getDuration(); + + /** + * The time interpolator used in calculating the elapsed fraction of the + * animation. The interpolator determines whether the animation runs with + * linear or non-linear motion, such as acceleration and deceleration. + * + * @param value the interpolator to be used by this animation + */ + void setInterpolator(TimeInterpolator value); + + /** + * Returns the timing interpolator that this animation uses. + * + * @return The timing interpolator for this animation. + */ + public TimeInterpolator getInterpolator(); +} diff --git a/core/java/android/animation/Animator.java b/core/java/android/animation/Animator.java index 788765dd3cce..da97d72ef796 100644 --- a/core/java/android/animation/Animator.java +++ b/core/java/android/animation/Animator.java @@ -22,14 +22,21 @@ import java.util.ArrayList; * This is the superclass for classes which provide basic support for animations which can be * started, ended, and have <code>AnimatorListeners</code> added to them. */ -public abstract class Animator implements Cloneable { - +public abstract class Animator implements Cloneable, Animatable { /** * The set of listeners to be sent events through the life of an animation. */ ArrayList<AnimatorListener> mListeners = null; + @Override + public abstract Animator setDuration(long duration); + + @Override + public TimeInterpolator getInterpolator() { + return null; + } + /** * Starts this animation. If the animation has a nonzero startDelay, the animation will start * running after that delay elapses. A non-delayed animation will have its initial @@ -70,47 +77,6 @@ public abstract class Animator implements Cloneable { } /** - * The amount of time, in milliseconds, to delay starting the animation after - * {@link #start()} is called. - * - * @return the number of milliseconds to delay running the animation - */ - public abstract long getStartDelay(); - - /** - * The amount of time, in milliseconds, to delay starting the animation after - * {@link #start()} is called. - - * @param startDelay The amount of the delay, in milliseconds - */ - public abstract void setStartDelay(long startDelay); - - - /** - * Sets the length of the animation. - * - * @param duration The length of the animation, in milliseconds. - */ - public abstract Animator setDuration(long duration); - - /** - * Gets the length of the animation. - * - * @return The length of the animation, in milliseconds. - */ - public abstract long getDuration(); - - /** - * The time interpolator used in calculating the elapsed fraction of this animation. The - * interpolator determines whether the animation runs with linear or non-linear motion, - * such as acceleration and deceleration. The default value is - * {@link android.view.animation.AccelerateDecelerateInterpolator} - * - * @param value the interpolator to be used by this animation - */ - public abstract void setInterpolator(TimeInterpolator value); - - /** * Returns whether this Animator is currently running (having been started and gone past any * initial startDelay period and not yet ended). * diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java index f9fa444534c0..b48853b4f0f0 100644 --- a/core/java/android/animation/AnimatorSet.java +++ b/core/java/android/animation/AnimatorSet.java @@ -120,9 +120,19 @@ public final class AnimatorSet extends Animator { // set, it is passed along to the child animations. private long mDuration = -1; + // Records the interpolator for the set. Null value indicates that no interpolator + // was set on this AnimatorSet, so it should not be passed down to the children. + private TimeInterpolator mInterpolator = null; + /** * Sets up this AnimatorSet to play all of the supplied animations at the same time. + * This is equivalent to calling {@link #play(Animator)} with the first animator in the + * set and then {@link Builder#with(Animator)} with each of the other animators. Note that + * an Animator with a {@link Animator#setStartDelay(long) startDelay} will not actually + * start until that delay elapses, which means that if the first animator in the list + * supplied to this constructor has a startDelay, none of the other animators will start + * until that first animator's startDelay has elapsed. * * @param items The animations that will be started simultaneously. */ @@ -230,15 +240,21 @@ public final class AnimatorSet extends Animator { /** * Sets the TimeInterpolator for all current {@link #getChildAnimations() child animations} - * of this AnimatorSet. + * of this AnimatorSet. The default value is null, which means that no interpolator + * is set on this AnimatorSet. Setting the interpolator to any non-null value + * will cause that interpolator to be set on the child animations + * when the set is started. * * @param interpolator the interpolator to be used by each child animation of this AnimatorSet */ @Override public void setInterpolator(TimeInterpolator interpolator) { - for (Node node : mNodes) { - node.animation.setInterpolator(interpolator); - } + mInterpolator = interpolator; + } + + @Override + public TimeInterpolator getInterpolator() { + return mInterpolator; } /** @@ -460,7 +476,12 @@ public final class AnimatorSet extends Animator { node.animation.setDuration(mDuration); } } - // First, sort the nodes (if necessary). This will ensure that sortedNodes + if (mInterpolator != null) { + for (Node node : mNodes) { + node.animation.setInterpolator(mInterpolator); + } + } + // First, sort the nodes (if necessary). This will ensure that sortedNodes // contains the animation nodes in the correct order. sortNodes(); diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index ea605b9424f2..cb4426491fbc 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -16,10 +16,8 @@ package android.animation; -import android.os.Handler; import android.os.Looper; -import android.os.Message; -import android.os.SystemProperties; +import android.os.Trace; import android.util.AndroidRuntimeException; import android.view.Choreographer; import android.view.animation.AccelerateDecelerateInterpolator; @@ -48,6 +46,7 @@ import java.util.HashMap; * Animation</a> developer guide.</p> * </div> */ +@SuppressWarnings("unchecked") public class ValueAnimator extends Animator { /** @@ -340,7 +339,7 @@ public class ValueAnimator extends Animator { return; } if (mValues == null || mValues.length == 0) { - setValues(new PropertyValuesHolder[]{PropertyValuesHolder.ofInt("", values)}); + setValues(PropertyValuesHolder.ofInt("", values)); } else { PropertyValuesHolder valuesHolder = mValues[0]; valuesHolder.setIntValues(values); @@ -368,7 +367,7 @@ public class ValueAnimator extends Animator { return; } if (mValues == null || mValues.length == 0) { - setValues(new PropertyValuesHolder[]{PropertyValuesHolder.ofFloat("", values)}); + setValues(PropertyValuesHolder.ofFloat("", values)); } else { PropertyValuesHolder valuesHolder = mValues[0]; valuesHolder.setFloatValues(values); @@ -400,8 +399,7 @@ public class ValueAnimator extends Animator { return; } if (mValues == null || mValues.length == 0) { - setValues(new PropertyValuesHolder[]{PropertyValuesHolder.ofObject("", - (TypeEvaluator)null, values)}); + setValues(PropertyValuesHolder.ofObject("", null, values)); } else { PropertyValuesHolder valuesHolder = mValues[0]; valuesHolder.setObjectValues(values); @@ -423,7 +421,7 @@ public class ValueAnimator extends Animator { mValues = values; mValuesMap = new HashMap<String, PropertyValuesHolder>(numValues); for (int i = 0; i < numValues; ++i) { - PropertyValuesHolder valuesHolder = (PropertyValuesHolder) values[i]; + PropertyValuesHolder valuesHolder = values[i]; mValuesMap.put(valuesHolder.getPropertyName(), valuesHolder); } // New property/values/target should cause re-initialization prior to starting @@ -537,6 +535,7 @@ public class ValueAnimator extends Animator { * * @hide */ + @SuppressWarnings("unchecked") protected static class AnimationHandler implements Runnable { // The per-thread list of all active animations /** @hide */ @@ -854,6 +853,7 @@ public class ValueAnimator extends Animator { * * @return The timing interpolator for this ValueAnimator. */ + @Override public TimeInterpolator getInterpolator() { return mInterpolator; } @@ -1024,6 +1024,8 @@ public class ValueAnimator extends Animator { mStarted = false; mStartListenersCalled = false; mPlayingBackwards = false; + Trace.asyncTraceEnd(Trace.TRACE_TAG_VIEW, "animator", + System.identityHashCode(this)); } /** @@ -1031,6 +1033,8 @@ public class ValueAnimator extends Animator { * called on the UI thread. */ private void startAnimation(AnimationHandler handler) { + Trace.asyncTraceBegin(Trace.TRACE_TAG_VIEW, "animator", + System.identityHashCode(this)); initAnimation(); handler.mAnimations.add(this); if (mStartDelay > 0 && mListeners != null) { @@ -1095,7 +1099,7 @@ public class ValueAnimator extends Animator { } } if (mRepeatMode == REVERSE) { - mPlayingBackwards = mPlayingBackwards ? false : true; + mPlayingBackwards = !mPlayingBackwards; } mCurrentIteration += (int)fraction; fraction = fraction % 1f; @@ -1252,7 +1256,7 @@ public class ValueAnimator extends Animator { } } - private AnimationHandler getOrCreateAnimationHandler() { + private static AnimationHandler getOrCreateAnimationHandler() { AnimationHandler handler = sAnimationHandler.get(); if (handler == null) { handler = new AnimationHandler(); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 31074e27cf8f..a26bdbcbfed0 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4030,10 +4030,16 @@ public class Activity extends ContextThemeWrapper * use this information to validate that the recipient is allowed to * receive the data. * - * <p>Note: if the calling activity is not expecting a result (that is it + * <p class="note">Note: if the calling activity is not expecting a result (that is it * did not use the {@link #startActivityForResult} * form that includes a request code), then the calling package will be - * null. + * null.</p> + * + * <p class="note">Note: prior to {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, + * the result from this method was unstable. If the process hosting the calling + * package was no longer running, it would return null instead of the proper package + * name. You can use {@link #getCallingActivity()} and retrieve the package name + * from that instead.</p> * * @return The package of the activity that will receive your * reply, or null if none. @@ -4052,12 +4058,12 @@ public class Activity extends ContextThemeWrapper * can use this information to validate that the recipient is allowed to * receive the data. * - * <p>Note: if the calling activity is not expecting a result (that is it + * <p class="note">Note: if the calling activity is not expecting a result (that is it * did not use the {@link #startActivityForResult} * form that includes a request code), then the calling package will be * null. * - * @return String The full name of the activity that will receive your + * @return The ComponentName of the activity that will receive your * reply, or null if none. */ public ComponentName getCallingActivity() { diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index c99051ba4dd6..98baa0ebb631 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -1413,6 +1413,14 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM return true; } + case SET_USER_IS_MONKEY_TRANSACTION: { + data.enforceInterface(IActivityManager.descriptor); + final boolean monkey = (data.readInt() == 1); + setUserIsMonkey(monkey); + reply.writeNoException(); + return true; + } + case FINISH_HEAVY_WEIGHT_APP_TRANSACTION: { data.enforceInterface(IActivityManager.descriptor); finishHeavyWeightApp(); @@ -3633,7 +3641,18 @@ class ActivityManagerProxy implements IActivityManager reply.recycle(); return res; } - + + public void setUserIsMonkey(boolean monkey) throws RemoteException { + Parcel data = Parcel.obtain(); + Parcel reply = Parcel.obtain(); + data.writeInterfaceToken(IActivityManager.descriptor); + data.writeInt(monkey ? 1 : 0); + mRemote.transact(SET_USER_IS_MONKEY_TRANSACTION, data, reply, 0); + reply.readException(); + data.recycle(); + reply.recycle(); + } + public void finishHeavyWeightApp() throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index e6ce963a8d1c..d4056c98beec 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1595,6 +1595,12 @@ public final class ActivityThread { public static String currentPackageName() { ActivityThread am = currentActivityThread(); return (am != null && am.mBoundApplication != null) + ? am.mBoundApplication.appInfo.packageName : null; + } + + public static String currentProcessName() { + ActivityThread am = currentActivityThread(); + return (am != null && am.mBoundApplication != null) ? am.mBoundApplication.processName : null; } diff --git a/core/java/android/app/ApplicationLoaders.java b/core/java/android/app/ApplicationLoaders.java index 9e3cd7eb8b57..a26b88cd4af0 100644 --- a/core/java/android/app/ApplicationLoaders.java +++ b/core/java/android/app/ApplicationLoaders.java @@ -16,6 +16,7 @@ package android.app; +import android.os.Trace; import dalvik.system.PathClassLoader; import java.util.HashMap; @@ -54,14 +55,19 @@ class ApplicationLoaders return loader; } + Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, zip); PathClassLoader pathClassloader = new PathClassLoader(zip, libPath, parent); - + Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); + mLoaders.put(zip, pathClassloader); return pathClassloader; } - return new PathClassLoader(zip, parent); + Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, zip); + PathClassLoader pathClassloader = new PathClassLoader(zip, parent); + Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); + return pathClassloader; } } diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index fa8839a66b3d..33a27709b039 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -285,7 +285,9 @@ public interface IActivityManager extends IInterface { int enterAnim, int exitAnim) throws RemoteException; public boolean isUserAMonkey() throws RemoteException; - + + public void setUserIsMonkey(boolean monkey) throws RemoteException; + public void finishHeavyWeightApp() throws RemoteException; public void setImmersive(IBinder token, boolean immersive) throws RemoteException; @@ -635,4 +637,5 @@ public interface IActivityManager extends IInterface { int REPORT_TOP_ACTIVITY_EXTRAS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+162; int GET_LAUNCHED_FROM_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+163; int KILL_UID_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+164; + int SET_USER_IS_MONKEY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+165; } diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index e0dfb254cd1a..a307a73d52b3 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -189,6 +189,10 @@ public class Instrumentation { if (mPerfMetrics != null) { results.putAll(mPerfMetrics); } + if (mUiAutomation != null) { + mUiAutomation.disconnect(); + mUiAutomation = null; + } mThread.finishInstrumentation(resultCode, results); } @@ -1695,10 +1699,6 @@ public class Instrumentation { startPerformanceSnapshot(); } onStart(); - if (mUiAutomation != null) { - mUiAutomation.disconnect(); - mUiAutomation = null; - } } } diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java index 7d02342ca59c..05b79c1d7a8e 100644 --- a/core/java/android/app/UiAutomation.java +++ b/core/java/android/app/UiAutomation.java @@ -31,6 +31,7 @@ import android.os.SystemClock; import android.util.Log; import android.view.Display; import android.view.InputEvent; +import android.view.KeyEvent; import android.view.Surface; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityInteractionClient; @@ -618,6 +619,25 @@ public final class UiAutomation { return screenShot; } + /** + * Sets whether this UiAutomation to run in a "monkey" mode. Applications can query whether + * they are executed in a "monkey" mode, i.e. run by a test framework, and avoid doing + * potentially undesirable actions such as calling 911 or posting on public forums etc. + * + * @param enable whether to run in a "monkey" mode or not. Default is not. + * @see {@link ActivityManager#isUserAMonkey()} + */ + public void setRunAsMonkey(boolean enable) { + synchronized (mLock) { + throwIfNotConnectedLocked(); + } + try { + ActivityManagerNative.getDefault().setUserIsMonkey(enable); + } catch (RemoteException re) { + Log.e(LOG_TAG, "Error while setting run as monkey!", re); + } + } + private static float getDegreesForRotation(int value) { switch (value) { case Surface.ROTATION_90: { @@ -693,6 +713,11 @@ public final class UiAutomation { listener.onAccessibilityEvent(AccessibilityEvent.obtain(event)); } } + + @Override + public boolean onKeyEvent(KeyEvent event) { + return false; + } }); } } diff --git a/core/java/android/content/SharedPreferences.java b/core/java/android/content/SharedPreferences.java index da5480e4bdf5..d4f7f06b008d 100644 --- a/core/java/android/content/SharedPreferences.java +++ b/core/java/android/content/SharedPreferences.java @@ -71,7 +71,9 @@ public interface SharedPreferences { * {@link #commit} or {@link #apply} are called. * * @param key The name of the preference to modify. - * @param value The new value for the preference. + * @param value The new value for the preference. Supplying {@code null} + * as the value is equivalent to calling {@link #remove(String)} with + * this key. * * @return Returns a reference to the same Editor object, so you can * chain put calls together. @@ -83,7 +85,9 @@ public interface SharedPreferences { * back once {@link #commit} is called. * * @param key The name of the preference to modify. - * @param values The new values for the preference. + * @param values The set of new values for the preference. Passing {@code null} + * for this argument is equivalent to calling {@link #remove(String)} with + * this key. * @return Returns a reference to the same Editor object, so you can * chain put calls together. */ diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 8f3b62d8f21c..8154bca2cb89 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -279,6 +279,30 @@ public class ActivityInfo extends ComponentInfo public static final int SCREEN_ORIENTATION_FULL_SENSOR = 10; /** + * Constant corresponding to <code>userLandscape</code> in + * the {@link android.R.attr#screenOrientation} attribute. + */ + public static final int SCREEN_ORIENTATION_USER_LANDSCAPE = 11; + + /** + * Constant corresponding to <code>userPortrait</code> in + * the {@link android.R.attr#screenOrientation} attribute. + */ + public static final int SCREEN_ORIENTATION_USER_PORTRAIT = 12; + + /** + * Constant corresponding to <code>fullUser</code> in + * the {@link android.R.attr#screenOrientation} attribute. + */ + public static final int SCREEN_ORIENTATION_FULL_USER = 13; + + /** + * Constant corresponding to <code>locked</code> in + * the {@link android.R.attr#screenOrientation} attribute. + */ + public static final int SCREEN_ORIENTATION_LOCKED = 14; + + /** * The preferred screen orientation this activity would like to run in. * From the {@link android.R.attr#screenOrientation} attribute, one of * {@link #SCREEN_ORIENTATION_UNSPECIFIED}, @@ -292,7 +316,11 @@ public class ActivityInfo extends ComponentInfo * {@link #SCREEN_ORIENTATION_SENSOR_PORTRAIT}, * {@link #SCREEN_ORIENTATION_REVERSE_LANDSCAPE}, * {@link #SCREEN_ORIENTATION_REVERSE_PORTRAIT}, - * {@link #SCREEN_ORIENTATION_FULL_SENSOR}. + * {@link #SCREEN_ORIENTATION_FULL_SENSOR}, + * {@link #SCREEN_ORIENTATION_USER_LANDSCAPE}, + * {@link #SCREEN_ORIENTATION_USER_PORTRAIT}, + * {@link #SCREEN_ORIENTATION_FULL_USER}, + * {@link #SCREEN_ORIENTATION_LOCKED}, */ public int screenOrientation = SCREEN_ORIENTATION_UNSPECIFIED; @@ -398,7 +426,7 @@ public class ActivityInfo extends ComponentInfo * Bit in {@link #configChanges} that indicates that the activity * can itself handle changes to the font scaling factor. Set from the * {@link android.R.attr#configChanges} attribute. This is - * not a core resource configutation, but a higher-level value, so its + * not a core resource configuration, but a higher-level value, so its * constant starts at the high bits. */ public static final int CONFIG_FONT_SCALE = 0x40000000; diff --git a/core/java/android/content/pm/PackageInfo.java b/core/java/android/content/pm/PackageInfo.java index fb539c572b69..af1a6d52fc9a 100644 --- a/core/java/android/content/pm/PackageInfo.java +++ b/core/java/android/content/pm/PackageInfo.java @@ -154,7 +154,7 @@ public class PackageInfo implements Parcelable { /** * Flag for {@link #requestedPermissionsFlags}: the requested permission * is required for the application to run; the user can not optionally - * disable it. + * disable it. Currently all permissions are required. */ public static final int REQUESTED_PERMISSION_REQUIRED = 1<<0; @@ -224,6 +224,9 @@ public class PackageInfo implements Parcelable { /** @hide */ public String restrictedAccountType; + /** @hide */ + public String requiredAccountType; + public PackageInfo() { } @@ -266,6 +269,7 @@ public class PackageInfo implements Parcelable { dest.writeInt(installLocation); dest.writeInt(requiredForAllUsers ? 1 : 0); dest.writeString(restrictedAccountType); + dest.writeString(requiredAccountType); } public static final Parcelable.Creator<PackageInfo> CREATOR @@ -306,5 +310,6 @@ public class PackageInfo implements Parcelable { installLocation = source.readInt(); requiredForAllUsers = source.readInt() != 0; restrictedAccountType = source.readString(); + requiredAccountType = source.readString(); } } diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index da15e3b2d2a9..30bdfef6e4bd 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1754,6 +1754,7 @@ public abstract class PackageManager { /** * Returns an {@link Intent} suitable for passing to {@code startActivityForResult} * which prompts the user to grant {@code permissions} to this application. + * @hide * * @throws NullPointerException if {@code permissions} is {@code null}. * @throws IllegalArgumentException if {@code permissions} contains {@code null}. diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 384aed89ff3e..358657325bb3 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -289,6 +289,7 @@ public class PackageParser { pi.installLocation = p.installLocation; pi.requiredForAllUsers = p.mRequiredForAllUsers; pi.restrictedAccountType = p.mRestrictedAccountType; + pi.requiredAccountType = p.mRequiredAccountType; pi.firstInstallTime = firstInstallTime; pi.lastUpdateTime = lastUpdateTime; if ((flags&PackageManager.GET_GIDS) != 0) { @@ -1407,8 +1408,11 @@ public class PackageParser { // that may change. String name = sa.getNonResourceString( com.android.internal.R.styleable.AndroidManifestUsesPermission_name); +/* boolean required = sa.getBoolean( com.android.internal.R.styleable.AndroidManifestUsesPermission_required, true); +*/ + boolean required = true; // Optional <uses-permission> not supported sa.recycle(); @@ -1813,13 +1817,19 @@ public class PackageParser { false)) { owner.mRequiredForAllUsers = true; } - String accountType = sa.getString(com.android.internal.R.styleable + String restrictedAccountType = sa.getString(com.android.internal.R.styleable .AndroidManifestApplication_restrictedAccountType); - if (accountType != null && accountType.length() > 0) { - owner.mRestrictedAccountType = accountType; + if (restrictedAccountType != null && restrictedAccountType.length() > 0) { + owner.mRestrictedAccountType = restrictedAccountType; } } + String requiredAccountType = sa.getString(com.android.internal.R.styleable + .AndroidManifestApplication_requiredAccountType); + if (requiredAccountType != null && requiredAccountType.length() > 0) { + owner.mRequiredAccountType = requiredAccountType; + } + if (sa.getBoolean( com.android.internal.R.styleable.AndroidManifestApplication_debuggable, false)) { @@ -3336,6 +3346,9 @@ public class PackageParser { /* The restricted account authenticator type that is used by this application */ public String mRestrictedAccountType; + /* The required account type without which this application will not function */ + public String mRequiredAccountType; + /** * Digest suitable for comparing whether this package's manifest is the * same as another. diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index ffefaa27a852..fc9e48661815 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -17,6 +17,7 @@ package android.content.res; import android.os.ParcelFileDescriptor; +import android.os.Trace; import android.util.Log; import android.util.TypedValue; @@ -602,7 +603,12 @@ public final class AssetManager { * the cookie of the added asset, or 0 on failure. * {@hide} */ - public native final int addAssetPath(String path); + public final int addAssetPath(String path) { + int res = addAssetPathNative(path); + return res; + } + + private native final int addAssetPathNative(String path); /** * Add multiple sets of assets to the asset manager at once. See diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 015261590487..d64bff980e68 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -16,6 +16,7 @@ package android.content.res; +import android.os.Trace; import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParser; @@ -1977,17 +1978,20 @@ public class Resources { } } - private boolean verifyPreloadConfig(TypedValue value, String name) { - if ((value.changingConfigurations&~(ActivityInfo.CONFIG_FONT_SCALE - | ActivityInfo.CONFIG_DENSITY)) != 0) { + static private final int VARYING_CONFIGS = ActivityInfo.activityInfoConfigToNative( + ActivityInfo.CONFIG_LAYOUT_DIRECTION); + + private boolean verifyPreloadConfig(int changingConfigurations, int resourceId, String name) { + if (((changingConfigurations&~(ActivityInfo.CONFIG_FONT_SCALE | + ActivityInfo.CONFIG_DENSITY)) & VARYING_CONFIGS) != 0) { String resName; try { - resName = getResourceName(value.resourceId); + resName = getResourceName(resourceId); } catch (NotFoundException e) { resName = "?"; } Log.w(TAG, "Preloaded " + name + " resource #0x" - + Integer.toHexString(value.resourceId) + + Integer.toHexString(resourceId) + " (" + resName + ") that varies with configuration!!"); return false; } @@ -2052,20 +2056,24 @@ public class Resources { + value.assetCookie + ": " + file); if (file.endsWith(".xml")) { + Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, file); try { XmlResourceParser rp = loadXmlResourceParser( file, id, value.assetCookie, "drawable"); dr = Drawable.createFromXml(this, rp); rp.close(); } catch (Exception e) { + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); NotFoundException rnf = new NotFoundException( "File " + file + " from drawable resource ID #0x" + Integer.toHexString(id)); rnf.initCause(e); throw rnf; } + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); } else { + Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, file); try { InputStream is = mAssets.openNonAsset( value.assetCookie, file, AssetManager.ACCESS_STREAMING); @@ -2075,12 +2083,14 @@ public class Resources { is.close(); // System.out.println("Created stream: " + dr); } catch (Exception e) { + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); NotFoundException rnf = new NotFoundException( "File " + file + " from drawable resource ID #0x" + Integer.toHexString(id)); rnf.initCause(e); throw rnf; } + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); } } } @@ -2090,7 +2100,7 @@ public class Resources { cs = dr.getConstantState(); if (cs != null) { if (mPreloading) { - if (verifyPreloadConfig(value, "drawable")) { + if (verifyPreloadConfig(cs.getChangingConfigurations(), value.resourceId, "drawable")) { if (isColorDrawable) { sPreloadedColorDrawables.put(key, cs); } else { @@ -2160,7 +2170,7 @@ public class Resources { csl = ColorStateList.valueOf(value.data); if (mPreloading) { - if (verifyPreloadConfig(value, "color")) { + if (verifyPreloadConfig(value.changingConfigurations, value.resourceId, "color")) { sPreloadedColorStateLists.put(key, csl); } } @@ -2186,18 +2196,21 @@ public class Resources { String file = value.string.toString(); if (file.endsWith(".xml")) { + Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, file); try { XmlResourceParser rp = loadXmlResourceParser( file, id, value.assetCookie, "colorstatelist"); csl = ColorStateList.createFromXml(this, rp); rp.close(); } catch (Exception e) { + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); NotFoundException rnf = new NotFoundException( "File " + file + " from color state list resource ID #0x" + Integer.toHexString(id)); rnf.initCause(e); throw rnf; } + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); } else { throw new NotFoundException( "File " + file + " from drawable resource ID #0x" @@ -2206,7 +2219,7 @@ public class Resources { if (csl != null) { if (mPreloading) { - if (verifyPreloadConfig(value, "color")) { + if (verifyPreloadConfig(value.changingConfigurations, value.resourceId, "color")) { sPreloadedColorStateLists.put(key, csl); } } else { diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 37cbe047c831..30118f9dd348 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -1387,14 +1387,14 @@ public abstract class SensorManager { * @throws IllegalArgumentException when sensor is a trigger sensor. */ public boolean cancelTriggerSensor(TriggerEventListener listener, Sensor sensor) { - return cancelTriggerSensorImpl(listener, sensor); + return cancelTriggerSensorImpl(listener, sensor, true); } /** * @hide */ protected abstract boolean cancelTriggerSensorImpl(TriggerEventListener listener, - Sensor sensor); + Sensor sensor, boolean disable); private LegacySensorManager getLegacySensorManager() { diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java index c6c999b8b63b..852cf4aba49e 100644 --- a/core/java/android/hardware/SystemSensorManager.java +++ b/core/java/android/hardware/SystemSensorManager.java @@ -20,6 +20,7 @@ import android.content.Context; import android.os.Handler; import android.os.Looper; import android.os.MessageQueue; +import android.util.Log; import android.util.SparseArray; import android.util.SparseBooleanArray; import android.util.SparseIntArray; @@ -135,7 +136,7 @@ public class SystemSensorManager extends SensorManager { if (sensor == null) { result = queue.removeAllSensors(); } else { - result = queue.removeSensor(sensor); + result = queue.removeSensor(sensor, true); } if (result && !queue.hasSensors()) { mSensorListeners.remove(listener); @@ -170,7 +171,8 @@ public class SystemSensorManager extends SensorManager { /** @hide */ @Override - protected boolean cancelTriggerSensorImpl(TriggerEventListener listener, Sensor sensor) { + protected boolean cancelTriggerSensorImpl(TriggerEventListener listener, Sensor sensor, + boolean disable) { if (sensor != null && Sensor.getReportingMode(sensor) != Sensor.REPORTING_MODE_ONE_SHOT) { return false; } @@ -181,7 +183,7 @@ public class SystemSensorManager extends SensorManager { if (sensor == null) { result = queue.removeAllSensors(); } else { - result = queue.removeSensor(sensor); + result = queue.removeSensor(sensor, disable); } if (result && !queue.hasSensors()) { mTriggerListeners.remove(listener); @@ -225,14 +227,17 @@ public class SystemSensorManager extends SensorManager { public boolean addSensor(Sensor sensor, int delay) { // Check if already present. - if (mActiveSensors.get(sensor.getHandle())) return false; - - if (enableSensor(sensor, delay) == 0) { - mActiveSensors.put(sensor.getHandle(), true); - addSensorEvent(sensor); - return true; + int handle = sensor.getHandle(); + if (mActiveSensors.get(handle)) return false; + + // Get ready to receive events before calling enable. + mActiveSensors.put(handle, true); + addSensorEvent(sensor); + if (enableSensor(sensor, delay) != 0) { + removeSensor(sensor, false); + return false; } - return false; + return true; } public boolean removeAllSensors() { @@ -252,10 +257,10 @@ public class SystemSensorManager extends SensorManager { return true; } - public boolean removeSensor(Sensor sensor) { + public boolean removeSensor(Sensor sensor, boolean disable) { final int handle = sensor.getHandle(); if (mActiveSensors.get(handle)) { - disableSensor(sensor); + if (disable) disableSensor(sensor); mActiveSensors.put(sensor.getHandle(), false); removeSensorEvent(sensor); return true; @@ -334,6 +339,10 @@ public class SystemSensorManager extends SensorManager { long timestamp) { final Sensor sensor = sHandleToSensor.get(handle); SensorEvent t = mSensorsEvents.get(handle); + if (t == null) { + Log.e(TAG, "Error: Sensor Event is null for Sensor: " + sensor); + return; + } // Copy from the values array. System.arraycopy(values, 0, t.values, 0, t.values.length); t.timestamp = timestamp; @@ -390,14 +399,19 @@ public class SystemSensorManager extends SensorManager { long timestamp) { final Sensor sensor = sHandleToSensor.get(handle); TriggerEvent t = mTriggerEvents.get(handle); + if (t == null) { + Log.e(TAG, "Error: Trigger Event is null for Sensor: " + sensor); + return; + } // Copy from the values array. System.arraycopy(values, 0, t.values, 0, t.values.length); t.timestamp = timestamp; t.sensor = sensor; - // A trigger sensor should be auto disabled. - mManager.cancelTriggerSensorImpl(mListener, sensor); + // A trigger sensor is auto disabled. So just clean up and don't call native + // disable. + mManager.cancelTriggerSensorImpl(mListener, sensor, false); mListener.onTrigger(t); } diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 4e4980d557c5..78bf9afcbb40 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -1136,7 +1136,7 @@ public class ConnectivityManager { * HTTP proxy. A {@code null} value will clear the global HTTP proxy. * * <p>This method requires the call to hold the permission - * {@link android.Manifest.permission#CHANGE_NETWORK_STATE}. + * {@link android.Manifest.permission#CONNECTIVITY_INTERNAL}. * {@hide} */ public void setGlobalProxy(ProxyProperties p) { diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index cc3c5f7cffaf..1d051dde497d 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -60,6 +60,7 @@ public class RouteInfo implements Parcelable { private final boolean mIsDefault; private final boolean mIsHost; + private final boolean mHasGateway; /** * Constructs a RouteInfo object. @@ -97,6 +98,8 @@ public class RouteInfo implements Parcelable { gateway = Inet6Address.ANY; } } + mHasGateway = (!gateway.isAnyLocalAddress()); + mDestination = new LinkAddress(NetworkUtils.getNetworkPart(destination.getAddress(), destination.getNetworkPrefixLength()), destination.getNetworkPrefixLength()); mGateway = gateway; @@ -171,6 +174,10 @@ public class RouteInfo implements Parcelable { return mIsHost; } + public boolean hasGateway() { + return mHasGateway; + } + public String toString() { String val = ""; if (mDestination != null) val = mDestination.toString(); diff --git a/core/java/android/os/Looper.java b/core/java/android/os/Looper.java index 363a1bfd4c55..fa28765206f0 100644 --- a/core/java/android/os/Looper.java +++ b/core/java/android/os/Looper.java @@ -201,8 +201,16 @@ public final class Looper { /** * Quits the looper. - * - * Causes the {@link #loop} method to terminate as soon as possible. + * <p> + * Causes the {@link #loop} method to terminate as soon as all remaining messages + * in the message queue that are already due to be delivered have been handled. + * However delayed messages with due times in the future may not be handled before + * the loop terminates. + * </p><p> + * Any attempt to post messages to the queue after {@link #quit} has been called + * will fail. For example, the {@link Handler#sendMessage(Message)} method will + * return false when the looper is being terminated. + * </p> */ public void quit() { mQueue.quit(); diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java index e0d40c96aafa..c058bfce28e6 100644 --- a/core/java/android/os/MessageQueue.java +++ b/core/java/android/os/MessageQueue.java @@ -132,11 +132,6 @@ public final class MessageQueue { nativePollOnce(mPtr, nextPollTimeoutMillis); synchronized (this) { - if (mQuiting) { - dispose(); - return null; - } - // Try to retrieve the next message. Return if found. final long now = SystemClock.uptimeMillis(); Message prevMsg = null; @@ -170,6 +165,12 @@ public final class MessageQueue { nextPollTimeoutMillis = -1; } + // Process the quit message now that all pending messages have been handled. + if (mQuiting) { + dispose(); + return null; + } + // If first time idle, then get the number of idlers to run. // Idle handles only run if the queue is empty or if the first message // in the queue (possibly a barrier) is due to be handled in the future. diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index 310b12cb9592..617f490e8454 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -25,8 +25,6 @@ import android.util.Log; * This tracing mechanism is independent of the method tracing mechanism * offered by {@link Debug#startMethodTracing}. In particular, it enables * tracing of events that occur across multiple processes. - * - * @hide */ public final class Trace { /* @@ -65,6 +63,8 @@ public final class Trace { public static final long TRACE_TAG_HAL = 1L << 11; /** @hide */ public static final long TRACE_TAG_APP = 1L << 12; + /** @hide */ + public static final long TRACE_TAG_RESOURCES = 1L << 13; private static final long TRACE_TAG_NOT_READY = 1L << 63; private static final int MAX_SECTION_NAME_LEN = 127; @@ -76,6 +76,8 @@ public final class Trace { private static native void nativeTraceCounter(long tag, String name, int value); private static native void nativeTraceBegin(long tag, String name); private static native void nativeTraceEnd(long tag); + private static native void nativeAsyncTraceBegin(long tag, String name, int cookie); + private static native void nativeAsyncTraceEnd(long tag, String name, int cookie); private static native void nativeSetAppTracingAllowed(boolean allowed); static { @@ -197,8 +199,44 @@ public final class Trace { } /** + * Writes a trace message to indicate that a given section of code has + * begun. Must be followed by a call to {@link #asyncTraceEnd} using the same + * tag. Unlike {@link #traceBegin(long, String)} and {@link #traceEnd(long)}, + * asynchronous events do not need to be nested. The name and cookie used to + * begin an event must be used to end it. + * + * @param traceTag The trace tag. + * @param methodName The method name to appear in the trace. + * @param cookie Unique identifier for distinguishing simultaneous events + * + * @hide + */ + public static void asyncTraceBegin(long traceTag, String methodName, int cookie) { + if (isTagEnabled(traceTag)) { + nativeAsyncTraceBegin(traceTag, methodName, cookie); + } + } + + /** + * Writes a trace message to indicate that the current method has ended. + * Must be called exactly once for each call to {@link #asyncTraceBegin(long, String, int)} + * using the same tag, name and cookie. + * + * @param traceTag The trace tag. + * @param methodName The method name to appear in the trace. + * @param cookie Unique identifier for distinguishing simultaneous events + * + * @hide + */ + public static void asyncTraceEnd(long traceTag, String methodName, int cookie) { + if (isTagEnabled(traceTag)) { + nativeAsyncTraceEnd(traceTag, methodName, cookie); + } + } + + /** * Writes a trace message to indicate that a given section of code has begun. This call must - * be followed by a corresponding call to {@link #traceEnd()} on the same thread. + * be followed by a corresponding call to {@link #endSection()} on the same thread. * * <p class="note"> At this time the vertical bar character '|', newline character '\n', and * null character '\0' are used internally by the tracing mechanism. If sectionName contains @@ -206,10 +244,8 @@ public final class Trace { * * @param sectionName The name of the code section to appear in the trace. This may be at * most 127 Unicode code units long. - * - * @hide */ - public static void traceBegin(String sectionName) { + public static void beginSection(String sectionName) { if (isTagEnabled(TRACE_TAG_APP)) { if (sectionName.length() > MAX_SECTION_NAME_LEN) { throw new IllegalArgumentException("sectionName is too long"); @@ -220,13 +256,12 @@ public final class Trace { /** * Writes a trace message to indicate that a given section of code has ended. This call must - * be preceeded by a corresponding call to {@link #traceBegin(String)}. Calling this method + * be preceeded by a corresponding call to {@link #beginSection(String)}. Calling this method * will mark the end of the most recently begun section of code, so care must be taken to - * ensure that traceBegin / traceEnd pairs are properly nested and called from the same thread. - * - * @hide + * ensure that beginSection / endSection pairs are properly nested and called from the same + * thread. */ - public static void traceEnd() { + public static void endSection() { if (isTagEnabled(TRACE_TAG_APP)) { nativeTraceEnd(TRACE_TAG_APP); } diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index b9b8f083ba1a..e580e2b9d1eb 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -110,7 +110,6 @@ public class UserManager { */ public static final String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth"; - /** * Key for user restrictions. Specifies if a user is disallowed from transferring files over * USB. The default value is <code>false</code>. @@ -121,6 +120,26 @@ public class UserManager { */ public static final String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer"; + /** + * Key for user restrictions. Specifies if a user is disallowed from configuring user + * credentials. The default value is <code>false</code>. + * <p/> + * Type: Boolean + * @see #setUserRestrictions(Bundle) + * @see #getUserRestrictions() + */ + public static final String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials"; + + /** + * Key for user restrictions. Specifies if a user is disallowed from removing users. + * The default value is <code>false</code>. + * <p/> + * Type: Boolean + * @see #setUserRestrictions(Bundle) + * @see #getUserRestrictions() + */ + public static final String DISALLOW_REMOVE_USER = "no_remove_user"; + private static UserManager sInstance = null; public synchronized static UserManager get(Context context) { @@ -179,16 +198,15 @@ public class UserManager { } /** - * Used to check if the user making this call is a restricted user. Restricted users may have - * application restrictions imposed on them. All apps should default to the most restrictive - * version, unless they have specific restrictions available through a call to - * {@link Context#getApplicationRestrictions()}. + * Used to check if the user making this call is linked to another user. Linked users may have + * a reduced number of available apps, app restrictions and account restrictions. + * @return whether the user making this call is a linked user */ - public boolean isUserRestricted() { + public boolean isLinkedUser() { try { return mService.isRestricted(); } catch (RemoteException re) { - Log.w(TAG, "Could not check if user restricted ", re); + Log.w(TAG, "Could not check if user is limited ", re); return false; } } diff --git a/core/java/android/security/IKeystoreService.java b/core/java/android/security/IKeystoreService.java index e1cc90e80cf0..3d75dc86a9a3 100644 --- a/core/java/android/security/IKeystoreService.java +++ b/core/java/android/security/IKeystoreService.java @@ -78,7 +78,7 @@ public interface IKeystoreService extends IInterface { return _result; } - public int insert(String name, byte[] item, int uid) throws RemoteException { + public int insert(String name, byte[] item, int uid, int flags) throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; @@ -87,6 +87,7 @@ public interface IKeystoreService extends IInterface { _data.writeString(name); _data.writeByteArray(item); _data.writeInt(uid); + _data.writeInt(flags); mRemote.transact(Stub.TRANSACTION_insert, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); @@ -243,7 +244,7 @@ public interface IKeystoreService extends IInterface { return _result; } - public int generate(String name, int uid) throws RemoteException { + public int generate(String name, int uid, int flags) throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; @@ -251,6 +252,7 @@ public interface IKeystoreService extends IInterface { _data.writeInterfaceToken(DESCRIPTOR); _data.writeString(name); _data.writeInt(uid); + _data.writeInt(flags); mRemote.transact(Stub.TRANSACTION_generate, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); @@ -261,7 +263,8 @@ public interface IKeystoreService extends IInterface { return _result; } - public int import_key(String name, byte[] data, int uid) throws RemoteException { + public int import_key(String name, byte[] data, int uid, int flags) + throws RemoteException { Parcel _data = Parcel.obtain(); Parcel _reply = Parcel.obtain(); int _result; @@ -270,6 +273,7 @@ public interface IKeystoreService extends IInterface { _data.writeString(name); _data.writeByteArray(data); _data.writeInt(uid); + _data.writeInt(flags); mRemote.transact(Stub.TRANSACTION_import, _data, _reply, 0); _reply.readException(); _result = _reply.readInt(); @@ -538,7 +542,7 @@ public interface IKeystoreService extends IInterface { public byte[] get(String name) throws RemoteException; - public int insert(String name, byte[] item, int uid) throws RemoteException; + public int insert(String name, byte[] item, int uid, int flags) throws RemoteException; public int del(String name, int uid) throws RemoteException; @@ -556,9 +560,9 @@ public interface IKeystoreService extends IInterface { public int zero() throws RemoteException; - public int generate(String name, int uid) throws RemoteException; + public int generate(String name, int uid, int flags) throws RemoteException; - public int import_key(String name, byte[] data, int uid) throws RemoteException; + public int import_key(String name, byte[] data, int uid, int flags) throws RemoteException; public byte[] sign(String name, byte[] data) throws RemoteException; diff --git a/core/java/android/text/bidi/BidiFormatter.java b/core/java/android/text/bidi/BidiFormatter.java index c5a77a6f90e6..7a08213c5280 100644 --- a/core/java/android/text/bidi/BidiFormatter.java +++ b/core/java/android/text/bidi/BidiFormatter.java @@ -273,6 +273,14 @@ public final class BidiFormatter { private final TextDirectionHeuristic mDefaultTextDirectionHeuristic; /** + * Factory for creating an instance of BidiFormatter for the default locale directionality. + * + */ + public static BidiFormatter getInstance() { + return new Builder().build(); + } + + /** * Factory for creating an instance of BidiFormatter given the context directionality. * * @param rtlContext Whether the context directionality is RTL. diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java index 85695fc98d66..aa43bad85a36 100644 --- a/core/java/android/view/LayoutInflater.java +++ b/core/java/android/view/LayoutInflater.java @@ -654,7 +654,7 @@ public abstract class LayoutInflater { /** * Version of {@link #onCreateView(String, AttributeSet)} that also - * takes the future parent of the view being constructure. The default + * takes the future parent of the view being constructed. The default * implementation simply calls {@link #onCreateView(String, AttributeSet)}. * * @param parent The future parent of the returned view. <em>Note that diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 7c82f7e85ac3..4fb243173f70 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -2758,6 +2758,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, TransformationInfo mTransformationInfo; + /** + * Current clip bounds. to which all drawing of this view are constrained. + */ + private Rect mClipBounds = null; + private boolean mLastIsOpaque; /** @@ -10103,7 +10108,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Offset this view's horizontal location by the specified amount of pixels. * - * @param offset the numer of pixels to offset the view by + * @param offset the number of pixels to offset the view by */ public void offsetLeftAndRight(int offset) { if (offset != 0) { @@ -13374,6 +13379,33 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** + * Sets a rectangular area on this view to which the view will be clipped + * it is drawn. Setting the value to null will remove the clip bounds + * and the view will draw normally, using its full bounds. + * + * @param clipBounds The rectangular area, in the local coordinates of + * this view, to which future drawing operations will be clipped. + */ + public void setClipBounds(Rect clipBounds) { + mClipBounds = clipBounds; + if (clipBounds != null) { + invalidate(clipBounds); + } else { + invalidate(); + } + } + + /** + * Returns a copy of the current {@link #setClipBounds(Rect) clipBounds}. + * + * @return A copy of the current clip bounds if clip bounds are set, + * otherwise null. + */ + public Rect getClipBounds() { + return (mClipBounds != null) ? new Rect(mClipBounds) : null; + } + + /** * Utility function, called by draw(canvas, parent, drawingTime) to handle the less common * case of an active Animation being run on the view. */ @@ -13849,6 +13881,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @param canvas The Canvas to which the View is rendered. */ public void draw(Canvas canvas) { + if (mClipBounds != null) { + canvas.clipRect(mClipBounds); + } final int privateFlags = mPrivateFlags; final boolean dirtyOpaque = (privateFlags & PFLAG_DIRTY_MASK) == PFLAG_DIRTY_OPAQUE && (mAttachInfo == null || !mAttachInfo.mIgnoreDirtyState); diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 311d1d033890..bf502dda9f2f 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -1464,10 +1464,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager final float y = event.getY(); final int childrenCount = mChildrenCount; if (childrenCount != 0) { + final boolean customChildOrder = isChildrenDrawingOrderEnabled(); final View[] children = mChildren; HoverTarget lastHoverTarget = null; for (int i = childrenCount - 1; i >= 0; i--) { - final View child = children[i]; + final int childIndex = customChildOrder + ? getChildDrawingOrder(childrenCount, i) : i; + final View child = children[childIndex]; if (!canViewReceivePointerEvents(child) || !isTransformedTouchPointInView(x, y, child, null)) { continue; @@ -3080,6 +3083,18 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } /** + * Returns whether ths group's children are clipped to their bounds before drawing. + * The default value is true. + * @see #setClipChildren(boolean) + * + * @return True if the group's children will be clipped to their bounds, + * false otherwise. + */ + public boolean getClipChildren() { + return ((mGroupFlags & FLAG_CLIP_CHILDREN) != 0); + } + + /** * By default, children are clipped to their bounds before drawing. This * allows view groups to override this behavior for animations, etc. * @@ -4525,7 +4540,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager */ @Override public final void layout(int l, int t, int r, int b) { - if (mTransition == null || !mTransition.isChangingLayout()) { + if (!mSuppressLayout && (mTransition == null || !mTransition.isChangingLayout())) { if (mTransition != null) { mTransition.layoutChange(this); } diff --git a/core/java/android/view/ViewPropertyAnimator.java b/core/java/android/view/ViewPropertyAnimator.java index 22f98b7fa301..98df064b5722 100644 --- a/core/java/android/view/ViewPropertyAnimator.java +++ b/core/java/android/view/ViewPropertyAnimator.java @@ -16,6 +16,7 @@ package android.view; +import android.animation.Animatable; import android.animation.Animator; import android.animation.ValueAnimator; import android.animation.TimeInterpolator; @@ -323,6 +324,15 @@ public class ViewPropertyAnimator { } /** + * Returns the timing interpolator that this animation uses. + * + * @return The timing interpolator for this animation. + */ + public TimeInterpolator getInterpolator() { + return null; + } + + /** * Sets a listener for events in the underlying Animators that run the property * animations. * diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index c1db4c60647e..f03c07751d19 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1727,7 +1727,7 @@ public final class ViewRootImpl implements ViewParent, if (didLayout) { performLayout(lp, desiredWindowWidth, desiredWindowHeight); - // By this point all views have been sized and positionned + // By this point all views have been sized and positioned // We can compute the transparent area if ((host.mPrivateFlags & View.PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) { @@ -1745,6 +1745,7 @@ public final class ViewRootImpl implements ViewParent, if (!mTransparentRegion.equals(mPreviousTransparentRegion)) { mPreviousTransparentRegion.set(mTransparentRegion); + mFullRedrawNeeded = true; // reconfigure window manager try { mWindowSession.setTransparentRegion(mWindow, mTransparentRegion); @@ -2592,12 +2593,12 @@ public final class ViewRootImpl implements ViewParent, // requestChildRectangleOnScreen() call (in which case 'rectangle' // is non-null and we just want to scroll to whatever that // rectangle is). - View focus = mView.findFocus(); + final View focus = mView.findFocus(); if (focus == null) { return false; } View lastScrolledFocus = (mLastScrolledFocus != null) ? mLastScrolledFocus.get() : null; - if (lastScrolledFocus != null && focus != lastScrolledFocus) { + if (focus != lastScrolledFocus) { // If the focus has changed, then ignore any requests to scroll // to a rectangle; first we want to make sure the entire focus // view is visible. @@ -2612,7 +2613,7 @@ public final class ViewRootImpl implements ViewParent, // as they are. if (DEBUG_INPUT_RESIZE) Log.v(TAG, "Keeping scroll y=" + mScrollY + " vi=" + vi.toShortString()); - } else if (focus != null) { + } else { // We need to determine if the currently focused view is // within the visible part of the window and, if not, apply // a pan so it can be seen. @@ -4922,7 +4923,7 @@ public final class ViewRootImpl implements ViewParent, public void handleDispatchDoneAnimating() { if (mWindowsAnimating) { mWindowsAnimating = false; - if (!mDirty.isEmpty() || mIsAnimating) { + if (!mDirty.isEmpty() || mIsAnimating || mFullRedrawNeeded) { scheduleTraversals(); } } diff --git a/core/java/android/webkit/WebChromeClient.java b/core/java/android/webkit/WebChromeClient.java index e93db0912fc9..21b0578f1355 100644 --- a/core/java/android/webkit/WebChromeClient.java +++ b/core/java/android/webkit/WebChromeClient.java @@ -69,7 +69,9 @@ public class WebChromeClient { /** * Notify the host application that the current page would - * like to show a custom View. + * like to show a custom View. This is used for Fullscreen + * video playback; see "HTML5 Video support" documentation on + * {@link WebView}. * @param view is the View object to be shown. * @param callback is the callback to be invoked if and when the view * is dismissed. @@ -84,7 +86,10 @@ public class WebChromeClient { * {@link ActivityInfo#screenOrientation ActivityInfo.screenOrientation}. * @param callback is the callback to be invoked if and when the view * is dismissed. + * @deprecated This method supports the obsolete plugin mechanism, + * and will not be invoked in future */ + @Deprecated public void onShowCustomView(View view, int requestedOrientation, CustomViewCallback callback) {}; diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 1f00c9c00153..afa4894edffd 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -26,6 +26,7 @@ import android.graphics.Picture; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.net.http.SslCertificate; +import android.os.Build; import android.os.Bundle; import android.os.Looper; import android.os.Message; @@ -241,6 +242,11 @@ public class WebView extends AbsoluteLayout private static final String LOGTAG = "webview_proxy"; + // Throwing an exception for incorrect thread usage if the + // build target is JB MR2 or newer. Defaults to false, and is + // set in the WebView constructor. + private static Boolean sEnforceThreadChecking = false; + /** * Transportation object for returning WebView across thread boundaries. */ @@ -483,6 +489,8 @@ public class WebView extends AbsoluteLayout if (context == null) { throw new IllegalArgumentException("Invalid context argument"); } + sEnforceThreadChecking = context.getApplicationInfo().targetSdkVersion >= + Build.VERSION_CODES.JELLY_BEAN_MR2; checkThread(); ensureProviderCreated(); @@ -1915,6 +1923,10 @@ public class WebView extends AbsoluteLayout "Future versions of WebView may not support use on other threads."); Log.w(LOGTAG, Log.getStackTraceString(throwable)); StrictMode.onWebViewMethodCalledOnWrongThread(throwable); + + if (sEnforceThreadChecking) { + throw new RuntimeException(throwable); + } } } diff --git a/core/java/android/webkit/WebViewDatabase.java b/core/java/android/webkit/WebViewDatabase.java index e08052a37918..99e0ffb24171 100644 --- a/core/java/android/webkit/WebViewDatabase.java +++ b/core/java/android/webkit/WebViewDatabase.java @@ -50,8 +50,10 @@ public class WebViewDatabase { * * @return true if there are any saved username/password pairs * @see WebView#savePassword - * @see #clearUsernamePassword + * @see #clearUsernamePassworda + * @deprecated Saving passwords in WebView will not be supported in future versions. */ + @Deprecated public boolean hasUsernamePassword() { throw new MustOverrideException(); } @@ -62,7 +64,9 @@ public class WebViewDatabase { * * @see WebView#savePassword * @see #hasUsernamePassword + * @deprecated Saving passwords in WebView will not be supported in future versions. */ + @Deprecated public void clearUsernamePassword() { throw new MustOverrideException(); } diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index cde6ceb00cfc..33fd8ce446ac 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -348,7 +348,7 @@ public class ImageView extends View { * {@link #setImageBitmap(android.graphics.Bitmap)} and * {@link android.graphics.BitmapFactory} instead.</p> * - * @param resId the resource identifier of the the drawable + * @param resId the resource identifier of the drawable * * @attr ref android.R.styleable#ImageView_src */ diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 52b7a81f395d..1246051a09bf 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -5921,6 +5921,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } Layout.Alignment alignment = getLayoutAlignment(); + final boolean testDirChange = mSingleLine && mLayout != null && + (alignment == Layout.Alignment.ALIGN_NORMAL || + alignment == Layout.Alignment.ALIGN_OPPOSITE); + int oldDir = 0; + if (testDirChange) oldDir = mLayout.getParagraphDirection(0); boolean shouldEllipsize = mEllipsize != null && getKeyListener() == null; final boolean switchEllipsize = mEllipsize == TruncateAt.MARQUEE && mMarqueeFadeMode != MARQUEE_FADE_NORMAL; @@ -6009,7 +6014,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } } - if (bringIntoView) { + if (bringIntoView || (testDirChange && oldDir != mLayout.getParagraphDirection(0))) { registerForPreDraw(); } diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java index f173327fe69f..043964f56a7f 100644 --- a/core/java/com/android/internal/app/LocalePicker.java +++ b/core/java/com/android/internal/app/LocalePicker.java @@ -38,6 +38,7 @@ import android.widget.TextView; import java.text.Collator; import java.util.Arrays; import java.util.Locale; +import java.util.ArrayList; public class LocalePicker extends ListFragment { private static final String TAG = "LocalePicker"; @@ -48,6 +49,10 @@ public class LocalePicker extends ListFragment { public void onLocaleSelected(Locale locale); } + protected boolean isInDeveloperMode() { + return false; + } + LocaleSelectionListener mListener; // default to null public static class LocaleInfo implements Comparable<LocaleInfo> { @@ -85,13 +90,39 @@ public class LocalePicker extends ListFragment { * {@link LocaleInfo#label}. */ public static ArrayAdapter<LocaleInfo> constructAdapter(Context context) { - return constructAdapter(context, R.layout.locale_picker_item, R.id.locale); + return constructAdapter(context, false /* disable pesudolocales */); + } + + public static ArrayAdapter<LocaleInfo> constructAdapter(Context context, + final boolean isInDeveloperMode) { + return constructAdapter(context, R.layout.locale_picker_item, R.id.locale, + isInDeveloperMode); } public static ArrayAdapter<LocaleInfo> constructAdapter(Context context, final int layoutId, final int fieldId) { + return constructAdapter(context, layoutId, fieldId, false /* disable pseudolocales */); + } + + public static ArrayAdapter<LocaleInfo> constructAdapter(Context context, + final int layoutId, final int fieldId, final boolean isInDeveloperMode) { final Resources resources = context.getResources(); - final String[] locales = Resources.getSystem().getAssets().getLocales(); + + ArrayList<String> localeList = new ArrayList<String>(Arrays.asList( + Resources.getSystem().getAssets().getLocales())); + if (isInDeveloperMode) { + if (!localeList.contains("zz_ZZ")) { + localeList.add("zz_ZZ"); + } + /** - TODO: Enable when zz_ZY Pseudolocale is complete + * if (!localeList.contains("zz_ZY")) { + * localeList.add("zz_ZY"); + * } + */ + } + String[] locales = new String[localeList.size()]; + locales = localeList.toArray(locales); + final String[] specialLocaleCodes = resources.getStringArray(R.array.special_locale_codes); final String[] specialLocaleNames = resources.getStringArray(R.array.special_locale_names); Arrays.sort(locales); @@ -118,7 +149,8 @@ public class LocalePicker extends ListFragment { // insert ours with full name // diff lang -> insert ours with lang-only name if (preprocess[finalSize-1].locale.getLanguage().equals( - language)) { + language) && + !preprocess[finalSize-1].locale.getLanguage().equals("zz")) { if (DEBUG) { Log.v(TAG, "backing up and fixing "+ preprocess[finalSize-1].label+" to "+ @@ -139,7 +171,9 @@ public class LocalePicker extends ListFragment { } else { String displayName; if (s.equals("zz_ZZ")) { - displayName = "Pseudo..."; + displayName = "[Developer] Accented English"; + } else if (s.equals("zz_ZY")) { + displayName = "[Developer] Fake Bi-Directional"; } else { displayName = toTitleCase(l.getDisplayLanguage(l)); } @@ -206,7 +240,8 @@ public class LocalePicker extends ListFragment { @Override public void onActivityCreated(final Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - final ArrayAdapter<LocaleInfo> adapter = constructAdapter(getActivity()); + final ArrayAdapter<LocaleInfo> adapter = constructAdapter(getActivity(), + isInDeveloperMode()); setListAdapter(adapter); } diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 1b088b3c81ac..b066d703360a 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -38,7 +38,6 @@ import android.view.View; import android.view.accessibility.AccessibilityManager; import com.android.internal.R; -import com.android.internal.widget.LockPatternView.Cell; import java.util.ArrayList; import java.util.List; @@ -51,7 +50,6 @@ import java.util.List; * "correct" states. */ public class LockPatternView extends View { - private static final String TAG = "LockPatternView"; // Aspect to use when rendering this view private static final int ASPECT_SQUARE = 0; // View will be the minimum of width/height private static final int ASPECT_LOCK_WIDTH = 1; // Fixed width; height will be minimum of (w,h) @@ -63,9 +61,6 @@ public class LockPatternView extends View { private Paint mPaint = new Paint(); private Paint mPathPaint = new Paint(); - // TODO: make this common with PhoneWindow - static final int STATUS_BAR_HEIGHT = 25; - /** * How many milliseconds we spend animating each circle of a lock pattern * if the animating mode is set. The entire animation should take this @@ -124,6 +119,7 @@ public class LockPatternView extends View { private final Path mCurrentPath = new Path(); private final Rect mInvalidate = new Rect(); + private final Rect mTmpInvalidateRect = new Rect(); private int mBitmapWidth; private int mBitmapHeight; @@ -132,7 +128,6 @@ public class LockPatternView extends View { private final Matrix mArrowMatrix = new Matrix(); private final Matrix mCircleMatrix = new Matrix(); - /** * Represents a cell in the 3 X 3 matrix of the unlock pattern view. */ @@ -680,8 +675,9 @@ public class LockPatternView extends View { private void handleActionMove(MotionEvent event) { // Handle all recent motion events so we don't skip any cells even when the device // is busy... + final float radius = (mSquareWidth * mDiameterFactor * 0.5f); final int historySize = event.getHistorySize(); - Rect invalidateRect = mInvalidate; + mTmpInvalidateRect.setEmpty(); boolean invalidateNow = false; for (int i = 0; i < historySize + 1; i++) { final float x = i < historySize ? event.getHistoricalX(i) : event.getX(); @@ -702,30 +698,30 @@ public class LockPatternView extends View { if (mPatternInProgress && patternSize > 0) { final ArrayList<Cell> pattern = mPattern; final Cell lastCell = pattern.get(patternSize - 1); - float startX = getCenterXForColumn(lastCell.column); - float startY = getCenterYForRow(lastCell.row); + float lastCellCenterX = getCenterXForColumn(lastCell.column); + float lastCellCenterY = getCenterYForRow(lastCell.row); - // Adjust for current position. Radius accounts for line width. - final float radius = (mSquareWidth * mDiameterFactor * 0.5f); - float left = Math.min(startX, x) - radius; - float right = Math.max(startX, x) + radius; - float top = Math.min(startY, y) - radius; - float bottom = Math.max(startY, y) + radius; + // Adjust for drawn segment from last cell to (x,y). Radius accounts for line width. + float left = Math.min(lastCellCenterX, x) - radius; + float right = Math.max(lastCellCenterX, x) + radius; + float top = Math.min(lastCellCenterY, y) - radius; + float bottom = Math.max(lastCellCenterY, y) + radius; // Invalidate between the pattern's new cell and the pattern's previous cell - if (hitCell != null && patternSize >= 2) { + if (hitCell != null) { final float width = mSquareWidth * 0.5f; final float height = mSquareHeight * 0.5f; - final float x2 = getCenterXForColumn(hitCell.column); - final float y2 = getCenterYForRow(hitCell.row); - left = Math.min(x2, left - width); - right = Math.max(x2, right + width); - top = Math.min(y2, top - height); - bottom = Math.max(y2, bottom + height); + final float hitCellCenterX = getCenterXForColumn(hitCell.column); + final float hitCellCenterY = getCenterYForRow(hitCell.row); + + left = Math.min(hitCellCenterX - width, left); + right = Math.max(hitCellCenterX + width, right); + top = Math.min(hitCellCenterY - height, top); + bottom = Math.max(hitCellCenterY + height, bottom); } // Invalidate between the pattern's last cell and the previous location - invalidateRect.union(Math.round(left), Math.round(top), + mTmpInvalidateRect.union(Math.round(left), Math.round(top), Math.round(right), Math.round(bottom)); } } @@ -734,8 +730,9 @@ public class LockPatternView extends View { // To save updates, we only invalidate if the user moved beyond a certain amount. if (invalidateNow) { - invalidate(invalidateRect); - invalidateRect.setEmpty(); + mInvalidate.union(mTmpInvalidateRect); + invalidate(mInvalidate); + mInvalidate.set(mTmpInvalidateRect); } } diff --git a/core/jni/android_os_Trace.cpp b/core/jni/android_os_Trace.cpp index 00ecd0a60061..131529183042 100644 --- a/core/jni/android_os_Trace.cpp +++ b/core/jni/android_os_Trace.cpp @@ -27,6 +27,18 @@ namespace android { +static void sanitizeString(String8& utf8Chars) { + size_t size = utf8Chars.size(); + char* str = utf8Chars.lockBuffer(size); + for (size_t i = 0; i < size; i++) { + char c = str[i]; + if (c == '\0' || c == '\n' || c == '|') { + str[i] = ' '; + } + } + utf8Chars.unlockBuffer(); +} + static jlong android_os_Trace_nativeGetEnabledTags(JNIEnv* env, jclass clazz) { return atrace_get_enabled_tags(); } @@ -41,17 +53,8 @@ static void android_os_Trace_nativeTraceBegin(JNIEnv* env, jclass clazz, jlong tag, jstring nameStr) { const size_t MAX_SECTION_NAME_LEN = 127; ScopedStringChars jchars(env, nameStr); - String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), - jchars.size()); - size_t size = utf8Chars.size(); - char* str = utf8Chars.lockBuffer(size); - for (size_t i = 0; i < size; i++) { - char c = str[i]; - if (c == '\0' || c == '\n' || c == '|') { - str[i] = ' '; - } - } - utf8Chars.unlockBuffer(); + String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size()); + sanitizeString(utf8Chars); atrace_begin(tag, utf8Chars.string()); } @@ -60,6 +63,24 @@ static void android_os_Trace_nativeTraceEnd(JNIEnv* env, jclass clazz, atrace_end(tag); } +static void android_os_Trace_nativeAsyncTraceBegin(JNIEnv* env, jclass clazz, + jlong tag, jstring nameStr, jint cookie) { + const size_t MAX_SECTION_NAME_LEN = 127; + ScopedStringChars jchars(env, nameStr); + String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size()); + sanitizeString(utf8Chars); + atrace_async_begin(tag, utf8Chars.string(), cookie); +} + +static void android_os_Trace_nativeAsyncTraceEnd(JNIEnv* env, jclass clazz, + jlong tag, jstring nameStr, jint cookie) { + const size_t MAX_SECTION_NAME_LEN = 127; + ScopedStringChars jchars(env, nameStr); + String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size()); + sanitizeString(utf8Chars); + atrace_async_end(tag, utf8Chars.string(), cookie); +} + static void android_os_Trace_nativeSetAppTracingAllowed(JNIEnv* env, jclass clazz, jboolean allowed) { atrace_set_debuggable(allowed); @@ -79,6 +100,12 @@ static JNINativeMethod gTraceMethods[] = { { "nativeTraceEnd", "(J)V", (void*)android_os_Trace_nativeTraceEnd }, + { "nativeAsyncTraceBegin", + "(JLjava/lang/String;I)V", + (void*)android_os_Trace_nativeAsyncTraceBegin }, + { "nativeAsyncTraceEnd", + "(JLjava/lang/String;I)V", + (void*)android_os_Trace_nativeAsyncTraceEnd }, { "nativeSetAppTracingAllowed", "(Z)V", (void*)android_os_Trace_nativeSetAppTracingAllowed }, diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 785bf132e295..dc4d9450ffaa 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -1642,7 +1642,7 @@ static JNINativeMethod gAssetManagerMethods[] = { (void*) android_content_AssetManager_getAssetLength }, { "getAssetRemainingLength", "(I)J", (void*) android_content_AssetManager_getAssetRemainingLength }, - { "addAssetPath", "(Ljava/lang/String;)I", + { "addAssetPathNative", "(Ljava/lang/String;)I", (void*) android_content_AssetManager_addAssetPath }, { "isUpToDate", "()Z", (void*) android_content_AssetManager_isUpToDate }, diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index ce76d4003ca3..ea194fc867e8 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Laat die program toe om te verander hoe netwerkgebruik teenoor programme gemeet word. Nie vir gebruik deur normale programme nie."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"kry toegang tot kennisgewings"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Laat die program toe om kennisgewings op te haal, te bestudeer en te verwyder, insluitende die kennisgewings wat deur ander programme geplaas is."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"bind aan \'n kennisgewingluisteraardiens"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Laat die houer toe om aan die top-koppelvlak van \'n kennisgewingluisteraardiens te bind. Behoort nooit vir gewone programme nodig te wees nie."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Stel wagwoordreëls"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Beheer lengte en watter karakters wat in die skermontsluit-wagwoorde gebruik word."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitor pogings om skerm te ontsluit"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksaksies"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Bergingspasie word min"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Sommige stelselfunksies werk moontlik nie"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> loop tans"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Raak vir meer inligting of om die program te stop."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Kanselleer"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Toeganklikheid"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Muurpapier"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Verander muurpapier"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Kennisgewingluisteraar"</string> <string name="vpn_title" msgid="19615213552042827">"VPN geaktiveer"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN is geaktiveer deur <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Raak om die netwerk te bestuur."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigeer tuis"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigeer op"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Meer opsies"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s - %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s-%2$s%3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Interne geheue"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kaart"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-berging"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Fout"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Hierdie program werk nie met rekeninge vir beperkte gebruikers nie"</string> <string name="app_not_found" msgid="3429141853498927379">"Geen program gevind om hierdie handeling te hanteer nie"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Herroep"</string> </resources> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 132d4cc18edf..84eba57615e8 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"ከመተግበሪያዎች በተለየ መልኩ እንዴት የአውታረ መረብ አጠቃቀም እንደተመዘገበ ለመቀየር ለመተግበሪያው ይፈቅዳሉ።ለመደበኛ መተግበሪያዎች አገልግሎት አይውልም።"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"ማሳወቂያዎችን ይድረሱ"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"መተግበሪያው ማሳወቂያዎችን እንዲያስመጣ፣ እንዲመረምር እና እንዲያጸዳ ያስችለዋል፣ በሌሎች መተግበሪያዎች የተለጠፉትንም ጨምሮ።"</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"ከአንድ የማሳወቂያ አዳማጭ አገልግሎት ጋር ይሰሩ"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"ያዢው የማሳወቂያ አዳማጭ አገልግሎቱን ከከፍተኛ-ደረጃ በይነገጹ ጋር እንዲያስር ያስችለዋል። ለመደበኛ መተግበሪያዎች በጭራሽ አያስፈልግም።"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"የይለፍ ቃል ድንቦች አዘጋጅ"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"በማያ-መክፈት የተፈቀዱ የይለፍ ቃል ርዝመት እና ቁምፊዎች ተቆጣጠር።"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"የማሳያ-ክፈት ሙከራዎችን አሳይ"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"የፅሁፍ እርምጃዎች"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"የማከማቻ ቦታ እያለቀ ነው"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"አንዳንድ የስርዓት ተግባራት ላይሰሩ ይችላሉ"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> እያሄደ ነው"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"ተጨማሪ መረጃ ለማግኘት ወይም መተግበሪያውን ለማቆም ይንኩ።"</string> <string name="ok" msgid="5970060430562524910">"እሺ"</string> <string name="cancel" msgid="6442560571259935130">"ይቅር"</string> <string name="yes" msgid="5362982303337969312">"እሺ"</string> @@ -1104,7 +1100,7 @@ <string name="new_app_description" msgid="1932143598371537340">"የድሮውን ትግበራ ሳታስቀምጥ አቁም።"</string> <string name="sendText" msgid="5209874571959469142">"ለፅሁፍ ድርጊት ምረጥ"</string> <string name="volume_ringtone" msgid="6885421406845734650">"የስልክ ጥሪ ድምፅ"</string> - <string name="volume_music" msgid="5421651157138628171">"ማህደረመረጃ ክፍልፍል"</string> + <string name="volume_music" msgid="5421651157138628171">" ማህደረ መረጃ ክፍልፍል"</string> <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"በብሉቱዝ በኩል ማጫወት"</string> <string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"የፀጥታ የስልክ የደውል ድምፅ ተዘጋጅቷል"</string> <string name="volume_call" msgid="3941680041282788711">"የጥሪ ላይ ድም ፅ መጨመሪያ/መቀነሻ"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"ተደራሽነት"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"ልጣፍ"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"ልጣፍ ለውጥ"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"ማሳወቂያ አዳማጭ"</string> <string name="vpn_title" msgid="19615213552042827">"VPN ነቅቷል።"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN በ<xliff:g id="APP">%s</xliff:g>ገብሯል"</string> <string name="vpn_text" msgid="3011306607126450322">"አውታረመረብ ለማደራጀት ንካ።"</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"መነሻ ዳስስ"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"አስስ"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"ተጨማሪ አማራጮች"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s፣ %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s፣ %2$s፣ %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"ውስጣዊ ማከማቻ"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD ካርድ"</string> <string name="storage_usb" msgid="3017954059538517278">"የUSB ማከማቻ"</string> @@ -1398,7 +1391,7 @@ <string name="data_usage_mobile_limit_snoozed_title" msgid="279240572165412168">"የተንቀሳቃሽ ውሂብ ወሰን አልፏል"</string> <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"Wi-Fi ውሂብ ገደብ ታልፏል"</string> <string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"<xliff:g id="SIZE">%s</xliff:g> ከተወሰነለት በላይ።"</string> - <string name="data_usage_restricted_title" msgid="5965157361036321914">"በስተጀርባ ውሂብ የተገደበ ነው"</string> + <string name="data_usage_restricted_title" msgid="5965157361036321914">"ዳራ ውሂብ የተገደበ ነው"</string> <string name="data_usage_restricted_body" msgid="6741521330997452990">"ገደብ ለማስወገድ ንካ።"</string> <string name="ssl_certificate" msgid="6510040486049237639">"የደህንነት ዕውቅና ማረጋገጫ"</string> <string name="ssl_certificate_is_valid" msgid="6825263250774569373">"ይህ የዐዕውቅና ማረጋገጫ ትክክል ነው።"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"ስህተት"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"ይህ መተግበሪያ የተገደቡ ተጠቃሚዎች መለያዎችን አይደግፍም"</string> <string name="app_not_found" msgid="3429141853498927379">"ይህን እርምጃ የሚያከናውን ምንም መተግበሪያ አልተገኘም"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"ሻር"</string> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index e13c0f2082a2..d134ca45bd81 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"للسماح للتطبيق بتعديل كيفية حساب استخدام الشبكة في التطبيقات. ليس للاستخدام بواسطة التطبيقات العادية."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"إشعارات الدخول"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"يتيح للتطبيق استرجاع الإشعارات وفحصها ومسحها، بما في ذلك تلك التي نشرتها تطبيقات أخرى."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"الربط بخدمة تلقّي الإشعارات الصوتية"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"يتيح للمالك الربط بواجهة المستوى العلوي لخدمة تلقّي الإشعارات الصوتية. ولن تكون هناك حاجة إليه مطلقًا مع التطبيقات العادية."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"تعيين قواعد كلمة المرور"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"يمكنك التحكم في الطول والأحرف المسموح بها في كلمات مرور إلغاء تأمين الشاشة."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"مراقبة محاولات إلغاء قفل الشاشة"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"إجراءات النص"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"مساحة التخزين منخفضة"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"قد لا تعمل بعض وظائف النظام"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> قيد التشغيل"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"المس للحصول على مزيد من المعلومات أو لإيقاف التطبيق."</string> <string name="ok" msgid="5970060430562524910">"موافق"</string> <string name="cancel" msgid="6442560571259935130">"إلغاء"</string> <string name="yes" msgid="5362982303337969312">"موافق"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"إمكانية الدخول"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"الخلفية"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"تغيير الخلفية"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"برنامج تلقّي الإشعارات الصوتية"</string> <string name="vpn_title" msgid="19615213552042827">"تم تنشيط الشبكة الظاهرية الخاصة (VPN)"</string> <string name="vpn_title_long" msgid="6400714798049252294">"تم تنشيط VPN بواسطة <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"المس لإدارة الشبكة."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"التنقل إلى الشاشة الرئيسية"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"التنقل إلى أعلى"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"المزيد من الخيارات"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s، %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s، %2$s، %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"وحدة تخزين داخلية"</string> <string name="storage_sd_card" msgid="3282948861378286745">"بطاقة SD"</string> <string name="storage_usb" msgid="3017954059538517278">"وحدة تخزين USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"خطأ"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"لا يوفر هذا التطبيق حسابات للمستخدمين المقيّدين"</string> <string name="app_not_found" msgid="3429141853498927379">"لم يتم العثور على تطبيق يمكنه التعامل مع هذا الإجراء."</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"إلغاء"</string> </resources> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 6653ac107a15..9f3d3e671f51 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Дазваляе прыкладанням змяняць метад уліку выкарыстання сеткі прыкладаннямі. Не для выкарыстання звычайнымі прыкладаннямі."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"доступ да паведамленняў"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Дазваляе прыкладанню атрымлiваць, правяраць i выдаляць апавяшчэннi, у тым лiку апублiкаваныя iншымi прыкладаннямi."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"прывязка да службы апавяшчэння слухача"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Дазваляе ўладальніку прывязвацца да верхняга ўзроўню інтэрфейсу службы апавяшчэння слухачоў. Ніколі не патрэбнае для звычайных прыкладанняў."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Устанавіць правілы паролю"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Кіраванне даўжынёй і колькасцю знакаў у паролі разблакоўкі экрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Сачыць за спробамі разблакоўкі экрана"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Дзеянні з тэкстам"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Месца для захавання на зыходзе"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Некаторыя сістэмныя функцыі могуць не працаваць"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"Прыкладанне <xliff:g id="APP_NAME">%1$s</xliff:g> працуе"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Націсніце, каб атрымаць дадатковую інфармацыю або спыніць праграму."</string> <string name="ok" msgid="5970060430562524910">"ОК"</string> <string name="cancel" msgid="6442560571259935130">"Адмяніць"</string> <string name="yes" msgid="5362982303337969312">"ОК"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Спецыяльныя магчымасці"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Шпалеры"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Змена шпалер"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Слухач апавяшчэння"</string> <string name="vpn_title" msgid="19615213552042827">"VPN актываваны"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN актывуецца прыкладаннем <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Дакраніцеся, каб кіраваць сеткай."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Перайсці да пачатковай старонкі"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Перайсці ўверх"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Больш налад"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Унутраная памяць"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-карта"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-назапашвальнік"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Памылка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Гэтае прыкладанне не падтрымлівае уліковыя запісы для карыстальнікаў з абмежаванымі правамі"</string> <string name="app_not_found" msgid="3429141853498927379">"Прыкладанне для гэтага дзеяння не знойдзенае"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Ануляваць"</string> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 3d3e19599dc4..0983b5ee9cbd 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Разрешава на приложението да променя това как употребата на мрежа се отчита спрямо приложенията. Не е предназначено за нормални приложения."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"достъп до известията"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Разрешава на приложението да извлича, преглежда и изчиства известия, включително публикуваните от други приложения."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"обвързване с услуга за слушател на известия"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Разрешава на притежателя да се обвърже с интерфейса от първо ниво на услуга за слушател на известия. Нормалните приложения не би трябвало никога да се нуждаят от това."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Задаване на правила за паролата"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролирайте дължината и разрешените знаци за паролите за отключване на екрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Наблюдаване на опитите за отключване на екрана"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Действия с текста"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Мястото в хранилището е на изчерпване"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Възможно е някои функции на системата да не работят"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> се изпълнява"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Докоснете за още информация или за да спрете приложението."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Отказ"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Достъпност"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Тапет"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Промяна на тапета"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Слушател на известия"</string> <string name="vpn_title" msgid="19615213552042827">"VPN е активирана"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN е активирана от <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Докоснете за управление на мрежата."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Придвижване към „Начало“"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Придвижване нагоре"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Още опции"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"„%1$s“ – %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"„%1$s“, „%2$s“ – %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Вътрешно хранилище"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD карта"</string> <string name="storage_usb" msgid="3017954059538517278">"USB хранилище"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Грешка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Това приложение не поддържа профили за потребители с ограничения"</string> <string name="app_not_found" msgid="3429141853498927379">"Няма намерено приложение за извършване на това действие"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Отмяна"</string> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index c96bef8065ea..ccea86672fd1 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permet que l\'aplicació modifiqui la manera com es calcula l\'ús de la xarxa per part de les aplicacions. No indicat per a les aplicacions normals."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"accedeix a les notificacions"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permet que l\'aplicació recuperi, examini i esborri les notificacions, incloses les que han publicat altres aplicacions."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"vincula a un servei de processament de notificacions"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Permet que el titular vinculi la interfície de nivell superior d\'un servei de processament de notificacions. No s\'hauria de necessitar mai per a les aplicacions normals."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Defineix les normes de contrasenya"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controla la longitud i els caràcters permesos a les contrasenyes de desbloqueig de pantalla."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Control d\'intents de desbloqueig de pantalla"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Accions de text"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"S\'està acabant l\'espai d\'emmagatzematge"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"És possible que algunes funcions del sistema no funcionin"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> s\'està executant"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Toca per obtenir més informació o bé per aturar l\'aplicació."</string> <string name="ok" msgid="5970060430562524910">"D\'acord"</string> <string name="cancel" msgid="6442560571259935130">"Cancel·la"</string> <string name="yes" msgid="5362982303337969312">"D\'acord"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibilitat"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fons de pantalla"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Canvia el fons de pantalla"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Processador de notificacions"</string> <string name="vpn_title" msgid="19615213552042827">"VPN activada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> ha activat VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Toca per gestionar la xarxa."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Torna a la pàgina d\'inici"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Mou cap a dalt"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Més opcions"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Emmagatzematge intern"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Targeta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Emmagatzematge USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Aquesta aplicació no admet comptes per a usuaris limitats"</string> <string name="app_not_found" msgid="3429141853498927379">"No s\'ha trobat cap aplicació per processar aquesta acció"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Revoca"</string> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 4738834dd496..c9a84cb211d5 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Umožňuje aplikaci upravit způsob výpočtu využití sítě aplikacemi. Toto oprávnění není určeno pro běžné aplikace."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"přístup k oznámením"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Umožňuje aplikacím načítat, zobrazovat a mazat oznámení včetně těch přidaných jinými aplikacemi."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"navázání na službu pro poslouchání oznámení"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Umožňuje držiteli navázat se na nejvyšší úroveň služby pro poslouchání oznámení. Běžné aplikace by toto oprávnění neměly nikdy požadovat."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nastavit pravidla pro heslo"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Řídit délku hesel pro odemčení obrazovky a povolené znaky."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Sledovat pokusy o odemčení obrazovky"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Operace s textem"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"V úložišti je málo místa"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Některé systémové funkce nemusí fungovat"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> je spuštěna"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Klepnutím zobrazíte další informace nebo ukončíte aplikaci."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Zrušit"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Usnadnění"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapeta"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Změnit tapetu"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Aplikace poslouchající oznámení"</string> <string name="vpn_title" msgid="19615213552042827">"Síť VPN je aktivována"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Aplikace <xliff:g id="APP">%s</xliff:g> aktivovala síť VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Dotykem zobrazíte správu sítě."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Přejít na plochu"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Přejít nahoru"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Další možnosti"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s – %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s – %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Interní úložiště"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Karta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Úložiště USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Chyba"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Tato aplikace u omezeného počtu uživatelů nepodporuje účty"</string> <string name="app_not_found" msgid="3429141853498927379">"Aplikace potřebná k provedení této akce nebyla nalezena"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Zrušit"</string> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 6c16e560ce26..d2b11e4643d2 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Tillader, at appen kan ændre den måde, som netværksforbrug udregnes på i forhold til apps. Anvendes ikke af normale apps."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"adgang til underretninger"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Tillader, at appen kan hente, undersøge og rydde underretninger, herunder dem, der er sendt af andre apps."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"forpligte sig til en underretningslyttertjeneste"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Tillader, at brugeren kan forpligte sig til en grænseflade for en underretningslyttertjeneste på øverste niveau. Bør aldrig være nødvendigt til almindelige apps."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Indstil regler for adgangskode"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontroller længden samt tilladte tegn i adgangskoder til oplåsning af skærmen."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Overvåg forsøg på oplåsning af skærm"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksthandlinger"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Der er snart ikke mere lagerplads"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Nogle systemfunktioner virker måske ikke"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> kører"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Tryk for at få flere oplysninger eller for at stoppe appen."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Annuller"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Tilgængelighed"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapet"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Skift tapet"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Underretningslytter"</string> <string name="vpn_title" msgid="19615213552042827">"VPN er aktiveret."</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN aktiveres af <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Tryk for at administrere netværket."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Naviger hjem"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Naviger op"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Flere valgmuligheder"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Internt lager"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-lager"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Fejl"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Denne applikation understøtter ikke konti for brugere med begrænsede rettigheder"</string> <string name="app_not_found" msgid="3429141853498927379">"Der blev ikke fundet nogen applikation, der kan håndtere denne handling"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Tilbagekald"</string> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index ead40043c318..c03aa70a0cb4 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -114,7 +114,7 @@ <string name="httpErrorLookup" msgid="4711687456111963163">"URL wurde nicht gefunden."</string> <string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"Das Authentifizierungsschema für die Website wird nicht unterstützt."</string> <string name="httpErrorAuth" msgid="1435065629438044534">"Bei der Authentifizierung ist ein Fehler aufgetreten."</string> - <string name="httpErrorProxyAuth" msgid="1788207010559081331">"Authentifizierung via Proxy-Server ist fehlgeschlagen."</string> + <string name="httpErrorProxyAuth" msgid="1788207010559081331">"Authentifizierung via Proxyserver ist fehlgeschlagen."</string> <string name="httpErrorConnect" msgid="8714273236364640549">"Verbindung zum Server konnte nicht hergestellt werden."</string> <string name="httpErrorIO" msgid="2340558197489302188">"Kommunikation mit dem Server konnte nicht hergestellt werden. Bitte versuchen Sie es später erneut."</string> <string name="httpErrorTimeout" msgid="4743403703762883954">"Zeitüberschreitung bei Serververbindung."</string> @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Ermöglicht der App, die Art und Weise zu ändern, wie der Netzwerkverbrauch im Hinblick auf Apps berechnet wird. Nicht für normale Apps vorgesehen."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"Auf Benachrichtigungen zugreifen"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Ermöglicht der App das Abrufen, Überprüfen und Löschen von Benachrichtigungen, einschließlich Benachrichtigungen, die von anderen Apps gepostet wurden"</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"An Benachrichtigungs-Listener-Dienst binden"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Ermöglicht dem Inhaber, sich an die Oberfläche der obersten Ebene eines Benachrichtigungs-Listener-Dienstes zu binden. Sollte nie für normale Apps benötigt werden."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Passwortregeln festlegen"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Zulässige Länge und Zeichen für Passwörter zum Entsperren des Bildschirms festlegen"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Versuche zum Entsperren des Displays überwachen"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Textaktionen"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Der Speicherplatz wird knapp"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Einige Systemfunktionen funktionieren möglicherweise nicht."</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> wird ausgeführt"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Für weitere Informationen oder zum Anhalten der App tippen"</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Abbrechen"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1072,7 +1068,7 @@ <string name="noApplications" msgid="2991814273936504689">"Diese Aktion kann von keiner App ausgeführt werden."</string> <string name="aerr_title" msgid="1905800560317137752"></string> <string name="aerr_application" msgid="932628488013092776">"\"<xliff:g id="APPLICATION">%1$s</xliff:g>\" wurde beendet."</string> - <string name="aerr_process" msgid="4507058997035697579">"Der Prozess <xliff:g id="PROCESS">%1$s</xliff:g> wurde beendet."</string> + <string name="aerr_process" msgid="4507058997035697579">"Der Prozess \"<xliff:g id="PROCESS">%1$s</xliff:g>\" wurde beendet."</string> <string name="anr_title" msgid="4351948481459135709"></string> <string name="anr_activity_application" msgid="1904477189057199066">"<xliff:g id="APPLICATION">%2$s</xliff:g> reagiert nicht."\n\n"Möchten Sie die App schließen?"</string> <string name="anr_activity_process" msgid="5776209883299089767">"Aktivität \"<xliff:g id="ACTIVITY">%1$s</xliff:g>\" reagiert nicht."\n\n"Möchten Sie sie beenden?"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Bedienungshilfen"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Hintergrund"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Hintergrund ändern"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Benachrichtigungs-Listener"</string> <string name="vpn_title" msgid="19615213552042827">"VPN aktiviert"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN wurde von <xliff:g id="APP">%s</xliff:g> aktiviert."</string> <string name="vpn_text" msgid="3011306607126450322">"Zum Verwalten des Netzwerks berühren"</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Zur Startseite navigieren"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Nach oben navigieren"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Weitere Optionen"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s. %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s. %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Interner Speicher"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-Karte"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-Speicher"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Fehler"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Diese App unterstützt keine Konten für eingeschränkte Nutzer."</string> <string name="app_not_found" msgid="3429141853498927379">"Für diese Aktion wurde keine App gefunden."</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Aufheben"</string> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index ac4ec2ec29f5..6dcdbf1286ca 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Επιτρέπει στην εφαρμογή την τροποποίηση του τρόπου υπολογισμού της χρήσης δικτύου έναντι των εφαρμογών. Δεν προορίζεται για χρήση από συνήθεις εφαρμογές."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"πρόσβαση στις ειδοποιήσεις"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Επιτρέπει στην εφαρμογή να ανακτά, να εξετάζει και να απαλείφει ειδοποιήσεις, συμπεριλαμβανομένων εκείνων που δημοσιεύονται από άλλες εφαρμογές."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"δέσμευση σε υπηρεσία ακρόασης ειδοποίησης"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Επιτρέπει στον κάτοχο τη δέσμευση στη διεπαφή ανωτάτου επιπέδου μιας υπηρεσίας ακρόασης ειδοποιήσεων. Δεν απαιτείται σε κανονικές εφαρμογές."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Ορισμός κανόνων κωδικού πρόσβασης"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Έλεγχος του μεγέθους και των χαρακτήρων που επιτρέπονται στους κωδικούς πρόσβασης ξεκλειδώματος οθόνης."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Παρακολούθηση προσπαθειών ξεκλειδώματος οθόνης"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Ενέργειες κειμένου"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ο χώρος αποθήκευσης εξαντλείται"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Ορισμένες λειτουργίες συστήματος ενδέχεται να μην λειτουργούν"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> εκτελείται"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Αγγίξτε για περισσότερες πληροφορίες ή για να διακόψετε την εκτέλεση της εφαρμογής."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Ακύρωση"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Προσβασιμότητα"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Ταπετσαρία"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Αλλαγή ταπετσαρίας"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Υπηρεσία ακρόασης ειδοποίησης"</string> <string name="vpn_title" msgid="19615213552042827">"Το VPN ενεργοποιήθηκε"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Το VPN ενεργοποιήθηκε από την εφαρμογή <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Αγγίξτε για τη διαχείριση του δικτύου."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Πλοήγηση στην αρχική σελίδα"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Πλοήγηση προς τα επάνω"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Περισσότερες επιλογές"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Εσωτερικός χώρος αποθήκευσης"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Κάρτα SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Χώρος αποθήκευσης USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Σφάλμα"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Αυτή η εφαρμογή δεν υποστηρίζει λογαριασμούς για περιορισμένους χρήστες"</string> <string name="app_not_found" msgid="3429141853498927379">"Δεν υπάρχει εφαρμογή για τη διαχείριση αυτής της ενέργειας"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Ανάκληση"</string> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 5285532ff5b7..08283c41bd22 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Allows the app to modify how network usage is accounted against apps. Not for use by normal apps."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"access notifications"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Allows the app to retrieve, examine, and clear notifications, including those posted by other apps."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"bind to a notification listener service"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Allows the holder to bind to the top-level interface of a notification listener service. Should never be needed for normal apps."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Set password rules"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Control the length and the characters allowed in screen-unlock passwords."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitor screen-unlock attempts"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Text actions"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Storage space running out"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Some system functions may not work"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> is running"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Touch for more information or to stop the app."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Cancel"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibility"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Wallpaper"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Change wallpaper"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Notification listener"</string> <string name="vpn_title" msgid="19615213552042827">"VPN activated"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN is activated by <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Touch to manage the network."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigate home"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigate up"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"More options"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Internal storage"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD card"</string> <string name="storage_usb" msgid="3017954059538517278">"USB storage"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"This application does not support accounts for limited users"</string> <string name="app_not_found" msgid="3429141853498927379">"No application found to handle this action"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Revoke"</string> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 20f0c33a6476..98528f738d98 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite que la aplicación modifique cómo se registra el uso de red en relación con las aplicaciones. Las aplicaciones normales no deben usar este permiso."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"acceder a las notificaciones"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite que la aplicación recupere, examine y elimine notificaciones, incluidas aquellas publicadas por otras aplicaciones."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"Vincular a un servicio de agente de escucha de notificaciones"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Permite al propietario vincularse a la interfaz de nivel superior de un servicio de agente de escucha de notificaciones. Las aplicaciones normales no deberían necesitar este permiso."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Establecer reglas de contraseña"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar la longitud y los caracteres permitidos en las contraseñas para desbloquear la pantalla"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Supervisa los intentos para desbloquear la pantalla"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acciones de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Queda poco espacio de almacenamiento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Es posible que algunas funciones del sistema no estén disponibles."</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> se está ejecutando"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Toca para obtener más información o para detener la aplicación."</string> <string name="ok" msgid="5970060430562524910">"Aceptar"</string> <string name="cancel" msgid="6442560571259935130">"Cancelar"</string> <string name="yes" msgid="5362982303337969312">"Aceptar"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accesibilidad"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Papel tapiz"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambiar fondo de pantalla"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Agente de escucha de notificaciones"</string> <string name="vpn_title" msgid="19615213552042827">"VPN activada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN está activado por <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Toca para administrar la red."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Desplazarse hasta la página principal"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Desplazarse hacia arriba"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Más opciones"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Almacenamiento interno"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Tarjeta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Almacenamiento USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Esta aplicación no admite cuentas para usuarios restringidos."</string> <string name="app_not_found" msgid="3429141853498927379">"No se encontró una aplicación para manejar esta acción."</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Revocar"</string> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 7dc03beca87a..09acbe1f9db9 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite que la aplicación modifique cómo se registra el uso de red en relación con las aplicaciones. Las aplicaciones normales no deben usar este permiso."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"acceder a las notificaciones"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite que la aplicación recupere, examine y borre notificaciones, incluidas las que han publicado otras aplicaciones."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"enlazar con un servicio de detector de notificaciones"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Permite enlazar con la interfaz de nivel superior de un servicio de detector de notificaciones. No debe ser necesario para las aplicaciones normales."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Establecimiento de reglas de contraseña"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar la longitud y los caracteres permitidos en las contraseñas de bloqueo de pantalla"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Control de intentos de bloqueo de pantalla"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acciones de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Queda poco espacio"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Es posible que algunas funciones del sistema no funcionen."</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> se está ejecutando"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Toca para obtener más información o para detener la aplicación."</string> <string name="ok" msgid="5970060430562524910">"Aceptar"</string> <string name="cancel" msgid="6442560571259935130">"Cancelar"</string> <string name="yes" msgid="5362982303337969312">"Aceptar"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accesibilidad"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fondo de pantalla"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambiar fondo de pantalla"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Detector de notificaciones"</string> <string name="vpn_title" msgid="19615213552042827">"VPN activada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN activada por <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Toca para administrar la red."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Ir al escritorio"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Desplazarse hacia arriba"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Más opciones"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Almacenamiento interno"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Tarjeta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Almacenamiento USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Esta aplicación no admite cuentas de usuarios limitados."</string> <string name="app_not_found" msgid="3429141853498927379">"No se ha encontrado ninguna aplicación que pueda realizar esta acción."</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Revocar"</string> </resources> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index e78e1698b5c2..d2d4d63abb00 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Võimaldab rakendusel muuta võrgukasutuse loendamist rakenduste suhtes. Mitte kasutada tavarakenduste puhul."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"juurdepääsu märguanded"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Võimaldab rakendusel tuua, kontrollida ja kustutada märguandeid, sh neid, mille on postitanud teised rakendused."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"seo märguannete kuulamisteenusega"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Võimaldab omanikul siduda märguannete kuulamisteenuse ülemise taseme kasutajaliidese. Seda ei tohiks tavarakenduste puhul kunagi vaja olla."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Parooli reeglite määramine"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrollige ekraaniluku avamise paroolide pikkust ja tähemärke."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekraani avamiskatsed"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstitoimingud"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Talletusruum saab täis"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Mõned süsteemifunktsioonid ei pruugi töötada"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> töötab"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Puudutage lisateabe saamiseks või rakenduse peatamiseks."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Tühista"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Juurdepääsetavus"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Taustapilt"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Muutke taustapilti"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Märguannete kuulamisteenus"</string> <string name="vpn_title" msgid="19615213552042827">"VPN on aktiveeritud"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN-i aktiveeris <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Võrgu haldamiseks puudutage."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Liigu avalehele"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Liigu üles"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Rohkem valikuid"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Sisemine salvestusruum"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kaart"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-mäluseade"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Viga"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Rakendus ei toeta piiratud õigustega kasutajate kontosid"</string> <string name="app_not_found" msgid="3429141853498927379">"Selle toimingu käsitlemiseks ei leitud ühtegi rakendust"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Tühista"</string> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 3ab64c035a6d..f723c378e7cd 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"به برنامه اجازه میدهد تا نحوه محاسبه کاربرد شبکه در برنامه را تغییر دهد. برای استفاده برنامههای عادی نیست."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"اعلانهای دسترسی"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"به برنامه اجازه میدهد به بازیابی، بررسی و پاک کردن اعلانها از جمله موارد پست شده توسط سایر برنامهها بپردازد."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"اتصال به یک سرویس شنونده اعلان"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"به دارنده اجازه میدهد به یک رابط سطح بالای سرویس شنونده اعلان متصل شود. این هرگز برای برنامههای عادی ضروری نیست."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"تنظیم قوانین رمز ورود"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"طول و نویسههای مجاز در گذرواژههای بازکردن قفل صفحه را کنترل کنید."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"نمایش تلاشهای قفل گشایی صفحه"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"عملکردهای متنی"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"فضای ذخیرهسازی رو به اتمام است"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"برخی از عملکردهای سیستم ممکن است کار نکنند"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> در حال اجرا است"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"برای کسب اطلاعات بیشتر یا توقف برنامه لمس کنید."</string> <string name="ok" msgid="5970060430562524910">"تأیید"</string> <string name="cancel" msgid="6442560571259935130">"لغو"</string> <string name="yes" msgid="5362982303337969312">"تأیید"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"قابلیت دسترسی"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"تصویر زمینه"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"تغییر تصویر زمینه"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"شنونده اعلان"</string> <string name="vpn_title" msgid="19615213552042827">"VPN فعال شد"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN توسط <xliff:g id="APP">%s</xliff:g> فعال شده است"</string> <string name="vpn_text" msgid="3011306607126450322">"برای مدیریت شبکه لمس کنید."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"رفتن به صفحهٔ اصلی"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"حرکت به بالا"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"سایر گزینهها"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"حافظهٔ داخلی"</string> <string name="storage_sd_card" msgid="3282948861378286745">"کارت SD"</string> <string name="storage_usb" msgid="3017954059538517278">"حافظهٔ USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"خطا"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"این برنامه حسابهای تعداد محدودی از کاربران را پشتیبانی نمیکند"</string> <string name="app_not_found" msgid="3429141853498927379">"برنامهای برای انجام این عملکرد موجود نیست"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"لغو"</string> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 86a9faedc100..7f7f07a9ace8 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Antaa sovelluksen muokata, miten sovellusten verkonkäyttöä lasketaan. Ei tavallisten sovellusten käyttöön."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"käytä ilmoituksia"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Antaa sovelluksen noutaa, tutkia ja tyhjentää ilmoituksia (myös muiden sovelluksien lähettämiä)."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"sido ilmoituskuuntelijapalveluun"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Antaa sovelluksen sitoutua ilmoituskuuntelijan ylimmän tason käyttöliittymään. Ei tavallisten sovelluksien käyttöön."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Aseta salasanasäännöt"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Hallinnoi ruudun lukituksenpoistosalasanoissa sallittuja merkkejä ja salasanan pituutta."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Tarkkaile ruudun lukituksen poistoyrityksiä"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstitoiminnot"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Tallennustila loppumassa"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Kaikki järjestelmätoiminnot eivät välttämättä toimi"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> on käynnissä"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Hanki lisätietoja tai sulje sovellus koskettamalla."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Peruuta"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Esteettömyys"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Taustakuva"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Vaihda taustakuvaa"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Ilmoituskuuntelija"</string> <string name="vpn_title" msgid="19615213552042827">"VPN on aktivoitu"</string> <string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> on aktivoinut VPN-yhteyden"</string> <string name="vpn_text" msgid="3011306607126450322">"Voit hallinnoida verkkoa koskettamalla."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Siirry etusivulle"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Siirry ylös"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Lisää asetuksia"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Sisäinen tallennustila"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kortti"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-tallennustila"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Virhe"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Tämä sovellus ei tue rajoitettujen käyttäjien tilejä"</string> <string name="app_not_found" msgid="3429141853498927379">"Tätä toimintoa käsittelevää sovellusta ei löydy"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Peruuta"</string> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 3b539da8f209..65c4ce57521e 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permet à l\'application de modifier l\'utilisation du réseau par les autres applications. Les applications standards ne doivent pas utiliser cette fonctionnalité."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"accéder aux notifications"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permet aux applications de récupérer, d\'examiner et d\'autoriser les notifications, y compris celles envoyées par d\'autres applications."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"s\'associer à l\'interface de niveau supérieur d\'un service d\'écoute des notifications"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Permet à l\'application de s\'associer à l\'interface de niveau supérieur d\'un service d\'écoute des notifications. Ne devrait jamais être nécessaire pour les applications normales."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Définir les règles du mot de passe"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Choisir le nombre et le type de caractères autorisés dans les mots de passe de déverrouillage de l\'écran"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Gérer les tentatives de déverrouillage de l\'écran"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Actions sur le texte"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Espace de stockage bientôt saturé"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Il est possible que certaines fonctionnalités du système ne soient pas opérationnelles."</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> en cours d\'exécution"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Appuyez ici pour en savoir plus ou arrêter l\'application."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Annuler"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibilité"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fond d\'écran"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Changer de fond d\'écran"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Outil d\'écoute des notifications"</string> <string name="vpn_title" msgid="19615213552042827">"VPN activé"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN activé par <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Appuyez ici pour gérer le réseau."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Retour à l\'accueil"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Parcourir vers le haut"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Plus d\'options"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Mémoire de stockage interne"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Carte SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Mémoire de stockage USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Erreur"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Les comptes des utilisateurs en accès limité ne sont pas acceptés pour cette application."</string> <string name="app_not_found" msgid="3429141853498927379">"Aucune application trouvée pour gérer cette action."</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Révoquer"</string> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index ac209192938e..79dbfff32700 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"एप्लिकेशन को यह संशोधित करने देता है कि एप्लिकेशन की तुलना में नेटवर्क उपयोग का मूल्यांकन कैसे किया जाता है. सामान्य एप्लिकेशन द्वारा उपयोग करने के लिए नहीं."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"सूचनाओं तक पहुंचें"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"एप्लिकेशन को सूचनाओं को प्राप्त करने, जांच करने, और साफ़ करने देता है, जिनमें अन्य एप्लिकेशन के द्वारा पोस्ट की गई सूचनाएं भी शामिल हैं."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"सूचना श्रवणकर्ता सेवा से जुड़ें"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"धारक को सूचना श्रवणकर्ता सेवा के शीर्ष स्तरीय इंटरफ़ेस से जुड़ने देती है. सामान्य एप्लिकेशन के लिए कभी भी आवश्यक नहीं होनी चाहिए."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"पासवर्ड नियम सेट करें"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"स्क्रीन-अनलॉक पासवर्ड में अनुमति प्राप्त लंबाई और वर्णों को नियंत्रित करें."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"स्क्रीन-अनलॉक के प्रयासों पर निगरानी रखें"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"पाठ क्रियाएं"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"संग्रहण स्थान समाप्त हो रहा है"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"हो सकता है कुछ सिस्टम फ़ंक्शन कार्य न करें"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> चल रहा है"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"अधिक जानकारी के लिए या एप्लिकेशन रोकने के लिए स्पर्श करें."</string> <string name="ok" msgid="5970060430562524910">"ठीक"</string> <string name="cancel" msgid="6442560571259935130">"रद्द करें"</string> <string name="yes" msgid="5362982303337969312">"ठीक"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"पहुंच-योग्यता"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"वॉलपेपर"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"वॉलपेपर बदलें"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"सूचना श्रवणकर्ता"</string> <string name="vpn_title" msgid="19615213552042827">"VPN सक्रिय"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN को <xliff:g id="APP">%s</xliff:g> द्वारा सक्रिय किया गया है"</string> <string name="vpn_text" msgid="3011306607126450322">"नेटवर्क प्रबंधित करने के लिए स्पर्श करें."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"होम पर नेविगेट करें"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"ऊपर नेविगेट करें"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"अधिक विकल्प"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"आंतरिक संग्रहण"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD कार्ड"</string> <string name="storage_usb" msgid="3017954059538517278">"USB संग्रहण"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"त्रुटि"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"यह एप्लिकेशन सीमित उपयोगकर्ताओं के खातों का समर्थन नहीं करता है"</string> <string name="app_not_found" msgid="3429141853498927379">"इस कार्यवाही को प्रबंधित करने के लिए कोई एप्लिकेशन नहीं मिला"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"निरस्त करें"</string> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 9569a6c79c5a..90b44d24697a 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Omogućuje aplikaciji izmjenu načina upotrebe mreže u odnosu na aplikacije. Nije namijenjeno uobičajenim aplikacijama."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"pristup obavijestima"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Omogućuje aplikaciji dohvaćanje, pregledavanje i brisanje obavijesti, uključujući obavijesti drugih aplikacija."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"vezanje uz uslugu slušatelja obavijesti"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Nositelju omogućuje vezanje uz sučelje najviše razine usluge slušatelja obavijesti. Ne bi smjelo biti potrebno za uobičajene aplikacije."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Postavi pravila zaporke"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Upravljajte duljinom zaporki za otključavanje zaslona i dopuštenim znakovima u tim zaporkama."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Nadgledaj pokušaje otključavanja zaslona"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Radnje s tekstom"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ponestaje prostora za pohranu"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Neke sistemske funkcije možda neće raditi"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> pokrenuta je"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Dodirnite za više informacija ili da biste zaustavili aplikaciju."</string> <string name="ok" msgid="5970060430562524910">"U redu"</string> <string name="cancel" msgid="6442560571259935130">"Odustani"</string> <string name="yes" msgid="5362982303337969312">"U redu"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Dostupnost"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Pozadinska slika"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Promjena pozadinske slike"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Slušatelj obavijesti"</string> <string name="vpn_title" msgid="19615213552042827">"VPN aktiviran"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Aplikacija <xliff:g id="APP">%s</xliff:g> aktivirala je VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Dodirnite za upravljanje mrežom."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Kreni na početnu"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Kreni gore"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Više opcija"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Interna pohrana"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD kartica"</string> <string name="storage_usb" msgid="3017954059538517278">"USB pohrana"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Pogreška"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Aplikacija ne podržava račune za ograničene korisnike"</string> <string name="app_not_found" msgid="3429141853498927379">"Nije pronađena aplikacija za upravljanje ovom radnjom"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Opozovi"</string> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 61e370752259..d71ac239b45b 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Lehetővé teszi az alkalmazás számára annak módosítását, hogy a hálózathasználatot hogyan számolják el az alkalmazások esetében. Normál alkalmazások nem használhatják."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"hozzáférési értesítések"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Lehetővé teszi, hogy az alkalmazás értesítéseket kérdezzen le, vizsgáljon és tisztítson meg, beleértve az egyéb alkalmazások által közzétett értesítéseket is."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"csatlakozzon értesítésfigyelő szolgáltatáshoz"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Lehetővé teszi a használó számára, hogy csatlakozzon egy értesítésfigyelő szolgáltatás legfelső szintű felületéhez. A normál alkalmazásoknak erre soha nincs szükségük."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Jelszavakkal kapcsolatos szabályok beállítása"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"A képernyőzár-feloldási jelszavakban engedélyezett karakterek és hosszúság vezérlése."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Képernyőzár-feloldási kísérletek figyelése"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Műveletek szöveggel"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Kevés a szabad terület"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Előfordulhat, hogy néhány rendszerfunkció nem működik."</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> jelenleg fut"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"További információért, illetve az alkalmazás leállításához érintse meg."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Mégse"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Kisegítő lehetőségek"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Háttérkép"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Háttérkép megváltoztatása"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Értesítésfigyelő"</string> <string name="vpn_title" msgid="19615213552042827">"VPN aktiválva"</string> <string name="vpn_title_long" msgid="6400714798049252294">"A(z) <xliff:g id="APP">%s</xliff:g> aktiválta a VPN-t"</string> <string name="vpn_text" msgid="3011306607126450322">"Érintse meg a hálózat kezeléséhez."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Ugrás a főoldalra"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Felfele mozgás"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"További lehetőségek"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Belső tárhely"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kártya"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-tár"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Hiba"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ez az alkalmazás nem támogatja a korlátozott jogokkal rendelkező felhasználói fiókokat."</string> <string name="app_not_found" msgid="3429141853498927379">"Nincs megfelelő alkalmazás a művelet elvégzésére."</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Visszavonás"</string> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index f4664e9a8001..a9b33de4dae5 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Mengizinkan apl memodifikasi cara penggunaan jaringan diperhitungkan terhadap apl. Tidak untuk digunakan oleh apl normal."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"mengakses pemberitahuan"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Mengizinkan aplikasi mengambil, memeriksa, dan menghapus pemberitahuan, termasuk pemberitahuan yang diposkan oleh aplikasi lain."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"mengikat layanan pendengar pemberitahuan"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Memungkinkan pemegang mengikat antarmuka tingkat teratas dari suatu layanan pendengar pemberitahuan. Tidak pernah diperlukan oleh aplikasi normal."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Setel aturan sandi"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrol panjang dan karakter yang diizinkan dalam sandi pembuka layar."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Upaya pembukaan kunci layar monitor"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tindakan teks"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ruang penyimpanan hampir habis"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Beberapa fungsi sistem mungkin tidak dapat bekerja"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> sedang berjalan"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Sentuh untuk informasi selengkapnya atau hentikan aplikasi."</string> <string name="ok" msgid="5970060430562524910">"Oke"</string> <string name="cancel" msgid="6442560571259935130">"Batal"</string> <string name="yes" msgid="5362982303337969312">"Oke"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Aksesibilitas"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Wallpaper"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Ubah wallpaper"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Pendengar pemberitahuan"</string> <string name="vpn_title" msgid="19615213552042827">"VPN diaktifkan"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN diaktifkan oleh <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Sentuh untuk mengelola jaringan."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigasi ke beranda"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigasi naik"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Opsi lainnya"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Penyimpanan internal"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Kartu SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Penyimpanan USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Kesalahan"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Aplikasi ini tidak mendukung akun untuk pengguna terbatas"</string> <string name="app_not_found" msgid="3429141853498927379">"Tidak ada aplikasi yang ditemukan untuk menangani tindakan ini"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Cabut"</string> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 592492a92a66..560b049b3728 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Consente all\'applicazione di modificare il calcolo dell\'utilizzo della rete tra le applicazioni. Da non usare per normali applicazioni."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"accesso a notifiche"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Consente all\'app di recuperare, esaminare e cancellare notifiche, comprese quelle pubblicate da altre app."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"vincolo a un servizio listener di notifica"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Consente al titolare di vincolarsi all\'interfaccia di primo livello di un servizio listener di notifica. Non dovrebbe mai essere necessaria per le normali applicazioni."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Imposta regole password"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlla la lunghezza e i caratteri ammessi nelle password di sblocco dello schermo."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitora tentativi di sblocco dello schermo"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Azioni testo"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Spazio di archiviazione in esaurimento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Alcune funzioni di sistema potrebbero non funzionare"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> è in esecuzione"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Tocca per ulteriori informazioni o per interrompere l\'app."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Annulla"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibilità"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Sfondo"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambia sfondo"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Listener di notifica"</string> <string name="vpn_title" msgid="19615213552042827">"VPN attiva"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN attivata da <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Tocca per gestire la rete."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Vai alla home page"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Vai in alto"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Altre opzioni"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Memoria interna"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Scheda SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Archivio USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Errore"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Questa applicazione non supporta account di utenti con limitazioni"</string> <string name="app_not_found" msgid="3429141853498927379">"Nessuna applicazione trovata in grado di gestire questa azione"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Revoca"</string> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 97c52c5d69e7..42f0e2df063f 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"הרשאה זו מאפשרת ליישום לשנות את אופן החישוב של נתוני שימוש ברשת מול כל יישום. לא מיועד לשימוש ביישומים רגילים."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"גישה להתראות"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"מאפשר ליישום לאחזר, לבדוק ולמחוק התראות, כולל כאלה שפורסמו על ידי יישומים אחרים."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"איגוד לשירות של מאזין להתראות"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"הרשאה זו מאפשרת למשתמש לבצע איגוד לממשק הרמה העליונה של שירות מאזין להתראות. הרשאה זו אף פעם אינה נחוצה ליישומים רגילים."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"הגדר כללי סיסמה"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"שלוט באורך ובתווים המותרים בסיסמאות לביטול נעילת מסך."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"עקוב אחר ניסיונות לביטול נעילת מסך"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"פעולות טקסט"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"שטח האחסון אוזל"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"ייתכן שפונקציות מערכת מסוימות לא יפעלו"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> פועל"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"גע לקבלת מידע נוסף או כדי לעצור את היישום."</string> <string name="ok" msgid="5970060430562524910">"אישור"</string> <string name="cancel" msgid="6442560571259935130">"ביטול"</string> <string name="yes" msgid="5362982303337969312">"אישור"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"נגישות"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"טפט"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"שנה טפט"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"מאזין להתראות"</string> <string name="vpn_title" msgid="19615213552042827">"VPN מופעל"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN מופעל על ידי <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"גע כדי לנהל את הרשת."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"נווט לדף הבית"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"נווט למעלה"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"אפשרויות נוספות"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"אחסון פנימי"</string> <string name="storage_sd_card" msgid="3282948861378286745">"כרטיס SD"</string> <string name="storage_usb" msgid="3017954059538517278">"אחסון USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"שגיאה"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"היישום הזה לא תומך בחשבונות עבור משתמשים מוגבלים"</string> <string name="app_not_found" msgid="3429141853498927379">"לא נמצא יישום שתומך בפעולה זו"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"בטל"</string> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 0abacb151280..f6b93f9ac6f7 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"アプリに対するネットワーク利用の計算方法を変更することをアプリに許可します。通常のアプリでは使用しません。"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"通知にアクセス"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"通知（他のアプリから投稿されたものも含む）を取得、調査、クリアすることをアプリに許可します。"</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"通知リスナーサービスにバインド"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"通知リスナーサービスのトップレベルインターフェースにバインドすることを所有者に許可します。通常のアプリでは不要です。"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"パスワードルールの設定"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"画面ロック解除パスワードの長さと使用できる文字を制御します。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"画面ロック解除試行の監視"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"テキスト操作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"空き容量わずか"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"一部のシステム機能が動作しない可能性があります"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g>を実行しています"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"タップすると詳細が表示されるか、アプリが停止します。"</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"キャンセル"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"ユーザー補助"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"壁紙"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"壁紙を変更"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"通知リスナー"</string> <string name="vpn_title" msgid="19615213552042827">"VPNが有効になりました"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPNが<xliff:g id="APP">%s</xliff:g>により有効化されました"</string> <string name="vpn_text" msgid="3011306607126450322">"タップしてネットワークを管理します。"</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"ホームへ移動"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"上へ移動"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"その他のオプション"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s、%2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s、%2$s、%3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"内部ストレージ"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SDカード"</string> <string name="storage_usb" msgid="3017954059538517278">"USBストレージ"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"エラー"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"このアプリでは限定ユーザー用のアカウントはサポートしていません"</string> <string name="app_not_found" msgid="3429141853498927379">"この操作を行うアプリが見つかりません"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"取り消し"</string> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index b07878c47286..5f50ac4ef48a 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"애플리케이션이 애플리케이션의 네트워크 사용량을 계산하는 방식을 수정할 수 있도록 허용합니다. 일반 애플리케이션에서는 사용하지 않습니다."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"알림 액세스"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"앱이 다른 앱에서 게시한 알림을 비롯하여 알림을 검색하고 살펴보며 삭제할 수 있도록 허용합니다."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"알림 수신기 서비스 사용"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"권한을 가진 프로그램이 알림 수신기 서비스에 대한 최상위 인터페이스를 사용하도록 허용합니다. 일반 앱에는 필요하지 않습니다."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"비밀번호 규칙 설정"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"화면 잠금해제 비밀번호에 허용되는 길이 및 문자 수를 제어합니다."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"화면 잠금해제 시도 모니터링"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"텍스트 작업"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"저장 공간이 부족함"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"일부 시스템 기능이 작동하지 않을 수 있습니다."</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g>이(가) 실행 중입니다."</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"자세한 정보를 보거나 앱을 중지하려면 터치하세요."</string> <string name="ok" msgid="5970060430562524910">"확인"</string> <string name="cancel" msgid="6442560571259935130">"취소"</string> <string name="yes" msgid="5362982303337969312">"확인"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"접근성"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"배경화면"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"배경화면 변경"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"알림 수신기"</string> <string name="vpn_title" msgid="19615213552042827">"VPN이 활성화됨"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN이 <xliff:g id="APP">%s</xliff:g>에 의해 활성화됨"</string> <string name="vpn_text" msgid="3011306607126450322">"네트워크를 관리하려면 터치하세요."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"홈 탐색"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"위로 탐색"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"옵션 더보기"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"내부 저장소"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD 카드"</string> <string name="storage_usb" msgid="3017954059538517278">"USB 저장소"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"오류"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"이 애플리케이션은 제한된 사용자를 위한 계정을 지원하지 않습니다."</string> <string name="app_not_found" msgid="3429141853498927379">"이 작업을 처리하는 애플리케이션을 찾을 수 없습니다."</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"취소"</string> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 1b7b68e14764..9237a2cd76f0 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Leidžiama programai keisti, kaip tinklas naudojamas, palyginti su programomis. Neskirta naudoti įprastoms programoms."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"pasiekti pranešimus"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Programai leidžiama gauti, patikrinti ir išvalyti pranešimus, įskaitant pranešimus, kuriuos paskelbė kitos programos."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"susisaistyti su pranešimų skaitymo priemonės paslauga"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Leidžiama turėtojui susisaistyti su pranešimų skaitymo priemonės paslaugos aukščiausio lygio sąsaja. Įprastoms programoms to neturėtų prireikti."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nustatyti slaptažodžio taisykles"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Valdyti leidžiamą ekrano atrakinimo slaptažodžių ilgį ir leidžiamus naudoti simbolius."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Stebėti bandymus atrakinti ekraną"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksto veiksmai"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Mažėja laisvos saugyklos vietos"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Kai kurios sistemos funkcijos gali neveikti"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ vykdoma"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Palieskite, jei norite gauti daugiau informacijos arba sustabdyti programą."</string> <string name="ok" msgid="5970060430562524910">"Gerai"</string> <string name="cancel" msgid="6442560571259935130">"Atšaukti"</string> <string name="yes" msgid="5362982303337969312">"Gerai"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Pasiekiamumas"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Darbalaukio fonas"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Keisti darbalaukio foną"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Pranešimų skaitymo priemonė"</string> <string name="vpn_title" msgid="19615213552042827">"VPN suaktyvintas"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN suaktyvino „<xliff:g id="APP">%s</xliff:g>“"</string> <string name="vpn_text" msgid="3011306607126450322">"Palieskite, kad valdytumėte tinklą."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Naršyti pagrindinį puslapį"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Naršyti į viršų"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Daugiau parinkčių"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Vidinė atmintis"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD kortelė"</string> <string name="storage_usb" msgid="3017954059538517278">"USB atmintis"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Klaida"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ši programa nepalaiko apribotų naudotojų paskyrų"</string> <string name="app_not_found" msgid="3429141853498927379">"Nerasta programa šiam veiksmui apdoroti"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Anuliuoti"</string> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 9ae5381d71b7..1de841e04d8a 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Ļauj lietotnei mainīt to, kā tīkla lietojums tiek uzskaitīts saistībā ar lietotnēm. Atļauja neattiecas uz parastām lietotnēm."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"piekļuve paziņojumiem"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Ļauj lietotnei izgūt, pārbaudīt un dzēst paziņojumus, tostarp lietotņu publicētos paziņojumus."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"saites izveidošana ar paziņojumu uztvērēja pakalpojumu"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Ļauj īpašniekam izveidot saiti ar paziņojumu uztvērēja pakalpojuma augšējā līmeņa saskarni. Parastajām lietotnēm tas nekad nav nepieciešams."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Paroles kārtulu iestatīšana"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolē ekrāna atbloķēšanas parolē atļautās rakstzīmes un garumu."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekrāna atbloķēšanas mēģinājumu pārraudzīšana"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksta darbības"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Paliek maz brīvas vietas"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Dažas sistēmas funkcijas var nedarboties."</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> darbojas"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Pieskarieties, lai iegūtu plašāku informāciju vai apturētu lietotnes darbību."</string> <string name="ok" msgid="5970060430562524910">"Labi"</string> <string name="cancel" msgid="6442560571259935130">"Atcelt"</string> <string name="yes" msgid="5362982303337969312">"Labi"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Pieejamība"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fona tapete"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Tapetes maiņa"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Paziņojumu uztvērējs"</string> <string name="vpn_title" msgid="19615213552042827">"VPN ir aktivizēts."</string> <string name="vpn_title_long" msgid="6400714798049252294">"Lietojumprogramma <xliff:g id="APP">%s</xliff:g> aktivizēja VPN."</string> <string name="vpn_text" msgid="3011306607126450322">"Pieskarieties, lai pārvaldītu tīklu."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Pārvietoties uz sākuma ekrānu"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Pārvietoties augšup"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Vairāk opciju"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s: %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s: %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Iekšējā atmiņa"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD karte"</string> <string name="storage_usb" msgid="3017954059538517278">"USB atmiņa"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Kļūda"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Šajā lietojumprogrammā netiek atbalstīti ierobežotu lietotāju konti."</string> <string name="app_not_found" msgid="3429141853498927379">"Netika atrasta neviena lietojumprogramma, kas var veikt šo darbību."</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Atsaukt"</string> </resources> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index bbde90dd4ff0..af5b866aa2e1 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Membenarkan apl untuk mengubah suai bagaimana penggunaan rangkaian diambil kira terhadap apl. Bukan untuk digunakan oleh apl biasa."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"pemberitahuan akses"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Membenarkan apl untuk mendapatkan semula, memeriksa dan memadam bersih pemberitahuan, termasuk yang disiarkan oleh apl lain."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"ikat kepada perkhidmatan pendengar pemberitahuan"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Membenarkan pemegang terikat dengan antara muka peringkat tertinggi bagi perkhidmatan pendengar pemberitahuan. Tidak sekali-kali diperlukan untuk apl biasa."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Tetapkan peraturan kata laluan"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Mengawal panjang dan aksara yang dibenarkan dalam kata laluan buka kunci skrin."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Memantau percubaan buka kunci skrin"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tindakan teks"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ruang storan semakin berkurangan"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Beberapa fungsi sistem mungkin tidak berfungsi"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> sedang berjalan"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Sentuh untuk maklumat lanjut atau untuk menghentikan apl."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Batal"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Kebolehaksesan"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Kertas dinding"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Tukar kertas dinding"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Pendengar pemberitahuan"</string> <string name="vpn_title" msgid="19615213552042827">"VPN diaktifkan"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN diaktifkan oleh <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Sentuh untuk mengurus rangkaian."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigasi laman utama"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigasi ke atas"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Lagi pilihan"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Storan dalaman"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Kad SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Storan USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Ralat"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Aplikasi ini tidak menyokong akaun untuk pengguna terhad"</string> <string name="app_not_found" msgid="3429141853498927379">"Tidak menemui aplikasi untuk mengendalikan tindakan ini"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Batalkan"</string> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 3bb502272414..e0d9bf27b091 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Lar appen endre hvordan nettverksbruk regnes ut for apper. Ikke beregnet på vanlige apper."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"varseltilgang"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Lar appen hente, gjennomgå og fjerne varsler, inkludert de som sendes fra andre apper."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"binding til en varsellyttertjeneste"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Lar innehaveren binde seg til det øverste grensesnittnivået for en varsellyttertjeneste. Skal aldri være nødvendig for vanlige apper."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Angi passordregler"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontroller tillatt lengde og tillatte tegn i passord for opplåsing av skjerm."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Overvåk forsøk på opplåsing av skjerm"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksthandlinger"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Lite ledig lagringsplass"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Enkelte systemfunksjoner fungerer muligens ikke slik de skal"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> kjører"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Trykk for mer informasjon, eller for å stoppe appen."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Avbryt"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Tilgjengelighet"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Bakgrunnsbilde"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Velg bakgrunnsbilde"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Varsellytteren"</string> <string name="vpn_title" msgid="19615213552042827">"VPN er aktivert"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN er aktivert av <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Trykk for å administrere nettverket."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Gå til startsiden"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Gå opp"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Flere alternativer"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s – %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s – %2$s – %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Intern lagring"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-lagring"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Feil"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Denne appen støtter ikke kontoer for brukere med begrensninger"</string> <string name="app_not_found" msgid="3429141853498927379">"Finner ingen apper som kan utføre denne handlingen"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Opphev"</string> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 4d71f0802986..2e92761e466e 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Hiermee kan een app aanpassen hoe het netwerkgebruik wordt toegekend aan apps. Dit wordt niet gebruikt door normale apps."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"toegang tot meldingen"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Hiermee kan de app meldingen ophalen, onderzoeken en wissen, waaronder meldingen die zijn verzonden door andere apps."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"koppelen aan een listener-service voor meldingen"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Hiermee kan de houder koppelen aan de hoofdinterface van een listener-service voor meldingen. Nooit vereist voor normale apps."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Wachtwoordregels instellen"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"De lengte en tekens beheren die zijn toegestaan in wachtwoorden voor schermontgrendeling."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Pogingen voor schermontgrendeling bijhouden"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstacties"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Opslagruimte is bijna vol"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Bepaalde systeemfuncties werken mogelijk niet"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> wordt uitgevoerd"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Raak aan voor meer informatie of om de app te stoppen."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Annuleren"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Toegankelijkheid"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Achtergrond"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Achtergrond wijzigen"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Listener voor meldingen"</string> <string name="vpn_title" msgid="19615213552042827">"VPN is geactiveerd"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN wordt geactiveerd door <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Raak aan om het netwerk te beheren."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigeren naar startpositie"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Omhoog navigeren"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Meer opties"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Interne opslag"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kaart"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-opslag"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Fout"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Deze app ondersteunt geen accounts voor beperkte gebruikers"</string> <string name="app_not_found" msgid="3429141853498927379">"Er is geen app gevonden om deze actie uit te voeren"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Intrekken"</string> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index f4fe46646beb..d8a4bf97e4f5 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Pozwala aplikacji na zmienianie sposobu rozliczania wykorzystania sieci przez aplikacje. Nieprzeznaczone dla zwykłych aplikacji."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"dostęp do powiadomień"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Umożliwia aplikacji pobieranie, sprawdzanie i usuwanie powiadomień, także tych, które pochodzą z innych aplikacji."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"utwórz połączenie z usługą odbiornika powiadomień"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Zezwala na tworzenie powiązania z interfejsem najwyższego poziomu usługi odbiornika powiadomień. Nie powinno być nigdy potrzebne dla zwykłych aplikacji."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Określ reguły hasła"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolowanie długości haseł odblokowania ekranu i dozwolonych w nich znaków"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitoruj próby odblokowania ekranu"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Działania na tekście"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Kończy się miejsce"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Niektóre funkcje systemu mogą nie działać"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> jest uruchomiona"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Kliknij, aby uzyskać więcej informacji lub zatrzymać aplikację."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Anuluj"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Ułatwienia dostępu"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapeta"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Zmień tapetę"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Odbiornik powiadomień"</string> <string name="vpn_title" msgid="19615213552042827">"VPN aktywny"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Obsługa sieci VPN została włączona przez aplikację <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Dotknij, aby zarządzać siecią."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Przejdź do strony głównej"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Przejdź wyżej"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Więcej opcji"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Pamięć wewnętrzna"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Karta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Nośnik USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Błąd"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ta aplikacja nie obsługuje kont użytkowników z ograniczeniami"</string> <string name="app_not_found" msgid="3429141853498927379">"Nie znaleziono aplikacji do obsługi tej akcji"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Cofnij"</string> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 36751b1728dc..66d50e63d088 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite que a aplicação modifique o modo como a utilização da rede é contabilizada em relação a aplicações. Nunca é necessário para aplicações normais."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"aceder às notificações"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite que a aplicação obtenha, examine e limpe notificações, incluindo as que foram publicadas por outras aplicações."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"vincular a um serviço de escuta de notificações"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Permite que o titular vincule a interface de nível superior de um serviço de escuta de notificações. Nunca deverá ser necessário para aplicações normais."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Definir regras de palavra-passe"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar o comprimento e os caracteres permitidos nas palavras-passe de desbloqueio do ecrã."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitorizar tentativas de desbloqueio do ecrã"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acções de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Está quase sem espaço de armazenamento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Algumas funções do sistema poderão não funcionar"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> em execução"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Toque para obter mais informações ou para parar a aplicação."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Cancelar"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Acessibilidade"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Imagem de fundo"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Alterar imagem de fundo"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Serviço de escuta de notificações"</string> <string name="vpn_title" msgid="19615213552042827">"VPN ativada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"A VPN foi ativada pelo <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Toque para gerir a rede."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navegar para página inicial"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navegar para cima"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mais opções"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"memória de armazenamento interno"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Cartão SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Armazenamento USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Erro"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Esta aplicação não suporta contas de utilizadores limitados"</string> <string name="app_not_found" msgid="3429141853498927379">"Não foram encontradas aplicações para executar esta ação"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Revogar"</string> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 61716fe5768e..3877158780c5 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite que o aplicativo modifique como o uso da rede é contabilizado em relação aos aplicativos. Não deve ser usado em aplicativos normais."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"acessar notificações"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite que o aplicativo recupere, examine e limpe notificações, inclusive as postadas por outros aplicativos."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"sujeitar a um serviço ouvinte de notificações"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Permite que o proprietário sujeite a interface de nível superior a um serviço ouvinte de notificações. Não deve ser necessário para aplicativos comuns."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Definir regras para senha"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controle o tamanho e os caracteres permitidos nas senhas de desbloqueio de tela."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitorar tentativas de desbloqueio da tela"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Ações de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Pouco espaço de armazenamento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Algumas funções do sistema podem não funcionar"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> está em execução"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Toque para mais informações ou para parar o aplicativo."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Cancelar"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Acessibilidade"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Plano de fundo"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Alterar plano de fundo"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Ouvinte de notificações"</string> <string name="vpn_title" msgid="19615213552042827">"VPN ativada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"A VPN está ativada por <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Toque para gerenciar a rede."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navegar na página inicial"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navegar para cima"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mais opções"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Armazenamento interno"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Cartão SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Armazenamento USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Erro"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"O aplicativo não suporta contas para usuários limitados"</string> <string name="app_not_found" msgid="3429141853498927379">"Nenhum aplicativo encontrado para executar a ação"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Revogar"</string> </resources> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 003f932d48af..21fcf0488bb5 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite aplicaţiei să modifice modul în care este calculată utilizarea reţelei pentru aplicaţii. Nu se utilizează de aplicaţiile obişnuite."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"accesare notificări"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite aplicației să recupereze, să examineze și să șteargă notificări, inclusiv pe cele postate de alte aplicații."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"conectare la un serviciu de citire a notificărilor"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Permite proprietarului să se conecteze la interfața de nivel superior a unui serviciu de citire a notificărilor. Nu ar trebui să fie niciodată necesară pentru aplicațiile obișnuite."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Setaţi reguli pentru parolă"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Stabiliţi lungimea şi tipul de caractere permise în parolele pentru deblocarea ecranului."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitorizaţi încercările de deblocare a ecranului"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acţiuni pentru text"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Spaţiul de stocare aproape ocupat"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Este posibil ca unele funcţii de sistem să nu funcţioneze"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> rulează acum"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Atingeți pentru mai multe informații sau pentru a opri aplicația."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Anulaţi"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accesibilitate"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Imagine de fundal"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Modificaţi imaginea de fundal"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Serviciu de citire a notificărilor"</string> <string name="vpn_title" msgid="19615213552042827">"VPN activat"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN este activată de <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Atingeţi pentru a gestiona reţeaua."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigaţi la ecranul de pornire"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigaţi în sus"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mai multe opţiuni"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Stocare internă"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Card SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Dsipozitiv de stocare USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Eroare"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Această aplicație nu acceptă conturile pentru utilizatori cu permisiuni limitate"</string> <string name="app_not_found" msgid="3429141853498927379">"Nicio aplicație pentru gestionarea acestei acțiuni"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Revocați"</string> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 2c8dfe800a72..592271b2ac34 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Приложение сможет изменять порядок расчета использования сетевых ресурсов различными программами. Это разрешение не используется обычными приложениями."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"доступ к уведомлениям"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Приложение сможет получать, проверять и удалять уведомления, включая те, что опубликованы другими приложениями."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"подключить к службе просмотра уведомлений"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Приложение сможет подключаться к базовому интерфейсу службы просмотра уведомлений. Это разрешение не используется обычными приложениями."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Правила выбора паролей"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролировать длину и символы при вводе паролей для снятия блокировки экрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Отслеживать попытки снятия блокировки экрана"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Операции с текстом"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Заканчивается свободное место"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Некоторые системные функции могут не работать"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" выполняется"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Нажмите, чтобы получить дополнительные данные или выключить приложение."</string> <string name="ok" msgid="5970060430562524910">"ОК"</string> <string name="cancel" msgid="6442560571259935130">"Отмена"</string> <string name="yes" msgid="5362982303337969312">"ОК"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Спец. возможности"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Фоновый рисунок"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Сменить обои"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Служба просмотра уведомлений"</string> <string name="vpn_title" msgid="19615213552042827">"Сеть VPN активна"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Сеть VPN активирована приложением <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Нажмите, чтобы открыть настройки."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Перейти на главную"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Перейти вверх"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Ещё"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Внутренняя память"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-карта"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-накопитель"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Ошибка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Приложение не поддерживает аккаунты с ограниченным доступом"</string> <string name="app_not_found" msgid="3429141853498927379">"Невозможно обработать это действие"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Отменить"</string> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 80a2c31ee6c3..228a9e73d2e5 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Umožňuje aplikácii upraviť používanie siete jednotlivými aplikáciami. Bežné aplikácie toto nastavenie nepoužívajú."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"prístup k upozorneniam"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Umožňuje aplikácii načítať, zobrazovať a mazať upozornenia vrátane tých, ktoré boli uverejnené inými aplikáciami."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"naviazanie sa na službu na počúvanie upozornení"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Umožňuje držiteľovi naviazať sa na najvyššiu úroveň služby na počúvanie upozornení. Bežné aplikácie by toto nastavenie nemali nikdy požadovať."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nastaviť pravidlá pre heslo"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Ovládanie dĺžky hesiel na odomknutie obrazovky a v nich používané znaky."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Sledovať pokusy o odomknutie obrazovky"</string> @@ -648,7 +646,7 @@ <string name="policylab_disableKeyguardFeatures" msgid="266329104542638802">"Zákaz funkcie v zámke kláves."</string> <string name="policydesc_disableKeyguardFeatures" msgid="3467082272186534614">"Zabrániť používaniu niektorých funkcií v zámke klávesov."</string> <string-array name="phoneTypes"> - <item msgid="8901098336658710359">"Domovská stránka"</item> + <item msgid="8901098336658710359">"Domov"</item> <item msgid="869923650527136615">"Mobil"</item> <item msgid="7897544654242874543">"Práca"</item> <item msgid="1103601433382158155">"Fax do práce"</item> @@ -658,19 +656,19 @@ <item msgid="9192514806975898961">"Vlastné"</item> </string-array> <string-array name="emailAddressTypes"> - <item msgid="8073994352956129127">"Domovská stránka"</item> + <item msgid="8073994352956129127">"Domov"</item> <item msgid="7084237356602625604">"Práca"</item> <item msgid="1112044410659011023">"Iné"</item> <item msgid="2374913952870110618">"Vlastné"</item> </string-array> <string-array name="postalAddressTypes"> - <item msgid="6880257626740047286">"Domovská stránka"</item> + <item msgid="6880257626740047286">"Domov"</item> <item msgid="5629153956045109251">"Práca"</item> <item msgid="4966604264500343469">"Iné"</item> <item msgid="4932682847595299369">"Vlastné"</item> </string-array> <string-array name="imAddressTypes"> - <item msgid="1738585194601476694">"Domovská stránka"</item> + <item msgid="1738585194601476694">"Domov"</item> <item msgid="1359644565647383708">"Práca"</item> <item msgid="7868549401053615677">"Iné"</item> <item msgid="3145118944639869809">"Vlastné"</item> @@ -691,7 +689,7 @@ <item msgid="1648797903785279353">"Jabber"</item> </string-array> <string name="phoneTypeCustom" msgid="1644738059053355820">"Vlastné"</string> - <string name="phoneTypeHome" msgid="2570923463033985887">"Domovská stránka"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Domov"</string> <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobil"</string> <string name="phoneTypeWork" msgid="8863939667059911633">"Práca"</string> <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Fax do práce"</string> @@ -716,16 +714,16 @@ <string name="eventTypeAnniversary" msgid="3876779744518284000">"Výročie"</string> <string name="eventTypeOther" msgid="7388178939010143077">"Iné"</string> <string name="emailTypeCustom" msgid="8525960257804213846">"Vlastné"</string> - <string name="emailTypeHome" msgid="449227236140433919">"Domovská stránka"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Domov"</string> <string name="emailTypeWork" msgid="3548058059601149973">"Práca"</string> <string name="emailTypeOther" msgid="2923008695272639549">"Iné"</string> <string name="emailTypeMobile" msgid="119919005321166205">"Mobil"</string> <string name="postalTypeCustom" msgid="8903206903060479902">"Vlastné"</string> - <string name="postalTypeHome" msgid="8165756977184483097">"Domovská stránka"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Domov"</string> <string name="postalTypeWork" msgid="5268172772387694495">"Práca"</string> <string name="postalTypeOther" msgid="2726111966623584341">"Iné"</string> <string name="imTypeCustom" msgid="2074028755527826046">"Vlastné"</string> - <string name="imTypeHome" msgid="6241181032954263892">"Domovská stránka"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Domov"</string> <string name="imTypeWork" msgid="1371489290242433090">"Práca"</string> <string name="imTypeOther" msgid="5377007495735915478">"Iné"</string> <string name="imProtocolCustom" msgid="6919453836618749992">"Vlastné"</string> @@ -757,7 +755,7 @@ <string name="relationTypeSister" msgid="1735983554479076481">"Sestra"</string> <string name="relationTypeSpouse" msgid="394136939428698117">"Manžel(-ka)"</string> <string name="sipAddressTypeCustom" msgid="2473580593111590945">"Vlastné"</string> - <string name="sipAddressTypeHome" msgid="6093598181069359295">"Domovská stránka"</string> + <string name="sipAddressTypeHome" msgid="6093598181069359295">"Domov"</string> <string name="sipAddressTypeWork" msgid="6920725730797099047">"Práca"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Iné"</string> <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Zadajte kód PIN"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Operácie s textom"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Nedostatok ukladacieho priestoru"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Niektoré systémové funkcie nemusia fungovať"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> je spustená"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Dotknutím sa zobrazíte viac informácií alebo zastavíte aplikáciu."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Zrušiť"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Zjednodušenie"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Tapeta"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Zmeniť tapetu"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Aplikácia na počúvanie upozornení"</string> <string name="vpn_title" msgid="19615213552042827">"Sieť VPN je aktivovaná"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Aplikáciu <xliff:g id="APP">%s</xliff:g> aktivovala sieť VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Dotykom môžete spravovať sieť."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Prejsť na plochu"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Prejsť na"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Viac možností"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Interné úložisko"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Karta SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Ukladací priestor USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Chyba"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Táto aplikácia nepodporuje účty v prípade používateľov s obmedzením"</string> <string name="app_not_found" msgid="3429141853498927379">"Aplikácia potrebná na spracovanie tejto akcie sa nenašla"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Odvolať"</string> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 766b605d4039..906c197ed830 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Programu omogoča, da spremeni uporabo omrežja na podlagi programov. Ni za uporabo z navadnimi programi."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"dostop do obvestil"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Dovoli aplikaciji, da prenese, razišče in izbriše obvestila, tudi tista, ki so jih objavile druge aplikacije."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"poveži se s storitvijo poslušalca obvestil"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Lastniku omogoča povezovanje z vmesnikom storitve poslušalca obvestil najvišje ravni. Tega nikoli ni treba uporabiti za navadne aplikacije."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nastavitev pravil za geslo"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Nadzor nad dolžino in znaki, ki so dovoljeni v geslih za odklepanje zaslona."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"nadzor nad poskusi odklepanja zaslona"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Besedilna dejanja"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Prostor za shranjevanje bo pošel"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Nekatere sistemske funkcije morda ne delujejo"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> se izvaja"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Dotaknite se, če želite izvedeti več ali ustaviti aplikacijo."</string> <string name="ok" msgid="5970060430562524910">"V redu"</string> <string name="cancel" msgid="6442560571259935130">"Prekliči"</string> <string name="yes" msgid="5362982303337969312">"V redu"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Pripomočki za osebe s posebnimi potrebami"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Ozadje"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Spreminjanje ozadja"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Poslušalec obvestil"</string> <string name="vpn_title" msgid="19615213552042827">"VPN aktiviran"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN je aktiviral program <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Dotaknite se, če želite upravljati omrežje."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Krmarjenje domov"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Krmarjenje navzgor"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Več možnosti"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Notranji pomnilnik"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Kartica SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Pomnilnik USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Napaka"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ta aplikacija ne podpira računov za uporabnike z omejitvami"</string> <string name="app_not_found" msgid="3429141853498927379">"Najdena ni bila nobena aplikacija za izvedbo tega dejanja"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Prekliči"</string> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 15b9ec54bf49..102ced6545fe 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Дозвољава апликацији да измени начин на који апликације користе мрежу. Не користе је уобичајене апликације."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"приступ обавештењима"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Дозвољава апликацији да преузима, испитује и брише обавештења, укључујући она која постављају друге апликације."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"повезивање са услугом монитора обавештења"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Дозвољава власнику да се повеже са интерфејсом услуге монитора обавештења највишег нивоа. Уобичајене апликације никада не би требало да је користе."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Подешавање правила за лозинку"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролишите дужину и знакове дозвољене у лозинкама за откључавање екрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Надгледање покушаја откључавања екрана"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Радње у вези са текстом"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Простор за складиштење је на измаку"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Неке системске функције можда не функционишу"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"Апликација <xliff:g id="APP_NAME">%1$s</xliff:g> је покренута"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Додирните за више информација или заустављање апликације."</string> <string name="ok" msgid="5970060430562524910">"Потврди"</string> <string name="cancel" msgid="6442560571259935130">"Откажи"</string> <string name="yes" msgid="5362982303337969312">"Потврди"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Приступачност"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Позадина"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Промена позадине"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Монитор обавештења"</string> <string name="vpn_title" msgid="19615213552042827">"VPN је активиран"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Апликација <xliff:g id="APP">%s</xliff:g> је активирала VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Додирните да бисте управљали мрежом."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Кретање до Почетне"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Кретање нагоре"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Још опција"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Интерна меморија"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD картица"</string> <string name="storage_usb" msgid="3017954059538517278">"USB меморија"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Грешка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ова апликација не подржава налоге за кориснике са ограничењем"</string> <string name="app_not_found" msgid="3429141853498927379">"Није пронађена ниједна апликација која би могла да обави ову радњу"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Опозови"</string> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 291681c38b92..adeffc3c59c0 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Tillåter att appen ändrar hur nätverksanvändning redovisas för appar. Används inte av vanliga appar."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"få åtkomst till meddelanden"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Tillåter att appen hämtar, granskar och raderar meddelanden, även sådana som skickats av andra appar."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"binda till en meddelandelyssnare"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Innehavaren tillåts att binda till den översta nivåns gränssnitt för en meddelandelyssnare. Ska inte behövas för vanliga appar."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Ange lösenordsregler"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Bestäm hur många och vilka tecken som är tillåtna i skärmlåsets lösenord."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Övervaka försök att låsa upp skärmen"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Textåtgärder"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Lagringsutrymmet börjar ta slut"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Det kan hända att vissa systemfunktioner inte fungerar"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> körs"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Tryck om du vill veta mer eller stoppa appen."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Avbryt"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Tillgänglighet"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Bakgrund"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Ändra bakgrund"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Meddelandelyssnare"</string> <string name="vpn_title" msgid="19615213552042827">"VPN är aktiverat"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN aktiveras av <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Tryck om du vill hantera nätverket."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Visa startsidan"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Navigera uppåt"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Fler alternativ"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Internminne"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-lagring"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Fel"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Appen har inte stöd för användarkonton med begränsningar"</string> <string name="app_not_found" msgid="3429141853498927379">"Ingen app som kan hantera åtgärden hittades"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Återkalla"</string> </resources> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index c8f13436ab59..0c113215fddc 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Huruhusu programu kurekebisha jinsi matumizi ya mtandao yana hesabika dhidi ya programu. Sio ya matumizi na programu za kawaida."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"fikia arifa"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Huruhusu programu kurejesha, kuchunguza, na kuondoa arifa, ikiwa ni pamoja na zile zilizochapishwa na programu nyingine."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"unganisha kwenye huduma ya kisikilizi cha arifa"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Inaruhusu kishikilizi kuunganishwa kwenye kiolesura cha kiwango cha juu cha huduma ya kisikilizi cha arifa. Haipaswi kuhitajika tena kwa programu za kawaida."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Weka kanuni za nenosiri"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Dhibiti urefu na vibambo vinavyoruhusiwa katika manenosiri ya kufungua skrini."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Chunguza majaribio ya kutofun gua skrini"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Vitendo vya maandishi"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Nafasi ya kuhafadhi inakwisha"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Baadhi ya vipengee vya mfumo huenda visifanye kazi"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> inaendesha"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Gusa ili upate maelezo zaidi au usitishe programu."</string> <string name="ok" msgid="5970060430562524910">"Sawa"</string> <string name="cancel" msgid="6442560571259935130">"Ghairi"</string> <string name="yes" msgid="5362982303337969312">"Sawa"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Ufikiaji"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Mandhari"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Badilisha mandhari"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Kisikilizi cha arifa"</string> <string name="vpn_title" msgid="19615213552042827">"VPN imewezeshwa"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN imeamilishwa na <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Gusa ili kudhibiti mtandao."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Abiri nyumbani"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Ongoza"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Chaguo zaidi"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Hifadhi ya mfumo"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Kadi ya SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Hifadhi ya USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Hitilafu"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Programu hii haiwezi kutumiwa na akaunti za watumiaji waliowekewa vizuizi"</string> <string name="app_not_found" msgid="3429141853498927379">"Hakuna programu iliyopatikana ili kushughulikia kitendo hiki"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Batilisha"</string> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 66b319901623..a92db7265fda 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"อนุญาตให้แอปพลิเคชันแก้ไขวิธีการบันทึกบัญชีการใช้งานเครือข่ายของแอปพลิเคชัน ไม่ใช้สำหรับแอปพลิเคชันทั่วไป"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"เข้าถึงการแจ้งเตือน"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"ทำให้แอปสามารถเรียกดู ตรวจสอบ และล้างการแจ้งเตือนได้ ซึ่งรวมถึงการแจ้งเตือนที่โพสต์โดยแอปอื่นๆ ด้วย"</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"เชื่อมโยงกับบริการตัวฟังการแจ้งเตือน"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"อนุญาตให้เจ้าของเชื่อมโยงกับอินเตอร์เฟซระดับสูงสุดของบริการตัวฟังการแจ้งเตือน ซึ่งไม่มีความจำเป็นสำหรับแอปธรรมดา"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"ตั้งค่ากฎรหัสผ่าน"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"ควบคุมความยาวและอักขระที่อนุญาตให้ใช้ในรหัสผ่านการปลดล็อกหน้าจอ"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"ตรวจสอบความพยายามในการปลดล็อกหน้าจอ"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"การทำงานของข้อความ"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"พื้นที่จัดเก็บเหลือน้อย"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"บางฟังก์ชันระบบอาจไม่ทำงาน"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> กำลังทำงาน"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"แตะเพื่อดูข้อมูลเพิ่มเติมหรือเพื่อหยุดแอป"</string> <string name="ok" msgid="5970060430562524910">"ตกลง"</string> <string name="cancel" msgid="6442560571259935130">"ยกเลิก"</string> <string name="yes" msgid="5362982303337969312">"ตกลง"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"การเข้าถึง"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"วอลเปเปอร์"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"เปลี่ยนวอลเปเปอร์"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"ตัวฟังการแจ้งเตือน"</string> <string name="vpn_title" msgid="19615213552042827">"VPN เปิดใช้งานแล้ว"</string> <string name="vpn_title_long" msgid="6400714798049252294">"เปิดใช้งาน VPN โดย <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"แตะเพื่อจัดการเครือข่าย"</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"นำทางไปหน้าแรก"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"นำทางขึ้น"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"ตัวเลือกเพิ่มเติม"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"ที่จัดเก็บข้อมูลภายใน"</string> <string name="storage_sd_card" msgid="3282948861378286745">"การ์ด SD"</string> <string name="storage_usb" msgid="3017954059538517278">"ที่เก็บข้อมูล USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"ข้อผิดพลาด"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"แอปพลิเคชันนี้ไม่สนับสนุนบัญชีผู้ใช้ที่ถูกจำกัด"</string> <string name="app_not_found" msgid="3429141853498927379">"ไม่พบแอปพลิเคชันสำหรับการทำงานนี้"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"เพิกถอน"</string> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index bd5f99df062f..e726333f52a4 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Pinapayagan ang app na baguhin kung paano isinasaalang-alang ang paggamit ng network laban sa apps. Hindi para sa paggamit ng normal na apps."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"i-access ang mga notification"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Pinapayagan ang app na kumuha, sumuri, at mag-clear ng mga notification, kabilang ang mga na-post ng iba pang apps."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"mapailalim sa isang serbisyo ng notification listener"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Nagbibigay-daan sa may-ari na mapailalim sa interface sa tuktok na antas ng isang serbisyo ng notification listener. Hindi dapat kailanganin para sa karaniwang apps kahit kailan."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Magtakda ng mga panuntunan sa password"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolin ang haba at mga character na pinapayagan sa mga password sa pag-unlock ng screen."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Subaybayan ang mga pagsubok sa pag-unlock ng screen"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Pagkilos ng teksto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Nauubusan na ang puwang ng storage"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Maaaring hindi gumana nang tama ang ilang paggana ng system"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"Tumatakbo ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Pindutin para sa higit pang impormasyon o upang ihinto ang app."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Kanselahin"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Kakayahang Ma-access"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Wallpaper"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Baguhin ang wallpaper"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Notification listener"</string> <string name="vpn_title" msgid="19615213552042827">"Naka-activate ang VPN"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Isinaaktibo ang VPN ng <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Pindutin upang pamahalaan ang network."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Magnabiga sa home"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Magnabiga pataas"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Higit pang mga pagpipilian"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Panloob na storage"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD card"</string> <string name="storage_usb" msgid="3017954059538517278">"USB storage"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Error"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Hindi sinusuportahan ng application na ito ang mga account para sa mga limitadong user"</string> <string name="app_not_found" msgid="3429141853498927379">"Walang nakitang application na mangangasiwa sa pagkilos na ito"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Bawiin"</string> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 79c3706b3a62..9e5e43bed0f0 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Uygulamaya, ağın uygulamalara göre nasıl kullanılacağını değiştirme izni verir. Normal uygulamalar tarafından kullanılmak için değildir."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"bildirimlere eriş"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Uygulamanın bildirimler almasına, bildirimleri incelemesine ve temizlemesine izin verir. Buna diğer uygulamalar tarafından yayınlanan bildirimler de dahildir."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"bildirim dinleyici hizmetine bağlan"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"İzin sahibine bir bildirim dinleyici hizmetinin en üst düzey arayüzüne bağlanma izni verir. Normal uygulamalarda hiçbir zaman gerek duyulmaz."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Şifre kuralları ayarla"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Ekran kilidini açma şifrelerinde izin verilen uzunluğu ve karakterleri denetleme."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekran kilidini açma denemelerini izle"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Metin eylemleri"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Depolama alanı bitiyor"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Bazı sistem işlevleri çalışmayabilir"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> çalışıyor"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Daha fazla bilgi edinmek için veya uygulamayı durdurmak için dokunun."</string> <string name="ok" msgid="5970060430562524910">"Tamam"</string> <string name="cancel" msgid="6442560571259935130">"İptal"</string> <string name="yes" msgid="5362982303337969312">"Tamam"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Erişebilirlik"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Duvar Kağıdı"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Duvar kağıdını değiştir"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Bildirim dinleyici"</string> <string name="vpn_title" msgid="19615213552042827">"VPN etkinleştirildi"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN, <xliff:g id="APP">%s</xliff:g> tarafından etkinleştirildi"</string> <string name="vpn_text" msgid="3011306607126450322">"Ağı yönetmek için dokunun."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Ana sayfaya git"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Yukarı git"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Diğer seçenekler"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Dahili depolama birimi"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD kart"</string> <string name="storage_usb" msgid="3017954059538517278">"USB bellek"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Hata"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Bu uygulama, kısıtlı kullanıcı hesaplarını desteklemiyor"</string> <string name="app_not_found" msgid="3429141853498927379">"Bu eylemi gerçekleştirecek bir uygulama bulunamadı"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"İptal et"</string> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index ad206d3f9397..bb223eafd614 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Дозволяє програмі змінювати метод підрахунку того, як програми використовують мережу. Не для використання звичайними програмами."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"отримувати доступ до сповіщень"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Дозволяє програмі отримувати, перевіряти й очищати сповіщення, зокрема опубліковані іншими програмами."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"прив’язуватися до служби читання сповіщень"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Дозволяє власнику прив’язуватися до інтерфейсу верхнього рівня служби читання сповіщень. Ніколи не застосовується для звичайних програм."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Устан. правила пароля"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролювати довжину паролів для розблокування екрана та дозволені в них символи."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Відстежув. спроби розблок. екрана"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Дії з текстом"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Закінчується пам’ять"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Деякі системні функції можуть не працювати"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> працює"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Торкніться, щоб дізнатися більше або зупинити програму."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Скасувати"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Доступність"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Фоновий мал."</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Змінити фоновий малюнок"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Служба читання сповіщень"</string> <string name="vpn_title" msgid="19615213552042827">"Мережу VPN активовано"</string> <string name="vpn_title_long" msgid="6400714798049252294">"Мережу VPN активовано програмою <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Торкніться, щоб керувати мережею."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Перейти на головну"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Перейти вгору"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Інші варіанти"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Внутрішня пам’ять"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Карта SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Носій USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Помилка"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ця програма не підтримує облікові записи для обмежених користувачів"</string> <string name="app_not_found" msgid="3429141853498927379">"Не знайдено програму для обробки цієї дії"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Анулювати"</string> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 4022f04291f6..a59214412f9a 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Cho phép ứng dụng sửa đổi cách tính mức sử dụng mạng so với ứng dụng. Không dành cho các ứng dụng thông thường."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"truy cập thông báo"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Cho phép ứng dụng truy xuất, kiểm tra và xóa thông báo, bao gồm những thông báo được đăng bởi các ứng dụng khác."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"liên kết với dịch vụ trình xử lý thông báo"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Cho phép chủ sở hữu liên kết với giao diện cấp cao nhất của dịch vụ trình xử lý thông báo. Không cần thiết cho các ứng dụng thông thường."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Đặt quy tắc mật khẩu"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kiểm soát độ dài và ký tự được phép trong mật khẩu mở khóa màn hình."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Giám sát những lần thử mở khóa màn hình"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tác vụ văn bản"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Sắp hết dung lượng lưu trữ"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Một số chức năng hệ thống có thể không hoạt động"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> đang chạy"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Chạm để xem thêm thông tin hoặc dừng ứng dụng."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Hủy"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Khả năng truy cập"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Hình nền"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Thay đổi hình nền"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Trình xử lý thông báo"</string> <string name="vpn_title" msgid="19615213552042827">"Đã kích hoạt VPN"</string> <string name="vpn_title_long" msgid="6400714798049252294">"VPN được <xliff:g id="APP">%s</xliff:g> kích hoạt"</string> <string name="vpn_text" msgid="3011306607126450322">"Chạm để quản lý mạng."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Điều hướng về trang chủ"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Điều hướng lên trên"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Tùy chọn khác"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Bộ nhớ trong"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Thẻ SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Bộ lưu trữ USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Lỗi"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Ứng dụng này không hỗ trợ tài khoản cho người dùng giới hạn"</string> <string name="app_not_found" msgid="3429141853498927379">"Không tìm thấy ứng dụng nào để xử lý tác vụ này"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Thu hồi"</string> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 5ebd3c7a70fd..79c79f3d7205 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"允许该应用修改对于各应用的网络使用情况的统计方式。普通应用不应使用此权限。"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"查看通知"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"允许该应用检索、检查并清除通知，包括其他应用发布的通知。"</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"绑定到通知侦听器服务"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"允许应用绑定到通知侦听器服务的顶级接口（普通应用绝不需要此权限）。"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"设置密码规则"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"控制屏幕解锁密码所允许的长度和字符。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"监视屏幕解锁尝试次数"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"文字操作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"存储空间不足"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"某些系统功能可能无法正常使用"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”正在运行"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"触摸即可了解详情或停止应用。"</string> <string name="ok" msgid="5970060430562524910">"确定"</string> <string name="cancel" msgid="6442560571259935130">"取消"</string> <string name="yes" msgid="5362982303337969312">"确定"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"辅助功能"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"壁纸"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"更改壁纸"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"通知侦听器"</string> <string name="vpn_title" msgid="19615213552042827">"VPN 已激活"</string> <string name="vpn_title_long" msgid="6400714798049252294">"“<xliff:g id="APP">%s</xliff:g>”已激活 VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"触摸可管理网络。"</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"导航首页"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"向上导航"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"更多选项"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s：%2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s - %2$s：%3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"内存设备"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD 卡"</string> <string name="storage_usb" msgid="3017954059538517278">"USB 存储器"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"错误"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"此应用不支持受限用户的帐户"</string> <string name="app_not_found" msgid="3429141853498927379">"找不到可处理此操作的应用"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"撤消"</string> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index a0c8c055a744..dfd91a47a766 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"允許應用程式修改應用程式網路使用量的計算方式 (不建議一般應用程式使用)。"</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"存取通知"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"允許應用程式擷取、檢查及清除通知 (包括由其他應用程式發佈的通知)。"</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"繫結至通知接聽器服務"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"允許應用程式繫結至通知接聽器服務的頂層介面 (一般應用程式不需使用)。"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"設定密碼規則"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"控制螢幕解鎖密碼所允許的長度和字元。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"監視螢幕解鎖嘗試次數"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"文字動作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"儲存空間即將用盡"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"部分系統功能可能無法運作"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」目前正在執行"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"輕觸即可瞭解詳情或停止應用程式。"</string> <string name="ok" msgid="5970060430562524910">"確定"</string> <string name="cancel" msgid="6442560571259935130">"取消"</string> <string name="yes" msgid="5362982303337969312">"確定"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"協助工具"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"桌布"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"變更桌布"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"通知接聽器"</string> <string name="vpn_title" msgid="19615213552042827">"VPN 已啟用"</string> <string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> 已啟用 VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"輕觸即可管理網路。"</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"瀏覽首頁"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"向上瀏覽"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"更多選項"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s：%2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s - %2$s：%3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"內部儲存空間"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD 卡"</string> <string name="storage_usb" msgid="3017954059538517278">"USB 儲存裝置"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"錯誤"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"這個應用程式不支援受限的使用者帳戶。"</string> <string name="app_not_found" msgid="3429141853498927379">"找不到支援此操作的應用程式"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"撤銷"</string> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 7f6260354dea..41ac207fc6a4 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -621,10 +621,8 @@ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Ivumela insiza ukuthi iguqule ukuthii ukusetshenziswa kwenethiwekhi kumiswa kanjani ezinsizeni. Ayisetshenziswa izinsiza ezijwayelekile."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"finyelela kuzaziso"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Ivumela uhlelo lokusebenza ukuthi lithole, lihlole, liphinde lisuse izaziso, ezifaka lezo ezithunyelwe ezinye izinhlelo zokusebenza."</string> - <!-- no translation found for permlab_bindNotificationListenerService (7057764742211656654) --> - <skip /> - <!-- no translation found for permdesc_bindNotificationListenerService (985697918576902986) --> - <skip /> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"bophezela kwisevisi yomlaleli wesaziso"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Ivumela umbambi ukubophezela kwisixhumi esibonakalayo sezinga eliphezulu lesevisi yomlaleli wesaziso. Akusoze kwadingeka kwizinhlelo zokusebenza ezivamile."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Misa imithetho yephasiwedi"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Lawula ubude nezinhlamvu ezivunyelwe kumaphasiwedi okuvula isikrini"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Gaka imizamo yokuvula isikrini"</string> @@ -1052,10 +1050,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Izenzo zombhalo"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Isikhala sokulondoloza siyaphela"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Eminye imisebenzi yohlelo ingahle ingasebenzi"</string> - <!-- no translation found for app_running_notification_title (8718335121060787914) --> - <skip /> - <!-- no translation found for app_running_notification_text (4653586947747330058) --> - <skip /> + <string name="app_running_notification_title" msgid="8718335121060787914">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> iyasebenza"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Thinta ukuthola ulwazi oluningi noma ukumisa uhlelo lokusebenza."</string> <string name="ok" msgid="5970060430562524910">"KULUNGILE"</string> <string name="cancel" msgid="6442560571259935130">"Khansela"</string> <string name="yes" msgid="5362982303337969312">"KULUNGILE"</string> @@ -1273,8 +1269,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"Ukufinyeleleka"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Iphephadonga"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"Shintsha iphephadonga"</string> - <!-- no translation found for notification_listener_binding_label (2014162835481906429) --> - <skip /> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Umlaleli wesaziso"</string> <string name="vpn_title" msgid="19615213552042827">"I-VPN isiyasebenza"</string> <string name="vpn_title_long" msgid="6400714798049252294">"i-VPN ivuswe ngu <xliff:g id="APP">%s</xliff:g>"</string> <string name="vpn_text" msgid="3011306607126450322">"Thinta ukuze wengamele inethiwekhi."</string> @@ -1378,10 +1373,8 @@ <string name="action_bar_home_description" msgid="5293600496601490216">"Zulazulela ekhaya"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Zulazulela phezulu"</string> <string name="action_menu_overflow_description" msgid="2295659037509008453">"Izinketho ezingaphezulu"</string> - <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> - <skip /> - <!-- no translation found for action_bar_home_subtitle_description_format (6985546530471780727) --> - <skip /> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> <string name="storage_internal" msgid="4891916833657929263">"Isitoreji sangaphakathi"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Ikhadi le-SD"</string> <string name="storage_usb" msgid="3017954059538517278">"Isitoreji se-USB"</string> @@ -1491,6 +1484,5 @@ <string name="error_message_title" msgid="4510373083082500195">"Iphutha"</string> <string name="app_no_restricted_accounts" msgid="5322164210667258876">"Lolu hlelo lokusebenza alusekeli ama-akhawunti wabasebenzisi abakhawulelwe"</string> <string name="app_not_found" msgid="3429141853498927379">"Alukho uhlelo lokusebenza olutholakele lokuphatha lesi senzo"</string> - <!-- no translation found for revoke (5404479185228271586) --> - <skip /> + <string name="revoke" msgid="5404479185228271586">"Chitha"</string> </resources> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 0afe4c132c5b..8821a01dcfad 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -570,7 +570,8 @@ this activity. --> <enum name="behind" value="3" /> <!-- Orientation is determined by a physical orientation sensor: - the display will rotate based on how the user moves the device. --> + the display will rotate based on how the user moves the device. + Ignores user's setting to turn off sensor-based rotation. --> <enum name="sensor" value="4" /> <!-- Always ignore orientation determined by orientation sensor: the display will not rotate when the user moves the device. --> @@ -593,6 +594,22 @@ the device will normally do (for example some devices won't normally use 180 degree rotation). --> <enum name="fullSensor" value="10" /> + <!-- Would like to have the screen in landscape orientation, but if + the user has enabled sensor-based rotation then we can use the + sensor to change which direction the screen is facing. --> + <enum name="userLandscape" value="11" /> + <!-- Would like to have the screen in portrait orientation, but if + the user has enabled sensor-based rotation then we can use the + sensor to change which direction the screen is facing. --> + <enum name="userPortrait" value="12" /> + <!-- Respect the user's sensor-based rotation preference, but if + sensor-based rotation is enabled then allow the screen to rotate + in all 4 possible directions regardless of what + the device will normally do (for example some devices won't + normally use 180 degree rotation). --> + <enum name="fullUser" value="13" /> + <!-- Screen is locked to its current rotation, whatever that is. --> + <enum name="locked" value="14" /> </attr> <!-- Specify one or more configuration changes that the activity will @@ -892,8 +909,13 @@ <!-- Declare that this application requires access to restricted accounts of a certain type. The default value is null and restricted accounts won\'t be visible to this application. The type should correspond to the account authenticator type, such as - "com.google" --> + "com.google". Only usable by system apps. --> <attr name="restrictedAccountType" format="string"/> + <!-- Declare that this application requires an account of a certain + type. The default value is null and indicates that the application can work without + any accounts. The type should correspond to the account authenticator type, such as + "com.google". --> + <attr name="requiredAccountType" format="string"/> </declare-styleable> <!-- The <code>permission</code> tag declares a security permission that can be @@ -996,8 +1018,9 @@ permission, and it must always be granted when it is installed. If you set this to false, then in some cases the application may be installed with it being granted the permission, and it will - need to request the permission later if it needs it. --> + need to request the permission later if it needs it. <attr name="required" format="boolean" /> + --> </declare-styleable> <!-- The <code>uses-configuration</code> tag specifies @@ -1040,7 +1063,7 @@ don't support it. If you set this to false, then this will not impose a restriction on where the application can be installed. --> - <attr name="required" /> + <attr name="required" format="boolean" /> </declare-styleable> <!-- The <code>uses-sdk</code> tag describes the SDK features that the diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 42d692fe4cff..074d91f9cbb5 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2042,6 +2042,7 @@ <public type="attr" name="childIndicatorStart" /> <public type="attr" name="childIndicatorEnd" /> <public type="attr" name="restrictedAccountType" /> + <public type="attr" name="requiredAccountType" /> <public type="style" name="Theme.NoTitleBar.Overscan" /> <public type="style" name="Theme.Light.NoTitleBar.Overscan" /> diff --git a/core/res/res/xml/storage_list.xml b/core/res/res/xml/storage_list.xml index 944bb3a94209..ceebdccdafe3 100644 --- a/core/res/res/xml/storage_list.xml +++ b/core/res/res/xml/storage_list.xml @@ -17,24 +17,12 @@ */ --> -<!-- The <device> element should contain one or more <storage> elements. - Exactly one of these should have the attribute primary="true". - This storage will be the primary external storage and should have mountPoint="/mnt/sdcard". - Each storage should have both a mountPoint and storageDescription attribute. - The following attributes are optional: - - primary: (boolean) this storage is the primary external storage - removable: (boolean) this is removable storage (for example, a real SD card) - emulated: (boolean) the storage is emulated via the FUSE sdcard daemon - mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage - (used for emulated storage that is shared with system's data partition) - - A storage should not have both emulated and removable set to true ---> +<!-- See storage config details at http://source.android.com/tech/storage/ --> <StorageList xmlns:android="http://schemas.android.com/apk/res/android"> <!-- removable is not set in nosdcard product --> - <storage android:mountPoint="/mnt/sdcard" - android:storageDescription="@string/storage_usb" - android:primary="true" /> + <storage + android:mountPoint="/storage/sdcard" + android:storageDescription="@string/storage_usb" + android:primary="true" /> </StorageList> diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml index 2ca77dd4bea9..3e3b12d06c49 100644 --- a/docs/html/_redirects.yaml +++ b/docs/html/_redirects.yaml @@ -24,6 +24,9 @@ redirects: - from: /sdk/installing/next.html to: /training/basics/firstapp/index.html +- from: /sdk/ndk/overview.html + to: /tools/sdk/ndk/index.html + - from: /sdk/ndk/... to: /tools/sdk/ndk/... @@ -113,13 +116,14 @@ redirects: - from: /guide/appendix/install-location.html to: /guide/topics/data/install-location.html -- from: /guide/basics/what-is-android.html +- from: /guide/basics/... to: /about/index.html - from: /guide/topics/security/security.html to: /training/articles/security-tips.html -# type: permanent -# comment: Move content and then adjust this + +- from: /guide/topics/security/index.html + to: /training/articles/security-tips.html - from: /guide/appendix/market-filters.html to: /google/play/filters.html diff --git a/docs/html/design/building-blocks/buttons.jd b/docs/html/design/building-blocks/buttons.jd index 9e82ed4c243a..600ec6c58a3b 100644 --- a/docs/html/design/building-blocks/buttons.jd +++ b/docs/html/design/building-blocks/buttons.jd @@ -1,5 +1,5 @@ page.title=Buttons -page.tags="button" +page.tags="button","input" @jd:body <p>A button consists of text and/or an image that clearly communicates what action will occur when the diff --git a/docs/html/design/building-blocks/grid-lists.jd b/docs/html/design/building-blocks/grid-lists.jd index 69a43b17ab9a..8c82ba97f023 100644 --- a/docs/html/design/building-blocks/grid-lists.jd +++ b/docs/html/design/building-blocks/grid-lists.jd @@ -1,5 +1,5 @@ page.title=Grid Lists -page.tags="gridview","layout" +page.tags="gridview","layout","listview" @jd:body <img src="{@docRoot}design/media/gridview_overview.png"> diff --git a/docs/html/design/building-blocks/progress.jd b/docs/html/design/building-blocks/progress.jd index 96cc1afca555..60ad2cad346f 100644 --- a/docs/html/design/building-blocks/progress.jd +++ b/docs/html/design/building-blocks/progress.jd @@ -1,5 +1,5 @@ page.title=Progress & Activity -page.tags="progressbar" +page.tags="progressbar","download","network" @jd:body <p>Progress bars and activity indicators signal to users that something is happening that will take a moment.</p> diff --git a/docs/html/design/building-blocks/spinners.jd b/docs/html/design/building-blocks/spinners.jd index 8c80b9178de6..3550b0cd5fb8 100644 --- a/docs/html/design/building-blocks/spinners.jd +++ b/docs/html/design/building-blocks/spinners.jd @@ -1,5 +1,5 @@ page.title=Spinners -page.tags="spinner","drop down" +page.tags="spinner","dropdown" @jd:body <p>Spinners provide a quick way to select one value from a set. In the default state, a spinner shows diff --git a/docs/html/design/building-blocks/switches.jd b/docs/html/design/building-blocks/switches.jd index 6386bdf5e64b..0b195b907fb1 100644 --- a/docs/html/design/building-blocks/switches.jd +++ b/docs/html/design/building-blocks/switches.jd @@ -1,5 +1,5 @@ page.title=Switches -page.tags="switch","checkbox","radiobutton" +page.tags="switch","checkbox","radiobutton","button" @jd:body <p>Switches allow the user to select options. There are three kinds of switches: checkboxes, radio diff --git a/docs/html/design/building-blocks/tabs.jd b/docs/html/design/building-blocks/tabs.jd index 1fe2c6203fdf..79cc9c76bf42 100644 --- a/docs/html/design/building-blocks/tabs.jd +++ b/docs/html/design/building-blocks/tabs.jd @@ -1,5 +1,5 @@ page.title=Tabs -page.tags="tabs","action bar","navigation" +page.tags="tabs","actionbar","navigation","viewpager" @jd:body <img src="{@docRoot}design/media/tabs_overview.png"> diff --git a/docs/html/design/building-blocks/text-fields.jd b/docs/html/design/building-blocks/text-fields.jd index c1bed783bc5d..82321f03d365 100644 --- a/docs/html/design/building-blocks/text-fields.jd +++ b/docs/html/design/building-blocks/text-fields.jd @@ -1,5 +1,5 @@ page.title=Text Fields -page.tags="text","edittext","input", +page.tags="text","edittext","input" @jd:body <p>Text fields allow the user to type text into your app. They can be either single line or multi-line. diff --git a/docs/html/design/patterns/accessibility.jd b/docs/html/design/patterns/accessibility.jd index edf38432a8aa..5f46082c0207 100644 --- a/docs/html/design/patterns/accessibility.jd +++ b/docs/html/design/patterns/accessibility.jd @@ -1,5 +1,5 @@ page.title=Accessibility -page.tags="accessibility","navigation" +page.tags="accessibility","navigation","input" @jd:body <p>One of Android's missions is to organize the world's information and make it universally accessible and useful. Accessibility is the measure of how successfully a product can be used by people with varying abilities. Our mission applies to all users-including people with disabilities such as visual impairment, color deficiency, hearing loss, and limited dexterity.</p> diff --git a/docs/html/design/patterns/app-structure.jd b/docs/html/design/patterns/app-structure.jd index e1bb81992e0a..1809ecd0eaea 100644 --- a/docs/html/design/patterns/app-structure.jd +++ b/docs/html/design/patterns/app-structure.jd @@ -1,5 +1,5 @@ page.title=Application Structure -page.tags="navigation","layout" +page.tags="navigation","layout","tablet" @jd:body <p>Apps come in many varieties that address very different needs. For example:</p> diff --git a/docs/html/design/patterns/compatibility.jd b/docs/html/design/patterns/compatibility.jd index 84ae3375a8af..3a56f5276735 100644 --- a/docs/html/design/patterns/compatibility.jd +++ b/docs/html/design/patterns/compatibility.jd @@ -1,4 +1,5 @@ page.title=Backwards Compatibility +page.tags="support" @jd:body <p>Significant changes in Android 3.0 included:</p> diff --git a/docs/html/design/patterns/confirming-acknowledging.jd b/docs/html/design/patterns/confirming-acknowledging.jd index f2e88eca7f41..e34723112345 100644 --- a/docs/html/design/patterns/confirming-acknowledging.jd +++ b/docs/html/design/patterns/confirming-acknowledging.jd @@ -1,5 +1,5 @@ page.title=Confirming & Acknowledging -page.tags="dialog","toast" +page.tags="dialog","toast","notification" @jd:body <p>In some situations, when a user invokes an action in your app, it's a good idea to <em>confirm</em> or <em>acknowledge</em> that action through text.</p> diff --git a/docs/html/design/patterns/gestures.jd b/docs/html/design/patterns/gestures.jd index 3ef133d20b37..127a1c8c12cd 100644 --- a/docs/html/design/patterns/gestures.jd +++ b/docs/html/design/patterns/gestures.jd @@ -1,5 +1,5 @@ page.title=Gestures -page.tags="gesture","input" +page.tags="gesture","input","touch" @jd:body <p>Gestures allow users to interact with your app by manipulating the screen objects you provide. The diff --git a/docs/html/design/patterns/help.jd b/docs/html/design/patterns/help.jd index cdac54d3242c..a32fb255d008 100644 --- a/docs/html/design/patterns/help.jd +++ b/docs/html/design/patterns/help.jd @@ -1,4 +1,5 @@ page.title=Help +page.tags="settings","preferences" @jd:body <p>We wish we could guarantee that if you follow every piece of advice on this website, everyone will be able to learn and use your app without a hitch. Sadly, that's not the case.</p> diff --git a/docs/html/design/patterns/navigation.jd b/docs/html/design/patterns/navigation.jd index 36debbef949c..b717884d5e77 100644 --- a/docs/html/design/patterns/navigation.jd +++ b/docs/html/design/patterns/navigation.jd @@ -1,5 +1,5 @@ page.title=Navigation with Back and Up -page.tags="navigation","activity" +page.tags="navigation","activity","task" @jd:body <p>Consistent navigation is an essential component of the overall user experience. Few things frustrate diff --git a/docs/html/design/patterns/selection.jd b/docs/html/design/patterns/selection.jd index 682ce5689f04..d16e86cbe173 100644 --- a/docs/html/design/patterns/selection.jd +++ b/docs/html/design/patterns/selection.jd @@ -1,5 +1,5 @@ page.title=Selection -page.tags="actionmode","navigation" +page.tags="actionmode","navigation","contextual" @jd:body <p>Android 3.0 changed the <em>long press</em> gesture—that is, a touch that's held in the same position for a moment—to be the global gesture to select data.. This affects the way you should diff --git a/docs/html/design/patterns/settings.jd b/docs/html/design/patterns/settings.jd index f86cd39367f1..4748e48c9642 100644 --- a/docs/html/design/patterns/settings.jd +++ b/docs/html/design/patterns/settings.jd @@ -1,5 +1,5 @@ page.title=Settings -page.tags="settings","preferences" +page.tags="preferences","sharedpreferences" @jd:body <p>Settings is a place in your app where users indicate their preferences for how your app should diff --git a/docs/html/design/patterns/swipe-views.jd b/docs/html/design/patterns/swipe-views.jd index b86d990007e8..f18fc6359a80 100644 --- a/docs/html/design/patterns/swipe-views.jd +++ b/docs/html/design/patterns/swipe-views.jd @@ -1,5 +1,5 @@ page.title=Swipe Views -page.tags="viewpager","navigation" +page.tags="viewpager","navigation","tabs" @jd:body <p>Efficient navigation is one of the cornerstones of a well-designed app. While apps are generally diff --git a/docs/html/design/patterns/widgets.jd b/docs/html/design/patterns/widgets.jd index f2b0f4a2e7fd..3152e91be9c2 100644 --- a/docs/html/design/patterns/widgets.jd +++ b/docs/html/design/patterns/widgets.jd @@ -1,5 +1,5 @@ page.title=Widgets -page.tags="appwidget" +page.tags="appwidget","home" @jd:body <p>Widgets are an essential aspect of home screen customization. You can imagine them as "at-a-glance" views of an app's most important data and functionality that is accessible right from the user's home screen. Users can move widgets across their home screen panels, and, if supported, resize them to tailor the amount of information within a widget to their preference.</p> diff --git a/docs/html/design/style/iconography.jd b/docs/html/design/style/iconography.jd index ce11cf7fb3ca..1475e5cee771 100644 --- a/docs/html/design/style/iconography.jd +++ b/docs/html/design/style/iconography.jd @@ -1,4 +1,5 @@ page.title=Iconography +page.tags="icons" @jd:body <img src="{@docRoot}design/media/iconography_overview.png"> diff --git a/docs/html/design/style/metrics-grids.jd b/docs/html/design/style/metrics-grids.jd index e2b9ab5c7d9c..3116ff6d3cca 100644 --- a/docs/html/design/style/metrics-grids.jd +++ b/docs/html/design/style/metrics-grids.jd @@ -1,4 +1,5 @@ page.title=Metrics and Grids +page.tags="layout","screens" @jd:body <p>Devices vary not only in physical size, but also in screen density (<acronym title="Dots per diff --git a/docs/html/design/style/touch-feedback.jd b/docs/html/design/style/touch-feedback.jd index 5fe72a7784f9..340a3a4918e5 100644 --- a/docs/html/design/style/touch-feedback.jd +++ b/docs/html/design/style/touch-feedback.jd @@ -1,4 +1,5 @@ page.title=Touch Feedback +page.tags="input","button" @jd:body <div class="layout-content-row" style="margin-bottom: -100px"> diff --git a/docs/html/design/style/typography.jd b/docs/html/design/style/typography.jd index 427b8c6fd226..114d13b69efb 100644 --- a/docs/html/design/style/typography.jd +++ b/docs/html/design/style/typography.jd @@ -1,4 +1,5 @@ page.title=Typography +page.tags="textview","font" @jd:body <div class="layout-content-row"> diff --git a/docs/html/design/style/writing.jd b/docs/html/design/style/writing.jd index 919ea7aa1fdf..5358847afdf7 100644 --- a/docs/html/design/style/writing.jd +++ b/docs/html/design/style/writing.jd @@ -1,4 +1,5 @@ page.title=Writing Style +page.tags="dialog","toast","notification" @jd:body <p>When choosing words for your app:</p> diff --git a/docs/html/google/play/billing/v2/api.jd b/docs/html/google/play/billing/v2/api.jd index 9d3a045fa70b..7e386a2b7b4b 100644 --- a/docs/html/google/play/billing/v2/api.jd +++ b/docs/html/google/play/billing/v2/api.jd @@ -1,4 +1,5 @@ page.title=In-app Billing Version 2 +excludeFromSuggestions=true @jd:body <div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">In-app Billing Version 2 is superseded. Please <a href="{@docRoot}google/play/billing/billing_overview.html#migration">migrate to Version 3</a> at your earliest convenience.</div> diff --git a/docs/html/google/play/billing/v2/billing_integrate.jd b/docs/html/google/play/billing/v2/billing_integrate.jd index defe26554be8..15813155446d 100644 --- a/docs/html/google/play/billing/v2/billing_integrate.jd +++ b/docs/html/google/play/billing/v2/billing_integrate.jd @@ -1,4 +1,5 @@ page.title=Implementing In-app Billing <span style="font-size:16px;">(IAB Version 2)</span> +excludeFromSuggestions=true @jd:body <div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">In-app Billing Version 2 is superseded. Please <a href="{@docRoot}google/play/billing/billing_overview.html#migration">migrate to Version 3</a> at your earliest convenience.</div> diff --git a/docs/html/google/play/billing/v2/billing_reference.jd b/docs/html/google/play/billing/v2/billing_reference.jd index 84576bce0bdb..a946295e3326 100644 --- a/docs/html/google/play/billing/v2/billing_reference.jd +++ b/docs/html/google/play/billing/v2/billing_reference.jd @@ -1,4 +1,5 @@ page.title=In-app Billing Reference <span style="font-size:16px;">(IAB Version 2)</span> +excludeFromSuggestions=true @jd:body <div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">In-app Billing Version 2 is superseded. Please <a href="{@docRoot}google/play/billing/billing_overview.html#migration">migrate to Version 3</a> at your earliest convenience.</div> diff --git a/docs/html/google/play/billing/v2/billing_subscriptions.jd b/docs/html/google/play/billing/v2/billing_subscriptions.jd index 5e3bd2859a4a..3bcf212d8a4b 100644 --- a/docs/html/google/play/billing/v2/billing_subscriptions.jd +++ b/docs/html/google/play/billing/v2/billing_subscriptions.jd @@ -1,4 +1,5 @@ page.title=Implementing Subscriptions <span style="font-size:16px;">(IAB Version 2)</span> +excludeFromSuggestions=true @jd:body <div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">In-app Billing Version 2 is superseded. Please <a href="{@docRoot}google/play/billing/billing_overview.html#migration">migrate to Version 3</a> at your earliest convenience.</div> diff --git a/docs/html/guide/components/processes-and-threads.jd b/docs/html/guide/components/processes-and-threads.jd index 07a2667dc73f..1fed712c38f5 100644 --- a/docs/html/guide/components/processes-and-threads.jd +++ b/docs/html/guide/components/processes-and-threads.jd @@ -1,4 +1,6 @@ page.title=Processes and Threads +page.tags="lifecycle","background" + @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/admin/device-admin.jd b/docs/html/guide/topics/admin/device-admin.jd index f917576ce87f..a47449858d2e 100644 --- a/docs/html/guide/topics/admin/device-admin.jd +++ b/docs/html/guide/topics/admin/device-admin.jd @@ -1,4 +1,5 @@ page.title=Device Administration +page.tags="devicepolicymanager","policy","security" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/admin/keychain.jd b/docs/html/guide/topics/admin/keychain.jd deleted file mode 100644 index 2ea24084e51b..000000000000 --- a/docs/html/guide/topics/admin/keychain.jd +++ /dev/null @@ -1,4 +0,0 @@ -page.title=Text and Input -@jd:body - -<p>Add contnet here</p> diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd index 93d6c6f0e99f..cdbf827fdf59 100644 --- a/docs/html/guide/topics/appwidgets/index.jd +++ b/docs/html/guide/topics/appwidgets/index.jd @@ -1,4 +1,5 @@ page.title=App Widgets +page.tags="home" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/connectivity/bluetooth.jd b/docs/html/guide/topics/connectivity/bluetooth.jd index 832b8506466c..1c55d8b6760f 100644 --- a/docs/html/guide/topics/connectivity/bluetooth.jd +++ b/docs/html/guide/topics/connectivity/bluetooth.jd @@ -1,4 +1,5 @@ page.title=Bluetooth +page.tags="wireless","bluetoothadapter","bluetoothdevice" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/connectivity/sip.jd b/docs/html/guide/topics/connectivity/sip.jd index a5f0e2e49a26..526eb839cbb9 100644 --- a/docs/html/guide/topics/connectivity/sip.jd +++ b/docs/html/guide/topics/connectivity/sip.jd @@ -1,4 +1,5 @@ page.title=Session Initiation Protocol +page.tags="sipmanager","sipprofile","sipaudiocall","telephony" @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/connectivity/wifip2p.jd b/docs/html/guide/topics/connectivity/wifip2p.jd index efb3ac796557..2167a0ff986e 100644 --- a/docs/html/guide/topics/connectivity/wifip2p.jd +++ b/docs/html/guide/topics/connectivity/wifip2p.jd @@ -1,4 +1,5 @@ page.title=Wi-Fi Direct +page.tags="wireless","WifiP2pManager" @jd:body diff --git a/docs/html/guide/topics/data/data-storage.jd b/docs/html/guide/topics/data/data-storage.jd index 2603a06186ff..385c1162ccbe 100644 --- a/docs/html/guide/topics/data/data-storage.jd +++ b/docs/html/guide/topics/data/data-storage.jd @@ -1,4 +1,5 @@ page.title=Storage Options +page.tags="database","sharedpreferences","sdcard" @jd:body diff --git a/docs/html/guide/topics/data/install-location.jd b/docs/html/guide/topics/data/install-location.jd index 757cd19b3c51..2ec0d5a9ef96 100644 --- a/docs/html/guide/topics/data/install-location.jd +++ b/docs/html/guide/topics/data/install-location.jd @@ -1,4 +1,5 @@ page.title=App Install Location +page.tags="sdcard","external" @jd:body diff --git a/docs/html/guide/topics/graphics/opengl.jd b/docs/html/guide/topics/graphics/opengl.jd index 3ec71b2db896..469eae26568d 100644 --- a/docs/html/guide/topics/graphics/opengl.jd +++ b/docs/html/guide/topics/graphics/opengl.jd @@ -1,6 +1,5 @@ page.title=OpenGL -parent.title=Graphics -parent.link=index.html +page.tags="games" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/graphics/prop-animation.jd b/docs/html/guide/topics/graphics/prop-animation.jd index 49d7bb8732d2..22bf76961905 100644 --- a/docs/html/guide/topics/graphics/prop-animation.jd +++ b/docs/html/guide/topics/graphics/prop-animation.jd @@ -1,6 +1,5 @@ page.title=Property Animation -parent.title=Animation -parent.link=animation.html +page.tags="valueanimator","objectanimator","layouttransition","ViewPropertyAnimator" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/location/strategies.jd b/docs/html/guide/topics/location/strategies.jd index 6cc8f1ae8754..2f7e6c37be9c 100644 --- a/docs/html/guide/topics/location/strategies.jd +++ b/docs/html/guide/topics/location/strategies.jd @@ -1,6 +1,5 @@ page.title=Location Strategies -parent.title=Location and Maps -parent.link=index.html +page.tags="geolocation","maps","mapview" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/media/audio-capture.jd b/docs/html/guide/topics/media/audio-capture.jd index 75d294b57092..44c618fbb237 100644 --- a/docs/html/guide/topics/media/audio-capture.jd +++ b/docs/html/guide/topics/media/audio-capture.jd @@ -1,6 +1,5 @@ page.title=Audio Capture -parent.title=Multimedia and Camera -parent.link=index.html +page.tags="mediarecorder" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd index 3fe23f8ce73a..8ebb349357ea 100644 --- a/docs/html/guide/topics/media/camera.jd +++ b/docs/html/guide/topics/media/camera.jd @@ -1,6 +1,5 @@ page.title=Camera -parent.title=Multimedia and Camera -parent.link=index.html +page.tags="mediarecorder" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/media/mediaplayer.jd b/docs/html/guide/topics/media/mediaplayer.jd index 45a58a7b5c4a..fb272d21f8e6 100644 --- a/docs/html/guide/topics/media/mediaplayer.jd +++ b/docs/html/guide/topics/media/mediaplayer.jd @@ -1,6 +1,5 @@ page.title=Media Playback -parent.title=Multimedia and Camera -parent.link=index.html +page.tags="mediaplayer","soundpool","audiomanager" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/resources/runtime-changes.jd b/docs/html/guide/topics/resources/runtime-changes.jd index 5f39aa534e62..45a548a602bc 100644 --- a/docs/html/guide/topics/resources/runtime-changes.jd +++ b/docs/html/guide/topics/resources/runtime-changes.jd @@ -1,6 +1,5 @@ page.title=Handling Runtime Changes -parent.title=Application Resources -parent.link=index.html +page.tags="activity","lifecycle" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/search/adding-custom-suggestions.jd b/docs/html/guide/topics/search/adding-custom-suggestions.jd index 02ee084f66fb..47ad2fec9a12 100644 --- a/docs/html/guide/topics/search/adding-custom-suggestions.jd +++ b/docs/html/guide/topics/search/adding-custom-suggestions.jd @@ -1,6 +1,5 @@ page.title=Adding Custom Suggestions -parent.title=Search -parent.link=index.html +page.tags="SearchRecentSuggestionsProvider", @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/search/adding-recent-query-suggestions.jd b/docs/html/guide/topics/search/adding-recent-query-suggestions.jd index 2c9a4617d8e4..c1d59d484868 100644 --- a/docs/html/guide/topics/search/adding-recent-query-suggestions.jd +++ b/docs/html/guide/topics/search/adding-recent-query-suggestions.jd @@ -1,6 +1,6 @@ page.title=Adding Recent Query Suggestions -parent.title=Search -parent.link=index.html +page.tags="SearchRecentSuggestions","SearchRecentSuggestionsProvider" + @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd index e24681a924c1..fc722b2820ec 100644 --- a/docs/html/guide/topics/search/search-dialog.jd +++ b/docs/html/guide/topics/search/search-dialog.jd @@ -1,6 +1,5 @@ page.title=Creating a Search Interface -parent.title=Search -parent.link=index.html +page.tags="searchview" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/search/searchable-config.jd b/docs/html/guide/topics/search/searchable-config.jd index fb689f9705f2..fc13c04557e3 100644 --- a/docs/html/guide/topics/search/searchable-config.jd +++ b/docs/html/guide/topics/search/searchable-config.jd @@ -1,6 +1,5 @@ page.title=Searchable Configuration -parent.title=Search -parent.link=index.html + @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/sensors/sensors_motion.jd b/docs/html/guide/topics/sensors/sensors_motion.jd index b6c3cb4ff966..289c63972c16 100644 --- a/docs/html/guide/topics/sensors/sensors_motion.jd +++ b/docs/html/guide/topics/sensors/sensors_motion.jd @@ -1,6 +1,5 @@ page.title=Motion Sensors -parent.title=Sensors -parent.link=index.html +page.tags="sensorevent","accelerometer","gyroscope","gravity","rotation" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/sensors/sensors_position.jd b/docs/html/guide/topics/sensors/sensors_position.jd index 869109b62363..55b282b4c74f 100644 --- a/docs/html/guide/topics/sensors/sensors_position.jd +++ b/docs/html/guide/topics/sensors/sensors_position.jd @@ -1,6 +1,5 @@ page.title=Position Sensors -parent.title=Sensors -parent.link=index.html +page.tags="sensorevent","orientation","proximity" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/text/copy-paste.jd b/docs/html/guide/topics/text/copy-paste.jd index 6c86f478cbf6..b34f0fa04f8c 100644 --- a/docs/html/guide/topics/text/copy-paste.jd +++ b/docs/html/guide/topics/text/copy-paste.jd @@ -1,4 +1,5 @@ page.title=Copy and Paste +page.tags="clipboardmanager","clipdata","input" @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/text/creating-input-method.jd b/docs/html/guide/topics/text/creating-input-method.jd index 7086824a755f..72545944be0c 100644 --- a/docs/html/guide/topics/text/creating-input-method.jd +++ b/docs/html/guide/topics/text/creating-input-method.jd @@ -1,5 +1,5 @@ page.title=Creating an Input Method -parent.title=Articles +page.tags="ime","keyboard","inputmethodservice" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/text/spell-checker-framework.jd b/docs/html/guide/topics/text/spell-checker-framework.jd index 7f7a0b84e53d..366f9cc39be4 100644 --- a/docs/html/guide/topics/text/spell-checker-framework.jd +++ b/docs/html/guide/topics/text/spell-checker-framework.jd @@ -1,5 +1,5 @@ page.title=Spelling Checker Framework -parent.title=Articles +page.tags="input","spellcheckerservice" @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/ui/controls/button.jd b/docs/html/guide/topics/ui/controls/button.jd index 8d48e9cb5dac..41b67b7f2043 100644 --- a/docs/html/guide/topics/ui/controls/button.jd +++ b/docs/html/guide/topics/ui/controls/button.jd @@ -1,6 +1,5 @@ page.title=Buttons -parent.title=Input Controls -parent.link=../controls.html +page.tags="button","imagebutton" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/controls/checkbox.jd b/docs/html/guide/topics/ui/controls/checkbox.jd index ea70980ba096..99140b55e84f 100644 --- a/docs/html/guide/topics/ui/controls/checkbox.jd +++ b/docs/html/guide/topics/ui/controls/checkbox.jd @@ -1,6 +1,5 @@ page.title=Checkboxes -parent.title=Input Controls -parent.link=../controls.html + @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/controls/pickers.jd b/docs/html/guide/topics/ui/controls/pickers.jd index cf90f1d6d482..a0e7afbe940d 100644 --- a/docs/html/guide/topics/ui/controls/pickers.jd +++ b/docs/html/guide/topics/ui/controls/pickers.jd @@ -1,6 +1,5 @@ -page.title= Pickers -parent.title=Form Controls -parent.link=controls-form.html +page.title=Pickers +page.tags="datepicker","timepicker" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/controls/radiobutton.jd b/docs/html/guide/topics/ui/controls/radiobutton.jd index c96e57649abc..d0c48ed454cc 100644 --- a/docs/html/guide/topics/ui/controls/radiobutton.jd +++ b/docs/html/guide/topics/ui/controls/radiobutton.jd @@ -1,6 +1,5 @@ page.title=Radio Buttons -parent.title=Input Controls -parent.link=../controls.html +page.tags="radiobutton","radiogroup" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/controls/spinner.jd b/docs/html/guide/topics/ui/controls/spinner.jd index deba3e609469..85714b6625b0 100644 --- a/docs/html/guide/topics/ui/controls/spinner.jd +++ b/docs/html/guide/topics/ui/controls/spinner.jd @@ -1,6 +1,5 @@ -page.title= Spinners -parent.title=Input Controls -parent.link=../controls.html +page.title=Spinners +page.tags="adapterview","spinneradapter" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/controls/text.jd b/docs/html/guide/topics/ui/controls/text.jd index 654883dc85a2..c0b98737749f 100644 --- a/docs/html/guide/topics/ui/controls/text.jd +++ b/docs/html/guide/topics/ui/controls/text.jd @@ -1,6 +1,5 @@ page.title=Text Fields -parent.title=Input Controls -parent.link=../controls.html +page.tags="edittext","autocompletetextview" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/controls/togglebutton.jd b/docs/html/guide/topics/ui/controls/togglebutton.jd index dd7634be3e60..3119cd9820b8 100644 --- a/docs/html/guide/topics/ui/controls/togglebutton.jd +++ b/docs/html/guide/topics/ui/controls/togglebutton.jd @@ -1,6 +1,5 @@ page.title=Toggle Buttons -parent.title=Input Controls -parent.link=../controls.html +page.tags="switch","togglebutton" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/custom-components.jd b/docs/html/guide/topics/ui/custom-components.jd index be82dbcc46aa..703a5cebfa30 100644 --- a/docs/html/guide/topics/ui/custom-components.jd +++ b/docs/html/guide/topics/ui/custom-components.jd @@ -1,6 +1,5 @@ page.title=Custom Components -parent.title=User Interface -parent.link=index.html +page.tags="view","widget" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd index 28e1418d900b..6398646e70f1 100644 --- a/docs/html/guide/topics/ui/declaring-layout.jd +++ b/docs/html/guide/topics/ui/declaring-layout.jd @@ -1,6 +1,5 @@ page.title=Layouts -parent.title=User Interface -parent.link=index.html +page.tags="view","viewgroup" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd index 3cfed13e3bd4..7f48eacbdbd2 100644 --- a/docs/html/guide/topics/ui/dialogs.jd +++ b/docs/html/guide/topics/ui/dialogs.jd @@ -1,4 +1,6 @@ page.title=Dialogs +page.tags="alertdialog","dialogfragment" + @jd:body diff --git a/docs/html/guide/topics/ui/drag-drop.jd b/docs/html/guide/topics/ui/drag-drop.jd index 884a1b218214..e98937468db9 100644 --- a/docs/html/guide/topics/ui/drag-drop.jd +++ b/docs/html/guide/topics/ui/drag-drop.jd @@ -1,6 +1,5 @@ page.title=Drag and Drop -parent.title=User Interface -parent.link=index.html +page.tags="clipdata","dragevent","onlongclicklistener" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd index 84c3dab78677..bc189c45de00 100644 --- a/docs/html/guide/topics/ui/layout/gridview.jd +++ b/docs/html/guide/topics/ui/layout/gridview.jd @@ -1,6 +1,5 @@ page.title=Grid View -parent.title=Layouts -parent.link=layout-objects.html +page.tags="gridview" @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/ui/layout/linear.jd b/docs/html/guide/topics/ui/layout/linear.jd index 8e3370642e31..444dc71edf41 100644 --- a/docs/html/guide/topics/ui/layout/linear.jd +++ b/docs/html/guide/topics/ui/layout/linear.jd @@ -1,6 +1,5 @@ page.title=Linear Layout -parent.title=Layouts -parent.link=layout-objects.html +page.tags="linearlayout" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/layout/listview.jd b/docs/html/guide/topics/ui/layout/listview.jd index fee52927e846..6cdd725ddb1c 100644 --- a/docs/html/guide/topics/ui/layout/listview.jd +++ b/docs/html/guide/topics/ui/layout/listview.jd @@ -1,6 +1,5 @@ page.title=List View -parent.title=Layouts -parent.link=declaring-layout.html +page.tags="listview" @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/ui/layout/relative.jd b/docs/html/guide/topics/ui/layout/relative.jd index 47f94176f4a2..65c56172fb02 100644 --- a/docs/html/guide/topics/ui/layout/relative.jd +++ b/docs/html/guide/topics/ui/layout/relative.jd @@ -1,6 +1,5 @@ page.title=Relative Layout -parent.title=Layouts -parent.link=layout-objects.html +page.tags="relativelayout" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/settings.jd b/docs/html/guide/topics/ui/settings.jd index 33e164b1f733..d96447dc032f 100644 --- a/docs/html/guide/topics/ui/settings.jd +++ b/docs/html/guide/topics/ui/settings.jd @@ -1,4 +1,6 @@ page.title=Settings +page.tags="preference","preferenceactivity","preferencefragment" + @jd:body diff --git a/docs/html/sdk/1.0_r1/index.jd b/docs/html/sdk/1.0_r1/index.jd index b38048331191..dea66208253c 100644 --- a/docs/html/sdk/1.0_r1/index.jd +++ b/docs/html/sdk/1.0_r1/index.jd @@ -1,5 +1,6 @@ page.title=Android 1.0 SDK, release 1 sdk.redirect=true sdk.redirect.path=index.html +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.0_r1/upgrading.jd b/docs/html/sdk/1.0_r1/upgrading.jd index d6d5dc486c59..d6a7ed5cdc60 100644 --- a/docs/html/sdk/1.0_r1/upgrading.jd +++ b/docs/html/sdk/1.0_r1/upgrading.jd @@ -1,5 +1,6 @@ page.title=Upgrading the SDK sdk.version=1.0_r1 +excludeFromSuggestions=true @jd:body <p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p> diff --git a/docs/html/sdk/1.0_r2/index.jd b/docs/html/sdk/1.0_r2/index.jd index c29c148a4861..8556e3c2a9b9 100644 --- a/docs/html/sdk/1.0_r2/index.jd +++ b/docs/html/sdk/1.0_r2/index.jd @@ -1,5 +1,6 @@ page.title=Android 1.0 SDK, release 2 sdk.redirect=true sdk.redirect.path=index.html +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.0_r2/upgrading.jd b/docs/html/sdk/1.0_r2/upgrading.jd index 409e30e8c195..243950d671d6 100644 --- a/docs/html/sdk/1.0_r2/upgrading.jd +++ b/docs/html/sdk/1.0_r2/upgrading.jd @@ -1,5 +1,6 @@ page.title=Upgrading the SDK sdk.version=1.0_r2 +excludeFromSuggestions=true @jd:body <p>For the current SDK release, see the links under <strong>Current SDK Release</strong> in the side navigation.</p> diff --git a/docs/html/sdk/1.1_r1/index.jd b/docs/html/sdk/1.1_r1/index.jd index 63fe51d759a7..44231ee6af3c 100644 --- a/docs/html/sdk/1.1_r1/index.jd +++ b/docs/html/sdk/1.1_r1/index.jd @@ -1,5 +1,6 @@ page.title=Android 1.1 SDK, Release 1 sdk.redirect=true sdk.redirect.path=index.html +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.1_r1/upgrading.jd b/docs/html/sdk/1.1_r1/upgrading.jd index bc71149fb356..840ae6b74858 100644 --- a/docs/html/sdk/1.1_r1/upgrading.jd +++ b/docs/html/sdk/1.1_r1/upgrading.jd @@ -1,5 +1,6 @@ page.title=Upgrading the SDK sdk.version=1.1_r1 +excludeFromSuggestions=true @jd:body <!-- diff --git a/docs/html/sdk/1.5_r1/index.jd b/docs/html/sdk/1.5_r1/index.jd index 60dfc142e4f6..7232f57decac 100644 --- a/docs/html/sdk/1.5_r1/index.jd +++ b/docs/html/sdk/1.5_r1/index.jd @@ -1,5 +1,6 @@ page.title=Android 1.5 SDK, Release 1 sdk.redirect=true sdk.redirect.path=index.html +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.5_r1/upgrading.jd b/docs/html/sdk/1.5_r1/upgrading.jd index 0a12d6223415..03770698997f 100644 --- a/docs/html/sdk/1.5_r1/upgrading.jd +++ b/docs/html/sdk/1.5_r1/upgrading.jd @@ -1,5 +1,6 @@ page.title=Upgrading the SDK sdk.version=1.5_r1 +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.5_r2/index.jd b/docs/html/sdk/1.5_r2/index.jd index 4fb99b604701..fac4f13bc67e 100644 --- a/docs/html/sdk/1.5_r2/index.jd +++ b/docs/html/sdk/1.5_r2/index.jd @@ -1,5 +1,6 @@ page.title=Android 1.5 SDK, Release 2 sdk.redirect=true sdk.redirect.path=index.html +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.5_r2/upgrading.jd b/docs/html/sdk/1.5_r2/upgrading.jd index bb5fc60e67f8..31b23582cbec 100644 --- a/docs/html/sdk/1.5_r2/upgrading.jd +++ b/docs/html/sdk/1.5_r2/upgrading.jd @@ -1,5 +1,6 @@ page.title=Upgrading the SDK sdk.version=1.5_r2 +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.5_r3/index.jd b/docs/html/sdk/1.5_r3/index.jd index eb10f5ee435f..e8cfaa17bd22 100644 --- a/docs/html/sdk/1.5_r3/index.jd +++ b/docs/html/sdk/1.5_r3/index.jd @@ -1,5 +1,6 @@ page.title=Android 1.5 SDK, Release 3 sdk.redirect=true sdk.redirect.path=index.html +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.5_r3/upgrading.jd b/docs/html/sdk/1.5_r3/upgrading.jd index 18c13144b746..62b9a787bcdd 100644 --- a/docs/html/sdk/1.5_r3/upgrading.jd +++ b/docs/html/sdk/1.5_r3/upgrading.jd @@ -1,6 +1,7 @@ page.title=Upgrading the SDK sdk.version=1.5 sdk.rel.id=3 +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.6_r1/index.jd b/docs/html/sdk/1.6_r1/index.jd index e7f9112ce2fb..671d1cdf043c 100644 --- a/docs/html/sdk/1.6_r1/index.jd +++ b/docs/html/sdk/1.6_r1/index.jd @@ -1,5 +1,6 @@ page.title=Android 1.6 SDK, Release 1 sdk.redirect=true sdk.redirect.path=index.html +excludeFromSuggestions=true @jd:body diff --git a/docs/html/sdk/1.6_r1/upgrading.jd b/docs/html/sdk/1.6_r1/upgrading.jd index 49535c9bc011..e6dded0f420a 100644 --- a/docs/html/sdk/1.6_r1/upgrading.jd +++ b/docs/html/sdk/1.6_r1/upgrading.jd @@ -1,5 +1,6 @@ page.title=Upgrading the SDK sdk.version=1.6 +excludeFromSuggestions=true @jd:body diff --git a/docs/html/tools/sdk/OLD_RELEASENOTES.jd b/docs/html/tools/sdk/OLD_RELEASENOTES.jd index 6865db235c0b..b7fd12f7cc5b 100644 --- a/docs/html/tools/sdk/OLD_RELEASENOTES.jd +++ b/docs/html/tools/sdk/OLD_RELEASENOTES.jd @@ -1,4 +1,5 @@ page.title=Release Notes for Older SDK Versions +excludeFromSuggestions=true @jd:body <div class="special"> diff --git a/docs/html/tools/sdk/RELEASENOTES.jd b/docs/html/tools/sdk/RELEASENOTES.jd index c7ece4230b1b..cbcbb1299c6a 100644 --- a/docs/html/tools/sdk/RELEASENOTES.jd +++ b/docs/html/tools/sdk/RELEASENOTES.jd @@ -1,4 +1,5 @@ page.title=SDK Release Notes +excludeFromSuggestions=true @jd:body <p>This document provides version-specific information about Android SDK diff --git a/docs/html/tools/sdk/addons.jd b/docs/html/tools/sdk/addons.jd deleted file mode 100644 index 8c5e1ed1c745..000000000000 --- a/docs/html/tools/sdk/addons.jd +++ /dev/null @@ -1,9 +0,0 @@ -page.title=SDK Add-Ons - -@jd:body - - - -<p>A page that lists SDK addons and links to release notes. Links to dashboards etc.</p> - - diff --git a/docs/html/tools/sdk/adt-notes.jd b/docs/html/tools/sdk/adt-notes.jd deleted file mode 100644 index 291b543f13fb..000000000000 --- a/docs/html/tools/sdk/adt-notes.jd +++ /dev/null @@ -1,5 +0,0 @@ -page.title=ADT Plugin for Eclipse -sdk.redirect=true -sdk.redirect.path=eclipse-adt.html - -@jd:body diff --git a/docs/html/tools/sdk/adt_download.html b/docs/html/tools/sdk/adt_download.html deleted file mode 100644 index 5ba2ef5be745..000000000000 --- a/docs/html/tools/sdk/adt_download.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<head> -<meta http-equiv="refresh" content="0;url=http://developer.android.com/sdk/eclipse-adt.html"> -<title>Redirecting...</title> -</head> -<body> -<p>You should be redirected. Please <a -href="http://developer.android.com/sdk/eclipse-adt.html">click here</a>.</p> -</body> -</html>
\ No newline at end of file diff --git a/docs/html/tools/sdk/libraries.jd b/docs/html/tools/sdk/libraries.jd deleted file mode 100644 index 9e47c4af58bc..000000000000 --- a/docs/html/tools/sdk/libraries.jd +++ /dev/null @@ -1,9 +0,0 @@ -page.title=Libraries - -@jd:body - - - -<p>A page that lists libraries and links to release notes. Links to dashboards etc.</p> - - diff --git a/docs/html/tools/sdk/ndk/1.5_r1/index.jd b/docs/html/tools/sdk/ndk/1.5_r1/index.jd index 4c70a8a6f91e..2f6764bc946c 100644 --- a/docs/html/tools/sdk/ndk/1.5_r1/index.jd +++ b/docs/html/tools/sdk/ndk/1.5_r1/index.jd @@ -1,6 +1,7 @@ page.title=Android 1.5 NDK, Release 1 sdk.redirect=true sdk.redirect.path=ndk/index.html +excludeFromSuggestions=true @jd:body diff --git a/docs/html/tools/sdk/ndk/1.6_r1/index.jd b/docs/html/tools/sdk/ndk/1.6_r1/index.jd index 090dcdc37867..1dc5b6f3d7fb 100644 --- a/docs/html/tools/sdk/ndk/1.6_r1/index.jd +++ b/docs/html/tools/sdk/ndk/1.6_r1/index.jd @@ -1,5 +1,6 @@ page.title=Android 1.6 NDK, Release 1 sdk.redirect=true sdk.redirect.path=ndk/index.html +excludeFromSuggestions=true @jd:body diff --git a/docs/html/tools/sdk/ndk/overview.jd b/docs/html/tools/sdk/ndk/overview.jd deleted file mode 100644 index 98ef1fcc7a77..000000000000 --- a/docs/html/tools/sdk/ndk/overview.jd +++ /dev/null @@ -1,588 +0,0 @@ -page.title=What is the NDK? -@jd:body - - <div id="qv-wrapper"> - <div id="qv"> - <h2>In this document</h2> - - <ol> - <li><a href="#choosing">When to Develop in Native Code</a></li> - <li> - <a href="#contents">Contents of the NDK</a> - <ol> - <li><a href="#tools">Development tools</a></li> - - <li><a href="#docs">Documentation</a></li> - - <li><a href="#samples">Sample applications</a></li> - </ol> - </li> - <li><a href="#reqs">System and Software Requirements</a></li> - </ol> - </div> - </div> - - <p>The Android NDK is a toolset that lets you embed components that make use of native code in - your Android applications.</p> - - <p>Android applications run in the Dalvik virtual machine. The NDK allows you to implement parts - of your applications using native-code languages such as C and C++. This can provide benefits to - certain classes of applications, in the form of reuse of existing code and in some cases - increased speed.</p> - - <p>The NDK provides:</p> - - <ul> - <li>A set of tools and build files used to generate native code libraries from C and C++ - sources</li> - - <li>A way to embed the corresponding native libraries into an application package file - (<code>.apk</code>) that can be deployed on Android devices</li> - - <li>A set of native system headers and libraries that will be supported in all future versions - of the Android platform, starting from Android 1.5. Applications that use native activities - must be run on Android 2.3 or later.</li> - - <li>Documentation, samples, and tutorials</li> - </ul> - - <p>The latest release of the NDK supports the following instruction sets:</p> - - <ul> - <li>ARMv5TE, including Thumb-1 instructions (see {@code docs/CPU-ARCH-ABIS.html} for more -information)</li> - - <li>ARMv7-A, including Thumb-2 and VFPv3-D16 instructions, with optional support for - NEON/VFPv3-D32 instructions (see {@code docs/CPU-ARM-NEON.html} for more information)</li> - - <li>x86 instructions (see {@code docs/CPU-X86.html} for more information)</li> - - <li>MIPS instructions (see {@code docs/CPU-MIPS.html} for more information)</li> - </ul> - - <p>ARMv5TE machine code will run on all ARM-based Android devices. ARMv7-A will run only on - devices such as the Verizon Droid or Google Nexus One that have a compatible CPU. The main - difference between the two instruction sets is that ARMv7-A supports hardware FPU, Thumb-2, and - NEON instructions. You can target either or both of the instruction sets — ARMv5TE is the - default, but switching to ARMv7-A is as easy as adding a single line to the application's - <code>Application.mk</code> file, without needing to change anything else in the file. You can also build for - both architectures at the same time and have everything stored in the final <code>.apk</code>. - Complete information is provided in the CPU-ARCH-ABIS.HTML in the NDK package.</p> - - <p>The NDK provides stable headers for libc (the C library), libm (the Math library), OpenGL ES - (3D graphics library), the JNI interface, and other libraries, as listed in the <a href= - "#tools">Development Tools</a> section.</p> - - <h2 id="choosing">When to Develop in Native Code</h2> - - <p>The NDK will not benefit most applications. As a developer, you need to balance its benefits - against its drawbacks; notably, using native code does not result in an automatic performance - increase, but always increases application complexity. In general, you should only use native - code if it is essential to your application, not just because you prefer to program in C/C++.</p> - - <p>Typical good candidates for the NDK are self-contained, CPU-intensive operations that don't - allocate much memory, such as signal processing, physics simulation, and so on. Simply re-coding - a method to run in C usually does not result in a large performance increase. When examining - whether or not you should develop in native code, think about your requirements and see if the - Android framework APIs provide the functionality that you need. The NDK can, however, can be an - effective way to reuse a large corpus of existing C/C++ code.</p> - - <p>The Android framework provides two ways to use native code:</p> - - <ul> - <li>Write your application using the Android framework and use JNI to access the APIs provided - by the Android NDK. This technique allows you to take advantage of the convenience of the - Android framework, but still allows you to write native code when necessary. If you use this - approach, your application must target specific, minimum Android platform levels, see <a - href="#platform-compat">Android platform compatibility</a> for more information.</li> - - <li> - <p>Write a native activity, which allows you to implement the lifecycle callbacks in native - code. The Android SDK provides the {@link android.app.NativeActivity} class, which is a - convenience class that notifies your - native code of any activity lifecycle callbacks (<code>onCreate()</code>, <code>onPause()</code>, - <code>onResume()</code>, etc). You can implement the callbacks in your native code to handle - these events when they occur. Applications that use native activities must be run on Android - 2.3 (API Level 9) or later.</p> - - <p>You cannot access features such as Services and Content Providers natively, so if you want - to use them or any other framework API, you can still write JNI code to do so.</p> - </li> - </ul> - - <h2 id="contents">Contents of the NDK</h2>The NDK contains the APIs, documentation, and sample - applications that help you write your native code. - - <h3 id="tools">Development tools</h3> - - <p>The NDK includes a set of cross-toolchains (compilers, linkers, etc..) that can generate - native ARM binaries on Linux, OS X, and Windows (with Cygwin) platforms.</p> - - <p>It provides a set of system headers for stable native APIs that are guaranteed to be supported - in all later releases of the platform:</p> - - <ul> - <li>libc (C library) headers</li> - - <li>libm (math library) headers</li> - - <li>JNI interface headers</li> - - <li>libz (Zlib compression) headers</li> - - <li>liblog (Android logging) header</li> - - <li>OpenGL ES 1.1 and OpenGL ES 2.0 (3D graphics libraries) headers</li> - - <li>libjnigraphics (Pixel buffer access) header (for Android 2.2 and above).</li> - - <li>A Minimal set of headers for C++ support</li> - - <li>OpenSL ES native audio libraries</li> - - <li>Android native application APIS</li> - </ul> - - <p>The NDK also provides a build system that lets you work efficiently with your sources, without - having to handle the toolchain/platform/CPU/ABI details. You create very short build files to - describe which sources to compile and which Android application will use them — the build - system compiles the sources and places the shared libraries directly in your application - project.</p> - - <p class="caution"><strong>Important:</strong> With the exception of the libraries listed above, - native system libraries in the Android platform are <em>not</em> stable and may change in future - platform versions. Your applications should <em>only</em> make use of the stable native system - libraries provided in this NDK.</p> - - <h3 id="docs">Documentation</h3> - - <p>The NDK package includes a set of documentation that describes the capabilities of the NDK and - how to use it to create shared libraries for your Android applications. In this release, the - documentation is provided only in the downloadable NDK package. You can find the documentation in - the <code><ndk>/docs/</code> directory. Included are these files (partial listing):</p> - - <ul> - <li> - INSTALL.HTML — describes how to install the NDK and configure it for your host - system</li> - - <li>OVERVIEW.HTML — provides an overview of the NDK capabilities and usage</li> - - <li>ANDROID-MK.HTML — describes the use of the Android.mk file, which defines the native - sources you want to compile</li> - - <li>APPLICATION-MK.HTML — describes the use of the Application.mk file, which describes - the native sources required by your Android application</li> - <li>CPLUSPLUS-SUPPORT.HTML — describes the C++ support provided in the Android NDK</li> - <li>CPU-ARCH-ABIS.HTML — a description of supported CPU architectures and how to target - them.</li> - - <li>CPU-FEATURES.HTML — a description of the <code>cpufeatures</code> static library that - lets your application code detect the target device's CPU family and the optional features at - runtime.</li> - - <li>CHANGES.HTML — a complete list of changes to the NDK across all releases.</li> - - <li>DEVELOPMENT.HTML — describes how to modify the NDK and generate release packages for it</li> - - <li>HOWTO.HTML — information about common tasks associated with NDK development</li> - - <li>IMPORT-MODULE.HTML — describes how to share and reuse modules</li> - - <li>LICENSES.HTML — information about the various open source licenses that govern the Android NDK</li> - - <li>NATIVE-ACTIVITY.HTML — describes how to implement native activities</li> - - <li>NDK-BUILD.HTML — describes the usage of the ndk-build script</li> - - <li>NDK-GDB.HTML — describes how to use the native code debugger</li> - - <li>PREBUILTS.HTML — information about how shared and static prebuilt libraries work </li> - - <li>STANDALONE-TOOLCHAIN.HTML — describes how to use Android NDK toolchain as a standalone - compiler (still in beta).</li> - - <li>SYSTEM-ISSUES.HTML — known issues in the Android system images that you should be - aware of, if you are developing using the NDK.</li> - - <li>STABLE-APIS.HTML — a complete list of the stable APIs exposed by headers in the - NDK.</li> - - </ul> - - <p>Additionally, the package includes detailed information about the "bionic" C library provided - with the Android platform that you should be aware of, if you are developing using the NDK. You - can find the documentation in the <code><ndk>/docs/system/libc/</code> directory:</p> - - <ul> - <li>OVERVIEW.HTML — provides an overview of the "bionic" C library and the features it - offers.</li> - </ul> - - <h3 id="samples">Sample applications</h3> - -<p>The NDK includes sample applications that illustrate how to use native code in your Android - applications:</p> - - <ul> - <li><code>hello-jni</code> — a simple application that loads a string from a native - method implemented in a shared library and then displays it in the application UI.</li> - - <li><code>two-libs</code> — a simple application that loads a shared library dynamically - and calls a native method provided by the library. In this case, the method is implemented in a - static library imported by the shared library.</li> - - <li><code>san-angeles</code> — a simple application that renders 3D graphics through the - native OpenGL ES APIs, while managing activity lifecycle with a {@link - android.opengl.GLSurfaceView} object.</li> - - <li><code>hello-gl2</code> — a simple application that renders a triangle using OpenGL ES - 2.0 vertex and fragment shaders.</li> - - <li><code>hello-neon</code> — a simple application that shows how to use the - <code>cpufeatures</code> library to check CPU capabilities at runtime, then use NEON intrinsics - if supported by the CPU. Specifically, the application implements two versions of a tiny - benchmark for a FIR filter loop, a C version and a NEON-optimized version for devices that - support it.</li> - - <li><code>bitmap-plasma</code> — a simple application that demonstrates how to access the - pixel buffers of Android {@link android.graphics.Bitmap} objects from native code, and uses - this to generate an old-school "plasma" effect.</li> - - <li><code>native-activity</code> — a simple application that demonstrates how to use the - native-app-glue static library to create a native activity</li> - - <li><code>native-plasma</code> — a version of bitmap-plasma implemented with a native - activity.</li> - </ul> - - <p>For each sample, the NDK includes the corresponding C source code and the necessary Android.mk - and Application.mk files. There are located under <code><ndk>/samples/<name>/</code> - and their source code can be found under <code><ndk>/samples/<name>/jni/</code>.</p> - - <p>You can build the shared libraries for the sample apps by going into - <code><ndk>/samples/<name>/</code> then calling the <code>ndk-build</code> command. - The generated shared libraries will be located under - <code><ndk>/samples/<name>/libs/armeabi/</code> for (ARMv5TE machine code) and/or - <code><ndk>/samples/<name>/libs/armeabi-v7a/</code> for (ARMv7 machine code).</p> - - <p>Next, build the sample Android applications that use the shared libraries:</p> - - <ul> - <li>If you are developing in Eclipse with ADT, use the New Project Wizard to create a new - Android project for each sample, using the "Import from Existing Source" option and importing - the source from <code><ndk>/samples/<name>/</code>. Then, set up an AVD, - if necessary, and build/run the application in the emulator.</li> - - <li>If you are developing with Ant, use the <code>android</code> tool to create the build file - for each of the sample projects at <code><ndk>/samples/<name>/</code>. - Then set up an AVD, if necessary, build your project in the usual way, and run it in the - emulator.</li> - - </ul> - - <p>For more information about developing with the Android SDK tools and what - you need to do to create, build, and run your applications, see - the <a href="{@docRoot}tools/workflow/index.html">Overview</a> - section for developing on Android.</p> - - <h4 id="hello-jni">Exploring the hello-jni Sample</h4> - - <p>The hello-jni sample is a simple demonstration on how to use JNI from an Android application. - The HelloJni activity receives a string from a simple C function and displays it in a - TextView.</p> - - <p>The main components of the sample include:</p> - - <ul> - <li>The familiar basic structure of an Android application (an <code>AndroidManifest.xml</code> - file, a <code>src/</code> and <code>res</code> directories, and a main activity)</li> - - <li>A <code>jni/</code> directory that includes the implemented source file for the native code - as well as the Android.mk file</li> - - <li>A <code>tests/</code> directory that contains unit test code.</li> - </ul> - - <ol> - <li>Create a new project in Eclipse from the existing sample source or use the - <code>android</code> tool to update the project so it generates a build.xml file that you can - use to build the sample. - - <ul> - <li>In Eclipse: - - <ol type="a"> - <li>Click <strong>File > New Android Project...</strong></li> - - <li>Select the <strong>Create project from existing source</strong> radio button.</li> - - <li>Select any API level above Android 1.5.</li> - - <li>In the <strong>Location</strong> field, click <strong>Browse...</strong> and select - the <code><ndk-root>/samples/hello-jni</code> directory.</li> - - <li>Click <strong>Finish</strong>.</li> - </ol> - </li> - - <li>On the command line: - - <ol type="a"> - <li>Change to the <code><ndk-root>/samples/hello-jni</code> directory.</li> - - <li>Run the following command to generate a build.xml file: - <pre class="no-pretty-print">android update project -p . -s</pre> - </li> - </ol> - </li> - </ul> - </li> - - <li>Compile the native code using the <code>ndk-build</code> command. - <pre class="no-pretty-print"> -cd <ndk-root>/samples/hello-jni -<ndk_root>/ndk-build -</pre> - </li> - - <li>Build and install the application as you would a normal Android application. If you are - using Eclipse, run the application to build and install it on a device. If you are using Ant, - run the following commands from the project directory: - <pre class="no-pretty-print"> -ant debug -adb install bin/HelloJni-debug.apk -</pre> - </li> - </ol> - - <p>When you run the application on the device, the string <code>Hello JNI</code> should appear on - your device. You can explore the rest of the samples that are located in the - <code><ndk-root>/samples</code> directory for more examples on how to use the JNI.</p> - - <h4 id="native-activity">Exploring the native-activity Sample Application</h4> - - <p>The native-activity sample provided with the Android NDK demonstrates how to use the - android_native_app_glue static library. This static library makes creating a native activity - easier by providing you with an implementation that handles your callbacks in another thread, so - you do not have to worry about them blocking your main UI thread. The main parts of the sample - are described below:</p> - - <ul> - <li>The familiar basic structure of an Android application (an <code>AndroidManifest.xml</code> - file, a <code>src/</code> and <code>res</code> directories). The AndroidManifest.xml declares - that the application is native and specifies the .so file of the native activity. See {@link - android.app.NativeActivity} for the source or see the - <code><ndk_root>/platforms/samples/native-activity/AndroidManifest.xml</code> file.</li> - - <li>A <code>jni/</code> directory contains the native activity, main.c, which uses the - <code>android_native_app_glue.h</code> interface to implement the activity. The Android.mk that - describes the native module to the build system also exists here.</li> - </ul> - - <p>To build this sample application:</p> - - <ol> - <li>Create a new project in Eclipse from the existing sample source or use the - <code>android</code> tool to update the project so it generates a build.xml file that you can - use to build the sample. - - <ul> - <li>In Eclipse: - - <ol type="a"> - <li>Click <strong>File > New Android Project...</strong></li> - - <li>Select the <strong>Create project from existing source</strong> radio button.</li> - - <li>Select any API level above Android 2.3.</li> - - <li>In the <strong>Location</strong> field, click <strong>Browse...</strong> and select - the <code><ndk-root>/samples/native-activity</code> directory.</li> - - <li>Click <strong>Finish</strong>.</li> - </ol> - </li> - - <li>On the command line: - - <ol type="a"> - <li>Change to the <code><ndk-root>/samples/native-activity</code> directory.</li> - - <li>Run the following command to generate a build.xml file: - <pre class="no-pretty-print"> -android update project -p . -s -</pre> - </li> - </ol> - </li> - </ul> - </li> - - <li>Compile the native code using the <code>ndk-build</code> command. - <pre class="no-pretty-print"> -cd <ndk-root>/platforms/samples/android-9/samples/native-activity -<ndk_root>/ndk-build -</pre> - </li> - - <li>Build and install the application as you would a normal Android application. If you are - using Eclipse, run the application to build and install it on a device. If you are using Ant, - run the following commands in the project directory, then run the application on the device: - <pre class="no-pretty-print"> -ant debug -adb install bin/NativeActivity-debug.apk -</pre> - </li> - </ol> - - - <h2 id="reqs">System and Software Requirements</h2> - - <p>The sections below describe the system and software requirements for using the Android NDK, as - well as platform compatibility considerations that affect appplications using libraries produced - with the NDK.</p> - - <h4>The Android SDK</h4> - - <ul> - <li>A complete Android SDK installation (including all dependencies) is required.</li> - - <li>Android 1.5 SDK or later version is required.</li> - </ul> - - <h4>Supported operating systems</h4> - - <ul> - <li>Windows XP (32-bit) or Vista (32- or 64-bit)</li> - - <li>Mac OS X 10.4.8 or later (x86 only)</li> - - <li>Linux (32 or 64-bit; Ubuntu 8.04, or other Linux distributions using GLibc 2.7 or -later)</li> - </ul> - - <h4>Required development tools</h4> - - <ul> - <li>For all development platforms, GNU Make 3.81 or later is required. Earlier versions of GNU - Make might work but have not been tested.</li> - - <li>A recent version of awk (either GNU Awk or Nawk) is also required.</li> - - <li>For Windows, <a href="http://www.cygwin.com">Cygwin</a> 1.7 or higher is required. The NDK - will <em>not</em> work with Cygwin 1.5 installations.</li> - </ul> - - <h4 id="platform-compat">Android platform compatibility</h4> - - <ul> - <li>The native libraries created by the Android NDK can only be used on devices running - specific minimum Android platform versions. The minimum required platform version depends on - the CPU architecture of the devices you are targeting. The following table details which - Android platform versions are compatible with native code developed for specific CPU - architectures. - - <table style="margin:1em;"> - <tr> - <th>Native Code CPU Architecture Used</th> - <th>Compatible Android Platform(s)</th> - </tr> - - <tr> - <td>ARM, ARM-NEON</td> - <td>Android 1.5 (API Level 3) and higher</td> - </tr> - - <tr> - <td>x86</td> - <td>Android 2.3 (API Level 9) and higher</td> - </tr> - - <tr> - <td>MIPS</td> - <td>Android 2.3 (API Level 9) and higher</td> - </tr> - </table> - - <p>These requirements mean you can use native libraries produced with the NDK in - applications that are deployable to ARM-based devices running Android 1.5 or later. If you are - deploying native libraries to x86 and MIPS-based devices, your application must target Android - 2.3 or later.</p> - </li> - - <li>To ensure compatibility, an application using a native library produced with the NDK - <em>must</em> declare a <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><code> - <uses-sdk></code></a> element in its manifest file, with an - <code>android:minSdkVersion</code> attribute value of "3" or higher. For example: - -<pre style="margin:1em;"> -<manifest> - <uses-sdk android:minSdkVersion="3" /> - ... -</manifest> -</pre> - </li> - - <li>If you use this NDK to create a native library that uses the OpenGL ES APIs, the - application containing the library can be deployed only to devices running the minimum platform - versions described in the table below. To ensure compatibility, make sure that your application - declares the proper <code>android:minSdkVersion</code> attribute value, as shown in the - following table.</li> - - <li style="list-style: none; display: inline"> - <table style="margin:1em;"> - <tr> - <th>OpenGL ES Version Used</th> - - <th>Compatible Android Platform(s)</th> - - <th>Required uses-sdk Attribute</th> - </tr> - - <tr> - <td>OpenGL ES 1.1</td> - - <td>Android 1.6 (API Level 4) and higher</td> - - <td><code>android:minSdkVersion="4"</code></td> - </tr> - - <tr> - <td>OpenGL ES 2.0</td> - - <td>Android 2.0 (API Level 5) and higher</td> - - <td><code>android:minSdkVersion="5"</code></td> - </tr> - </table> - - <p>For more information about API Level and its relationship to Android platform versions, - see <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">Android API Levels</a>.</p> - </li> - - <li>Additionally, an application using the OpenGL ES APIs should declare a - <code><uses-feature></code> element in its manifest, with an - <code>android:glEsVersion</code> attribute that specifies the minimum OpenGl ES version - required by the application. This ensures that Google Play will show your application only - to users whose devices are capable of supporting your application. For example: - <pre style="margin:1em;"> -<manifest> -<!-- Declare that the application uses the OpenGL ES 2.0 API and is designed - to run only on devices that support OpenGL ES 2.0 or higher. --> - <uses-feature android:glEsVersion="0x00020000" /> - ... -</manifest> -</pre> - - <p>For more information, see the <a href= - "{@docRoot}guide/topics/manifest/uses-feature-element.html"><code><uses-feature></code></a> - documentation.</p> - </li> - - <li>If you use this NDK to create a native library that uses the API to access Android {@link - android.graphics.Bitmap} pixel buffers or utilizes native activities, the application - containing the library can be deployed only to devices running Android 2.2 (API level 8) or - higher. To ensure compatibility, make sure that your application declares <code><uses-sdk - android:minSdkVersion="8" /></code> attribute value in its manifest.</li> - </ul> diff --git a/docs/html/tools/sdk/older_releases.jd b/docs/html/tools/sdk/older_releases.jd index bb274b67aa7a..94baa92e4e4e 100644 --- a/docs/html/tools/sdk/older_releases.jd +++ b/docs/html/tools/sdk/older_releases.jd @@ -1,4 +1,5 @@ page.title=SDK Archives +excludeFromSuggestions=true @jd:body <p>This page provides a full list of archived and obsolete SDK releases, diff --git a/docs/html/tools/sdk/platforms.jd b/docs/html/tools/sdk/platforms.jd deleted file mode 100644 index 27e89dea5b6c..000000000000 --- a/docs/html/tools/sdk/platforms.jd +++ /dev/null @@ -1,9 +0,0 @@ -page.title=Android Development Platforms - -@jd:body - - - -<p>A page that lists platforms and links to release notes. Links to dashboards etc.</p> - - diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd index 7d1218446f73..4d8aa34ca544 100644 --- a/docs/html/tools/sdk/tools-notes.jd +++ b/docs/html/tools/sdk/tools-notes.jd @@ -1,4 +1,5 @@ page.title=SDK Tools +excludeFromSuggestions=true @jd:body <p>SDK Tools is a downloadable component for the Android SDK. It includes the diff --git a/docs/html/tools/sdk/usb-drivers.jd b/docs/html/tools/sdk/usb-drivers.jd deleted file mode 100644 index 27e89dea5b6c..000000000000 --- a/docs/html/tools/sdk/usb-drivers.jd +++ /dev/null @@ -1,9 +0,0 @@ -page.title=Android Development Platforms - -@jd:body - - - -<p>A page that lists platforms and links to release notes. Links to dashboards etc.</p> - - diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index c90f400b6b26..d5183d5f9bc7 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -17,6 +17,7 @@ package android.graphics.drawable; import android.graphics.Insets; +import android.os.Trace; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -745,7 +746,12 @@ public abstract class Drawable { * Create a drawable from an inputstream */ public static Drawable createFromStream(InputStream is, String srcName) { - return createFromResourceStream(null, null, is, srcName, null); + Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, srcName != null ? srcName : "Unknown drawable"); + try { + return createFromResourceStream(null, null, is, srcName, null); + } finally { + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); + } } /** @@ -754,7 +760,12 @@ public abstract class Drawable { */ public static Drawable createFromResourceStream(Resources res, TypedValue value, InputStream is, String srcName) { - return createFromResourceStream(res, value, is, srcName, null); + Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, srcName != null ? srcName : "Unknown drawable"); + try { + return createFromResourceStream(res, value, is, srcName, null); + } finally { + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); + } } /** @@ -900,9 +911,14 @@ public abstract class Drawable { return null; } - Bitmap bm = BitmapFactory.decodeFile(pathName); - if (bm != null) { - return drawableFromBitmap(null, bm, null, null, null, pathName); + Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, pathName); + try { + Bitmap bm = BitmapFactory.decodeFile(pathName); + if (bm != null) { + return drawableFromBitmap(null, bm, null, null, null, pathName); + } + } finally { + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); } return null; diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index a0c97012e397..8a4d598a533c 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -512,7 +512,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { @Override public int getChangingConfigurations() { - return mChangingConfigurations; + return mChangingConfigurations | mChildrenChangingConfigurations; } public final int addChild(Drawable dr) { diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index eb0c164af112..ea29b7dc49cc 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -18,6 +18,7 @@ package android.renderscript; import java.io.IOException; import java.io.InputStream; +import java.util.HashMap; import android.content.res.Resources; import android.content.res.AssetManager; import android.graphics.Bitmap; @@ -92,6 +93,9 @@ public class Allocation extends BaseObj { int mCurrentDimY; int mCurrentDimZ; int mCurrentCount; + static HashMap<Integer, Allocation> mAllocationMap = + new HashMap<Integer, Allocation>(); + IoInputNotifier mBufferNotifier; /** @@ -273,14 +277,14 @@ public class Allocation extends BaseObj { throw new RSIllegalArgumentException("Invalid usage combination."); } } - - // don't need to account for USAGE_SHARED Allocations - if ((usage & USAGE_SHARED) == 0) { - int numBytes = t.getCount() * t.getElement().getBytesSize(); - rs.addAllocSizeForGC(numBytes); - mGCSize = numBytes; + if (t != null) { + // don't need to account for USAGE_SHARED Allocations + if ((usage & USAGE_SHARED) == 0) { + int numBytes = t.getCount() * t.getElement().getBytesSize(); + rs.addAllocSizeForGC(numBytes); + mGCSize = numBytes; + } } - mType = t; mUsage = usage; @@ -351,6 +355,12 @@ public class Allocation extends BaseObj { mType.updateFromNative(); updateCacheInfo(mType); } + // don't need to account for USAGE_SHARED Allocations + if ((mUsage & USAGE_SHARED) == 0) { + int numBytes = mType.getCount() * mType.getElement().getBytesSize(); + mRS.addAllocSizeForGC(numBytes); + mGCSize = numBytes; + } } /** @@ -1713,6 +1723,41 @@ public class Allocation extends BaseObj { throw new RSRuntimeException("Could not convert string to utf-8."); } } + + /** + * Interface to handle notification when new buffers are + * available via USAGE_IO_INPUT. An application will receive + * one notification when a buffer is available. Additional + * buffers will not trigger new notifications until a buffer is + * processed. + */ + public interface IoInputNotifier { + public void onBufferAvailable(Allocation a); + } + + /** + * Set a notification handler for USAGE_IO_INPUT + * + * @param callback instance of the IoInputNotifier class to be called + * when buffer arrive. + */ + public void setIoInputNotificationHandler(IoInputNotifier callback) { + synchronized(mAllocationMap) { + mAllocationMap.put(new Integer(getID(mRS)), this); + mBufferNotifier = callback; + } + } + + static void sendBufferNotification(int id) { + synchronized(mAllocationMap) { + Allocation a = mAllocationMap.get(new Integer(id)); + + if ((a != null) && (a.mBufferNotifier != null)) { + a.mBufferNotifier.onBufferAvailable(a); + } + } + } + } diff --git a/graphics/java/android/renderscript/FieldPacker.java b/graphics/java/android/renderscript/FieldPacker.java index 0a7e88277d22..decd0c79bd09 100644 --- a/graphics/java/android/renderscript/FieldPacker.java +++ b/graphics/java/android/renderscript/FieldPacker.java @@ -16,6 +16,8 @@ package android.renderscript; +import android.util.Log; +import java.util.BitSet; /** * Utility class for packing arguments and structures from Android system objects to @@ -27,12 +29,14 @@ public class FieldPacker { mPos = 0; mLen = len; mData = new byte[len]; + mAlignment = new BitSet(); } public FieldPacker(byte[] data) { mPos = 0; mLen = data.length; mData = data; + mAlignment = new BitSet(); } public void align(int v) { @@ -41,10 +45,29 @@ public class FieldPacker { } while ((mPos & (v - 1)) != 0) { + mAlignment.flip(mPos); mData[mPos++] = 0; } } + public void subalign(int v) { + if ((v & (v - 1)) != 0) { + throw new RSIllegalArgumentException("argument must be a non-negative non-zero power of 2: " + v); + } + + while ((mPos & (v - 1)) != 0) { + mPos--; + } + + if (mPos > 0) { + while (mAlignment.get(mPos - 1) == true) { + mPos--; + mAlignment.flip(mPos); + } + } + + } + public void reset() { mPos = 0; } @@ -67,12 +90,26 @@ public class FieldPacker { mData[mPos++] = v; } + public byte subI8() { + subalign(1); + return mData[--mPos]; + } + public void addI16(short v) { align(2); mData[mPos++] = (byte)(v & 0xff); mData[mPos++] = (byte)(v >> 8); } + public short subI16() { + subalign(2); + short v = 0; + v = (short)((mData[--mPos] & 0xff) << 8); + v = (short)(v | (short)(mData[--mPos] & 0xff)); + return v; + } + + public void addI32(int v) { align(4); mData[mPos++] = (byte)(v & 0xff); @@ -81,6 +118,17 @@ public class FieldPacker { mData[mPos++] = (byte)((v >> 24) & 0xff); } + public int subI32() { + subalign(4); + int v = 0; + v = ((mData[--mPos] & 0xff) << 24); + v = v | ((mData[--mPos] & 0xff) << 16); + v = v | ((mData[--mPos] & 0xff) << 8); + v = v | ((mData[--mPos] & 0xff)); + return v; + } + + public void addI64(long v) { align(8); mData[mPos++] = (byte)(v & 0xff); @@ -93,6 +141,29 @@ public class FieldPacker { mData[mPos++] = (byte)((v >> 56) & 0xff); } + public long subI64() { + subalign(8); + long v = 0; + byte x = 0; + x = ((mData[--mPos])); + v = (long)(v | (((long)x) & 0xff) << 56l); + x = ((mData[--mPos])); + v = (long)(v | (((long)x) & 0xff) << 48l); + x = ((mData[--mPos])); + v = (long)(v | (((long)x) & 0xff) << 40l); + x = ((mData[--mPos])); + v = (long)(v | (((long)x) & 0xff) << 32l); + x = ((mData[--mPos])); + v = (long)(v | (((long)x) & 0xff) << 24l); + x = ((mData[--mPos])); + v = (long)(v | (((long)x) & 0xff) << 16l); + x = ((mData[--mPos])); + v = (long)(v | (((long)x) & 0xff) << 8l); + x = ((mData[--mPos])); + v = (long)(v | (((long)x) & 0xff)); + return v; + } + public void addU8(short v) { if ((v < 0) || (v > 0xff)) { android.util.Log.e("rs", "FieldPacker.addU8( " + v + " )"); @@ -143,10 +214,18 @@ public class FieldPacker { addI32(Float.floatToRawIntBits(v)); } + public float subF32() { + return Float.intBitsToFloat(subI32()); + } + public void addF64(double v) { addI64(Double.doubleToRawLongBits(v)); } + public double subF64() { + return Double.longBitsToDouble(subI64()); + } + public void addObj(BaseObj obj) { if (obj != null) { addI32(obj.getID(null)); @@ -315,28 +394,195 @@ public class FieldPacker { addU64(v.w); } + + public Float2 subFloat2() { + Float2 v = new Float2(); + v.y = subF32(); + v.x = subF32(); + return v; + } + public Float3 subFloat3() { + Float3 v = new Float3(); + v.z = subF32(); + v.y = subF32(); + v.x = subF32(); + return v; + } + public Float4 subFloat4() { + Float4 v = new Float4(); + v.w = subF32(); + v.z = subF32(); + v.y = subF32(); + v.x = subF32(); + return v; + } + + public Double2 subDouble2() { + Double2 v = new Double2(); + v.y = subF64(); + v.x = subF64(); + return v; + } + public Double3 subDouble3() { + Double3 v = new Double3(); + v.z = subF64(); + v.y = subF64(); + v.x = subF64(); + return v; + } + public Double4 subDouble4() { + Double4 v = new Double4(); + v.w = subF64(); + v.z = subF64(); + v.y = subF64(); + v.x = subF64(); + return v; + } + + public Byte2 subByte2() { + Byte2 v = new Byte2(); + v.y = subI8(); + v.x = subI8(); + return v; + } + public Byte3 subByte3() { + Byte3 v = new Byte3(); + v.z = subI8(); + v.y = subI8(); + v.x = subI8(); + return v; + } + public Byte4 subByte4() { + Byte4 v = new Byte4(); + v.w = subI8(); + v.z = subI8(); + v.y = subI8(); + v.x = subI8(); + return v; + } + + public Short2 subShort2() { + Short2 v = new Short2(); + v.y = subI16(); + v.x = subI16(); + return v; + } + public Short3 subShort3() { + Short3 v = new Short3(); + v.z = subI16(); + v.y = subI16(); + v.x = subI16(); + return v; + } + public Short4 subShort4() { + Short4 v = new Short4(); + v.w = subI16(); + v.z = subI16(); + v.y = subI16(); + v.x = subI16(); + return v; + } + + public Int2 subInt2() { + Int2 v = new Int2(); + v.y = subI32(); + v.x = subI32(); + return v; + } + public Int3 subInt3() { + Int3 v = new Int3(); + v.z = subI32(); + v.y = subI32(); + v.x = subI32(); + return v; + } + public Int4 subInt4() { + Int4 v = new Int4(); + v.w = subI32(); + v.z = subI32(); + v.y = subI32(); + v.x = subI32(); + return v; + } + + public Long2 subLong2() { + Long2 v = new Long2(); + v.y = subI64(); + v.x = subI64(); + return v; + } + public Long3 subLong3() { + Long3 v = new Long3(); + v.z = subI64(); + v.y = subI64(); + v.x = subI64(); + return v; + } + public Long4 subLong4() { + Long4 v = new Long4(); + v.w = subI64(); + v.z = subI64(); + v.y = subI64(); + v.x = subI64(); + return v; + } + + + public void addMatrix(Matrix4f v) { for (int i=0; i < v.mMat.length; i++) { addF32(v.mMat[i]); } } + public Matrix4f subMatrix4f() { + Matrix4f v = new Matrix4f(); + for (int i = v.mMat.length - 1; i >= 0; i--) { + v.mMat[i] = subF32(); + } + return v; + } + public void addMatrix(Matrix3f v) { for (int i=0; i < v.mMat.length; i++) { addF32(v.mMat[i]); } } + public Matrix3f subMatrix3f() { + Matrix3f v = new Matrix3f(); + for (int i = v.mMat.length - 1; i >= 0; i--) { + v.mMat[i] = subF32(); + } + return v; + } + public void addMatrix(Matrix2f v) { for (int i=0; i < v.mMat.length; i++) { addF32(v.mMat[i]); } } + public Matrix2f subMatrix2f() { + Matrix2f v = new Matrix2f(); + for (int i = v.mMat.length - 1; i >= 0; i--) { + v.mMat[i] = subF32(); + } + return v; + } + public void addBoolean(boolean v) { addI8((byte)(v ? 1 : 0)); } + public boolean subBoolean() { + byte v = subI8(); + if (v == 1) { + return true; + } + return false; + } + public final byte[] getData() { return mData; } @@ -344,6 +590,7 @@ public class FieldPacker { private final byte mData[]; private int mPos; private int mLen; + private BitSet mAlignment; } diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index d5af2767bb40..33639dc57d4f 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -18,7 +18,9 @@ package android.renderscript; import java.io.File; import java.lang.reflect.Field; +import java.util.concurrent.locks.*; +import android.app.ActivityManager; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -97,9 +99,29 @@ public class RenderScript { mCacheDir = cacheDir; } + /** + * ContextType specifies the specific type of context to be created. + * + */ public enum ContextType { + /** + * NORMAL context, this is the default and what shipping apps should + * use. + */ NORMAL (0), + + /** + * DEBUG context, perform extra runtime checks to validate the + * kernels and APIs are being used as intended. Get and SetElementAt + * will be bounds checked in this mode. + */ DEBUG (1), + + /** + * PROFILE context, Intended to be used once the first time an + * application is run on a new device. This mode allows the runtime to + * do additional testing and performance tuning. + */ PROFILE (2); int mID; @@ -580,31 +602,59 @@ public class RenderScript { validate(); rsnScriptInvokeV(mContext, id, slot, params); } + native void rsnScriptSetVarI(int con, int id, int slot, int val); synchronized void nScriptSetVarI(int id, int slot, int val) { validate(); rsnScriptSetVarI(mContext, id, slot, val); } + native int rsnScriptGetVarI(int con, int id, int slot); + synchronized int nScriptGetVarI(int id, int slot) { + validate(); + return rsnScriptGetVarI(mContext, id, slot); + } + native void rsnScriptSetVarJ(int con, int id, int slot, long val); synchronized void nScriptSetVarJ(int id, int slot, long val) { validate(); rsnScriptSetVarJ(mContext, id, slot, val); } + native long rsnScriptGetVarJ(int con, int id, int slot); + synchronized long nScriptGetVarJ(int id, int slot) { + validate(); + return rsnScriptGetVarJ(mContext, id, slot); + } + native void rsnScriptSetVarF(int con, int id, int slot, float val); synchronized void nScriptSetVarF(int id, int slot, float val) { validate(); rsnScriptSetVarF(mContext, id, slot, val); } + native float rsnScriptGetVarF(int con, int id, int slot); + synchronized float nScriptGetVarF(int id, int slot) { + validate(); + return rsnScriptGetVarF(mContext, id, slot); + } native void rsnScriptSetVarD(int con, int id, int slot, double val); synchronized void nScriptSetVarD(int id, int slot, double val) { validate(); rsnScriptSetVarD(mContext, id, slot, val); } + native double rsnScriptGetVarD(int con, int id, int slot); + synchronized double nScriptGetVarD(int id, int slot) { + validate(); + return rsnScriptGetVarD(mContext, id, slot); + } native void rsnScriptSetVarV(int con, int id, int slot, byte[] val); synchronized void nScriptSetVarV(int id, int slot, byte[] val) { validate(); rsnScriptSetVarV(mContext, id, slot, val); } + native void rsnScriptGetVarV(int con, int id, int slot, byte[] val); + synchronized void nScriptGetVarV(int id, int slot, byte[] val) { + validate(); + rsnScriptGetVarV(mContext, id, slot, val); + } native void rsnScriptSetVarVE(int con, int id, int slot, byte[] val, int e, int[] dims); synchronized void nScriptSetVarVE(int id, int slot, byte[] val, @@ -885,7 +935,8 @@ public class RenderScript { } /** - * @hide + * Place a message into the message queue to be sent back to the message + * handler once all previous commands have been executed. * * @param id * @param data @@ -966,6 +1017,7 @@ public class RenderScript { static final int RS_MESSAGE_TO_CLIENT_RESIZE = 2; static final int RS_MESSAGE_TO_CLIENT_ERROR = 3; static final int RS_MESSAGE_TO_CLIENT_USER = 4; + static final int RS_MESSAGE_TO_CLIENT_NEW_BUFFER = 5; static final int RS_ERROR_FATAL_UNKNOWN = 0x1000; @@ -1025,6 +1077,11 @@ public class RenderScript { continue; } + if (msg == RS_MESSAGE_TO_CLIENT_NEW_BUFFER) { + Allocation.sendBufferNotification(subID); + continue; + } + // 2: teardown. // But we want to avoid starving other threads during // teardown by yielding until the next line in the destructor @@ -1042,8 +1099,11 @@ public class RenderScript { RenderScript mRS; boolean mRun = true; - int currentSize = 0; - final static int targetSize = 256*1024*1024; // call System.gc after 256MB of allocs + long currentSize = 0; + long targetSize; // call System.gc after 512MB of allocs + + final Lock lock = new ReentrantLock(); + final Condition cond = lock.newCondition(); GCThread(RenderScript rs) { super("RSGCThread"); @@ -1052,29 +1112,37 @@ public class RenderScript { } public void run() { + ActivityManager am = (ActivityManager)mRS.getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE); + ActivityManager.MemoryInfo meminfo = new ActivityManager.MemoryInfo(); + am.getMemoryInfo(meminfo); + targetSize = (long)(meminfo.totalMem * .5f); + while(mRun) { - boolean doGC = false; - synchronized(this) { - if (currentSize >= targetSize) { - doGC = true; - } - } - if (doGC == true) { - System.gc(); - } + System.gc(); + lock.lock(); try { - sleep(1, 0); - } catch(InterruptedException e) { + cond.awaitUninterruptibly(); + } finally { + lock.unlock(); } } + Log.d(LOG_TAG, "GCThread exiting."); } - public synchronized void addAllocSize(int bytes) { + public synchronized void addAllocSize(long bytes) { currentSize += bytes; + if (currentSize >= targetSize) { + lock.lock(); + try { + cond.signal(); + } finally { + lock.unlock(); + } + } } - public synchronized void removeAllocSize(int bytes) { + public synchronized void removeAllocSize(long bytes) { currentSize -= bytes; } @@ -1147,9 +1215,9 @@ public class RenderScript { /** * Create a basic RenderScript context. * - * @hide * * @param ctx The context. + * @param ct The type of context to be created. * @return RenderScript */ public static RenderScript create(Context ctx, ContextType ct) { @@ -1186,6 +1254,7 @@ public class RenderScript { nContextDeinitToClient(mContext); mMessageThread.mRun = false; mGCThread.mRun = false; + mGCThread.addAllocSize(0); try { mMessageThread.join(); mGCThread.join(); diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java index b4055882ab2a..b4ba943482c5 100644 --- a/graphics/java/android/renderscript/Script.java +++ b/graphics/java/android/renderscript/Script.java @@ -220,6 +220,9 @@ public class Script extends BaseObj { public void setVar(int index, float v) { mRS.nScriptSetVarF(getID(mRS), index, v); } + public float getVarF(int index) { + return mRS.nScriptGetVarF(getID(mRS), index); + } /** * Only intended for use by generated reflected code. @@ -230,6 +233,9 @@ public class Script extends BaseObj { public void setVar(int index, double v) { mRS.nScriptSetVarD(getID(mRS), index, v); } + public double getVarD(int index) { + return mRS.nScriptGetVarD(getID(mRS), index); + } /** * Only intended for use by generated reflected code. @@ -240,6 +246,10 @@ public class Script extends BaseObj { public void setVar(int index, int v) { mRS.nScriptSetVarI(getID(mRS), index, v); } + public int getVarI(int index) { + return mRS.nScriptGetVarI(getID(mRS), index); + } + /** * Only intended for use by generated reflected code. @@ -250,6 +260,10 @@ public class Script extends BaseObj { public void setVar(int index, long v) { mRS.nScriptSetVarJ(getID(mRS), index, v); } + public long getVarJ(int index) { + return mRS.nScriptGetVarJ(getID(mRS), index); + } + /** * Only intended for use by generated reflected code. @@ -260,6 +274,9 @@ public class Script extends BaseObj { public void setVar(int index, boolean v) { mRS.nScriptSetVarI(getID(mRS), index, v ? 1 : 0); } + public boolean getVarB(int index) { + return mRS.nScriptGetVarI(getID(mRS), index) > 0 ? true : false; + } /** * Only intended for use by generated reflected code. @@ -293,6 +310,10 @@ public class Script extends BaseObj { mRS.nScriptSetVarVE(getID(mRS), index, v.getData(), e.getID(mRS), dims); } + public void getVarV(int index, FieldPacker v) { + mRS.nScriptGetVarV(getID(mRS), index, v.getData()); + } + public void setTimeZone(String timeZone) { mRS.validate(); try { diff --git a/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java b/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java index 3e58b8726ec7..86f37d847427 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java +++ b/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java @@ -20,7 +20,11 @@ import android.util.Log; /** * - * @hide + * Intrinsic for converting RGB to RGBA by using a 3D lookup table. The + * incoming r,g,b values are use as normalized x,y,z coordinates into a 3D + * allocation. The 8 nearest values are sampled and linearly interpolated. The + * result is placed in the output. + * **/ public final class ScriptIntrinsic3DLUT extends ScriptIntrinsic { private Allocation mLUT; diff --git a/graphics/java/android/renderscript/Type.java b/graphics/java/android/renderscript/Type.java index d7c8255e3e52..a5e24ce14597 100644 --- a/graphics/java/android/renderscript/Type.java +++ b/graphics/java/android/renderscript/Type.java @@ -112,7 +112,7 @@ public class Type extends BaseObj { /** * Get the YUV format * - * @hide + * * @return int */ public int getYuv() { @@ -277,7 +277,9 @@ public class Type extends BaseObj { } /** - * @hide + * Set the YUV layout for a Type. This controls how the memory is + * interpreted. Generally and application should not need to call this + * function and it would be set by the Camera. * * only NV21, YV12. Enums from ImageFormat */ diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index 460a51677b1b..b9f871336e90 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -987,6 +987,15 @@ nScriptSetVarI(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slo rsScriptSetVarI(con, (RsScript)script, slot, val); } +static jint +nScriptGetVarI(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot) +{ + LOG_API("nScriptGetVarI, con(%p), s(%p), slot(%i)", con, (void *)script, slot); + int value = 0; + rsScriptGetVarV(con, (RsScript)script, slot, &value, sizeof(value)); + return value; +} + static void nScriptSetVarObj(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jint val) { @@ -1001,6 +1010,15 @@ nScriptSetVarJ(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slo rsScriptSetVarJ(con, (RsScript)script, slot, val); } +static jlong +nScriptGetVarJ(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot) +{ + LOG_API("nScriptGetVarJ, con(%p), s(%p), slot(%i)", con, (void *)script, slot); + jlong value = 0; + rsScriptGetVarV(con, (RsScript)script, slot, &value, sizeof(value)); + return value; +} + static void nScriptSetVarF(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, float val) { @@ -1008,6 +1026,15 @@ nScriptSetVarF(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slo rsScriptSetVarF(con, (RsScript)script, slot, val); } +static jfloat +nScriptGetVarF(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot) +{ + LOG_API("nScriptGetVarF, con(%p), s(%p), slot(%i)", con, (void *)script, slot); + jfloat value = 0; + rsScriptGetVarV(con, (RsScript)script, slot, &value, sizeof(value)); + return value; +} + static void nScriptSetVarD(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, double val) { @@ -1015,6 +1042,15 @@ nScriptSetVarD(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slo rsScriptSetVarD(con, (RsScript)script, slot, val); } +static jdouble +nScriptGetVarD(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot) +{ + LOG_API("nScriptGetVarD, con(%p), s(%p), slot(%i)", con, (void *)script, slot); + jdouble value = 0; + rsScriptGetVarV(con, (RsScript)script, slot, &value, sizeof(value)); + return value; +} + static void nScriptSetVarV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data) { @@ -1026,6 +1062,16 @@ nScriptSetVarV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slo } static void +nScriptGetVarV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data) +{ + LOG_API("nScriptSetVarV, con(%p), s(%p), slot(%i)", con, (void *)script, slot); + jint len = _env->GetArrayLength(data); + jbyte *ptr = _env->GetByteArrayElements(data, NULL); + rsScriptGetVarV(con, (RsScript)script, slot, ptr, len); + _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); +} + +static void nScriptSetVarVE(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data, jint elem, jintArray dims) { LOG_API("nScriptSetVarVE, con(%p), s(%p), slot(%i)", con, (void *)script, slot); @@ -1600,10 +1646,15 @@ static JNINativeMethod methods[] = { {"rsnScriptForEachClipped", "(IIIIIIIIIII)V", (void*)nScriptForEachClipped }, {"rsnScriptForEachClipped", "(IIIII[BIIIIII)V", (void*)nScriptForEachClippedV }, {"rsnScriptSetVarI", "(IIII)V", (void*)nScriptSetVarI }, +{"rsnScriptGetVarI", "(III)I", (void*)nScriptGetVarI }, {"rsnScriptSetVarJ", "(IIIJ)V", (void*)nScriptSetVarJ }, +{"rsnScriptGetVarJ", "(III)J", (void*)nScriptGetVarJ }, {"rsnScriptSetVarF", "(IIIF)V", (void*)nScriptSetVarF }, +{"rsnScriptGetVarF", "(III)F", (void*)nScriptGetVarF }, {"rsnScriptSetVarD", "(IIID)V", (void*)nScriptSetVarD }, +{"rsnScriptGetVarD", "(III)D", (void*)nScriptGetVarD }, {"rsnScriptSetVarV", "(III[B)V", (void*)nScriptSetVarV }, +{"rsnScriptGetVarV", "(III[B)V", (void*)nScriptGetVarV }, {"rsnScriptSetVarVE", "(III[BI[I)V", (void*)nScriptSetVarVE }, {"rsnScriptSetVarObj", "(IIII)V", (void*)nScriptSetVarObj }, diff --git a/keystore/java/android/security/AndroidKeyPairGenerator.java b/keystore/java/android/security/AndroidKeyPairGenerator.java index c42001b79705..69755833e6f4 100644 --- a/keystore/java/android/security/AndroidKeyPairGenerator.java +++ b/keystore/java/android/security/AndroidKeyPairGenerator.java @@ -49,10 +49,7 @@ import java.security.spec.X509EncodedKeySpec; * * {@hide} */ -@SuppressWarnings("deprecation") public class AndroidKeyPairGenerator extends KeyPairGeneratorSpi { - public static final String NAME = "AndroidKeyPairGenerator"; - private android.security.KeyStore mKeyStore; private AndroidKeyPairGeneratorSpec mSpec; @@ -79,12 +76,21 @@ public class AndroidKeyPairGenerator extends KeyPairGeneratorSpi { "Must call initialize with an AndroidKeyPairGeneratorSpec first"); } + if (((mSpec.getFlags() & KeyStore.FLAG_ENCRYPTED) != 0) + && (mKeyStore.state() != KeyStore.State.UNLOCKED)) { + throw new IllegalStateException( + "Android keystore must be in initialized and unlocked state " + + "if encryption is required"); + } + final String alias = mSpec.getKeystoreAlias(); Credentials.deleteAllTypesForAlias(mKeyStore, alias); final String privateKeyAlias = Credentials.USER_PRIVATE_KEY + alias; - mKeyStore.generate(privateKeyAlias); + if (!mKeyStore.generate(privateKeyAlias, KeyStore.UID_SELF, mSpec.getFlags())) { + throw new IllegalStateException("could not generate key in keystore"); + } final PrivateKey privKey; final OpenSSLEngine engine = OpenSSLEngine.getInstance("keystore"); @@ -131,7 +137,8 @@ public class AndroidKeyPairGenerator extends KeyPairGeneratorSpi { throw new IllegalStateException("Can't get encoding of certificate", e); } - if (!mKeyStore.put(Credentials.USER_CERTIFICATE + alias, certBytes)) { + if (!mKeyStore.put(Credentials.USER_CERTIFICATE + alias, certBytes, KeyStore.UID_SELF, + mSpec.getFlags())) { Credentials.deleteAllTypesForAlias(mKeyStore, alias); throw new IllegalStateException("Can't store certificate in AndroidKeyStore"); } diff --git a/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java b/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java index 18225a542f02..b126f0361572 100644 --- a/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java +++ b/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java @@ -32,10 +32,9 @@ import javax.security.auth.x500.X500Principal; * {@code KeyPairGenerator} that works with <a href="{@docRoot} * guide/topics/security/keystore.html">Android KeyStore facility</a>. The * Android KeyStore facility is accessed through a - * {@link java.security.KeyPairGenerator} API using the - * {@code AndroidKeyPairGenerator} provider. The {@code context} passed in may - * be used to pop up some UI to ask the user to unlock or initialize the Android - * keystore facility. + * {@link java.security.KeyPairGenerator} API using the {@code AndroidKeyStore} + * provider. The {@code context} passed in may be used to pop up some UI to ask + * the user to unlock or initialize the Android KeyStore facility. * <p> * After generation, the {@code keyStoreAlias} is used with the * {@link java.security.KeyStore#getEntry(String, java.security.KeyStore.ProtectionParameter)} @@ -47,10 +46,10 @@ import javax.security.auth.x500.X500Principal; * Distinguished Name along with the other parameters specified with the * {@link Builder}. * <p> - * The self-signed certificate may be replaced at a later time by a certificate - * signed by a real Certificate Authority. + * The self-signed X.509 certificate may be replaced at a later time by a + * certificate signed by a real Certificate Authority. */ -public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { +public final class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { private final String mKeystoreAlias; private final Context mContext; @@ -63,6 +62,8 @@ public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { private final Date mEndDate; + private final int mFlags; + /** * Parameter specification for the "{@code AndroidKeyPairGenerator}" * instance of the {@link java.security.KeyPairGenerator} API. The @@ -93,7 +94,8 @@ public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { * @hide should be built with AndroidKeyPairGeneratorSpecBuilder */ public AndroidKeyPairGeneratorSpec(Context context, String keyStoreAlias, - X500Principal subjectDN, BigInteger serialNumber, Date startDate, Date endDate) { + X500Principal subjectDN, BigInteger serialNumber, Date startDate, Date endDate, + int flags) { if (context == null) { throw new IllegalArgumentException("context == null"); } else if (TextUtils.isEmpty(keyStoreAlias)) { @@ -116,51 +118,72 @@ public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { mSerialNumber = serialNumber; mStartDate = startDate; mEndDate = endDate; + mFlags = flags; } /** - * @hide + * Returns the alias that will be used in the {@code java.security.KeyStore} + * in conjunction with the {@code AndroidKeyStore}. */ - String getKeystoreAlias() { + public String getKeystoreAlias() { return mKeystoreAlias; } /** - * @hide + * Gets the Android context used for operations with this instance. */ - Context getContext() { + public Context getContext() { return mContext; } /** - * @hide + * Gets the subject distinguished name to be used on the X.509 certificate + * that will be put in the {@link java.security.KeyStore}. */ - X500Principal getSubjectDN() { + public X500Principal getSubjectDN() { return mSubjectDN; } /** - * @hide + * Gets the serial number to be used on the X.509 certificate that will be + * put in the {@link java.security.KeyStore}. */ - BigInteger getSerialNumber() { + public BigInteger getSerialNumber() { return mSerialNumber; } /** - * @hide + * Gets the start date to be used on the X.509 certificate that will be put + * in the {@link java.security.KeyStore}. */ - Date getStartDate() { + public Date getStartDate() { return mStartDate; } /** - * @hide + * Gets the end date to be used on the X.509 certificate that will be put in + * the {@link java.security.KeyStore}. */ - Date getEndDate() { + public Date getEndDate() { return mEndDate; } /** + * @hide + */ + int getFlags() { + return mFlags; + } + + /** + * Returns {@code true} if this parameter will require generated keys to be + * encrypted in the {@link java.security.KeyStore}. + */ + public boolean isEncryptionRequired() { + return (mFlags & KeyStore.FLAG_ENCRYPTED) != 0; + } + + /** * Builder class for {@link AndroidKeyPairGeneratorSpec} objects. * <p> * This will build a parameter spec for use with the <a href="{@docRoot} @@ -175,16 +198,17 @@ public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { * Calendar end = new Calendar(); * end.add(1, Calendar.YEAR); * - * AndroidKeyPairGeneratorSpec spec = new AndroidKeyPairGeneratorSpec.Builder(mContext) - * .setAlias("myKey") - * .setSubject(new X500Principal("CN=myKey")) - * .setSerial(BigInteger.valueOf(1337)) - * .setStartDate(start.getTime()) - * .setEndDate(end.getTime()) - * .build(); + * AndroidKeyPairGeneratorSpec spec = + * new AndroidKeyPairGeneratorSpec.Builder(mContext) + * .setAlias("myKey") + * .setSubject(new X500Principal("CN=myKey")) + * .setSerial(BigInteger.valueOf(1337)) + * .setStartDate(start.getTime()) + * .setEndDate(end.getTime()) + * .build(); * </pre> */ - public static class Builder { + public final static class Builder { private final Context mContext; private String mKeystoreAlias; @@ -197,6 +221,14 @@ public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { private Date mEndDate; + private int mFlags; + + /** + * Creates a new instance of the {@code Builder} with the given + * {@code context}. The {@code context} passed in may be used to pop up + * some UI to ask the user to unlock or initialize the Android KeyStore + * facility. + */ public Builder(Context context) { if (context == null) { throw new NullPointerException("context == null"); @@ -266,6 +298,17 @@ public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { } /** + * Indicates that this key must be encrypted at rest on storage. Note + * that enabling this will require that the user enable a strong lock + * screen (e.g., PIN, password) before creating or using the generated + * key is successful. + */ + public Builder setEncryptionRequired() { + mFlags |= KeyStore.FLAG_ENCRYPTED; + return this; + } + + /** * Builds the instance of the {@code AndroidKeyPairGeneratorSpec}. * * @throws IllegalArgumentException if a required field is missing @@ -273,7 +316,7 @@ public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { */ public AndroidKeyPairGeneratorSpec build() { return new AndroidKeyPairGeneratorSpec(mContext, mKeystoreAlias, mSubjectDN, - mSerialNumber, mStartDate, mEndDate); + mSerialNumber, mStartDate, mEndDate, mFlags); } } } diff --git a/keystore/java/android/security/AndroidKeyStore.java b/keystore/java/android/security/AndroidKeyStore.java index 8a9826bd6176..dcc951685d59 100644 --- a/keystore/java/android/security/AndroidKeyStore.java +++ b/keystore/java/android/security/AndroidKeyStore.java @@ -27,6 +27,10 @@ import java.io.InputStream; import java.io.OutputStream; import java.security.InvalidKeyException; import java.security.Key; +import java.security.KeyStore.Entry; +import java.security.KeyStore.PrivateKeyEntry; +import java.security.KeyStore.ProtectionParameter; +import java.security.KeyStore; import java.security.KeyStoreException; import java.security.KeyStoreSpi; import java.security.NoSuchAlgorithmException; @@ -198,14 +202,14 @@ public class AndroidKeyStore extends KeyStoreSpi { } if (key instanceof PrivateKey) { - setPrivateKeyEntry(alias, (PrivateKey) key, chain); + setPrivateKeyEntry(alias, (PrivateKey) key, chain, null); } else { throw new KeyStoreException("Only PrivateKeys are supported"); } } - private void setPrivateKeyEntry(String alias, PrivateKey key, Certificate[] chain) - throws KeyStoreException { + private void setPrivateKeyEntry(String alias, PrivateKey key, Certificate[] chain, + AndroidKeyStoreParameter params) throws KeyStoreException { byte[] keyBytes = null; final String pkeyAlias; @@ -317,15 +321,20 @@ public class AndroidKeyStore extends KeyStoreSpi { Credentials.deleteCertificateTypesForAlias(mKeyStore, alias); } + final int flags = (params == null) ? 0 : params.getFlags(); + if (shouldReplacePrivateKey - && !mKeyStore.importKey(Credentials.USER_PRIVATE_KEY + alias, keyBytes)) { + && !mKeyStore.importKey(Credentials.USER_PRIVATE_KEY + alias, keyBytes, + android.security.KeyStore.UID_SELF, flags)) { Credentials.deleteAllTypesForAlias(mKeyStore, alias); throw new KeyStoreException("Couldn't put private key in keystore"); - } else if (!mKeyStore.put(Credentials.USER_CERTIFICATE + alias, userCertBytes)) { + } else if (!mKeyStore.put(Credentials.USER_CERTIFICATE + alias, userCertBytes, + android.security.KeyStore.UID_SELF, flags)) { Credentials.deleteAllTypesForAlias(mKeyStore, alias); throw new KeyStoreException("Couldn't put certificate #1 in keystore"); } else if (chainBytes != null - && !mKeyStore.put(Credentials.CA_CERTIFICATE + alias, chainBytes)) { + && !mKeyStore.put(Credentials.CA_CERTIFICATE + alias, chainBytes, + android.security.KeyStore.UID_SELF, flags)) { Credentials.deleteAllTypesForAlias(mKeyStore, alias); throw new KeyStoreException("Couldn't put certificate chain in keystore"); } @@ -355,7 +364,8 @@ public class AndroidKeyStore extends KeyStoreSpi { throw new KeyStoreException(e); } - if (!mKeyStore.put(Credentials.CA_CERTIFICATE + alias, encoded)) { + if (!mKeyStore.put(Credentials.CA_CERTIFICATE + alias, encoded, + android.security.KeyStore.UID_SELF, android.security.KeyStore.FLAG_NONE)) { throw new KeyStoreException("Couldn't insert certificate; is KeyStore initialized?"); } } @@ -517,4 +527,37 @@ public class AndroidKeyStore extends KeyStoreSpi { mKeyStore = android.security.KeyStore.getInstance(); } + @Override + public void engineSetEntry(String alias, Entry entry, ProtectionParameter param) + throws KeyStoreException { + if (entry == null) { + throw new KeyStoreException("entry == null"); + } + + if (engineContainsAlias(alias)) { + engineDeleteEntry(alias); + } + + if (entry instanceof KeyStore.TrustedCertificateEntry) { + KeyStore.TrustedCertificateEntry trE = (KeyStore.TrustedCertificateEntry) entry; + engineSetCertificateEntry(alias, trE.getTrustedCertificate()); + return; + } + + if (param != null && !(param instanceof AndroidKeyStoreParameter)) { + throw new KeyStoreException("protParam should be AndroidKeyStoreParameter; was: " + + param.getClass().getName()); + } + + if (entry instanceof PrivateKeyEntry) { + PrivateKeyEntry prE = (PrivateKeyEntry) entry; + setPrivateKeyEntry(alias, prE.getPrivateKey(), prE.getCertificateChain(), + (AndroidKeyStoreParameter) param); + return; + } + + throw new KeyStoreException( + "Entry must be a PrivateKeyEntry or TrustedCertificateEntry; was " + entry); + } + } diff --git a/keystore/java/android/security/AndroidKeyStoreParameter.java b/keystore/java/android/security/AndroidKeyStoreParameter.java new file mode 100644 index 000000000000..44f57c4ee568 --- /dev/null +++ b/keystore/java/android/security/AndroidKeyStoreParameter.java @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.security; + +import android.content.Context; +import android.security.AndroidKeyPairGeneratorSpec.Builder; + +import java.security.KeyPairGenerator; +import java.security.PrivateKey; +import java.security.KeyStore.ProtectionParameter; +import java.security.cert.Certificate; + +/** + * This provides the optional parameters that can be specified for + * {@code KeyStore} entries that work with <a href="{@docRoot} + * guide/topics/security/keystore.html">Android KeyStore facility</a>. The + * Android KeyStore facility is accessed through a + * {@link java.security.KeyStore} API using the {@code AndroidKeyStore} + * provider. The {@code context} passed in may be used to pop up some UI to ask + * the user to unlock or initialize the Android KeyStore facility. + * <p> + * Any entries placed in the {@code KeyStore} may be retrieved later. Note that + * there is only one logical instance of the {@code KeyStore} per application + * UID so apps using the {@code sharedUid} facility will also share a + * {@code KeyStore}. + * <p> + * Keys may be generated using the {@link KeyPairGenerator} facility with a + * {@link AndroidKeyPairGeneratorSpec} to specify the entry's {@code alias}. A + * self-signed X.509 certificate will be attached to generated entries, but that + * may be replaced at a later time by a certificate signed by a real Certificate + * Authority. + */ +public final class AndroidKeyStoreParameter implements ProtectionParameter { + private int mFlags; + + private AndroidKeyStoreParameter(int flags) { + mFlags = flags; + } + + /** + * @hide + */ + public int getFlags() { + return mFlags; + } + + /** + * Returns {@code true} if this parameter requires entries to be encrypted + * on the disk. + */ + public boolean isEncryptionRequired() { + return (mFlags & KeyStore.FLAG_ENCRYPTED) != 0; + } + + /** + * Builder class for {@link AndroidKeyStoreParameter} objects. + * <p> + * This will build protection parameters for use with the <a + * href="{@docRoot} guide/topics/security/keystore.html">Android KeyStore + * facility</a>. + * <p> + * This can be used to require that KeyStore entries be stored encrypted. + * <p> + * Example: + * + * <pre class="prettyprint"> + * AndroidKeyStoreParameter params = + * new AndroidKeyStoreParameter.Builder(mContext).setEncryptionRequired().build(); + * </pre> + */ + public final static class Builder { + private int mFlags; + + /** + * Creates a new instance of the {@code Builder} with the given + * {@code context}. The {@code context} passed in may be used to pop up + * some UI to ask the user to unlock or initialize the Android KeyStore + * facility. + */ + public Builder(Context context) { + if (context == null) { + throw new NullPointerException("context == null"); + } + + // Context is currently not used, but will be in the future. + } + + /** + * Indicates that this key must be encrypted at rest on storage. Note + * that enabling this will require that the user enable a strong lock + * screen (e.g., PIN, password) before creating or using the generated + * key is successful. + */ + public Builder setEncryptionRequired() { + mFlags |= KeyStore.FLAG_ENCRYPTED; + return this; + } + + /** + * Builds the instance of the {@code AndroidKeyPairGeneratorSpec}. + * + * @throws IllegalArgumentException if a required field is missing + * @return built instance of {@code AndroidKeyPairGeneratorSpec} + */ + public AndroidKeyStoreParameter build() { + return new AndroidKeyStoreParameter(mFlags); + } + } +} diff --git a/keystore/java/android/security/AndroidKeyStoreProvider.java b/keystore/java/android/security/AndroidKeyStoreProvider.java index 40d7e1a210ab..8ca301e6b521 100644 --- a/keystore/java/android/security/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/AndroidKeyStoreProvider.java @@ -33,7 +33,6 @@ public class AndroidKeyStoreProvider extends Provider { put("KeyStore." + AndroidKeyStore.NAME, AndroidKeyStore.class.getName()); // java.security.KeyPairGenerator - put("KeyPairGenerator." + AndroidKeyPairGenerator.NAME, - AndroidKeyPairGenerator.class.getName()); + put("KeyPairGenerator." + AndroidKeyStore.NAME, AndroidKeyPairGenerator.class.getName()); } } diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 852f0bb4ea65..45385ee975c0 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -40,6 +40,13 @@ public class KeyStore { public static final int UNDEFINED_ACTION = 9; public static final int WRONG_PASSWORD = 10; + // Used for UID field to indicate the calling UID. + public static final int UID_SELF = -1; + + // Flags for "put" "import" and "generate" + public static final int FLAG_NONE = 0; + public static final int FLAG_ENCRYPTED = 1; + // States public enum State { UNLOCKED, LOCKED, UNINITIALIZED }; @@ -87,17 +94,21 @@ public class KeyStore { } } - public boolean put(String key, byte[] value, int uid) { + public boolean put(String key, byte[] value, int uid, int flags) { try { - return mBinder.insert(key, value, uid) == NO_ERROR; + return mBinder.insert(key, value, uid, flags) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; } } + public boolean put(String key, byte[] value, int uid) { + return put(key, value, uid, FLAG_ENCRYPTED); + } + public boolean put(String key, byte[] value) { - return put(key, value, -1); + return put(key, value, UID_SELF); } public boolean delete(String key, int uid) { @@ -110,7 +121,7 @@ public class KeyStore { } public boolean delete(String key) { - return delete(key, -1); + return delete(key, UID_SELF); } public boolean contains(String key, int uid) { @@ -123,7 +134,7 @@ public class KeyStore { } public boolean contains(String key) { - return contains(key, -1); + return contains(key, UID_SELF); } public String[] saw(String prefix, int uid) { @@ -136,7 +147,7 @@ public class KeyStore { } public String[] saw(String prefix) { - return saw(prefix, -1); + return saw(prefix, UID_SELF); } public boolean reset() { @@ -185,30 +196,38 @@ public class KeyStore { } } - public boolean generate(String key, int uid) { + public boolean generate(String key, int uid, int flags) { try { - return mBinder.generate(key, uid) == NO_ERROR; + return mBinder.generate(key, uid, flags) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; } } + public boolean generate(String key, int uid) { + return generate(key, uid, FLAG_ENCRYPTED); + } + public boolean generate(String key) { - return generate(key, -1); + return generate(key, UID_SELF); } - public boolean importKey(String keyName, byte[] key, int uid) { + public boolean importKey(String keyName, byte[] key, int uid, int flags) { try { - return mBinder.import_key(keyName, key, uid) == NO_ERROR; + return mBinder.import_key(keyName, key, uid, flags) == NO_ERROR; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; } } + public boolean importKey(String keyName, byte[] key, int uid) { + return importKey(keyName, key, uid, FLAG_ENCRYPTED); + } + public boolean importKey(String keyName, byte[] key) { - return importKey(keyName, key, -1); + return importKey(keyName, key, UID_SELF); } public byte[] getPubkey(String key) { @@ -230,7 +249,7 @@ public class KeyStore { } public boolean delKey(String key) { - return delKey(key, -1); + return delKey(key, UID_SELF); } public byte[] sign(String key, byte[] data) { diff --git a/keystore/tests/src/android/security/AndroidKeyPairGeneratorSpecTest.java b/keystore/tests/src/android/security/AndroidKeyPairGeneratorSpecTest.java index 3d275cd72d0b..5d4ab9cfde03 100644 --- a/keystore/tests/src/android/security/AndroidKeyPairGeneratorSpecTest.java +++ b/keystore/tests/src/android/security/AndroidKeyPairGeneratorSpecTest.java @@ -39,8 +39,9 @@ public class AndroidKeyPairGeneratorSpecTest extends AndroidTestCase { private static final Date NOW_PLUS_10_YEARS = new Date(NOW.getYear() + 10, 0, 1); public void testConstructor_Success() throws Exception { - AndroidKeyPairGeneratorSpec spec = new AndroidKeyPairGeneratorSpec(getContext(), - TEST_ALIAS_1, TEST_DN_1, SERIAL_1, NOW, NOW_PLUS_10_YEARS); + AndroidKeyPairGeneratorSpec spec = + new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, TEST_DN_1, SERIAL_1, + NOW, NOW_PLUS_10_YEARS, 0); assertEquals("Context should be the one specified", getContext(), spec.getContext()); @@ -60,6 +61,7 @@ public class AndroidKeyPairGeneratorSpecTest extends AndroidTestCase { .setSerialNumber(SERIAL_1) .setStartDate(NOW) .setEndDate(NOW_PLUS_10_YEARS) + .setEncryptionRequired() .build(); assertEquals("Context should be the one specified", getContext(), spec.getContext()); @@ -71,12 +73,14 @@ public class AndroidKeyPairGeneratorSpecTest extends AndroidTestCase { assertEquals("startDate should be the one specified", NOW, spec.getStartDate()); assertEquals("endDate should be the one specified", NOW_PLUS_10_YEARS, spec.getEndDate()); + + assertEquals("encryption flag should be on", KeyStore.FLAG_ENCRYPTED, spec.getFlags()); } public void testConstructor_NullContext_Failure() throws Exception { try { new AndroidKeyPairGeneratorSpec(null, TEST_ALIAS_1, TEST_DN_1, SERIAL_1, NOW, - NOW_PLUS_10_YEARS); + NOW_PLUS_10_YEARS, 0); fail("Should throw IllegalArgumentException when context is null"); } catch (IllegalArgumentException success) { } @@ -85,7 +89,7 @@ public class AndroidKeyPairGeneratorSpecTest extends AndroidTestCase { public void testConstructor_NullKeystoreAlias_Failure() throws Exception { try { new AndroidKeyPairGeneratorSpec(getContext(), null, TEST_DN_1, SERIAL_1, NOW, - NOW_PLUS_10_YEARS); + NOW_PLUS_10_YEARS, 0); fail("Should throw IllegalArgumentException when keystoreAlias is null"); } catch (IllegalArgumentException success) { } @@ -94,7 +98,7 @@ public class AndroidKeyPairGeneratorSpecTest extends AndroidTestCase { public void testConstructor_NullSubjectDN_Failure() throws Exception { try { new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, null, SERIAL_1, NOW, - NOW_PLUS_10_YEARS); + NOW_PLUS_10_YEARS, 0); fail("Should throw IllegalArgumentException when subjectDN is null"); } catch (IllegalArgumentException success) { } @@ -103,7 +107,7 @@ public class AndroidKeyPairGeneratorSpecTest extends AndroidTestCase { public void testConstructor_NullSerial_Failure() throws Exception { try { new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, TEST_DN_1, null, NOW, - NOW_PLUS_10_YEARS); + NOW_PLUS_10_YEARS, 0); fail("Should throw IllegalArgumentException when startDate is null"); } catch (IllegalArgumentException success) { } @@ -112,7 +116,7 @@ public class AndroidKeyPairGeneratorSpecTest extends AndroidTestCase { public void testConstructor_NullStartDate_Failure() throws Exception { try { new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, TEST_DN_1, SERIAL_1, null, - NOW_PLUS_10_YEARS); + NOW_PLUS_10_YEARS, 0); fail("Should throw IllegalArgumentException when startDate is null"); } catch (IllegalArgumentException success) { } @@ -121,7 +125,7 @@ public class AndroidKeyPairGeneratorSpecTest extends AndroidTestCase { public void testConstructor_NullEndDate_Failure() throws Exception { try { new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, TEST_DN_1, SERIAL_1, NOW, - null); + null, 0); fail("Should throw IllegalArgumentException when keystoreAlias is null"); } catch (IllegalArgumentException success) { } @@ -130,7 +134,7 @@ public class AndroidKeyPairGeneratorSpecTest extends AndroidTestCase { public void testConstructor_EndBeforeStart_Failure() throws Exception { try { new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, TEST_DN_1, SERIAL_1, - NOW_PLUS_10_YEARS, NOW); + NOW_PLUS_10_YEARS, NOW, 0); fail("Should throw IllegalArgumentException when end is before start"); } catch (IllegalArgumentException success) { } diff --git a/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java b/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java index 69007c43f978..c5cf51448869 100644 --- a/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java +++ b/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java @@ -27,6 +27,7 @@ import java.security.SecureRandom; import java.security.cert.Certificate; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import java.text.SimpleDateFormat; import java.util.Date; import javax.security.auth.x500.X500Principal; @@ -64,22 +65,34 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase { assertFalse(mAndroidKeyStore.isUnlocked()); + mGenerator = java.security.KeyPairGenerator.getInstance("AndroidKeyStore"); + } + + private void setupPassword() { assertTrue(mAndroidKeyStore.password("1111")); assertTrue(mAndroidKeyStore.isUnlocked()); String[] aliases = mAndroidKeyStore.saw(""); assertNotNull(aliases); assertEquals(0, aliases.length); - - mGenerator = java.security.KeyPairGenerator.getInstance(AndroidKeyPairGenerator.NAME); } - public void testKeyPairGenerator_Initialize_Params_Success() throws Exception { - mGenerator.initialize(new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, - TEST_DN_1, TEST_SERIAL_1, NOW, NOW_PLUS_10_YEARS)); + public void testKeyPairGenerator_Initialize_Params_Encrypted_Success() throws Exception { + setupPassword(); + + mGenerator.initialize(new AndroidKeyPairGeneratorSpec.Builder(getContext()) + .setAlias(TEST_ALIAS_1) + .setSubject(TEST_DN_1) + .setSerialNumber(TEST_SERIAL_1) + .setStartDate(NOW) + .setEndDate(NOW_PLUS_10_YEARS) + .setEncryptionRequired() + .build()); } - public void testKeyPairGenerator_Initialize_KeySize_Failure() throws Exception { + public void testKeyPairGenerator_Initialize_KeySize_Encrypted_Failure() throws Exception { + setupPassword(); + try { mGenerator.initialize(1024); fail("KeyPairGenerator should not support setting the key size"); @@ -87,7 +100,10 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase { } } - public void testKeyPairGenerator_Initialize_KeySizeAndSecureRandom_Failure() throws Exception { + public void testKeyPairGenerator_Initialize_KeySizeAndSecureRandom_Encrypted_Failure() + throws Exception { + setupPassword(); + try { mGenerator.initialize(1024, new SecureRandom()); fail("KeyPairGenerator should not support setting the key size"); @@ -95,14 +111,48 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase { } } - public void testKeyPairGenerator_Initialize_ParamsAndSecureRandom_Failure() throws Exception { - mGenerator.initialize(new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, - TEST_DN_1, TEST_SERIAL_1, NOW, NOW_PLUS_10_YEARS), new SecureRandom()); + public void testKeyPairGenerator_Initialize_ParamsAndSecureRandom_Encrypted_Failure() + throws Exception { + setupPassword(); + + mGenerator.initialize( + new AndroidKeyPairGeneratorSpec.Builder(getContext()) + .setAlias(TEST_ALIAS_1) + .setSubject(TEST_DN_1) + .setSerialNumber(TEST_SERIAL_1) + .setStartDate(NOW) + .setEndDate(NOW_PLUS_10_YEARS) + .setEncryptionRequired() + .build(), + new SecureRandom()); } - public void testKeyPairGenerator_GenerateKeyPair_Success() throws Exception { - mGenerator.initialize(new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, - TEST_DN_1, TEST_SERIAL_1, NOW, NOW_PLUS_10_YEARS)); + public void testKeyPairGenerator_GenerateKeyPair_Encrypted_Success() throws Exception { + setupPassword(); + + mGenerator.initialize(new AndroidKeyPairGeneratorSpec.Builder(getContext()) + .setAlias(TEST_ALIAS_1) + .setSubject(TEST_DN_1) + .setSerialNumber(TEST_SERIAL_1) + .setStartDate(NOW) + .setEndDate(NOW_PLUS_10_YEARS) + .setEncryptionRequired() + .build()); + + final KeyPair pair = mGenerator.generateKeyPair(); + assertNotNull("The KeyPair returned should not be null", pair); + + assertKeyPairCorrect(pair, TEST_ALIAS_1, TEST_DN_1, TEST_SERIAL_1, NOW, NOW_PLUS_10_YEARS); + } + + public void testKeyPairGenerator_GenerateKeyPair_Unencrypted_Success() throws Exception { + mGenerator.initialize(new AndroidKeyPairGeneratorSpec.Builder(getContext()) + .setAlias(TEST_ALIAS_1) + .setSubject(TEST_DN_1) + .setSerialNumber(TEST_SERIAL_1) + .setStartDate(NOW) + .setEndDate(NOW_PLUS_10_YEARS) + .build()); final KeyPair pair = mGenerator.generateKeyPair(); assertNotNull("The KeyPair returned should not be null", pair); @@ -113,8 +163,13 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase { public void testKeyPairGenerator_GenerateKeyPair_Replaced_Success() throws Exception { // Generate the first key { - mGenerator.initialize(new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, - TEST_DN_1, TEST_SERIAL_1, NOW, NOW_PLUS_10_YEARS)); + mGenerator.initialize(new AndroidKeyPairGeneratorSpec.Builder(getContext()) + .setAlias(TEST_ALIAS_1) + .setSubject(TEST_DN_1) + .setSerialNumber(TEST_SERIAL_1) + .setStartDate(NOW) + .setEndDate(NOW_PLUS_10_YEARS) + .build()); final KeyPair pair1 = mGenerator.generateKeyPair(); assertNotNull("The KeyPair returned should not be null", pair1); assertKeyPairCorrect(pair1, TEST_ALIAS_1, TEST_DN_1, TEST_SERIAL_1, NOW, @@ -123,8 +178,13 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase { // Replace the original key { - mGenerator.initialize(new AndroidKeyPairGeneratorSpec(getContext(), TEST_ALIAS_2, - TEST_DN_2, TEST_SERIAL_2, NOW, NOW_PLUS_10_YEARS)); + mGenerator.initialize(new AndroidKeyPairGeneratorSpec.Builder(getContext()) + .setAlias(TEST_ALIAS_2) + .setSubject(TEST_DN_2) + .setSerialNumber(TEST_SERIAL_2) + .setStartDate(NOW) + .setEndDate(NOW_PLUS_10_YEARS) + .build()); final KeyPair pair2 = mGenerator.generateKeyPair(); assertNotNull("The KeyPair returned should not be null", pair2); assertKeyPairCorrect(pair2, TEST_ALIAS_2, TEST_DN_2, TEST_SERIAL_2, NOW, @@ -132,6 +192,49 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase { } } + public void testKeyPairGenerator_GenerateKeyPair_Replaced_UnencryptedToEncrypted_Success() + throws Exception { + // Generate the first key + { + mGenerator.initialize(new AndroidKeyPairGeneratorSpec.Builder(getContext()) + .setAlias(TEST_ALIAS_1) + .setSubject(TEST_DN_1) + .setSerialNumber(TEST_SERIAL_1) + .setStartDate(NOW) + .setEndDate(NOW_PLUS_10_YEARS) + .build()); + final KeyPair pair1 = mGenerator.generateKeyPair(); + assertNotNull("The KeyPair returned should not be null", pair1); + assertKeyPairCorrect(pair1, TEST_ALIAS_1, TEST_DN_1, TEST_SERIAL_1, NOW, + NOW_PLUS_10_YEARS); + } + + // Attempt to replace previous key + { + mGenerator.initialize(new AndroidKeyPairGeneratorSpec.Builder(getContext()) + .setAlias(TEST_ALIAS_1) + .setSubject(TEST_DN_2) + .setSerialNumber(TEST_SERIAL_2) + .setStartDate(NOW) + .setEndDate(NOW_PLUS_10_YEARS) + .setEncryptionRequired() + .build()); + try { + mGenerator.generateKeyPair(); + fail("Should not be able to generate encrypted key while not initialized"); + } catch (IllegalStateException expected) { + } + + assertTrue(mAndroidKeyStore.password("1111")); + assertTrue(mAndroidKeyStore.isUnlocked()); + + final KeyPair pair2 = mGenerator.generateKeyPair(); + assertNotNull("The KeyPair returned should not be null", pair2); + assertKeyPairCorrect(pair2, TEST_ALIAS_1, TEST_DN_2, TEST_SERIAL_2, NOW, + NOW_PLUS_10_YEARS); + } + } + private void assertKeyPairCorrect(KeyPair pair, String alias, X500Principal dn, BigInteger serial, Date start, Date end) throws Exception { final PublicKey pubKey = pair.getPublic(); @@ -163,10 +266,10 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase { assertEquals("The Serial should be the one passed into the params", serial, x509userCert.getSerialNumber()); - assertEquals("The notBefore date should be the one passed into the params", start, + assertDateEquals("The notBefore date should be the one passed into the params", start, x509userCert.getNotBefore()); - assertEquals("The notAfter date should be the one passed into the params", end, + assertDateEquals("The notAfter date should be the one passed into the params", end, x509userCert.getNotAfter()); x509userCert.verify(pubKey); @@ -178,4 +281,13 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase { assertNotNull("The keystore should return the public key for the generated key", pubKeyBytes); } + + private static void assertDateEquals(String message, Date date1, Date date2) throws Exception { + SimpleDateFormat formatter = new SimpleDateFormat("dd MMM yyyy HH:mm:ss"); + + String result1 = formatter.format(date1); + String result2 = formatter.format(date2); + + assertEquals(message, result1, result2); + } } diff --git a/keystore/tests/src/android/security/AndroidKeyStoreTest.java b/keystore/tests/src/android/security/AndroidKeyStoreTest.java index 8928e065945a..05ffe109289a 100644 --- a/keystore/tests/src/android/security/AndroidKeyStoreTest.java +++ b/keystore/tests/src/android/security/AndroidKeyStoreTest.java @@ -469,12 +469,14 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertTrue(mAndroidKeyStore.reset()); assertFalse(mAndroidKeyStore.isUnlocked()); + mKeyStore = java.security.KeyStore.getInstance("AndroidKeyStore"); + } + + private void setupPassword() { assertTrue(mAndroidKeyStore.password("1111")); assertTrue(mAndroidKeyStore.isUnlocked()); assertEquals(0, mAndroidKeyStore.saw("").length); - - mKeyStore = java.security.KeyStore.getInstance(AndroidKeyStore.NAME); } private void assertAliases(final String[] expectedAliases) throws KeyStoreException { @@ -495,7 +497,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { expectedAliases.length, count); } - public void testKeyStore_Aliases_Success() throws Exception { + public void testKeyStore_Aliases_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertAliases(new String[] {}); @@ -509,7 +513,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertAliases(new String[] { TEST_ALIAS_1, TEST_ALIAS_2 }); } - public void testKeyStore_Aliases_NotInitialized_Failure() throws Exception { + public void testKeyStore_Aliases_NotInitialized_Encrypted_Failure() throws Exception { + setupPassword(); + try { mKeyStore.aliases(); fail("KeyStore should throw exception when not initialized"); @@ -517,7 +523,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_ContainsAliases_PrivateAndCA_Success() throws Exception { + public void testKeyStore_ContainsAliases_PrivateAndCA_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertAliases(new String[] {}); @@ -534,7 +542,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.containsAlias(TEST_ALIAS_3)); } - public void testKeyStore_ContainsAliases_CAOnly_Success() throws Exception { + public void testKeyStore_ContainsAliases_CAOnly_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_2, FAKE_CA_1)); @@ -542,13 +552,17 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertTrue("Should contain added CA certificate", mKeyStore.containsAlias(TEST_ALIAS_2)); } - public void testKeyStore_ContainsAliases_NonExistent_Failure() throws Exception { + public void testKeyStore_ContainsAliases_NonExistent_Encrypted_Failure() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertFalse("Should contain added CA certificate", mKeyStore.containsAlias(TEST_ALIAS_1)); } - public void testKeyStore_DeleteEntry_Success() throws Exception { + public void testKeyStore_DeleteEntry_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); // TEST_ALIAS_1 @@ -578,14 +592,18 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertAliases(new String[] { }); } - public void testKeyStore_DeleteEntry_EmptyStore_Success() throws Exception { + public void testKeyStore_DeleteEntry_EmptyStore_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); // Should not throw when a non-existent entry is requested for delete. mKeyStore.deleteEntry(TEST_ALIAS_1); } - public void testKeyStore_DeleteEntry_NonExistent_Success() throws Exception { + public void testKeyStore_DeleteEntry_NonExistent_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); // TEST_ALIAS_1 @@ -598,7 +616,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.deleteEntry(TEST_ALIAS_2); } - public void testKeyStore_GetCertificate_Single_Success() throws Exception { + public void testKeyStore_GetCertificate_Single_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); @@ -618,14 +638,18 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertEquals("Actual and retrieved certificates should be the same", actual, retrieved); } - public void testKeyStore_GetCertificate_NonExist_Failure() throws Exception { + public void testKeyStore_GetCertificate_NonExist_Encrypted_Failure() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertNull("Certificate should not exist in keystore", mKeyStore.getCertificate(TEST_ALIAS_1)); } - public void testKeyStore_GetCertificateAlias_CAEntry_Success() throws Exception { + public void testKeyStore_GetCertificateAlias_CAEntry_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); @@ -637,7 +661,10 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.getCertificateAlias(actual)); } - public void testKeyStore_GetCertificateAlias_PrivateKeyEntry_Success() throws Exception { + public void testKeyStore_GetCertificateAlias_PrivateKeyEntry_Encrypted_Success() + throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, @@ -652,8 +679,10 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.getCertificateAlias(actual)); } - public void testKeyStore_GetCertificateAlias_CAEntry_WithPrivateKeyUsingCA_Success() + public void testKeyStore_GetCertificateAlias_CAEntry_WithPrivateKeyUsingCA_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); // Insert TrustedCertificateEntry with CA name @@ -672,7 +701,10 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.getCertificateAlias(actual)); } - public void testKeyStore_GetCertificateAlias_NonExist_Empty_Failure() throws Exception { + public void testKeyStore_GetCertificateAlias_NonExist_Empty_Encrypted_Failure() + throws Exception { + setupPassword(); + mKeyStore.load(null, null); CertificateFactory f = CertificateFactory.getInstance("X.509"); @@ -682,7 +714,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.getCertificateAlias(actual)); } - public void testKeyStore_GetCertificateAlias_NonExist_Failure() throws Exception { + public void testKeyStore_GetCertificateAlias_NonExist_Encrypted_Failure() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); @@ -694,7 +728,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.getCertificateAlias(userCert)); } - public void testKeyStore_GetCertificateChain_SingleLength_Success() throws Exception { + public void testKeyStore_GetCertificateChain_SingleLength_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, @@ -720,14 +756,18 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.getCertificateChain(TEST_ALIAS_2)); } - public void testKeyStore_GetCertificateChain_NonExist_Failure() throws Exception { + public void testKeyStore_GetCertificateChain_NonExist_Encrypted_Failure() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertNull("Stored certificate alias should not be found", mKeyStore.getCertificateChain(TEST_ALIAS_1)); } - public void testKeyStore_GetCreationDate_PrivateKeyEntry_Success() throws Exception { + public void testKeyStore_GetCreationDate_PrivateKeyEntry_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, @@ -745,7 +785,29 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertTrue("Time should be close to current time", actual.after(expectedAfter)); } - public void testKeyStore_GetCreationDate_CAEntry_Success() throws Exception { + public void testKeyStore_GetCreationDate_PrivateKeyEntry_Unencrypted_Success() throws Exception { + mKeyStore.load(null, null); + + assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, + FAKE_KEY_1, KeyStore.UID_SELF, KeyStore.FLAG_NONE)); + assertTrue(mAndroidKeyStore.put(Credentials.USER_CERTIFICATE + TEST_ALIAS_1, FAKE_USER_1, + KeyStore.UID_SELF, KeyStore.FLAG_NONE)); + assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1, + KeyStore.UID_SELF, KeyStore.FLAG_NONE)); + + Date now = new Date(); + Date actual = mKeyStore.getCreationDate(TEST_ALIAS_1); + + Date expectedAfter = new Date(now.getTime() - SLOP_TIME_MILLIS); + Date expectedBefore = new Date(now.getTime() + SLOP_TIME_MILLIS); + + assertTrue("Time should be close to current time", actual.before(expectedBefore)); + assertTrue("Time should be close to current time", actual.after(expectedAfter)); + } + + public void testKeyStore_GetCreationDate_CAEntry_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); @@ -761,7 +823,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertTrue("Time should be close to current time", actual.after(expectedAfter)); } - public void testKeyStore_GetEntry_NullParams_Success() throws Exception { + public void testKeyStore_GetEntry_NullParams_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, @@ -779,6 +843,26 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertPrivateKeyEntryEquals(keyEntry, FAKE_KEY_1, FAKE_USER_1, FAKE_CA_1); } + public void testKeyStore_GetEntry_NullParams_Unencrypted_Success() throws Exception { + mKeyStore.load(null, null); + + assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, + FAKE_KEY_1, KeyStore.UID_SELF, KeyStore.FLAG_NONE)); + assertTrue(mAndroidKeyStore.put(Credentials.USER_CERTIFICATE + TEST_ALIAS_1, FAKE_USER_1, + KeyStore.UID_SELF, KeyStore.FLAG_NONE)); + assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1, + KeyStore.UID_SELF, KeyStore.FLAG_NONE)); + + Entry entry = mKeyStore.getEntry(TEST_ALIAS_1, null); + assertNotNull("Entry should exist", entry); + + assertTrue("Should be a PrivateKeyEntry", entry instanceof PrivateKeyEntry); + + PrivateKeyEntry keyEntry = (PrivateKeyEntry) entry; + + assertPrivateKeyEntryEquals(keyEntry, FAKE_KEY_1, FAKE_USER_1, FAKE_CA_1); + } + @SuppressWarnings("unchecked") private void assertPrivateKeyEntryEquals(PrivateKeyEntry keyEntry, byte[] key, byte[] cert, byte[] ca) throws Exception { @@ -801,8 +885,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { private void assertPrivateKeyEntryEquals(PrivateKeyEntry keyEntry, PrivateKey expectedKey, Certificate expectedCert, Collection<Certificate> expectedChain) throws Exception { - assertEquals("Returned PrivateKey should be what we inserted", expectedKey, - keyEntry.getPrivateKey()); + assertEquals("Returned PrivateKey should be what we inserted", + ((RSAPrivateKey) expectedKey).getModulus(), + ((RSAPrivateKey) keyEntry.getPrivateKey()).getModulus()); assertEquals("Returned Certificate should be what we inserted", expectedCert, keyEntry.getCertificate()); @@ -823,14 +908,25 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_GetEntry_Nonexistent_NullParams_Failure() throws Exception { + public void testKeyStore_GetEntry_Nonexistent_NullParams_Encrypted_Failure() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertNull("A non-existent entry should return null", mKeyStore.getEntry(TEST_ALIAS_1, null)); } - public void testKeyStore_GetKey_NoPassword_Success() throws Exception { + public void testKeyStore_GetEntry_Nonexistent_NullParams_Unencrypted_Failure() throws Exception { + mKeyStore.load(null, null); + + assertNull("A non-existent entry should return null", + mKeyStore.getEntry(TEST_ALIAS_1, null)); + } + + public void testKeyStore_GetKey_NoPassword_Encrypted_Success() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, @@ -848,10 +944,37 @@ public class AndroidKeyStoreTest extends AndroidTestCase { KeyFactory keyFact = KeyFactory.getInstance("RSA"); PrivateKey expectedKey = keyFact.generatePrivate(new PKCS8EncodedKeySpec(FAKE_KEY_1)); - assertEquals("Inserted key should be same as retrieved key", actualKey, expectedKey); + assertEquals("Inserted key should be same as retrieved key", + ((RSAPrivateKey) expectedKey).getModulus(), actualKey.getModulus()); } - public void testKeyStore_GetKey_Certificate_Failure() throws Exception { + public void testKeyStore_GetKey_NoPassword_Unencrypted_Success() throws Exception { + mKeyStore.load(null, null); + + assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, + FAKE_KEY_1, KeyStore.UID_SELF, KeyStore.FLAG_NONE)); + assertTrue(mAndroidKeyStore.put(Credentials.USER_CERTIFICATE + TEST_ALIAS_1, FAKE_USER_1, + KeyStore.UID_SELF, KeyStore.FLAG_NONE)); + assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1, + KeyStore.UID_SELF, KeyStore.FLAG_NONE)); + + Key key = mKeyStore.getKey(TEST_ALIAS_1, null); + assertNotNull("Key should exist", key); + + assertTrue("Should be a RSAPrivateKey", key instanceof RSAPrivateKey); + + RSAPrivateKey actualKey = (RSAPrivateKey) key; + + KeyFactory keyFact = KeyFactory.getInstance("RSA"); + PrivateKey expectedKey = keyFact.generatePrivate(new PKCS8EncodedKeySpec(FAKE_KEY_1)); + + assertEquals("Inserted key should be same as retrieved key", + ((RSAPrivateKey) expectedKey).getModulus(), actualKey.getModulus()); + } + + public void testKeyStore_GetKey_Certificate_Encrypted_Failure() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); @@ -859,21 +982,28 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertNull("Certificate entries should return null", mKeyStore.getKey(TEST_ALIAS_1, null)); } - public void testKeyStore_GetKey_NonExistent_Failure() throws Exception { + public void testKeyStore_GetKey_NonExistent_Encrypted_Failure() throws Exception { + setupPassword(); + mKeyStore.load(null, null); assertNull("A non-existent entry should return null", mKeyStore.getKey(TEST_ALIAS_1, null)); } - public void testKeyStore_GetProvider_Success() throws Exception { + public void testKeyStore_GetProvider_Encrypted_Success() throws Exception { + assertEquals(AndroidKeyStoreProvider.PROVIDER_NAME, mKeyStore.getProvider().getName()); + setupPassword(); assertEquals(AndroidKeyStoreProvider.PROVIDER_NAME, mKeyStore.getProvider().getName()); } - public void testKeyStore_GetType_Success() throws Exception { + public void testKeyStore_GetType_Encrypted_Success() throws Exception { + assertEquals(AndroidKeyStore.NAME, mKeyStore.getType()); + setupPassword(); assertEquals(AndroidKeyStore.NAME, mKeyStore.getType()); } - public void testKeyStore_IsCertificateEntry_CA_Success() throws Exception { + public void testKeyStore_IsCertificateEntry_CA_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); @@ -882,7 +1012,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.isCertificateEntry(TEST_ALIAS_1)); } - public void testKeyStore_IsCertificateEntry_PrivateKey_Failure() throws Exception { + public void testKeyStore_IsCertificateEntry_PrivateKey_Encrypted_Failure() throws Exception { + setupPassword(); mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, @@ -894,14 +1025,23 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mKeyStore.isCertificateEntry(TEST_ALIAS_1)); } - public void testKeyStore_IsCertificateEntry_NonExist_Failure() throws Exception { + public void testKeyStore_IsCertificateEntry_NonExist_Encrypted_Failure() throws Exception { + setupPassword(); + mKeyStore.load(null, null); + + assertFalse("Should return false for non-existent entry", + mKeyStore.isCertificateEntry(TEST_ALIAS_1)); + } + + public void testKeyStore_IsCertificateEntry_NonExist_Unencrypted_Failure() throws Exception { mKeyStore.load(null, null); assertFalse("Should return false for non-existent entry", mKeyStore.isCertificateEntry(TEST_ALIAS_1)); } - public void testKeyStore_IsKeyEntry_PrivateKey_Success() throws Exception { + public void testKeyStore_IsKeyEntry_PrivateKey_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, @@ -912,7 +1052,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertTrue("Should return true for PrivateKeyEntry", mKeyStore.isKeyEntry(TEST_ALIAS_1)); } - public void testKeyStore_IsKeyEntry_CA_Failure() throws Exception { + public void testKeyStore_IsKeyEntry_CA_Encrypted_Failure() throws Exception { + setupPassword(); mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); @@ -920,17 +1061,19 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertFalse("Should return false for CA certificate", mKeyStore.isKeyEntry(TEST_ALIAS_1)); } - public void testKeyStore_IsKeyEntry_NonExist_Failure() throws Exception { + public void testKeyStore_IsKeyEntry_NonExist_Encrypted_Failure() throws Exception { + setupPassword(); mKeyStore.load(null, null); assertFalse("Should return false for non-existent entry", mKeyStore.isKeyEntry(TEST_ALIAS_1)); } - public void testKeyStore_SetCertificate_CA_Success() throws Exception { + public void testKeyStore_SetCertificate_CA_Encrypted_Success() throws Exception { final CertificateFactory f = CertificateFactory.getInstance("X.509"); final Certificate actual = f.generateCertificate(new ByteArrayInputStream(FAKE_CA_1)); + setupPassword(); mKeyStore.load(null, null); mKeyStore.setCertificateEntry(TEST_ALIAS_1, actual); @@ -942,7 +1085,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { retrieved); } - public void testKeyStore_SetCertificate_CAExists_Overwrite_Success() throws Exception { + public void testKeyStore_SetCertificate_CAExists_Overwrite_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); @@ -958,7 +1102,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertAliases(new String[] { TEST_ALIAS_1 }); } - public void testKeyStore_SetCertificate_PrivateKeyExists_Failure() throws Exception { + public void testKeyStore_SetCertificate_PrivateKeyExists_Encrypted_Failure() throws Exception { + setupPassword(); mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.importKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1, @@ -978,7 +1123,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_SetEntry_PrivateKeyEntry_Success() throws Exception { + public void testKeyStore_SetEntry_PrivateKeyEntry_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); KeyFactory keyFact = KeyFactory.getInstance("RSA"); @@ -1005,8 +1151,63 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertPrivateKeyEntryEquals(actual, FAKE_KEY_1, FAKE_USER_1, FAKE_CA_1); } - public void testKeyStore_SetEntry_PrivateKeyEntry_Overwrites_PrivateKeyEntry_Success() + public void testKeyStore_SetEntry_PrivateKeyEntry_Unencrypted_Success() throws Exception { + mKeyStore.load(null, null); + + KeyFactory keyFact = KeyFactory.getInstance("RSA"); + PrivateKey expectedKey = keyFact.generatePrivate(new PKCS8EncodedKeySpec(FAKE_KEY_1)); + + final CertificateFactory f = CertificateFactory.getInstance("X.509"); + + final Certificate[] expectedChain = new Certificate[2]; + expectedChain[0] = f.generateCertificate(new ByteArrayInputStream(FAKE_USER_1)); + expectedChain[1] = f.generateCertificate(new ByteArrayInputStream(FAKE_CA_1)); + + PrivateKeyEntry expected = new PrivateKeyEntry(expectedKey, expectedChain); + + mKeyStore.setEntry(TEST_ALIAS_1, expected, null); + + Entry actualEntry = mKeyStore.getEntry(TEST_ALIAS_1, null); + assertNotNull("Retrieved entry should exist", actualEntry); + + assertTrue("Retrieved entry should be of type PrivateKeyEntry", + actualEntry instanceof PrivateKeyEntry); + + PrivateKeyEntry actual = (PrivateKeyEntry) actualEntry; + + assertPrivateKeyEntryEquals(actual, FAKE_KEY_1, FAKE_USER_1, FAKE_CA_1); + } + + public void testKeyStore_SetEntry_PrivateKeyEntry_Params_Unencrypted_Failure() throws Exception { + mKeyStore.load(null, null); + + KeyFactory keyFact = KeyFactory.getInstance("RSA"); + PrivateKey expectedKey = keyFact.generatePrivate(new PKCS8EncodedKeySpec(FAKE_KEY_1)); + + final CertificateFactory f = CertificateFactory.getInstance("X.509"); + + final Certificate[] expectedChain = new Certificate[2]; + expectedChain[0] = f.generateCertificate(new ByteArrayInputStream(FAKE_USER_1)); + expectedChain[1] = f.generateCertificate(new ByteArrayInputStream(FAKE_CA_1)); + + PrivateKeyEntry entry = new PrivateKeyEntry(expectedKey, expectedChain); + + try { + mKeyStore.setEntry(TEST_ALIAS_1, entry, + new AndroidKeyStoreParameter.Builder(getContext()) + .setEncryptionRequired() + .build()); + fail("Shouldn't be able to insert encrypted entry when KeyStore uninitialized"); + } catch (KeyStoreException expected) { + } + + assertNull(mKeyStore.getEntry(TEST_ALIAS_1, null)); + } + + public void + testKeyStore_SetEntry_PrivateKeyEntry_Overwrites_PrivateKeyEntry_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); final KeyFactory keyFact = KeyFactory.getInstance("RSA"); @@ -1060,7 +1261,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_SetEntry_CAEntry_Overwrites_PrivateKeyEntry_Success() throws Exception { + public void testKeyStore_SetEntry_CAEntry_Overwrites_PrivateKeyEntry_Encrypted_Success() + throws Exception { + setupPassword(); mKeyStore.load(null, null); final CertificateFactory f = CertificateFactory.getInstance("X.509"); @@ -1104,7 +1307,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_SetEntry_PrivateKeyEntry_Overwrites_CAEntry_Success() throws Exception { + public void testKeyStore_SetEntry_PrivateKeyEntry_Overwrites_CAEntry_Encrypted_Success() + throws Exception { + setupPassword(); mKeyStore.load(null, null); final CertificateFactory f = CertificateFactory.getInstance("X.509"); @@ -1148,8 +1353,11 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_SetEntry_PrivateKeyEntry_Overwrites_ShortPrivateKeyEntry_Success() + public + void + testKeyStore_SetEntry_PrivateKeyEntry_Overwrites_ShortPrivateKeyEntry_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); final CertificateFactory f = CertificateFactory.getInstance("X.509"); @@ -1198,7 +1406,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_SetEntry_CAEntry_Overwrites_CAEntry_Success() throws Exception { + public void testKeyStore_SetEntry_CAEntry_Overwrites_CAEntry_Encrypted_Success() + throws Exception { + setupPassword(); mKeyStore.load(null, null); final CertificateFactory f = CertificateFactory.getInstance("X.509"); @@ -1239,7 +1449,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_SetKeyEntry_ProtectedKey_Failure() throws Exception { + public void testKeyStore_SetKeyEntry_ProtectedKey_Encrypted_Failure() throws Exception { + setupPassword(); mKeyStore.load(null, null); final CertificateFactory f = CertificateFactory.getInstance("X.509"); @@ -1259,7 +1470,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_SetKeyEntry_Success() throws Exception { + public void testKeyStore_SetKeyEntry_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); final CertificateFactory f = CertificateFactory.getInstance("X.509"); @@ -1285,7 +1497,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertPrivateKeyEntryEquals(actual, FAKE_KEY_1, FAKE_USER_1, FAKE_CA_1); } - public void testKeyStore_SetKeyEntry_Replaced_Success() throws Exception { + public void testKeyStore_SetKeyEntry_Replaced_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); final CertificateFactory f = CertificateFactory.getInstance("X.509"); @@ -1376,7 +1589,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { return cert; } - public void testKeyStore_SetKeyEntry_ReplacedChain_Success() throws Exception { + public void testKeyStore_SetKeyEntry_ReplacedChain_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); // Create key #1 @@ -1429,8 +1643,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_SetKeyEntry_ReplacedChain_DifferentPrivateKey_Failure() + public void testKeyStore_SetKeyEntry_ReplacedChain_DifferentPrivateKey_Encrypted_Failure() throws Exception { + setupPassword(); mKeyStore.load(null, null); // Create key #1 @@ -1472,7 +1687,48 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_Size_Success() throws Exception { + public void testKeyStore_SetKeyEntry_ReplacedChain_UnencryptedToEncrypted_Failure() + throws Exception { + mKeyStore.load(null, null); + + // Create key #1 + { + final String privateKeyAlias = Credentials.USER_PRIVATE_KEY + TEST_ALIAS_1; + assertTrue(mAndroidKeyStore.generate(privateKeyAlias, + android.security.KeyStore.UID_SELF, android.security.KeyStore.FLAG_NONE)); + + X509Certificate cert = + generateCertificate(mAndroidKeyStore, TEST_ALIAS_1, TEST_SERIAL_1, TEST_DN_1, + NOW, NOW_PLUS_10_YEARS); + + assertTrue(mAndroidKeyStore.put(Credentials.USER_CERTIFICATE + TEST_ALIAS_1, + cert.getEncoded(), android.security.KeyStore.UID_SELF, + android.security.KeyStore.FLAG_NONE)); + } + + // Replace with one that requires encryption + { + Entry entry = mKeyStore.getEntry(TEST_ALIAS_1, null); + + try { + mKeyStore.setEntry(TEST_ALIAS_1, entry, new AndroidKeyStoreParameter.Builder( + getContext()).setEncryptionRequired().build()); + fail("Should not allow setting of Entry without unlocked keystore"); + } catch (KeyStoreException success) { + } + + assertTrue(mAndroidKeyStore.password("1111")); + assertTrue(mAndroidKeyStore.isUnlocked()); + + mKeyStore.setEntry(TEST_ALIAS_1, entry, + new AndroidKeyStoreParameter.Builder(getContext()) + .setEncryptionRequired() + .build()); + } + } + + public void testKeyStore_Size_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); @@ -1501,7 +1757,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertAliases(new String[] { TEST_ALIAS_2 }); } - public void testKeyStore_Store_LoadStoreParam_Failure() throws Exception { + public void testKeyStore_Store_LoadStoreParam_Encrypted_Failure() throws Exception { + setupPassword(); mKeyStore.load(null, null); try { @@ -1511,7 +1768,7 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_Load_InputStreamSupplied_Failure() throws Exception { + public void testKeyStore_Load_InputStreamSupplied_Encrypted_Failure() throws Exception { byte[] buf = "FAKE KEYSTORE".getBytes(); ByteArrayInputStream is = new ByteArrayInputStream(buf); @@ -1522,7 +1779,7 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_Load_PasswordSupplied_Failure() throws Exception { + public void testKeyStore_Load_PasswordSupplied_Encrypted_Failure() throws Exception { try { mKeyStore.load(null, "password".toCharArray()); fail("Should throw IllegalArgumentException when password is supplied"); @@ -1530,7 +1787,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } } - public void testKeyStore_Store_OutputStream_Failure() throws Exception { + public void testKeyStore_Store_OutputStream_Encrypted_Failure() throws Exception { + setupPassword(); mKeyStore.load(null, null); OutputStream sink = new ByteArrayOutputStream(); @@ -1558,7 +1816,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { cert.getEncoded())); } - public void testKeyStore_KeyOperations_Wrap_Success() throws Exception { + public void testKeyStore_KeyOperations_Wrap_Encrypted_Success() throws Exception { + setupPassword(); mKeyStore.load(null, null); setupKey(); diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 8bd805cc9934..e0d96c93c600 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -19,6 +19,7 @@ // #define LOG_TAG "asset" +#define ATRACE_TAG ATRACE_TAG_RESOURCES //#define LOG_NDEBUG 0 #include <androidfw/Asset.h> @@ -32,6 +33,7 @@ #include <utils/threads.h> #include <utils/Timers.h> #include <utils/ZipFileRO.h> +#include <cutils/trace.h> #include <assert.h> #include <dirent.h> @@ -51,6 +53,14 @@ _rc; }) #endif +#ifdef HAVE_ANDROID_OS +#define MY_TRACE_BEGIN(x) ATRACE_BEGIN(x) +#define MY_TRACE_END() ATRACE_END() +#else +#define MY_TRACE_BEGIN(x) +#define MY_TRACE_END() +#endif + using namespace android; /* @@ -638,6 +648,7 @@ const ResTable* AssetManager::getResTable(bool required) const ResTable* sharedRes = NULL; bool shared = true; const asset_path& ap = mAssetPaths.itemAt(i); + MY_TRACE_BEGIN(ap.path.string()); Asset* idmap = openIdmapLocked(ap); ALOGV("Looking for resource asset in '%s'\n", ap.path.string()); if (ap.type != kFileTypeDirectory) { @@ -702,6 +713,7 @@ const ResTable* AssetManager::getResTable(bool required) const if (idmap != NULL) { delete idmap; } + MY_TRACE_END(); } if (required && !rt) ALOGW("Unable to find resources file resources.arsc"); diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 7b59bf24576f..a630ea11a3dd 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -30,6 +30,7 @@ ifeq ($(USE_OPENGL_RENDERER),true) PatchCache.cpp \ PathCache.cpp \ PathTessellator.cpp \ + PixelBuffer.cpp \ Program.cpp \ ProgramCache.cpp \ RenderBufferCache.cpp \ diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp index 57d1a4f27a55..a381a6829c24 100644 --- a/libs/hwui/Caches.cpp +++ b/libs/hwui/Caches.cpp @@ -70,6 +70,7 @@ void Caches::init() { mCurrentPositionPointer = this; mCurrentPositionStride = 0; mCurrentTexCoordsPointer = this; + mCurrentPixelBuffer = 0; mTexCoordsArrayEnabled = false; @@ -366,6 +367,28 @@ bool Caches::unbindIndicesBuffer() { } /////////////////////////////////////////////////////////////////////////////// +// PBO +/////////////////////////////////////////////////////////////////////////////// + +bool Caches::bindPixelBuffer(const GLuint buffer) { + if (mCurrentPixelBuffer != buffer) { + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer); + mCurrentPixelBuffer = buffer; + return true; + } + return false; +} + +bool Caches::unbindPixelBuffer() { + if (mCurrentPixelBuffer) { + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); + mCurrentPixelBuffer = 0; + return true; + } + return false; +} + +/////////////////////////////////////////////////////////////////////////////// // Meshes and textures /////////////////////////////////////////////////////////////////////////////// diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h index 63836c1c7dea..91b938b5c989 100644 --- a/libs/hwui/Caches.h +++ b/libs/hwui/Caches.h @@ -176,6 +176,16 @@ public: bool unbindIndicesBuffer(); /** + * Binds the specified buffer as the current GL unpack pixel buffer. + */ + bool bindPixelBuffer(const GLuint buffer); + + /** + * Resets the current unpack pixel buffer to 0 (default value.) + */ + bool unbindPixelBuffer(); + + /** * Binds an attrib to the specified float vertex pointer. * Assumes a stride of gMeshStride and a size of 2. */ @@ -307,6 +317,7 @@ private: GLuint mCurrentBuffer; GLuint mCurrentIndicesBuffer; + GLuint mCurrentPixelBuffer; void* mCurrentPositionPointer; GLsizei mCurrentPositionStride; void* mCurrentTexCoordsPointer; diff --git a/libs/hwui/DeferredDisplayList.cpp b/libs/hwui/DeferredDisplayList.cpp index fe51bf956d8c..d5007e12ebf9 100644 --- a/libs/hwui/DeferredDisplayList.cpp +++ b/libs/hwui/DeferredDisplayList.cpp @@ -21,6 +21,7 @@ #include <utils/Trace.h> +#include "Caches.h" #include "Debug.h" #include "DisplayListOp.h" #include "OpenGLRenderer.h" @@ -377,6 +378,8 @@ static status_t replayBatchList(Vector<DrawOpBatch*>& batchList, status_t DeferredDisplayList::flush(OpenGLRenderer& renderer, Rect& dirty) { ATRACE_NAME("flush drawing commands"); + Caches::getInstance().fontRenderer->endPrecaching(); + status_t status = DrawGlInfo::kStatusDone; if (isEmpty()) return status; // nothing to flush diff --git a/libs/hwui/Dither.cpp b/libs/hwui/Dither.cpp index 51f1e39c1501..19b384962459 100644 --- a/libs/hwui/Dither.cpp +++ b/libs/hwui/Dither.cpp @@ -75,6 +75,7 @@ void Dither::bindDitherTexture() { void Dither::clear() { if (mInitialized) { glDeleteTextures(1, &mDitherTexture); + mInitialized = false; } } diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index 44dc731c6be7..6894ef916570 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -33,6 +33,7 @@ #include "Debug.h" #include "Extensions.h" #include "FontRenderer.h" +#include "PixelBuffer.h" #include "Rect.h" namespace android { @@ -133,26 +134,13 @@ void FontRenderer::flushAllAndInvalidate() { for (uint32_t i = 0; i < mCacheTextures.size(); i++) { mCacheTextures[i]->init(); } - -#if DEBUG_FONT_RENDERER - uint16_t totalGlyphs = 0; - for (uint32_t i = 0; i < mCacheTextures.size(); i++) { - totalGlyphs += mCacheTextures[i]->getGlyphCount(); - // Erase caches, just as a debugging facility - if (mCacheTextures[i]->getTexture()) { - memset(mCacheTextures[i]->getTexture(), 0, - mCacheTextures[i]->getWidth() * mCacheTextures[i]->getHeight()); - } - } - ALOGD("Flushing caches: glyphs cached = %d", totalGlyphs); -#endif } void FontRenderer::flushLargeCaches() { // Start from 1; don't deallocate smallest/default texture for (uint32_t i = 1; i < mCacheTextures.size(); i++) { CacheTexture* cacheTexture = mCacheTextures[i]; - if (cacheTexture->getTexture()) { + if (cacheTexture->getPixelBuffer()) { cacheTexture->init(); LruCache<Font::FontDescription, Font*>::Iterator it(mActiveFonts); while (it.next()) { @@ -226,7 +214,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp uint32_t cacheWidth = cacheTexture->getWidth(); - if (!cacheTexture->getTexture()) { + if (!cacheTexture->getPixelBuffer()) { Caches::getInstance().activeTexture(0); // Large-glyph texture memory is allocated only as needed cacheTexture->allocateTexture(); @@ -239,7 +227,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp // or anti-aliased (8 bits per pixel) SkMask::Format format = static_cast<SkMask::Format>(glyph.fMaskFormat); - uint8_t* cacheBuffer = cacheTexture->getTexture(); + uint8_t* cacheBuffer = cacheTexture->getPixelBuffer()->map(); uint32_t cacheX = 0, bX = 0, cacheY = 0, bY = 0; // Copy the glyph image, taking the mask format into account @@ -377,56 +365,36 @@ void FontRenderer::checkTextureUpdate() { Caches& caches = Caches::getInstance(); GLuint lastTextureId = 0; - // OpenGL ES 3.0+ lets us specify the row length for unpack operations such - // as glTexSubImage2D(). This allows us to upload a sub-rectangle of a texture. - // With OpenGL ES 2.0 we have to upload entire stripes instead. - const bool hasUnpackRowLength = Extensions::getInstance().getMajorGlVersion() >= 3; + bool resetPixelStore = false; glPixelStorei(GL_UNPACK_ALIGNMENT, 1); // Iterate over all the cache textures and see which ones need to be updated for (uint32_t i = 0; i < mCacheTextures.size(); i++) { CacheTexture* cacheTexture = mCacheTextures[i]; - if (cacheTexture->isDirty() && cacheTexture->getTexture()) { - const Rect* dirtyRect = cacheTexture->getDirtyRect(); - uint32_t x = hasUnpackRowLength ? dirtyRect->left : 0; - uint32_t y = dirtyRect->top; - uint32_t width = cacheTexture->getWidth(); - uint32_t height = dirtyRect->getHeight(); - void* textureData = cacheTexture->getTexture() + y * width + x; - + if (cacheTexture->isDirty() && cacheTexture->getPixelBuffer()) { if (cacheTexture->getTextureId() != lastTextureId) { lastTextureId = cacheTexture->getTextureId(); caches.activeTexture(0); glBindTexture(GL_TEXTURE_2D, lastTextureId); - - // The unpack row length only needs to be specified when a new - // texture is bound - if (hasUnpackRowLength) { - glPixelStorei(GL_UNPACK_ROW_LENGTH, width); - } } - // If we can upload a sub-rectangle, use the dirty rect width - // instead of the width of the entire texture - if (hasUnpackRowLength) { - width = dirtyRect->getWidth(); + if (cacheTexture->upload()) { + resetPixelStore = true; } #if DEBUG_FONT_RENDERER ALOGD("glTexSubimage for cacheTexture %d: x, y, width height = %d, %d, %d, %d", i, x, y, width, height); #endif - - glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, - GL_ALPHA, GL_UNSIGNED_BYTE, textureData); - - cacheTexture->setDirty(false); } } + // Unbind any PBO we might have used to update textures + caches.unbindPixelBuffer(); + // Reset to default unpack row length to avoid affecting texture // uploads in other parts of the renderer - if (hasUnpackRowLength) { + if (resetPixelStore) { glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); } @@ -539,13 +507,14 @@ FontRenderer::DropShadow FontRenderer::renderDropShadow(SkPaint* paint, const ch uint32_t startIndex, uint32_t len, int numGlyphs, uint32_t radius, const float* positions) { checkInit(); + DropShadow image; + image.width = 0; + image.height = 0; + image.image = NULL; + image.penX = 0; + image.penY = 0; + if (!mCurrentFont) { - DropShadow image; - image.width = 0; - image.height = 0; - image.image = NULL; - image.penX = 0; - image.penY = 0; return image; } @@ -559,6 +528,11 @@ FontRenderer::DropShadow FontRenderer::renderDropShadow(SkPaint* paint, const ch uint32_t paddedWidth = (uint32_t) (bounds.right - bounds.left) + 2 * radius; uint32_t paddedHeight = (uint32_t) (bounds.top - bounds.bottom) + 2 * radius; + uint32_t maxSize = Caches::getInstance().maxTextureSize; + if (paddedWidth > maxSize || paddedHeight > maxSize) { + return image; + } + // Align buffers for renderscript usage if (paddedWidth & (RS_CPU_ALLOCATION_ALIGNMENT - 1)) { paddedWidth += RS_CPU_ALLOCATION_ALIGNMENT - paddedWidth % RS_CPU_ALLOCATION_ALIGNMENT; @@ -578,10 +552,12 @@ FontRenderer::DropShadow FontRenderer::renderDropShadow(SkPaint* paint, const ch mCurrentFont->render(paint, text, startIndex, len, numGlyphs, penX, penY, Font::BITMAP, dataBuffer, paddedWidth, paddedHeight, NULL, positions); + // Unbind any PBO we might have used + Caches::getInstance().unbindPixelBuffer(); + blurImage(&dataBuffer, paddedWidth, paddedHeight, radius); } - DropShadow image; image.width = paddedWidth; image.height = paddedHeight; image.image = dataBuffer; @@ -612,6 +588,10 @@ void FontRenderer::precache(SkPaint* paint, const char* text, int numGlyphs, con font->precache(paint, text, numGlyphs); } +void FontRenderer::endPrecaching() { + checkTextureUpdate(); +} + bool FontRenderer::renderPosText(SkPaint* paint, const Rect* clip, const char *text, uint32_t startIndex, uint32_t len, int numGlyphs, int x, int y, const float* positions, Rect* bounds, Functor* functor) { @@ -690,5 +670,16 @@ void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, int *image = outImage; } +uint32_t FontRenderer::getCacheSize() const { + uint32_t size = 0; + for (uint32_t i = 0; i < mCacheTextures.size(); i++) { + CacheTexture* cacheTexture = mCacheTextures[i]; + if (cacheTexture && cacheTexture->getPixelBuffer()) { + size += cacheTexture->getPixelBuffer()->getSize(); + } + } + return size; +} + }; // namespace uirenderer }; // namespace android diff --git a/libs/hwui/FontRenderer.h b/libs/hwui/FontRenderer.h index 1da3b6cb3433..348b7e3b2b0a 100644 --- a/libs/hwui/FontRenderer.h +++ b/libs/hwui/FontRenderer.h @@ -61,6 +61,7 @@ public: void setFont(SkPaint* paint, const mat4& matrix); void precache(SkPaint* paint, const char* text, int numGlyphs, const mat4& matrix); + void endPrecaching(); // bounds is an out parameter bool renderPosText(SkPaint* paint, const Rect* clip, const char *text, uint32_t startIndex, @@ -95,16 +96,7 @@ public: mLinearFiltering = linearFiltering; } - uint32_t getCacheSize() const { - uint32_t size = 0; - for (uint32_t i = 0; i < mCacheTextures.size(); i++) { - CacheTexture* cacheTexture = mCacheTextures[i]; - if (cacheTexture && cacheTexture->getTexture()) { - size += cacheTexture->getWidth() * cacheTexture->getHeight(); - } - } - return size; - } + uint32_t getCacheSize() const; private: friend class Font; diff --git a/libs/hwui/GammaFontRenderer.cpp b/libs/hwui/GammaFontRenderer.cpp index bd0a4b39092b..06d2aad12f2a 100644 --- a/libs/hwui/GammaFontRenderer.cpp +++ b/libs/hwui/GammaFontRenderer.cpp @@ -129,6 +129,12 @@ void ShaderGammaFontRenderer::setupProgram(ProgramDescription& description, } } +void ShaderGammaFontRenderer::endPrecaching() { + if (mRenderer) { + mRenderer->endPrecaching(); + } +} + /////////////////////////////////////////////////////////////////////////////// // Lookup-based renderer /////////////////////////////////////////////////////////////////////////////// @@ -146,6 +152,12 @@ LookupGammaFontRenderer::LookupGammaFontRenderer(): GammaFontRenderer() { mRenderer = NULL; } +void LookupGammaFontRenderer::endPrecaching() { + if (mRenderer) { + mRenderer->endPrecaching(); + } +} + /////////////////////////////////////////////////////////////////////////////// // Lookup-based renderer, using 3 different correction tables /////////////////////////////////////////////////////////////////////////////// @@ -177,6 +189,14 @@ Lookup3GammaFontRenderer::~Lookup3GammaFontRenderer() { } } +void Lookup3GammaFontRenderer::endPrecaching() { + for (int i = 0; i < kGammaCount; i++) { + if (mRenderers[i]) { + mRenderers[i]->endPrecaching(); + } + } +} + void Lookup3GammaFontRenderer::clear() { for (int i = 0; i < kGammaCount; i++) { delete mRenderers[i]; diff --git a/libs/hwui/GammaFontRenderer.h b/libs/hwui/GammaFontRenderer.h index 5c1860ea5c8e..bbfa66d37fa7 100644 --- a/libs/hwui/GammaFontRenderer.h +++ b/libs/hwui/GammaFontRenderer.h @@ -40,6 +40,8 @@ public: virtual void describe(ProgramDescription& description, const SkPaint* paint) const = 0; virtual void setupProgram(ProgramDescription& description, Program* program) const = 0; + virtual void endPrecaching() = 0; + static GammaFontRenderer* createRenderer(); protected: @@ -86,6 +88,8 @@ public: void describe(ProgramDescription& description, const SkPaint* paint) const; void setupProgram(ProgramDescription& description, Program* program) const; + void endPrecaching(); + private: ShaderGammaFontRenderer(bool multiGamma); @@ -134,6 +138,8 @@ public: void setupProgram(ProgramDescription& description, Program* program) const { } + void endPrecaching(); + private: LookupGammaFontRenderer(); @@ -171,6 +177,8 @@ public: void setupProgram(ProgramDescription& description, Program* program) const { } + void endPrecaching(); + private: Lookup3GammaFontRenderer(); diff --git a/libs/hwui/GradientCache.cpp b/libs/hwui/GradientCache.cpp index eef366c409f9..507ed958da68 100644 --- a/libs/hwui/GradientCache.cpp +++ b/libs/hwui/GradientCache.cpp @@ -148,8 +148,11 @@ void GradientCache::getGradientInfo(const uint32_t* colors, const int count, GradientInfo& info) { uint32_t width = 256 * (count - 1); - if (!mHasNpot) { - width = 1 << (31 - __builtin_clz(width)); + // If the npot extension is not supported we cannot use non-clamp + // wrap modes. We therefore find the nearest largest power of 2 + // unless width is already a power of 2 + if (!mHasNpot && (width & (width - 1)) != 0) { + width = 1 << (32 - __builtin_clz(width)); } bool hasAlpha = false; diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index e18d92223ed4..dcd1eb834fcb 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2644,6 +2644,9 @@ void OpenGLRenderer::drawTextShadow(SkPaint* paint, const char* text, int bytesC mCaches.dropShadowCache.setFontRenderer(fontRenderer); const ShadowTexture* shadow = mCaches.dropShadowCache.get( paint, text, bytesCount, count, mDrawModifiers.mShadowRadius, positions); + // If the drop shadow exceeds the max texture size or couldn't be + // allocated, skip drawing + if (!shadow) return; const AutoTexture autoCleanup(shadow); const float sx = x - shadow->left + mDrawModifiers.mShadowDx; diff --git a/libs/hwui/PixelBuffer.cpp b/libs/hwui/PixelBuffer.cpp new file mode 100644 index 000000000000..8280370a33d0 --- /dev/null +++ b/libs/hwui/PixelBuffer.cpp @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2013 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. + */ + +#define LOG_TAG "OpenGLRenderer" + +#include <utils/Log.h> + +#include "Caches.h" +#include "Extensions.h" +#include "PixelBuffer.h" +#include "Properties.h" + +namespace android { +namespace uirenderer { + +/////////////////////////////////////////////////////////////////////////////// +// CPU pixel buffer +/////////////////////////////////////////////////////////////////////////////// + +class CpuPixelBuffer: public PixelBuffer { +public: + CpuPixelBuffer(GLenum format, uint32_t width, uint32_t height); + ~CpuPixelBuffer(); + + uint8_t* map(AccessMode mode = kAccessMode_ReadWrite); + void unmap(); + + uint8_t* getMappedPointer() const; + + void upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset); + +private: + uint8_t* mBuffer; +}; + +CpuPixelBuffer::CpuPixelBuffer(GLenum format, uint32_t width, uint32_t height): + PixelBuffer(format, width, height) { + mBuffer = new uint8_t[width * height * formatSize(format)]; +} + +CpuPixelBuffer::~CpuPixelBuffer() { + delete[] mBuffer; +} + +uint8_t* CpuPixelBuffer::map(AccessMode mode) { + if (mAccessMode == kAccessMode_None) { + mAccessMode = mode; + } + return mBuffer; +} + +void CpuPixelBuffer::unmap() { + mAccessMode = kAccessMode_None; +} + +uint8_t* CpuPixelBuffer::getMappedPointer() const { + return mAccessMode == kAccessMode_None ? NULL : mBuffer; +} + +void CpuPixelBuffer::upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) { + glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, + mFormat, GL_UNSIGNED_BYTE, mBuffer + offset); +} + +/////////////////////////////////////////////////////////////////////////////// +// GPU pixel buffer +/////////////////////////////////////////////////////////////////////////////// + +class GpuPixelBuffer: public PixelBuffer { +public: + GpuPixelBuffer(GLenum format, uint32_t width, uint32_t height); + ~GpuPixelBuffer(); + + uint8_t* map(AccessMode mode = kAccessMode_ReadWrite); + void unmap(); + + uint8_t* getMappedPointer() const; + + void upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset); + +private: + GLuint mBuffer; + uint8_t* mMappedPointer; + Caches& mCaches; +}; + +GpuPixelBuffer::GpuPixelBuffer(GLenum format, uint32_t width, uint32_t height): + PixelBuffer(format, width, height), mMappedPointer(0), mCaches(Caches::getInstance()) { + glGenBuffers(1, &mBuffer); + mCaches.bindPixelBuffer(mBuffer); + glBufferData(GL_PIXEL_UNPACK_BUFFER, getSize(), NULL, GL_DYNAMIC_DRAW); + mCaches.unbindPixelBuffer(); +} + +GpuPixelBuffer::~GpuPixelBuffer() { + glDeleteBuffers(1, &mBuffer); +} + +uint8_t* GpuPixelBuffer::map(AccessMode mode) { + if (mAccessMode == kAccessMode_None) { + mCaches.bindPixelBuffer(mBuffer); + mMappedPointer = (uint8_t*) glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, getSize(), mode); + mAccessMode = mode; + } + + return mMappedPointer; +} + +void GpuPixelBuffer::unmap() { + if (mAccessMode != kAccessMode_None) { + if (mMappedPointer) { + mCaches.bindPixelBuffer(mBuffer); + glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); + } + mAccessMode = kAccessMode_None; + mMappedPointer = NULL; + } +} + +uint8_t* GpuPixelBuffer::getMappedPointer() const { + return mMappedPointer; +} + +void GpuPixelBuffer::upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) { + // If the buffer is not mapped, unmap() will not bind it + mCaches.bindPixelBuffer(mBuffer); + unmap(); + glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, mFormat, + GL_UNSIGNED_BYTE, (void*) offset); +} + +/////////////////////////////////////////////////////////////////////////////// +// Factory +/////////////////////////////////////////////////////////////////////////////// + +PixelBuffer* PixelBuffer::create(GLenum format, uint32_t width, uint32_t height, BufferType type) { + bool gpuBuffer = type == kBufferType_Auto && Extensions::getInstance().getMajorGlVersion() >= 3; + if (gpuBuffer) { + char property[PROPERTY_VALUE_MAX]; + if (property_get(PROPERTY_ENABLE_GPU_PIXEL_BUFFERS, property, "false") > 0) { + if (!strcmp(property, "true")) { + return new GpuPixelBuffer(format, width, height); + } + } + } + return new CpuPixelBuffer(format, width, height); +} + +}; // namespace uirenderer +}; // namespace android diff --git a/libs/hwui/PixelBuffer.h b/libs/hwui/PixelBuffer.h new file mode 100644 index 000000000000..32d541776a82 --- /dev/null +++ b/libs/hwui/PixelBuffer.h @@ -0,0 +1,180 @@ +/* + * Copyright (C) 2013 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. + */ + +#ifndef ANDROID_HWUI_PIXEL_BUFFER_H +#define ANDROID_HWUI_PIXEL_BUFFER_H + +#include <GLES3/gl3.h> + +namespace android { +namespace uirenderer { + +/** + * Represents a pixel buffer. A pixel buffer will be backed either by a + * PBO on OpenGL ES 3.0 and higher or by an array of uint8_t on other + * versions. If the buffer is backed by a PBO it will of type + * GL_PIXEL_UNPACK_BUFFER. + * + * To read from or write into a PixelBuffer you must first map the + * buffer using the map(AccessMode) method. This method returns a + * pointer to the beginning of the buffer. + * + * Before the buffer can be used by the GPU, for instance to upload + * a texture, you must first unmap the buffer. To do so, call the + * unmap() method. + * + * Mapping and unmapping a PixelBuffer can have the side effect of + * changing the currently active GL_PIXEL_UNPACK_BUFFER. It is + * therefore recommended to call Caches::unbindPixelbuffer() after + * using a PixelBuffer to upload to a texture. + */ +class PixelBuffer { +public: + enum BufferType { + kBufferType_Auto, + kBufferType_CPU + }; + + enum AccessMode { + kAccessMode_None = 0, + kAccessMode_Read = GL_MAP_READ_BIT, + kAccessMode_Write = GL_MAP_WRITE_BIT, + kAccessMode_ReadWrite = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT + }; + + /** + * Creates a new PixelBuffer object with the specified format and + * dimensions. The buffer is immediately allocated. + * + * The buffer type specifies how the buffer should be allocated. + * By default this method will automatically choose whether to allocate + * a CPU or GPU buffer. + */ + static PixelBuffer* create(GLenum format, uint32_t width, uint32_t height, + BufferType type = kBufferType_Auto); + + virtual ~PixelBuffer() { + } + + /** + * Returns the format of this render buffer. + */ + GLenum getFormat() const { + return mFormat; + } + + /** + * Maps this before with the specified access mode. This method + * returns a pointer to the region of memory where the buffer was + * mapped. + * + * If the buffer is already mapped when this method is invoked, + * this method will return the previously mapped pointer. The + * access mode can only be changed by calling unmap() first. + * + * The specified access mode cannot be kAccessMode_None. + */ + virtual uint8_t* map(AccessMode mode = kAccessMode_ReadWrite) = 0; + + /** + * Unmaps this buffer, if needed. After the buffer is unmapped, + * the pointer previously returned by map() becomes invalid and + * should not be used. After calling this method, getMappedPointer() + * will always return NULL. + */ + virtual void unmap() = 0; + + /** + * Returns the current access mode for this buffer. If the buffer + * is not mapped, this method returns kAccessMode_None. + */ + AccessMode getAccessMode() const { + return mAccessMode; + } + + /** + * Returns the currently mapped pointer. Returns NULL if the buffer + * is not mapped. + */ + virtual uint8_t* getMappedPointer() const = 0; + + /** + * Upload the specified rectangle of this pixe buffer as a + * GL_TEXTURE_2D texture. Calling this method will trigger + * an unmap() if necessary. + */ + virtual void upload(uint32_t x, uint32_t y, uint32_t width, uint32_t height, int offset) = 0; + + /** + * Returns the width of the render buffer in pixels. + */ + uint32_t getWidth() const { + return mWidth; + } + + /** + * Returns the height of the render buffer in pixels. + */ + uint32_t getHeight() const { + return mHeight; + } + + /** + * Returns the size of this pixel buffer in bytes. + */ + uint32_t getSize() const { + return mWidth * mHeight * formatSize(mFormat); + } + + /** + * Returns the number of bytes per pixel in the specified format. + * + * Supported formats: + * GL_ALPHA + * GL_RGBA + */ + static uint32_t formatSize(GLenum format) { + switch (format) { + case GL_ALPHA: + return 1; + case GL_RGBA: + return 4; + } + return 0; + } + +protected: + /** + * Creates a new render buffer in the specified format and dimensions. + * The format must be GL_ALPHA or GL_RGBA. + */ + PixelBuffer(GLenum format, uint32_t width, uint32_t height): + mFormat(format), mWidth(width), mHeight(height), mAccessMode(kAccessMode_None) { + } + + GLenum mFormat; + + uint32_t mWidth; + uint32_t mHeight; + + AccessMode mAccessMode; + +}; // class PixelBuffer + +}; // namespace uirenderer +}; // namespace android + +#endif // ANDROID_HWUI_PIXEL_BUFFER_H diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h index e4b4f3c4fb8d..6eea00cd6c54 100644 --- a/libs/hwui/Properties.h +++ b/libs/hwui/Properties.h @@ -25,6 +25,10 @@ * the OpenGLRenderer. */ +/////////////////////////////////////////////////////////////////////////////// +// Compile-time properties +/////////////////////////////////////////////////////////////////////////////// + // If turned on, text is interpreted as glyphs instead of UTF-16 #define RENDER_TEXT_AS_GLYPHS 1 @@ -39,6 +43,10 @@ // to properly implement overdraw debugging #define STENCIL_BUFFER_SIZE 8 +/////////////////////////////////////////////////////////////////////////////// +// Debug properties +/////////////////////////////////////////////////////////////////////////////// + /** * Debug level for app developers. The value is a numeric value defined * by the DebugLevel enum below. @@ -82,6 +90,23 @@ enum DebugLevel { #define PROPERTY_DEBUG_STENCIL_CLIP "debug.hwui.show_non_rect_clip" /** + * Disables draw operation deferral if set to "true", forcing draw + * commands to be issued to OpenGL in order, and processed in sequence + * with state-manipulation canvas commands. + */ +#define PROPERTY_DISABLE_DRAW_DEFER "debug.hwui.disable_draw_defer" + +/** + * Used to disable draw operation reordering when deferring draw operations + * Has no effect if PROPERTY_DISABLE_DRAW_DEFER is set to "true" + */ +#define PROPERTY_DISABLE_DRAW_REORDER "debug.hwui.disable_draw_reorder" + +/////////////////////////////////////////////////////////////////////////////// +// Runtime configuration properties +/////////////////////////////////////////////////////////////////////////////// + +/** * Used to enable/disable scissor optimization. The accepted values are * "true" and "false". The default value is "false". * @@ -97,17 +122,10 @@ enum DebugLevel { #define PROPERTY_DISABLE_SCISSOR_OPTIMIZATION "ro.hwui.disable_scissor_opt" /** - * Disables draw operation deferral if set to "true", forcing draw - * commands to be issued to OpenGL in order, and processed in sequence - * with state-manipulation canvas commands. - */ -#define PROPERTY_DISABLE_DRAW_DEFER "debug.hwui.disable_draw_defer" - -/** - * Used to disable draw operation reordering when deferring draw operations - * Has no effect if PROPERTY_DISABLE_DRAW_DEFER is set to "true" + * Indicates whether PBOs can be used to back pixel buffers. + * Accepted values are "true" and "false". */ -#define PROPERTY_DISABLE_DRAW_REORDER "debug.hwui.disable_draw_reorder" +#define PROPERTY_ENABLE_GPU_PIXEL_BUFFERS "hwui.use_gpu_pixel_buffers" // These properties are defined in mega-bytes #define PROPERTY_TEXTURE_CACHE_SIZE "ro.hwui.texture_cache_size" @@ -152,8 +170,9 @@ enum DebugLevel { // Lumincance threshold above which white gamma correction is applied. Range: [0..255] #define PROPERTY_TEXT_WHITE_GAMMA_THRESHOLD "hwui.text_gamma.white_threshold" -// Converts a number of mega-bytes into bytes -#define MB(s) s * 1024 * 1024 +/////////////////////////////////////////////////////////////////////////////// +// Default property values +/////////////////////////////////////////////////////////////////////////////// #define DEFAULT_TEXTURE_CACHE_SIZE 24.0f #define DEFAULT_LAYER_CACHE_SIZE 16.0f @@ -170,6 +189,13 @@ enum DebugLevel { #define DEFAULT_TEXT_BLACK_GAMMA_THRESHOLD 64 #define DEFAULT_TEXT_WHITE_GAMMA_THRESHOLD 192 +/////////////////////////////////////////////////////////////////////////////// +// Misc +/////////////////////////////////////////////////////////////////////////////// + +// Converts a number of mega-bytes into bytes +#define MB(s) s * 1024 * 1024 + static DebugLevel readDebugLevel() { char property[PROPERTY_VALUE_MAX]; if (property_get(PROPERTY_DEBUG, property, NULL) > 0) { diff --git a/libs/hwui/TextDropShadowCache.cpp b/libs/hwui/TextDropShadowCache.cpp index f1f35bd1711c..6976eaa3d70e 100644 --- a/libs/hwui/TextDropShadowCache.cpp +++ b/libs/hwui/TextDropShadowCache.cpp @@ -178,6 +178,10 @@ ShadowTexture* TextDropShadowCache::get(SkPaint* paint, const char* text, uint32 FontRenderer::DropShadow shadow = mRenderer->renderDropShadow(&paintCopy, text, 0, len, numGlyphs, radius, positions); + if (!shadow.image) { + return NULL; + } + texture = new ShadowTexture; texture->left = shadow.penX; texture->top = shadow.penY; diff --git a/libs/hwui/font/CacheTexture.cpp b/libs/hwui/font/CacheTexture.cpp index 577f46389fdb..6c5267d338a7 100644 --- a/libs/hwui/font/CacheTexture.cpp +++ b/libs/hwui/font/CacheTexture.cpp @@ -18,6 +18,8 @@ #include "CacheTexture.h" #include "../Debug.h" +#include "../Extensions.h" +#include "../PixelBuffer.h" namespace android { namespace uirenderer { @@ -111,6 +113,11 @@ CacheTexture::CacheTexture(uint16_t width, uint16_t height, uint32_t maxQuadCoun mMesh(NULL), mCurrentQuad(0), mMaxQuadCount(maxQuadCount) { mCacheBlocks = new CacheBlock(TEXTURE_BORDER_SIZE, TEXTURE_BORDER_SIZE, mWidth - TEXTURE_BORDER_SIZE, mHeight - TEXTURE_BORDER_SIZE, true); + + // OpenGL ES 3.0+ lets us specify the row length for unpack operations such + // as glTexSubImage2D(). This allows us to upload a sub-rectangle of a texture. + // With OpenGL ES 2.0 we have to upload entire stripes instead. + mHasES3 = Extensions::getInstance().getMajorGlVersion() >= 3; } CacheTexture::~CacheTexture() { @@ -143,7 +150,7 @@ void CacheTexture::releaseMesh() { void CacheTexture::releaseTexture() { if (mTexture) { - delete[] mTexture; + delete mTexture; mTexture = NULL; } if (mTextureId) { @@ -154,6 +161,17 @@ void CacheTexture::releaseTexture() { mCurrentQuad = 0; } +void CacheTexture::setLinearFiltering(bool linearFiltering, bool bind) { + if (linearFiltering != mLinearFiltering) { + mLinearFiltering = linearFiltering; + + const GLenum filtering = linearFiltering ? GL_LINEAR : GL_NEAREST; + if (bind) glBindTexture(GL_TEXTURE_2D, getTextureId()); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering); + } +} + void CacheTexture::allocateMesh() { if (!mMesh) { mMesh = new TextureVertex[mMaxQuadCount * 4]; @@ -162,7 +180,7 @@ void CacheTexture::allocateMesh() { void CacheTexture::allocateTexture() { if (!mTexture) { - mTexture = new uint8_t[mWidth * mHeight]; + mTexture = PixelBuffer::create(GL_ALPHA, mWidth, mHeight); } if (!mTextureId) { @@ -183,6 +201,34 @@ void CacheTexture::allocateTexture() { } } +bool CacheTexture::upload() { + const Rect& dirtyRect = mDirtyRect; + + uint32_t x = mHasES3 ? dirtyRect.left : 0; + uint32_t y = dirtyRect.top; + uint32_t width = mHasES3 ? dirtyRect.getWidth() : mWidth; + uint32_t height = dirtyRect.getHeight(); + + // The unpack row length only needs to be specified when a new + // texture is bound + if (mHasES3) { + glPixelStorei(GL_UNPACK_ROW_LENGTH, mWidth); + } + + mTexture->upload(x, y, width, height, y * mWidth + x); + + setDirty(false); + + return mHasES3; +} + +void CacheTexture::setDirty(bool dirty) { + mDirty = dirty; + if (!dirty) { + mDirtyRect.setEmpty(); + } +} + bool CacheTexture::fitBitmap(const SkGlyph& glyph, uint32_t* retOriginX, uint32_t* retOriginY) { if (glyph.fHeight + TEXTURE_BORDER_SIZE * 2 > mHeight) { return false; diff --git a/libs/hwui/font/CacheTexture.h b/libs/hwui/font/CacheTexture.h index e7fb4746492a..ddcc836419a9 100644 --- a/libs/hwui/font/CacheTexture.h +++ b/libs/hwui/font/CacheTexture.h @@ -30,6 +30,8 @@ namespace android { namespace uirenderer { +class PixelBuffer; + /** * CacheBlock is a node in a linked list of current free space areas in a CacheTexture. * Using CacheBlocks enables us to pack the cache from top to bottom as well as left to right. @@ -83,6 +85,10 @@ public: void allocateTexture(); void allocateMesh(); + // Returns true if glPixelStorei(GL_UNPACK_ROW_LENGTH) must be reset + // This method will also call setDirty(false) + bool upload(); + bool fitBitmap(const SkGlyph& glyph, uint32_t* retOriginX, uint32_t* retOriginY); inline uint16_t getWidth() const { @@ -97,7 +103,7 @@ public: return &mDirtyRect; } - inline uint8_t* getTexture() const { + inline PixelBuffer* getPixelBuffer() const { return mTexture; } @@ -110,13 +116,6 @@ public: return mDirty; } - inline void setDirty(bool dirty) { - mDirty = dirty; - if (!dirty) { - mDirtyRect.setEmpty(); - } - } - inline bool getLinearFiltering() const { return mLinearFiltering; } @@ -124,16 +123,7 @@ public: /** * This method assumes that the proper texture unit is active. */ - void setLinearFiltering(bool linearFiltering, bool bind = true) { - if (linearFiltering != mLinearFiltering) { - mLinearFiltering = linearFiltering; - - const GLenum filtering = linearFiltering ? GL_LINEAR : GL_NEAREST; - if (bind) glBindTexture(GL_TEXTURE_2D, getTextureId()); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering); - } - } + void setLinearFiltering(bool linearFiltering, bool bind = true); inline uint16_t getGlyphCount() const { return mNumGlyphs; @@ -176,7 +166,9 @@ public: } private: - uint8_t* mTexture; + void setDirty(bool dirty); + + PixelBuffer* mTexture; GLuint mTextureId; uint16_t mWidth; uint16_t mHeight; @@ -188,6 +180,7 @@ private: uint32_t mMaxQuadCount; CacheBlock* mCacheBlocks; Rect mDirtyRect; + bool mHasES3; }; }; // namespace uirenderer diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp index 02c1aa191e5c..011cfc14ac5c 100644 --- a/libs/hwui/font/Font.cpp +++ b/libs/hwui/font/Font.cpp @@ -25,11 +25,12 @@ #include <SkGlyph.h> #include <SkUtils.h> -#include "Debug.h" #include "FontUtil.h" #include "Font.h" -#include "FontRenderer.h" -#include "Properties.h" +#include "../Debug.h" +#include "../FontRenderer.h" +#include "../PixelBuffer.h" +#include "../Properties.h" namespace android { namespace uirenderer { @@ -200,25 +201,23 @@ void Font::drawCachedGlyphTransformed(CachedGlyphInfo* glyph, int x, int y, p[3].x(), p[3].y(), u1, v1, glyph->mCacheTexture); } -void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y, - uint8_t* bitmap, uint32_t bitmapW, uint32_t bitmapH, Rect* bounds, const float* pos) { - int nPenX = x + glyph->mBitmapLeft; - int nPenY = y + glyph->mBitmapTop; - - uint32_t endX = glyph->mStartX + glyph->mBitmapWidth; - uint32_t endY = glyph->mStartY + glyph->mBitmapHeight; +void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y, uint8_t* bitmap, + uint32_t bitmapWidth, uint32_t bitmapHeight, Rect* bounds, const float* pos) { + int dstX = x + glyph->mBitmapLeft; + int dstY = y + glyph->mBitmapTop; CacheTexture* cacheTexture = glyph->mCacheTexture; + uint32_t cacheWidth = cacheTexture->getWidth(); - const uint8_t* cacheBuffer = cacheTexture->getTexture(); - - uint32_t cacheX = 0, cacheY = 0; - int32_t bX = 0, bY = 0; - for (cacheX = glyph->mStartX, bX = nPenX; cacheX < endX; cacheX++, bX++) { - for (cacheY = glyph->mStartY, bY = nPenY; cacheY < endY; cacheY++, bY++) { - uint8_t tempCol = cacheBuffer[cacheY * cacheWidth + cacheX]; - bitmap[bY * bitmapW + bX] = tempCol; - } + uint32_t startY = glyph->mStartY * cacheWidth; + uint32_t endY = startY + (glyph->mBitmapHeight * cacheWidth); + + PixelBuffer* pixelBuffer = cacheTexture->getPixelBuffer(); + const uint8_t* cacheBuffer = pixelBuffer->map(); + + for (uint32_t cacheY = startY, bitmapY = dstY * bitmapWidth; cacheY < endY; + cacheY += cacheWidth, bitmapY += bitmapWidth) { + memcpy(&bitmap[bitmapY + dstX], &cacheBuffer[cacheY + glyph->mStartX], glyph->mBitmapWidth); } } diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index 286e203c0d61..cf159f0ed1db 100644 --- a/media/java/android/media/MediaExtractor.java +++ b/media/java/android/media/MediaExtractor.java @@ -67,7 +67,7 @@ final public class MediaExtractor { * Sets the DataSource object to be used as the data source for this extractor * {@hide} */ - public native final void setDataSource(DataSource source); + public native final void setDataSource(DataSource source) throws IOException; /** * Sets the data source as a content Uri. @@ -121,7 +121,8 @@ final public class MediaExtractor { * @param path the path of the file, or the http URL * @param headers the headers associated with the http request for the stream you want to play */ - public final void setDataSource(String path, Map<String, String> headers) { + public final void setDataSource(String path, Map<String, String> headers) + throws IOException { String[] keys = null; String[] values = null; @@ -140,7 +141,7 @@ final public class MediaExtractor { } private native final void setDataSource( - String path, String[] keys, String[] values); + String path, String[] keys, String[] values) throws IOException; /** * Sets the data source (file-path or http URL) to use. @@ -154,7 +155,7 @@ final public class MediaExtractor { * As an alternative, the application could first open the file for reading, * and then use the file descriptor form {@link #setDataSource(FileDescriptor)}. */ - public final void setDataSource(String path) { + public final void setDataSource(String path) throws IOException { setDataSource(path, null, null); } @@ -164,7 +165,7 @@ final public class MediaExtractor { * * @param fd the FileDescriptor for the file you want to extract from. */ - public final void setDataSource(FileDescriptor fd) { + public final void setDataSource(FileDescriptor fd) throws IOException { setDataSource(fd, 0, 0x7ffffffffffffffL); } @@ -178,7 +179,7 @@ final public class MediaExtractor { * @param length the length in bytes of the data to be extracted */ public native final void setDataSource( - FileDescriptor fd, long offset, long length); + FileDescriptor fd, long offset, long length) throws IOException; @Override protected void finalize() { diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 85a32caba65a..f74516366b09 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -1181,7 +1181,8 @@ public class MediaPlayer /** * Gets the duration of the file. * - * @return the duration in milliseconds + * @return the duration in milliseconds, if no duration is available + * (for example, if streaming live content), -1 is returned. */ public native int getDuration(); diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index 93bcf03bb463..1034e9372ec6 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -277,14 +277,12 @@ public class RemoteControlClient */ public final static int FLAG_KEY_MEDIA_NEXT = 1 << 7; /** - * @hide - * TODO un-hide and add in javadoc of setTransportControlFlags(int) * Flag indicating a RemoteControlClient can receive changes in the media playback position * through the {@link #OnPlaybackPositionUpdateListener} interface. This flag must be set * in order for components that display the RemoteControlClient information, to display and * let the user control media playback position. * @see #setTransportControlFlags(int) - * @see #setPlaybackPositionProvider(PlaybackPositionProvider) + * @see #setOnGetPlaybackPositionListener(OnGetPlaybackPositionListener) * @see #setPlaybackPositionUpdateListener(OnPlaybackPositionUpdateListener) */ public final static int FLAG_KEY_MEDIA_POSITION_UPDATE = 1 << 8; @@ -607,8 +605,6 @@ public class RemoteControlClient } /** - * @hide - * TODO un-hide * Sets the current playback state and the matching media position for the current playback * speed. * @param state The current playback state, one of the following values: @@ -660,7 +656,8 @@ public class RemoteControlClient * {@link #FLAG_KEY_MEDIA_PAUSE}, * {@link #FLAG_KEY_MEDIA_STOP}, * {@link #FLAG_KEY_MEDIA_FAST_FORWARD}, - * {@link #FLAG_KEY_MEDIA_NEXT} + * {@link #FLAG_KEY_MEDIA_NEXT}, + * {@link #FLAG_KEY_MEDIA_POSITION_UPDATE} */ public void setTransportControlFlags(int transportControlFlags) { synchronized(mCacheLock) { @@ -673,8 +670,6 @@ public class RemoteControlClient } /** - * @hide - * TODO un-hide * Interface definition for a callback to be invoked when the media playback position is * requested to be updated. * @see RemoteControlClient#FLAG_KEY_MEDIA_POSITION_UPDATE @@ -695,30 +690,26 @@ public class RemoteControlClient } /** - * @hide - * TODO un-hide * Interface definition for a callback to be invoked when the media playback position is * queried. * @see RemoteControlClient#FLAG_KEY_MEDIA_POSITION_UPDATE */ - public interface PlaybackPositionProvider { + public interface OnGetPlaybackPositionListener { /** * Called on the implementer of the interface to query the current playback position. * @return a negative value if the current playback position (or the last valid playback * position) is not known, or a zero or positive value expressed in ms indicating the * current position, or the last valid known position. */ - long getPlaybackPosition(); + long onGetPlaybackPosition(); } /** - * @hide - * TODO un-hide * Sets the listener to be called whenever the media playback position is requested * to be updated. * Notifications will be received in the same thread as the one in which RemoteControlClient * was created. - * @param l + * @param l the position update listener to be called */ public void setPlaybackPositionUpdateListener(OnPlaybackPositionUpdateListener l) { synchronized(mCacheLock) { @@ -737,14 +728,12 @@ public class RemoteControlClient } /** - * @hide - * TODO un-hide * Sets the listener to be called whenever the media current playback position is needed. * Queries will be received in the same thread as the one in which RemoteControlClient * was created. - * @param l + * @param l the listener to be called to retrieve the playback position */ - public void setPlaybackPositionProvider(PlaybackPositionProvider l) { + public void setOnGetPlaybackPositionListener(OnGetPlaybackPositionListener l) { synchronized(mCacheLock) { int oldCapa = mPlaybackPositionCapabilities; if (l != null) { @@ -942,7 +931,7 @@ public class RemoteControlClient /** * Provider registered by user of RemoteControlClient to provide the current playback position. */ - private PlaybackPositionProvider mPositionProvider; + private OnGetPlaybackPositionListener mPositionProvider; /** * The current remote control client generation ID across the system, as known by this object */ diff --git a/packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java b/packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java index f11b4994cb00..36ce7cee5f30 100644 --- a/packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java +++ b/packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java @@ -86,7 +86,7 @@ public class FakeApp extends Application { @Override public void onCreate() { - String processName = ActivityThread.currentPackageName(); + String processName = ActivityThread.currentProcessName(); Slog.i("FakeOEMFeatures", "Creating app in process: " + processName); if (!getApplicationInfo().packageName.equals(processName)) { // If we are not in the main process of the app, then don't do diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 5f9e92106f58..273ac310a9aa 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -4203,9 +4203,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { // Ignore sensor when plugged into HDMI. // Note that the dock orientation overrides the HDMI orientation. preferredRotation = mHdmiRotation; + } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_LOCKED) { + // Application just wants to remain locked in the last rotation. + preferredRotation = lastRotation; } else if ((mUserRotationMode == WindowManagerPolicy.USER_ROTATION_FREE && (orientation == ActivityInfo.SCREEN_ORIENTATION_USER - || orientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)) + || orientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED + || orientation == ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE + || orientation == ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT + || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_USER)) || orientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR || orientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE @@ -4221,7 +4227,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { } if (sensorRotation != Surface.ROTATION_180 || mAllowAllRotations == 1 - || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR) { + || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR + || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_USER) { preferredRotation = sensorRotation; } else { preferredRotation = lastRotation; @@ -4269,6 +4276,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { return mSeascapeRotation; case ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE: + case ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE: // Return either landscape rotation. if (isLandscapeOrSeascape(preferredRotation)) { return preferredRotation; @@ -4279,6 +4287,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { return mLandscapeRotation; case ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT: + case ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT: // Return either portrait rotation. if (isAnyPortrait(preferredRotation)) { return preferredRotation; diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index 488540779ea2..7fcf1d5d4c68 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -64,7 +64,7 @@ import java.util.List; public class KeyguardHostView extends KeyguardViewBase { private static final String TAG = "KeyguardHostView"; - // transport control states + // Transport control states. static final int TRANSPORT_GONE = 0; static final int TRANSPORT_INVISIBLE = 1; static final int TRANSPORT_VISIBLE = 2; @@ -139,6 +139,9 @@ public class KeyguardHostView extends KeyguardViewBase { public KeyguardHostView(Context context, AttributeSet attrs) { super(context, attrs); + + if (DEBUG) Log.e(TAG, "KeyguardHostView()"); + mLockPatternUtils = new LockPatternUtils(context); // Note: This depends on KeyguardHostView getting reconstructed every time the @@ -203,6 +206,9 @@ public class KeyguardHostView extends KeyguardViewBase { mTransportState = (dcs.clearing ? TRANSPORT_GONE : (isMusicPlaying(dcs.playbackState) ? TRANSPORT_VISIBLE : TRANSPORT_INVISIBLE)); mPlaybackState = dcs.playbackState; + + if (DEBUG) Log.v(TAG, "Initial transport state: " + + mTransportState + ", pbstate=" + mPlaybackState); } private void cleanupAppWidgetIds() { @@ -1205,7 +1211,7 @@ public class KeyguardHostView extends KeyguardViewBase { * Create KeyguardTransportControlView on demand. * @return */ - private KeyguardTransportControlView getTransportControlView() { + private KeyguardTransportControlView getOrCreateTransportControl() { if (mTransportControl == null) { LayoutInflater inflater = LayoutInflater.from(mContext); mTransportControl = (KeyguardTransportControlView) @@ -1380,17 +1386,19 @@ public class KeyguardHostView extends KeyguardViewBase { @Override public Parcelable onSaveInstanceState() { - if (DEBUG) Log.d(TAG, "onSaveInstanceState"); + if (DEBUG) Log.d(TAG, "onSaveInstanceState, tstate=" + mTransportState); Parcelable superState = super.onSaveInstanceState(); SavedState ss = new SavedState(superState); - ss.transportState = mTransportState; + // If the transport is showing, force it to show it on restore. + final boolean showing = mTransportControl != null + && mAppWidgetContainer.getWidgetPageIndex(mTransportControl) >= 0; + ss.transportState = showing ? TRANSPORT_VISIBLE : mTransportState; ss.appWidgetToShow = mAppWidgetToShow; return ss; } @Override public void onRestoreInstanceState(Parcelable state) { - if (DEBUG) Log.d(TAG, "onRestoreInstanceState"); if (!(state instanceof SavedState)) { super.onRestoreInstanceState(state); return; @@ -1399,6 +1407,7 @@ public class KeyguardHostView extends KeyguardViewBase { super.onRestoreInstanceState(ss.getSuperState()); mTransportState = (ss.transportState); mAppWidgetToShow = ss.appWidgetToShow; + if (DEBUG) Log.d(TAG, "onRestoreInstanceState, transport=" + mTransportState); post(mSwitchPageRunnable); } @@ -1424,23 +1433,44 @@ public class KeyguardHostView extends KeyguardViewBase { mAppWidgetContainer.setCurrentPage(pageToShow); } + /** + * Examines the current state and adds the transport to the widget pager when the state changes. + * + * Showing the initial transport and keeping it around is a bit tricky because the signals + * coming from music players aren't always clear. Here's how the states are handled: + * + * {@link TRANSPORT_GONE} means we have no reason to show the transport - remove it if present. + * + * {@link TRANSPORT_INVISIBLE} means we have potential to show the transport because a music + * player is registered but not currently playing music (or we don't know the state yet). The + * code adds it conditionally on play state. + * + * {@link #TRANSPORT_VISIBLE} means a music player is active and transport should be showing. + * + * Once the transport is showing, we always show it until keyguard is dismissed. This state is + * maintained by onSave/RestoreInstanceState(). This state is cleared in + * {@link KeyguardViewManager#hide} when keyguard is dismissed, which causes the transport to be + * gone when keyguard is restarted until we get an update with the current state. + * + * @param state + */ private void ensureTransportPresentOrRemoved(int state) { - int page = getWidgetPosition(R.id.keyguard_transport_control); - if (state == TRANSPORT_INVISIBLE || state == TRANSPORT_VISIBLE) { - if (page == -1) { - if (DEBUGXPORT) Log.v(TAG, "add transport"); - // insert to left of camera if it exists, otherwise after right-most widget - int lastWidget = mAppWidgetContainer.getChildCount() - 1; - int position = 0; // handle no widget case - if (lastWidget >= 0) { - position = mAppWidgetContainer.isCameraPage(lastWidget) ? - lastWidget : lastWidget + 1; - } - mAppWidgetContainer.addWidget(getTransportControlView(), position); + final boolean showing = getWidgetPosition(R.id.keyguard_transport_control) != -1; + final boolean visible = state == TRANSPORT_VISIBLE; + final boolean shouldBeVisible = state == TRANSPORT_INVISIBLE && isMusicPlaying(state); + if (!showing && (visible || shouldBeVisible)) { + if (DEBUGXPORT) Log.v(TAG, "add transport"); + // insert to left of camera if it exists, otherwise after right-most widget + int lastWidget = mAppWidgetContainer.getChildCount() - 1; + int position = 0; // handle no widget case + if (lastWidget >= 0) { + position = mAppWidgetContainer.isCameraPage(lastWidget) ? + lastWidget : lastWidget + 1; } - } else if (page != -1) { + mAppWidgetContainer.addWidget(getOrCreateTransportControl(), position); + } else if (showing && state == TRANSPORT_GONE) { if (DEBUGXPORT) Log.v(TAG, "remove transport"); - mAppWidgetContainer.removeWidget(getTransportControlView()); + mAppWidgetContainer.removeWidget(getOrCreateTransportControl()); mTransportControl = null; } } @@ -1473,7 +1503,7 @@ public class KeyguardHostView extends KeyguardViewBase { // if music playing, show transport if (musicTransportState == TRANSPORT_VISIBLE) { if (DEBUG) Log.d(TAG, "Music playing, show transport"); - return mAppWidgetContainer.getWidgetPageIndex(getTransportControlView()); + return mAppWidgetContainer.getWidgetPageIndex(getOrCreateTransportControl()); } // else show the right-most widget (except for camera) diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java index 159a92db7c48..ad87a4ba5c4c 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java @@ -392,6 +392,8 @@ public class KeyguardUpdateMonitor { mDisplayClientState.clientGeneration = clientGeneration; mDisplayClientState.clearing = clearing; mDisplayClientState.intent = p; + if (DEBUG) + Log.v(TAG, "handleSetGenerationId(g=" + clientGeneration + ", clear=" + clearing + ")"); for (int i = 0; i < mCallbacks.size(); i++) { KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); if (cb != null) { @@ -401,6 +403,11 @@ public class KeyguardUpdateMonitor { } protected void handleSetPlaybackState(int generationId, int playbackState, long eventTime) { + if (DEBUG) + Log.v(TAG, "handleSetPlaybackState(gen=" + generationId + + ", state=" + playbackState + ", t=" + eventTime + ")"); + mDisplayClientState.playbackState = playbackState; + mDisplayClientState.playbackEventTime = eventTime; if (generationId == mDisplayClientState.clientGeneration) { for (int i = 0; i < mCallbacks.size(); i++) { KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java index 8e10528f594c..c49228e44f38 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java @@ -915,7 +915,7 @@ public class KeyguardViewMediator { * @see #handleReset() */ private void resetStateLocked(Bundle options) { - if (DEBUG) Log.d(TAG, "resetStateLocked"); + if (DEBUG) Log.e(TAG, "resetStateLocked"); Message msg = mHandler.obtainMessage(RESET, options); mHandler.sendMessage(msg); } diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index ffc36723eba2..01625dd1eb8a 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1470,8 +1470,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { loge("Error modifying route - no interface name"); return false; } - - if (r.isHostRoute() == false) { + if (r.hasGateway()) { RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getAllRoutes(), r.getGateway()); if (bestRoute != null) { if (bestRoute.getGateway().equals(r.getGateway())) { @@ -2347,28 +2346,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { } } - for (RouteInfo r : routeDiff.added) { - if (isLinkDefault || ! r.isDefaultRoute()) { - addRoute(newLp, r, TO_DEFAULT_TABLE); - } else { - // add to a secondary route table - addRoute(newLp, r, TO_SECONDARY_TABLE); - - // many radios add a default route even when we don't want one. - // remove the default route unless somebody else has asked for it - String ifaceName = newLp.getInterfaceName(); - if (TextUtils.isEmpty(ifaceName) == false && mAddedRoutes.contains(r) == false) { - if (VDBG) log("Removing " + r + " for interface " + ifaceName); - try { - mNetd.removeRoute(ifaceName, r); - } catch (Exception e) { - // never crash - catch them all - if (DBG) loge("Exception trying to remove a route: " + e); - } - } - } - } - if (!isLinkDefault) { // handle DNS routes if (routesChanged) { @@ -2393,6 +2370,29 @@ public class ConnectivityService extends IConnectivityManager.Stub { } } } + + for (RouteInfo r : routeDiff.added) { + if (isLinkDefault || ! r.isDefaultRoute()) { + addRoute(newLp, r, TO_DEFAULT_TABLE); + } else { + // add to a secondary route table + addRoute(newLp, r, TO_SECONDARY_TABLE); + + // many radios add a default route even when we don't want one. + // remove the default route unless somebody else has asked for it + String ifaceName = newLp.getInterfaceName(); + if (TextUtils.isEmpty(ifaceName) == false && mAddedRoutes.contains(r) == false) { + if (VDBG) log("Removing " + r + " for interface " + ifaceName); + try { + mNetd.removeRoute(ifaceName, r); + } catch (Exception e) { + // never crash - catch them all + if (DBG) loge("Exception trying to remove a route: " + e); + } + } + } + } + return routesChanged; } @@ -3045,7 +3045,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { } public void setGlobalProxy(ProxyProperties proxyProperties) { - enforceChangePermission(); + enforceConnectivityInternalPermission(); synchronized (mProxyLock) { if (proxyProperties == mGlobalProxy) return; if (proxyProperties != null && proxyProperties.equals(mGlobalProxy)) return; @@ -3063,10 +3063,15 @@ public class ConnectivityService extends IConnectivityManager.Stub { mGlobalProxy = null; } ContentResolver res = mContext.getContentResolver(); - Settings.Global.putString(res, Settings.Global.GLOBAL_HTTP_PROXY_HOST, host); - Settings.Global.putInt(res, Settings.Global.GLOBAL_HTTP_PROXY_PORT, port); - Settings.Global.putString(res, Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST, - exclList); + final long token = Binder.clearCallingIdentity(); + try { + Settings.Global.putString(res, Settings.Global.GLOBAL_HTTP_PROXY_HOST, host); + Settings.Global.putInt(res, Settings.Global.GLOBAL_HTTP_PROXY_PORT, port); + Settings.Global.putString(res, Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST, + exclList); + } finally { + Binder.restoreCallingIdentity(token); + } } if (mGlobalProxy == null) { diff --git a/services/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/java/com/android/server/accessibility/AccessibilityInputFilter.java index 179db1235b21..0d8a571de721 100644 --- a/services/java/com/android/server/accessibility/AccessibilityInputFilter.java +++ b/services/java/com/android/server/accessibility/AccessibilityInputFilter.java @@ -25,6 +25,7 @@ import android.view.Display; import android.view.InputDevice; import android.view.InputEvent; import android.view.InputFilter; +import android.view.KeyEvent; import android.view.MotionEvent; import android.view.WindowManagerPolicy; import android.view.accessibility.AccessibilityEvent; @@ -80,7 +81,7 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo private final Choreographer mChoreographer; - private int mCurrentDeviceId; + private int mCurrentTouchDeviceId; private boolean mInstalled; @@ -98,6 +99,8 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo private boolean mHoverEventSequenceStarted; + private boolean mKeyEventSequenceStarted; + AccessibilityInputFilter(Context context, AccessibilityManagerService service) { super(context.getMainLooper()); mContext = context; @@ -133,11 +136,21 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo Slog.d(TAG, "Received event: " + event + ", policyFlags=0x" + Integer.toHexString(policyFlags)); } - if (mEventHandler == null) { + if (event instanceof MotionEvent + && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { + MotionEvent motionEvent = (MotionEvent) event; + onMotionEvent(motionEvent, policyFlags); + } else if (event instanceof KeyEvent + && event.isFromSource(InputDevice.SOURCE_KEYBOARD)) { + KeyEvent keyEvent = (KeyEvent) event; + onKeyEvent(keyEvent, policyFlags); + } else { super.onInputEvent(event, policyFlags); - return; } - if (event.getSource() != InputDevice.SOURCE_TOUCHSCREEN) { + } + + private void onMotionEvent(MotionEvent event, int policyFlags) { + if (mEventHandler == null) { super.onInputEvent(event, policyFlags); return; } @@ -149,26 +162,25 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo return; } final int deviceId = event.getDeviceId(); - if (mCurrentDeviceId != deviceId) { + if (mCurrentTouchDeviceId != deviceId) { + mCurrentTouchDeviceId = deviceId; mMotionEventSequenceStarted = false; mHoverEventSequenceStarted = false; mEventHandler.clear(); - mCurrentDeviceId = deviceId; } - if (mCurrentDeviceId < 0) { + if (mCurrentTouchDeviceId < 0) { super.onInputEvent(event, policyFlags); return; } // We do not handle scroll events. - MotionEvent motionEvent = (MotionEvent) event; - if (motionEvent.getActionMasked() == MotionEvent.ACTION_SCROLL) { + if (event.getActionMasked() == MotionEvent.ACTION_SCROLL) { super.onInputEvent(event, policyFlags); return; } // Wait for a down touch event to start processing. - if (motionEvent.isTouchEvent()) { + if (event.isTouchEvent()) { if (!mMotionEventSequenceStarted) { - if (motionEvent.getActionMasked() != MotionEvent.ACTION_DOWN) { + if (event.getActionMasked() != MotionEvent.ACTION_DOWN) { return; } mMotionEventSequenceStarted = true; @@ -176,7 +188,7 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo } else { // Wait for an enter hover event to start processing. if (!mHoverEventSequenceStarted) { - if (motionEvent.getActionMasked() != MotionEvent.ACTION_HOVER_ENTER) { + if (event.getActionMasked() != MotionEvent.ACTION_HOVER_ENTER) { return; } mHoverEventSequenceStarted = true; @@ -185,6 +197,22 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo batchMotionEvent((MotionEvent) event, policyFlags); } + private void onKeyEvent(KeyEvent event, int policyFlags) { + if ((policyFlags & WindowManagerPolicy.FLAG_PASS_TO_USER) == 0) { + mKeyEventSequenceStarted = false; + super.onInputEvent(event, policyFlags); + return; + } + // Wait for a down key event to start processing. + if (!mKeyEventSequenceStarted) { + if (event.getAction() != KeyEvent.ACTION_DOWN) { + return; + } + mKeyEventSequenceStarted = true; + } + mAms.notifyKeyEvent(event, policyFlags); + } + private void scheduleProcessBatchedEvents() { mChoreographer.postCallback(Choreographer.CALLBACK_INPUT, mProcessBatchedEventsRunnable, null); @@ -286,6 +314,13 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo } } + void reset() { + setEnabledFeatures(0); + mKeyEventSequenceStarted = false; + mMotionEventSequenceStarted = false; + mHoverEventSequenceStarted = false; + } + private void enableFeatures() { mMotionEventSequenceStarted = false; mHoverEventSequenceStarted = false; diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java index 527e891ff731..110c4dadc201 100644 --- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -61,16 +61,20 @@ import android.os.UserManager; import android.provider.Settings; import android.text.TextUtils; import android.text.TextUtils.SimpleStringSplitter; +import android.util.Pools.Pool; +import android.util.Pools.SimplePool; import android.util.Slog; import android.util.SparseArray; import android.view.Display; import android.view.IWindow; import android.view.IWindowManager; import android.view.InputDevice; +import android.view.InputEventConsistencyVerifier; import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.MagnificationSpec; import android.view.WindowManager; +import android.view.WindowManagerPolicy; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityInteractionClient; import android.view.accessibility.AccessibilityManager; @@ -132,6 +136,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { private static final int OWN_PROCESS_ID = android.os.Process.myPid(); + private static final int MAX_POOL_SIZE = 10; + private static int sIdCounter = 0; private static int sNextWindowId; @@ -140,6 +146,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { private final Object mLock = new Object(); + private final Pool<PendingEvent> mPendingEventPool = + new SimplePool<PendingEvent>(MAX_POOL_SIZE); + private final SimpleStringSplitter mStringColonSplitter = new SimpleStringSplitter(COMPONENT_NAME_SEPARATOR); @@ -633,6 +642,17 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } } + boolean notifyKeyEvent(KeyEvent event, int policyFlags) { + synchronized (mLock) { + KeyEvent localClone = KeyEvent.obtain(event); + boolean handled = notifyKeyEventLocked(localClone, policyFlags, false); + if (!handled) { + handled = notifyKeyEventLocked(localClone, policyFlags, true); + } + return handled; + } + } + /** * Gets the bounds of the accessibility focus in the active window. * @@ -798,6 +818,27 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { return false; } + private boolean notifyKeyEventLocked(KeyEvent event, int policyFlags, boolean isDefault) { + // TODO: Now we are giving the key events to the last enabled + // service that can handle them which is the last one + // in our list since we write the last enabled as the + // last record in the enabled services setting. Ideally, + // the user should make the call which service handles + // key events. However, only one service should handle + // key events to avoid user frustration when different + // behavior is observed from different combinations of + // enabled accessibility services. + UserState state = getCurrentUserStateLocked(); + for (int i = state.mBoundServices.size() - 1; i >= 0; i--) { + Service service = state.mBoundServices.get(i); + if (service.mIsDefault == isDefault) { + service.notifyKeyEvent(event, policyFlags); + return true; + } + } + return false; + } + private void notifyClearAccessibilityNodeInfoCacheLocked() { UserState state = getCurrentUserStateLocked(); for (int i = state.mBoundServices.size() - 1; i >= 0; i--) { @@ -1119,8 +1160,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { boolean setInputFilter = false; AccessibilityInputFilter inputFilter = null; synchronized (mLock) { - if ((userState.mIsAccessibilityEnabled && userState.mIsTouchExplorationEnabled) - || userState.mIsDisplayMagnificationEnabled) { + if (userState.mIsAccessibilityEnabled) { if (!mHasInputFilter) { mHasInputFilter = true; if (mInputFilter == null) { @@ -1141,7 +1181,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } else { if (mHasInputFilter) { mHasInputFilter = false; - mInputFilter.setEnabledFeatures(0); + mInputFilter.reset(); inputFilter = null; setInputFilter = true; } @@ -1446,6 +1486,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { public static final int MSG_ANNOUNCE_NEW_USER_IF_NEEDED = 5; public static final int MSG_UPDATE_INPUT_FILTER = 6; public static final int MSG_SHOW_ENABLED_TOUCH_EXPLORATION_DIALOG = 7; + public static final int MSG_SEND_KEY_EVENT_TO_INPUT_FILTER = 8; public MainHandler(Looper looper) { super(looper); @@ -1464,6 +1505,16 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } event.recycle(); } break; + case MSG_SEND_KEY_EVENT_TO_INPUT_FILTER: { + KeyEvent event = (KeyEvent) msg.obj; + final int policyFlags = msg.arg1; + synchronized (mLock) { + if (mHasInputFilter && mInputFilter != null) { + mInputFilter.sendInputEvent(event, policyFlags); + } + } + event.recycle(); + } break; case MSG_SEND_STATE_TO_CLIENTS: { final int clientState = msg.arg1; final int userId = msg.arg2; @@ -1536,6 +1587,22 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } } + private PendingEvent obtainPendingEventLocked(KeyEvent event, int policyFlags, int sequence) { + PendingEvent pendingEvent = mPendingEventPool.acquire(); + if (pendingEvent == null) { + pendingEvent = new PendingEvent(); + } + pendingEvent.event = event; + pendingEvent.policyFlags = policyFlags; + pendingEvent.sequence = sequence; + return pendingEvent; + } + + private void recyclePendingEventLocked(PendingEvent pendingEvent) { + pendingEvent.clear(); + mPendingEventPool.release(pendingEvent); + } + /** * This class represents an accessibility service. It stores all per service * data required for the service management, provides API for starting/stopping the @@ -1545,12 +1612,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { * connection for the service. */ class Service extends IAccessibilityServiceConnection.Stub - implements ServiceConnection, DeathRecipient { - - // We pick the MSBs to avoid collision since accessibility event types are - // used as message types allowing us to remove messages per event type. - private static final int MSG_ON_GESTURE = 0x80000000; - private static final int MSG_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE = 0x40000000; + implements ServiceConnection, DeathRecipient {; final int mUserId; @@ -1594,29 +1656,22 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { final SparseArray<AccessibilityEvent> mPendingEvents = new SparseArray<AccessibilityEvent>(); - /** - * Handler for delayed event dispatch. - */ - public Handler mHandler = new Handler(mMainHandler.getLooper()) { + final KeyEventDispatcher mKeyEventDispatcher = new KeyEventDispatcher(); + + // Handler only for dispatching accessibility events since we use event + // types as message types allowing us to remove messages per event type. + public Handler mEventDispatchHandler = new Handler(mMainHandler.getLooper()) { @Override public void handleMessage(Message message) { - final int type = message.what; - switch (type) { - case MSG_ON_GESTURE: { - final int gestureId = message.arg1; - notifyGestureInternal(gestureId); - } break; - case MSG_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE: { - notifyClearAccessibilityNodeInfoCacheInternal(); - } break; - default: { - final int eventType = type; - notifyAccessibilityEventInternal(eventType); - } break; - } + final int eventType = message.what; + notifyAccessibilityEventInternal(eventType); } }; + // Handler for scheduling method invocations on the main thread. + public InvocationHandler mInvocationHandler = new InvocationHandler( + mMainHandler.getLooper()); + public Service(int userId, ComponentName componentName, AccessibilityServiceInfo accessibilityServiceInfo) { mUserId = userId; @@ -1703,6 +1758,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { return false; } UserState userState = getUserStateLocked(mUserId); + mKeyEventDispatcher.flush(); if (!mIsAutomation) { mContext.unbindService(this); } else { @@ -1718,6 +1774,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } @Override + public void setOnKeyEventResult(boolean handled, int sequence) { + mKeyEventDispatcher.setOnKeyEventResult(handled, sequence); + } + + @Override public AccessibilityServiceInfo getServiceInfo() { synchronized (mLock) { return mAccessibilityServiceInfo; @@ -2109,6 +2170,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { public void binderDied() { synchronized (mLock) { + mKeyEventDispatcher.flush(); UserState userState = getUserStateLocked(mUserId); // The death recipient is unregistered in removeServiceLocked removeServiceLocked(this, userState); @@ -2141,12 +2203,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { final int what = eventType; if (oldEvent != null) { - mHandler.removeMessages(what); + mEventDispatchHandler.removeMessages(what); oldEvent.recycle(); } - Message message = mHandler.obtainMessage(what); - mHandler.sendMessageDelayed(message, mNotificationTimeout); + Message message = mEventDispatchHandler.obtainMessage(what); + mEventDispatchHandler.sendMessageDelayed(message, mNotificationTimeout); } } @@ -2211,11 +2273,18 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } public void notifyGesture(int gestureId) { - mHandler.obtainMessage(MSG_ON_GESTURE, gestureId, 0).sendToTarget(); + mInvocationHandler.obtainMessage(InvocationHandler.MSG_ON_GESTURE, + gestureId, 0).sendToTarget(); + } + + public void notifyKeyEvent(KeyEvent event, int policyFlags) { + mInvocationHandler.obtainMessage(InvocationHandler.MSG_ON_KEY_EVENT, + policyFlags, 0, event).sendToTarget(); } public void notifyClearAccessibilityNodeInfoCache() { - mHandler.sendEmptyMessage(MSG_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE); + mInvocationHandler.sendEmptyMessage( + InvocationHandler.MSG_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE); } private void notifyGestureInternal(int gestureId) { @@ -2230,6 +2299,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } } + private void notifyKeyEventInternal(KeyEvent event, int policyFlags) { + mKeyEventDispatcher.notifyKeyEvent(event, policyFlags); + } + private void notifyClearAccessibilityNodeInfoCacheInternal() { IAccessibilityServiceClient listener = mServiceInterface; if (listener != null) { @@ -2339,6 +2412,177 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } return null; } + + private final class InvocationHandler extends Handler { + + public static final int MSG_ON_GESTURE = 1; + public static final int MSG_ON_KEY_EVENT = 2; + public static final int MSG_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE = 3; + public static final int MSG_ON_KEY_EVENT_TIMEOUT = 4; + + public InvocationHandler(Looper looper) { + super(looper, null, true); + } + + @Override + public void handleMessage(Message message) { + final int type = message.what; + switch (type) { + case MSG_ON_GESTURE: { + final int gestureId = message.arg1; + notifyGestureInternal(gestureId); + } break; + case MSG_ON_KEY_EVENT: { + KeyEvent event = (KeyEvent) message.obj; + final int policyFlags = message.arg1; + notifyKeyEventInternal(event, policyFlags); + } break; + case MSG_CLEAR_ACCESSIBILITY_NODE_INFO_CACHE: { + notifyClearAccessibilityNodeInfoCacheInternal(); + } break; + case MSG_ON_KEY_EVENT_TIMEOUT: { + PendingEvent eventState = (PendingEvent) message.obj; + setOnKeyEventResult(false, eventState.sequence); + } break; + default: { + throw new IllegalArgumentException("Unknown message: " + type); + } + } + } + } + + private final class KeyEventDispatcher { + + private static final long ON_KEY_EVENT_TIMEOUT_MILLIS = 500; + + private PendingEvent mPendingEvents; + + private final InputEventConsistencyVerifier mSentEventsVerifier = + InputEventConsistencyVerifier.isInstrumentationEnabled() + ? new InputEventConsistencyVerifier( + this, 0, KeyEventDispatcher.class.getSimpleName()) : null; + + public void notifyKeyEvent(KeyEvent event, int policyFlags) { + final PendingEvent pendingEvent; + + synchronized (mLock) { + pendingEvent = addPendingEventLocked(event, policyFlags); + } + + Message message = mInvocationHandler.obtainMessage( + InvocationHandler.MSG_ON_KEY_EVENT_TIMEOUT, pendingEvent); + mInvocationHandler.sendMessageDelayed(message, ON_KEY_EVENT_TIMEOUT_MILLIS); + + try { + // Accessibility services are exclusively not in the system + // process, therefore no need to clone the motion event to + // prevent tampering. It will be cloned in the IPC call. + mServiceInterface.onKeyEvent(pendingEvent.event, pendingEvent.sequence); + } catch (RemoteException re) { + setOnKeyEventResult(false, pendingEvent.sequence); + } + } + + public void setOnKeyEventResult(boolean handled, int sequence) { + synchronized (mLock) { + PendingEvent pendingEvent = removePendingEventLocked(sequence); + if (pendingEvent != null) { + mInvocationHandler.removeMessages( + InvocationHandler.MSG_ON_KEY_EVENT_TIMEOUT, + pendingEvent); + pendingEvent.handled = handled; + finishPendingEventLocked(pendingEvent); + } + } + } + + public void flush() { + synchronized (mLock) { + cancelAllPendingEventsLocked(); + mSentEventsVerifier.reset(); + } + } + + private PendingEvent addPendingEventLocked(KeyEvent event, int policyFlags) { + final int sequence = event.getSequenceNumber(); + PendingEvent pendingEvent = obtainPendingEventLocked(event, policyFlags, sequence); + pendingEvent.next = mPendingEvents; + mPendingEvents = pendingEvent; + return pendingEvent; + } + + private PendingEvent removePendingEventLocked(int sequence) { + PendingEvent previous = null; + PendingEvent current = mPendingEvents; + + while (current != null) { + if (current.sequence == sequence) { + if (previous != null) { + previous.next = current.next; + } else { + mPendingEvents = current.next; + } + current.next = null; + return current; + } + previous = current; + current = current.next; + } + return null; + } + + private void finishPendingEventLocked(PendingEvent pendingEvent) { + if (!pendingEvent.handled) { + sendKeyEventToInputFilter(pendingEvent.event, pendingEvent.policyFlags); + } + // Nullify the event since we do not want it to be + // recycled yet. It will be sent to the input filter. + pendingEvent.event = null; + recyclePendingEventLocked(pendingEvent); + } + + private void sendKeyEventToInputFilter(KeyEvent event, int policyFlags) { + if (DEBUG) { + Slog.i(LOG_TAG, "Injecting event: " + event); + } + if (mSentEventsVerifier != null) { + mSentEventsVerifier.onKeyEvent(event, 0); + } + policyFlags |= WindowManagerPolicy.FLAG_PASS_TO_USER; + mMainHandler.obtainMessage(MainHandler.MSG_SEND_KEY_EVENT_TO_INPUT_FILTER, + policyFlags, 0, event).sendToTarget(); + } + + private void cancelAllPendingEventsLocked() { + while (mPendingEvents != null) { + PendingEvent pendingEvent = removePendingEventLocked(mPendingEvents.sequence); + pendingEvent.handled = false; + mInvocationHandler.removeMessages(InvocationHandler.MSG_ON_KEY_EVENT_TIMEOUT, + pendingEvent); + finishPendingEventLocked(pendingEvent); + } + } + } + } + + private static final class PendingEvent { + PendingEvent next; + + KeyEvent event; + int policyFlags; + int sequence; + boolean handled; + + public void clear() { + if (event != null) { + event.recycle(); + event = null; + } + next = null; + policyFlags = 0; + sequence = 0; + handled = false; + } } final class SecurityPolicy { diff --git a/services/java/com/android/server/accessibility/EventStreamTransformation.java b/services/java/com/android/server/accessibility/EventStreamTransformation.java index 3289a1592199..8c93e7b4440d 100644 --- a/services/java/com/android/server/accessibility/EventStreamTransformation.java +++ b/services/java/com/android/server/accessibility/EventStreamTransformation.java @@ -57,7 +57,7 @@ import android.view.accessibility.AccessibilityEvent; interface EventStreamTransformation { /** - * Receives motion event. Passed are the event transformed by previous + * Receives a motion event. Passed are the event transformed by previous * transformations and the raw event to which no transformations have * been applied. * diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index cc7905c6cb54..bc1df8591831 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -936,6 +936,12 @@ public final class ActivityManagerService extends ActivityManagerNative CompatModeDialog mCompatModeDialog; long mLastMemUsageReportTime = 0; + /** + * Flag whether the current user is a "monkey", i.e. whether + * the UI is driven by a UI automation tool. + */ + private boolean mUserIsMonkey; + final Handler mHandler = new Handler() { //public Handler() { // if (localLOGV) Slog.v(TAG, "Handler started!"); @@ -4577,7 +4583,7 @@ public final class ActivityManagerService extends ActivityManagerNative public String getCallingPackage(IBinder token) { synchronized (this) { ActivityRecord r = getCallingRecordLocked(token); - return r != null && r.app != null ? r.info.packageName : null; + return r != null ? r.info.packageName : null; } } @@ -7434,11 +7440,27 @@ public final class ActivityManagerService extends ActivityManagerNative } } + public void setUserIsMonkey(boolean userIsMonkey) { + synchronized (this) { + synchronized (mPidsSelfLocked) { + final int callingPid = Binder.getCallingPid(); + ProcessRecord precessRecord = mPidsSelfLocked.get(callingPid); + if (precessRecord == null) { + throw new SecurityException("Unknown process: " + callingPid); + } + if (precessRecord.instrumentationUiAutomationConnection == null) { + throw new SecurityException("Only an instrumentation process " + + "with a UiAutomation can call setUserIsMonkey"); + } + } + mUserIsMonkey = userIsMonkey; + } + } + public boolean isUserAMonkey() { - // For now the fact that there is a controller implies - // we have a monkey. synchronized (this) { - return mController != null; + // If there is a controller also implies the user is a monkey. + return (mUserIsMonkey || mController != null); } } @@ -12435,6 +12457,9 @@ public final class ActivityManagerService extends ActivityManagerNative } catch (RemoteException re) { /* ignore */ } + // Only a UiAutomation can set this flag and now that + // it is finished we make sure it is reset to its default. + mUserIsMonkey = false; } app.instrumentationWatcher = null; app.instrumentationUiAutomationConnection = null; diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 154c4e8a8ab9..1b8ee82682f4 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -8694,15 +8694,7 @@ public class PackageManagerService extends IPackageManager.Stub { if (outInfo != null) { // A user ID was deleted here. Go through all users and remove it // from KeyStore. - final int appId = outInfo.removedAppId; - if (appId != -1) { - final KeyStore keyStore = KeyStore.getInstance(); - if (keyStore != null) { - for (final int userId : sUserManager.getUserIds()) { - keyStore.clearUid(UserHandle.getUid(userId, appId)); - } - } - } + removeKeystoreDataIfNeeded(UserHandle.USER_ALL, outInfo.removedAppId); } } @@ -8862,6 +8854,7 @@ public class PackageManagerService extends IPackageManager.Stub { outInfo.removedUsers = new int[] {removeUser}; } mInstaller.clearUserData(packageName, removeUser); + removeKeystoreDataIfNeeded(removeUser, appId); schedulePackageCleaning(packageName, removeUser, false); return true; } @@ -9014,29 +9007,34 @@ public class PackageManagerService extends IPackageManager.Stub { } PackageParser.Package p; boolean dataOnly = false; + final int appId; synchronized (mPackages) { p = mPackages.get(packageName); - if(p == null) { + if (p == null) { dataOnly = true; PackageSetting ps = mSettings.mPackages.get(packageName); - if((ps == null) || (ps.pkg == null)) { - Slog.w(TAG, "Package named '" + packageName +"' doesn't exist."); + if ((ps == null) || (ps.pkg == null)) { + Slog.w(TAG, "Package named '" + packageName + "' doesn't exist."); return false; } p = ps.pkg; } - } - - if (!dataOnly) { - //need to check this only for fully installed applications - if (p == null) { - Slog.w(TAG, "Package named '" + packageName +"' doesn't exist."); - return false; + if (!dataOnly) { + // need to check this only for fully installed applications + if (p == null) { + Slog.w(TAG, "Package named '" + packageName + "' doesn't exist."); + return false; + } + final ApplicationInfo applicationInfo = p.applicationInfo; + if (applicationInfo == null) { + Slog.w(TAG, "Package " + packageName + " has no applicationInfo."); + return false; + } } - final ApplicationInfo applicationInfo = p.applicationInfo; - if (applicationInfo == null) { - Slog.w(TAG, "Package " + packageName + " has no applicationInfo."); - return false; + if (p != null && p.applicationInfo != null) { + appId = p.applicationInfo.uid; + } else { + appId = -1; } } int retCode = mInstaller.clearUserData(packageName, userId); @@ -9045,9 +9043,33 @@ public class PackageManagerService extends IPackageManager.Stub { + packageName); return false; } + removeKeystoreDataIfNeeded(userId, appId); return true; } + /** + * Remove entries from the keystore daemon. Will only remove it if the + * {@code appId} is valid. + */ + private static void removeKeystoreDataIfNeeded(int userId, int appId) { + if (appId < 0) { + return; + } + + final KeyStore keyStore = KeyStore.getInstance(); + if (keyStore != null) { + if (userId == UserHandle.USER_ALL) { + for (final int individual : sUserManager.getUserIds()) { + keyStore.clearUid(UserHandle.getUid(individual, appId)); + } + } else { + keyStore.clearUid(UserHandle.getUid(userId, appId)); + } + } else { + Slog.w(TAG, "Could not contact keystore to clear entries for app id " + appId); + } + } + public void deleteApplicationCacheFiles(final String packageName, final IPackageDataObserver observer) { mContext.enforceCallingOrSelfPermission( diff --git a/services/java/com/android/server/pm/UserManagerService.java b/services/java/com/android/server/pm/UserManagerService.java index 3ef93706dd72..df90a5664bc8 100644 --- a/services/java/com/android/server/pm/UserManagerService.java +++ b/services/java/com/android/server/pm/UserManagerService.java @@ -622,6 +622,8 @@ public class UserManagerService extends IUserManager.Stub { UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES); writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_BLUETOOTH); writeBoolean(serializer, restrictions, UserManager.DISALLOW_USB_FILE_TRANSFER); + writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_CREDENTIALS); + writeBoolean(serializer, restrictions, UserManager.DISALLOW_REMOVE_USER); serializer.endTag(null, TAG_RESTRICTIONS); } serializer.endTag(null, TAG_USER); @@ -742,6 +744,8 @@ public class UserManagerService extends IUserManager.Stub { UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES); readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_BLUETOOTH); readBoolean(parser, restrictions, UserManager.DISALLOW_USB_FILE_TRANSFER); + readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_CREDENTIALS); + readBoolean(parser, restrictions, UserManager.DISALLOW_REMOVE_USER); } } } diff --git a/services/java/com/android/server/wifi/WifiService.java b/services/java/com/android/server/wifi/WifiService.java index f8d5d2ef8fc0..4d23e5cfeb60 100644 --- a/services/java/com/android/server/wifi/WifiService.java +++ b/services/java/com/android/server/wifi/WifiService.java @@ -734,7 +734,7 @@ public final class WifiService extends IWifiManager.Stub { if (gateway instanceof Inet4Address) { info.gateway = NetworkUtils.inetAddressToInt((Inet4Address)gateway); } - } else if (r.isHostRoute()) { + } else if (r.hasGateway() == false) { LinkAddress dest = r.getDestination(); if (dest.getAddress() instanceof Inet4Address) { info.netmask = NetworkUtils.prefixLengthToNetmaskInt( diff --git a/wifi/java/android/net/wifi/WifiConfigStore.java b/wifi/java/android/net/wifi/WifiConfigStore.java index 7b1a71f36a75..d3d5b1bb48b7 100644 --- a/wifi/java/android/net/wifi/WifiConfigStore.java +++ b/wifi/java/android/net/wifi/WifiConfigStore.java @@ -634,6 +634,8 @@ class WifiConfigStore { if (config.priority > mLastPriority) { mLastPriority = config.priority; } + config.ipAssignment = IpAssignment.DHCP; + config.proxySettings = ProxySettings.NONE; mConfiguredNetworks.put(config.networkId, config); mNetworkIds.put(configKey(config), config.networkId); } @@ -831,8 +833,9 @@ class WifiConfigStore { while (true) { int id = -1; - IpAssignment ipAssignment = IpAssignment.UNASSIGNED; - ProxySettings proxySettings = ProxySettings.UNASSIGNED; + // Default is DHCP with no proxy + IpAssignment ipAssignment = IpAssignment.DHCP; + ProxySettings proxySettings = ProxySettings.NONE; LinkProperties linkProperties = new LinkProperties(); String proxyHost = null; int proxyPort = -1; @@ -902,7 +905,8 @@ class WifiConfigStore { config.ipAssignment = ipAssignment; break; case UNASSIGNED: - //Ignore + loge("BUG: Found UNASSIGNED IP on file, use DHCP"); + config.ipAssignment = IpAssignment.DHCP; break; default: loge("Ignore invalid ip assignment while reading"); @@ -920,7 +924,8 @@ class WifiConfigStore { config.proxySettings = proxySettings; break; case UNASSIGNED: - //Ignore + loge("BUG: Found UNASSIGNED proxy on file, use NONE"); + config.proxySettings = ProxySettings.NONE; break; default: loge("Ignore invalid proxy settings while reading"); @@ -1176,6 +1181,8 @@ class WifiConfigStore { WifiConfiguration currentConfig = mConfiguredNetworks.get(netId); if (currentConfig == null) { currentConfig = new WifiConfiguration(); + currentConfig.ipAssignment = IpAssignment.DHCP; + currentConfig.proxySettings = ProxySettings.NONE; currentConfig.networkId = netId; } diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index c0a3bc15d513..a5d98cc1f4d4 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1648,15 +1648,7 @@ public class WifiStateMachine extends StateMachine { private void handleNetworkDisconnect() { if (DBG) log("Stopping DHCP and clearing IP"); - /* - * stop DHCP - */ - if (mDhcpStateMachine != null) { - /* In case we were in middle of DHCP operation - restore back powermode */ - handlePostDhcpSetup(); - mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_STOP_DHCP); - } + stopDhcp(); try { mNwService.clearInterfaceAddresses(mInterfaceName); @@ -1734,6 +1726,24 @@ public class WifiStateMachine extends StateMachine { } + void startDhcp() { + if (mDhcpStateMachine == null) { + mDhcpStateMachine = DhcpStateMachine.makeDhcpStateMachine( + mContext, WifiStateMachine.this, mInterfaceName); + + } + mDhcpStateMachine.registerForPreDhcpNotification(); + mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP); + } + + void stopDhcp() { + if (mDhcpStateMachine != null) { + /* In case we were in middle of DHCP operation restore back powermode */ + handlePostDhcpSetup(); + mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_STOP_DHCP); + } + } + void handlePostDhcpSetup() { /* Restore power save and suspend optimizations */ setSuspendOptimizationsNative(SUSPEND_DUE_TO_DHCP, true); @@ -1751,7 +1761,7 @@ public class WifiStateMachine extends StateMachine { mDhcpResults = dhcpResults; } LinkProperties linkProperties = dhcpResults.linkProperties; - mWifiConfigStore.setLinkProperties(mLastNetworkId, linkProperties); + mWifiConfigStore.setLinkProperties(mLastNetworkId, new LinkProperties(linkProperties)); InetAddress addr = null; Iterator<InetAddress> addrs = linkProperties.getAddresses().iterator(); if (addrs.hasNext()) { @@ -2432,6 +2442,9 @@ public class WifiStateMachine extends StateMachine { if (DBG) log("Already in delayed stop"); break; } + /* disconnect right now, but leave the driver running for a bit */ + mWifiConfigStore.disableAllNetworks(); + mInDelayedStop = true; mDelayedStopCounter++; if (DBG) log("Delayed stop message " + mDelayedStopCounter); @@ -2452,6 +2465,9 @@ public class WifiStateMachine extends StateMachine { mDelayedStopCounter++; mAlarmManager.cancel(mDriverStopIntent); if (DBG) log("Delayed stop ignored due to start"); + if (mOperationalMode == CONNECT_MODE) { + mWifiConfigStore.enableAllNetworks(); + } } break; case CMD_DELAYED_STOP_DRIVER: @@ -2996,15 +3012,10 @@ public class WifiStateMachine extends StateMachine { @Override public void enter() { if (!mWifiConfigStore.isUsingStaticIp(mLastNetworkId)) { - //start DHCP - if (mDhcpStateMachine == null) { - mDhcpStateMachine = DhcpStateMachine.makeDhcpStateMachine( - mContext, WifiStateMachine.this, mInterfaceName); - - } - mDhcpStateMachine.registerForPreDhcpNotification(); - mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP); + startDhcp(); } else { + // stop any running dhcp before assigning static IP + stopDhcp(); DhcpResults dhcpResults = new DhcpResults( mWifiConfigStore.getLinkProperties(mLastNetworkId)); dhcpResults.linkProperties.setInterfaceName(mInterfaceName); @@ -3352,9 +3363,13 @@ public class WifiStateMachine extends StateMachine { public boolean processMessage(Message message) { switch (message.what) { case WifiMonitor.WPS_SUCCESS_EVENT: + // Ignore intermediate success, wait for full connection + break; + case WifiMonitor.NETWORK_CONNECTION_EVENT: replyToMessage(mSourceMessage, WifiManager.WPS_COMPLETED); mSourceMessage.recycle(); mSourceMessage = null; + deferMessage(message); transitionTo(mDisconnectedState); break; case WifiMonitor.WPS_OVERLAP_EVENT: @@ -3398,7 +3413,6 @@ public class WifiStateMachine extends StateMachine { case CMD_ENABLE_NETWORK: case CMD_RECONNECT: case CMD_REASSOCIATE: - case WifiMonitor.NETWORK_CONNECTION_EVENT: /* Handled after exiting WPS state */ deferMessage(message); break; case WifiMonitor.NETWORK_DISCONNECTION_EVENT: |