diff options
Diffstat (limited to 'core')
124 files changed, 5014 insertions, 1603 deletions
diff --git a/core/java/android/animation/LayoutTransition.java b/core/java/android/animation/LayoutTransition.java index 634e4d8..c643137 100644 --- a/core/java/android/animation/LayoutTransition.java +++ b/core/java/android/animation/LayoutTransition.java @@ -119,6 +119,24 @@ public class LayoutTransition { public static final int DISAPPEARING = 3; /** + * A flag indicating the animation that runs on those items that are changing + * due to a layout change not caused by items being added to or removed + * from the container. This transition type is not enabled by default; it can be + * enabled via {@link #enableTransitionType(int)}. + */ + public static final int CHANGING = 4; + + /** + * Private bit fields used to set the collection of enabled transition types for + * mTransitionTypes. + */ + private static final int FLAG_APPEARING = 0x01; + private static final int FLAG_DISAPPEARING = 0x02; + private static final int FLAG_CHANGE_APPEARING = 0x04; + private static final int FLAG_CHANGE_DISAPPEARING = 0x08; + private static final int FLAG_CHANGING = 0x10; + + /** * These variables hold the animations that are currently used to run the transition effects. * These animations are set to defaults, but can be changed to custom animations by * calls to setAnimator(). @@ -127,11 +145,13 @@ public class LayoutTransition { private Animator mAppearingAnim = null; private Animator mChangingAppearingAnim = null; private Animator mChangingDisappearingAnim = null; + private Animator mChangingAnim = null; /** * These are the default animations, defined in the constructor, that will be used * unless the user specifies custom animations. */ + private static ObjectAnimator defaultChange; private static ObjectAnimator defaultChangeIn; private static ObjectAnimator defaultChangeOut; private static ObjectAnimator defaultFadeIn; @@ -143,15 +163,16 @@ public class LayoutTransition { private static long DEFAULT_DURATION = 300; /** - * The durations of the four different animations + * The durations of the different animations */ private long mChangingAppearingDuration = DEFAULT_DURATION; private long mChangingDisappearingDuration = DEFAULT_DURATION; + private long mChangingDuration = DEFAULT_DURATION; private long mAppearingDuration = DEFAULT_DURATION; private long mDisappearingDuration = DEFAULT_DURATION; /** - * The start delays of the four different animations. Note that the default behavior of + * The start delays of the different animations. Note that the default behavior of * the appearing item is the default duration, since it should wait for the items to move * before fading it. Same for the changing animation when disappearing; it waits for the item * to fade out before moving the other items. @@ -160,12 +181,14 @@ public class LayoutTransition { private long mDisappearingDelay = 0; private long mChangingAppearingDelay = 0; private long mChangingDisappearingDelay = DEFAULT_DURATION; + private long mChangingDelay = 0; /** - * The inter-animation delays used on the two changing animations + * The inter-animation delays used on the changing animations */ private long mChangingAppearingStagger = 0; private long mChangingDisappearingStagger = 0; + private long mChangingStagger = 0; /** * The default interpolators used for the animations @@ -174,6 +197,7 @@ public class LayoutTransition { private TimeInterpolator mDisappearingInterpolator = new AccelerateDecelerateInterpolator(); private TimeInterpolator mChangingAppearingInterpolator = new DecelerateInterpolator(); private TimeInterpolator mChangingDisappearingInterpolator = new DecelerateInterpolator(); + private TimeInterpolator mChangingInterpolator = new DecelerateInterpolator(); /** * These hashmaps are used to store the animations that are currently running as part of @@ -212,6 +236,13 @@ public class LayoutTransition { private long staggerDelay; /** + * These are the types of transition animations that the LayoutTransition is reacting + * to. By default, appearing/disappearing and the change animations related to them are + * enabled (not CHANGING). + */ + private int mTransitionTypes = FLAG_CHANGE_APPEARING | FLAG_CHANGE_DISAPPEARING | + FLAG_APPEARING | FLAG_DISAPPEARING; + /** * The set of listeners that should be notified when APPEARING/DISAPPEARING transitions * start and end. */ @@ -248,6 +279,9 @@ public class LayoutTransition { defaultChangeOut = defaultChangeIn.clone(); defaultChangeOut.setStartDelay(mChangingDisappearingDelay); defaultChangeOut.setInterpolator(mChangingDisappearingInterpolator); + defaultChange = defaultChangeIn.clone(); + defaultChange.setStartDelay(mChangingDelay); + defaultChange.setInterpolator(mChangingInterpolator); defaultFadeIn = ObjectAnimator.ofFloat(null, "alpha", 0f, 1f); defaultFadeIn.setDuration(DEFAULT_DURATION); @@ -260,6 +294,7 @@ public class LayoutTransition { } mChangingAppearingAnim = defaultChangeIn; mChangingDisappearingAnim = defaultChangeOut; + mChangingAnim = defaultChange; mAppearingAnim = defaultFadeIn; mDisappearingAnim = defaultFadeOut; } @@ -275,18 +310,101 @@ public class LayoutTransition { public void setDuration(long duration) { mChangingAppearingDuration = duration; mChangingDisappearingDuration = duration; + mChangingDuration = duration; mAppearingDuration = duration; mDisappearingDuration = duration; } /** + * Enables the specified transitionType for this LayoutTransition object. + * By default, a LayoutTransition listens for changes in children being + * added/remove/hidden/shown in the container, and runs the animations associated with + * those events. That is, all transition types besides {@link #CHANGING} are enabled by default. + * You can also enable {@link #CHANGING} animations by calling this method with the + * {@link #CHANGING} transitionType. + * + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}. + */ + public void enableTransitionType(int transitionType) { + switch (transitionType) { + case APPEARING: + mTransitionTypes |= FLAG_APPEARING; + break; + case DISAPPEARING: + mTransitionTypes |= FLAG_DISAPPEARING; + break; + case CHANGE_APPEARING: + mTransitionTypes |= FLAG_CHANGE_APPEARING; + break; + case CHANGE_DISAPPEARING: + mTransitionTypes |= FLAG_CHANGE_DISAPPEARING; + break; + case CHANGING: + mTransitionTypes |= FLAG_CHANGING; + break; + } + } + + /** + * Disables the specified transitionType for this LayoutTransition object. + * By default, all transition types except {@link #CHANGING} are enabled. + * + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}. + */ + public void disableTransitionType(int transitionType) { + switch (transitionType) { + case APPEARING: + mTransitionTypes &= ~FLAG_APPEARING; + break; + case DISAPPEARING: + mTransitionTypes &= ~FLAG_DISAPPEARING; + break; + case CHANGE_APPEARING: + mTransitionTypes &= ~FLAG_CHANGE_APPEARING; + break; + case CHANGE_DISAPPEARING: + mTransitionTypes &= ~FLAG_CHANGE_DISAPPEARING; + break; + case CHANGING: + mTransitionTypes &= ~FLAG_CHANGING; + break; + } + } + + /** + * Returns whether the specified transitionType is enabled for this LayoutTransition object. + * By default, all transition types except {@link #CHANGING} are enabled. + * + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}. + * @return true if the specified transitionType is currently enabled, false otherwise. + */ + public boolean isTransitionTypeEnabled(int transitionType) { + switch (transitionType) { + case APPEARING: + return (mTransitionTypes & FLAG_APPEARING) == FLAG_APPEARING; + case DISAPPEARING: + return (mTransitionTypes & FLAG_DISAPPEARING) == FLAG_DISAPPEARING; + case CHANGE_APPEARING: + return (mTransitionTypes & FLAG_CHANGE_APPEARING) == FLAG_CHANGE_APPEARING; + case CHANGE_DISAPPEARING: + return (mTransitionTypes & FLAG_CHANGE_DISAPPEARING) == FLAG_CHANGE_DISAPPEARING; + case CHANGING: + return (mTransitionTypes & FLAG_CHANGING) == FLAG_CHANGING; + } + return false; + } + + /** * Sets the start delay on one of the animation objects used by this transition. The * <code>transitionType</code> parameter determines the animation whose start delay * is being set. * - * @param transitionType one of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, - * {@link #APPEARING}, or {@link #DISAPPEARING}, which determines the animation whose start - * delay is being set. + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}, which determines + * the animation whose start delay is being set. * @param delay The length of time, in milliseconds, to delay before starting the animation. * @see Animator#setStartDelay(long) */ @@ -298,6 +416,9 @@ public class LayoutTransition { case CHANGE_DISAPPEARING: mChangingDisappearingDelay = delay; break; + case CHANGING: + mChangingDelay = delay; + break; case APPEARING: mAppearingDelay = delay; break; @@ -312,9 +433,9 @@ public class LayoutTransition { * <code>transitionType</code> parameter determines the animation whose start delay * is returned. * - * @param transitionType one of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, - * {@link #APPEARING}, or {@link #DISAPPEARING}, which determines the animation whose start - * delay is returned. + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}, which determines + * the animation whose start delay is returned. * @return long The start delay of the specified animation. * @see Animator#getStartDelay() */ @@ -324,6 +445,8 @@ public class LayoutTransition { return mChangingAppearingDelay; case CHANGE_DISAPPEARING: return mChangingDisappearingDelay; + case CHANGING: + return mChangingDelay; case APPEARING: return mAppearingDelay; case DISAPPEARING: @@ -338,9 +461,9 @@ public class LayoutTransition { * <code>transitionType</code> parameter determines the animation whose duration * is being set. * - * @param transitionType one of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, - * {@link #APPEARING}, or {@link #DISAPPEARING}, which determines the animation whose - * duration is being set. + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}, which determines + * the animation whose duration is being set. * @param duration The length of time, in milliseconds, that the specified animation should run. * @see Animator#setDuration(long) */ @@ -352,6 +475,9 @@ public class LayoutTransition { case CHANGE_DISAPPEARING: mChangingDisappearingDuration = duration; break; + case CHANGING: + mChangingDuration = duration; + break; case APPEARING: mAppearingDuration = duration; break; @@ -366,9 +492,9 @@ public class LayoutTransition { * <code>transitionType</code> parameter determines the animation whose duration * is returned. * - * @param transitionType one of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, - * {@link #APPEARING}, or {@link #DISAPPEARING}, which determines the animation whose - * duration is returned. + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}, which determines + * the animation whose duration is returned. * @return long The duration of the specified animation. * @see Animator#getDuration() */ @@ -378,6 +504,8 @@ public class LayoutTransition { return mChangingAppearingDuration; case CHANGE_DISAPPEARING: return mChangingDisappearingDuration; + case CHANGING: + return mChangingDuration; case APPEARING: return mAppearingDuration; case DISAPPEARING: @@ -389,9 +517,10 @@ public class LayoutTransition { /** * Sets the length of time to delay between starting each animation during one of the - * CHANGE animations. + * change animations. * - * @param transitionType A value of {@link #CHANGE_APPEARING} or @link #CHANGE_DISAPPEARING}. + * @param transitionType A value of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, or + * {@link #CHANGING}. * @param duration The length of time, in milliseconds, to delay before launching the next * animation in the sequence. */ @@ -403,15 +532,19 @@ public class LayoutTransition { case CHANGE_DISAPPEARING: mChangingDisappearingStagger = duration; break; + case CHANGING: + mChangingStagger = duration; + break; // noop other cases } } /** - * Tets the length of time to delay between starting each animation during one of the - * CHANGE animations. + * Gets the length of time to delay between starting each animation during one of the + * change animations. * - * @param transitionType A value of {@link #CHANGE_APPEARING} or @link #CHANGE_DISAPPEARING}. + * @param transitionType A value of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, or + * {@link #CHANGING}. * @return long The length of time, in milliseconds, to delay before launching the next * animation in the sequence. */ @@ -421,6 +554,8 @@ public class LayoutTransition { return mChangingAppearingStagger; case CHANGE_DISAPPEARING: return mChangingDisappearingStagger; + case CHANGING: + return mChangingStagger; } // shouldn't reach here return 0; @@ -431,9 +566,9 @@ public class LayoutTransition { * <code>transitionType</code> parameter determines the animation whose interpolator * is being set. * - * @param transitionType one of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, - * {@link #APPEARING}, or {@link #DISAPPEARING}, which determines the animation whose - * duration is being set. + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}, which determines + * the animation whose interpolator is being set. * @param interpolator The interpolator that the specified animation should use. * @see Animator#setInterpolator(TimeInterpolator) */ @@ -445,6 +580,9 @@ public class LayoutTransition { case CHANGE_DISAPPEARING: mChangingDisappearingInterpolator = interpolator; break; + case CHANGING: + mChangingInterpolator = interpolator; + break; case APPEARING: mAppearingInterpolator = interpolator; break; @@ -459,9 +597,9 @@ public class LayoutTransition { * <code>transitionType</code> parameter determines the animation whose interpolator * is returned. * - * @param transitionType one of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, - * {@link #APPEARING}, or {@link #DISAPPEARING}, which determines the animation whose - * duration is being set. + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}, which determines + * the animation whose interpolator is being returned. * @return TimeInterpolator The interpolator that the specified animation uses. * @see Animator#setInterpolator(TimeInterpolator) */ @@ -471,6 +609,8 @@ public class LayoutTransition { return mChangingAppearingInterpolator; case CHANGE_DISAPPEARING: return mChangingDisappearingInterpolator; + case CHANGING: + return mChangingInterpolator; case APPEARING: return mAppearingInterpolator; case DISAPPEARING: @@ -504,9 +644,9 @@ public class LayoutTransition { * values queried when the transition begins may need to use a different mechanism * than a standard ObjectAnimator object.</p> * - * @param transitionType one of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, - * {@link #APPEARING}, or {@link #DISAPPEARING}, which determines the animation whose - * duration is being set. + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}, which determines the + * animation whose animator is being set. * @param animator The animation being assigned. A value of <code>null</code> means that no * animation will be run for the specified transitionType. */ @@ -518,6 +658,9 @@ public class LayoutTransition { case CHANGE_DISAPPEARING: mChangingDisappearingAnim = animator; break; + case CHANGING: + mChangingAnim = animator; + break; case APPEARING: mAppearingAnim = animator; break; @@ -530,9 +673,9 @@ public class LayoutTransition { /** * Gets the animation used during one of the transition types that may run. * - * @param transitionType one of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, - * {@link #APPEARING}, or {@link #DISAPPEARING}, which determines the animation whose - * duration is being set. + * @param transitionType One of {@link #CHANGE_APPEARING}, {@link #CHANGE_DISAPPEARING}, + * {@link #CHANGING}, {@link #APPEARING}, or {@link #DISAPPEARING}, which determines + * the animation whose animator is being returned. * @return Animator The animation being used for the given transition type. * @see #setAnimator(int, Animator) */ @@ -542,6 +685,8 @@ public class LayoutTransition { return mChangingAppearingAnim; case CHANGE_DISAPPEARING: return mChangingDisappearingAnim; + case CHANGING: + return mChangingAnim; case APPEARING: return mAppearingAnim; case DISAPPEARING: @@ -554,20 +699,44 @@ public class LayoutTransition { /** * This function sets up animations on all of the views that change during layout. * For every child in the parent, we create a change animation of the appropriate - * type (appearing or disappearing) and ask it to populate its start values from its + * type (appearing, disappearing, or changing) and ask it to populate its start values from its * target view. We add layout listeners to all child views and listen for changes. For * those views that change, we populate the end values for those animations and start them. * Animations are not run on unchanging views. * - * @param parent The container which is undergoing an appearing or disappearing change. - * @param newView The view being added to or removed from the parent. - * @param changeReason A value of APPEARING or DISAPPEARING, indicating whether the - * transition is occuring because an item is being added to or removed from the parent. + * @param parent The container which is undergoing a change. + * @param newView The view being added to or removed from the parent. May be null if the + * changeReason is CHANGING. + * @param changeReason A value of APPEARING, DISAPPEARING, or CHANGING, indicating whether the + * transition is occurring because an item is being added to or removed from the parent, or + * if it is running in response to a layout operation (that is, if the value is CHANGING). */ private void runChangeTransition(final ViewGroup parent, View newView, final int changeReason) { - Animator baseAnimator = (changeReason == APPEARING) ? - mChangingAppearingAnim : mChangingDisappearingAnim; + Animator baseAnimator = null; + Animator parentAnimator = null; + final long duration; + switch (changeReason) { + case APPEARING: + baseAnimator = mChangingAppearingAnim; + duration = mChangingAppearingDuration; + parentAnimator = defaultChangeIn; + break; + case DISAPPEARING: + baseAnimator = mChangingDisappearingAnim; + duration = mChangingDisappearingDuration; + parentAnimator = defaultChangeOut; + break; + case CHANGING: + baseAnimator = mChangingAnim; + duration = mChangingDuration; + parentAnimator = defaultChange; + break; + default: + // Shouldn't reach here + duration = 0; + break; + } // If the animation is null, there's nothing to do if (baseAnimator == null) { return; @@ -575,8 +744,6 @@ public class LayoutTransition { // reset the inter-animation delay, in case we use it later staggerDelay = 0; - final long duration = (changeReason == APPEARING) ? - mChangingAppearingDuration : mChangingDisappearingDuration; final ViewTreeObserver observer = parent.getViewTreeObserver(); // used for later cleanup if (!observer.isAlive()) { @@ -594,8 +761,6 @@ public class LayoutTransition { } } if (mAnimateParentHierarchy) { - Animator parentAnimator = (changeReason == APPEARING) ? - defaultChangeIn : defaultChangeOut; ViewGroup tempParent = parent; while (tempParent != null) { ViewParent parentParent = tempParent.getParent(); @@ -727,13 +892,20 @@ public class LayoutTransition { } } - long startDelay; - if (changeReason == APPEARING) { - startDelay = mChangingAppearingDelay + staggerDelay; - staggerDelay += mChangingAppearingStagger; - } else { - startDelay = mChangingDisappearingDelay + staggerDelay; - staggerDelay += mChangingDisappearingStagger; + long startDelay = 0; + switch (changeReason) { + case APPEARING: + startDelay = mChangingAppearingDelay + staggerDelay; + staggerDelay += mChangingAppearingStagger; + break; + case DISAPPEARING: + startDelay = mChangingDisappearingDelay + staggerDelay; + staggerDelay += mChangingDisappearingStagger; + break; + case CHANGING: + startDelay = mChangingDelay + staggerDelay; + staggerDelay += mChangingStagger; + break; } anim.setStartDelay(startDelay); anim.setDuration(duration); @@ -766,7 +938,8 @@ public class LayoutTransition { for (TransitionListener listener : mListeners) { listener.startTransition(LayoutTransition.this, parent, child, changeReason == APPEARING ? - CHANGE_APPEARING : CHANGE_DISAPPEARING); + CHANGE_APPEARING : changeReason == DISAPPEARING ? + CHANGE_DISAPPEARING : CHANGING); } } } @@ -784,7 +957,8 @@ public class LayoutTransition { for (TransitionListener listener : mListeners) { listener.endTransition(LayoutTransition.this, parent, child, changeReason == APPEARING ? - CHANGE_APPEARING : CHANGE_DISAPPEARING); + CHANGE_APPEARING : changeReason == DISAPPEARING ? + CHANGE_DISAPPEARING : CHANGING); } } } @@ -831,6 +1005,8 @@ public class LayoutTransition { anim.start(); anim.end(); } + // listeners should clean up the currentChangingAnimations list, but just in case... + currentChangingAnimations.clear(); } /** @@ -902,6 +1078,7 @@ public class LayoutTransition { switch (transitionType) { case CHANGE_APPEARING: case CHANGE_DISAPPEARING: + case CHANGING: if (currentChangingAnimations.size() > 0) { LinkedHashMap<View, Animator> currentAnimCopy = (LinkedHashMap<View, Animator>) currentChangingAnimations.clone(); @@ -1031,21 +1208,48 @@ public class LayoutTransition { * affect CHANGE_APPEARING or CHANGE_DISAPPEARING animations. */ private void addChild(ViewGroup parent, View child, boolean changesLayout) { - // Want disappearing animations to finish up before proceeding - cancel(DISAPPEARING); - if (changesLayout) { + if ((mTransitionTypes & FLAG_APPEARING) == FLAG_APPEARING) { + // Want disappearing animations to finish up before proceeding + cancel(DISAPPEARING); + } + if (changesLayout && (mTransitionTypes & FLAG_CHANGE_APPEARING) == FLAG_CHANGE_APPEARING) { // Also, cancel changing animations so that we start fresh ones from current locations cancel(CHANGE_APPEARING); + cancel(CHANGING); } - if (mListeners != null) { + if (mListeners != null && (mTransitionTypes & FLAG_APPEARING) == FLAG_APPEARING) { for (TransitionListener listener : mListeners) { listener.startTransition(this, parent, child, APPEARING); } } - if (changesLayout) { + if (changesLayout && (mTransitionTypes & FLAG_CHANGE_APPEARING) == FLAG_CHANGE_APPEARING) { runChangeTransition(parent, child, APPEARING); } - runAppearingTransition(parent, child); + if ((mTransitionTypes & FLAG_APPEARING) == FLAG_APPEARING) { + runAppearingTransition(parent, child); + } + } + + /** + * This method is called by ViewGroup when there is a call to layout() on the container + * with this LayoutTransition. If the CHANGING transition is enabled and if there is no other + * transition currently running on the container, then this call runs a CHANGING transition. + * The transition does not start immediately; it just sets up the mechanism to run if any + * of the children of the container change their layout parameters (similar to + * the CHANGE_APPEARING and CHANGE_DISAPPEARING transitions). + * + * @param parent The ViewGroup whose layout() method has been called. + * + * @hide + */ + public void layoutChange(ViewGroup parent) { + if ((mTransitionTypes & FLAG_CHANGING) == FLAG_CHANGING && !isRunning()) { + // This method is called for all calls to layout() in the container, including + // those caused by add/remove/hide/show events, which will already have set up + // transition animations. Avoid setting up CHANGING animations in this case; only + // do so when there is not a transition already running on the container. + runChangeTransition(parent, null, CHANGING); + } } /** @@ -1097,21 +1301,28 @@ public class LayoutTransition { * affect CHANGE_APPEARING or CHANGE_DISAPPEARING animations. */ private void removeChild(ViewGroup parent, View child, boolean changesLayout) { - // Want appearing animations to finish up before proceeding - cancel(APPEARING); - if (changesLayout) { + if ((mTransitionTypes & FLAG_DISAPPEARING) == FLAG_DISAPPEARING) { + // Want appearing animations to finish up before proceeding + cancel(APPEARING); + } + if (changesLayout && + (mTransitionTypes & FLAG_CHANGE_DISAPPEARING) == FLAG_CHANGE_DISAPPEARING) { // Also, cancel changing animations so that we start fresh ones from current locations cancel(CHANGE_DISAPPEARING); + cancel(CHANGING); } - if (mListeners != null) { + if (mListeners != null && (mTransitionTypes & FLAG_DISAPPEARING) == FLAG_DISAPPEARING) { for (TransitionListener listener : mListeners) { listener.startTransition(this, parent, child, DISAPPEARING); } } - if (changesLayout) { + if (changesLayout && + (mTransitionTypes & FLAG_CHANGE_DISAPPEARING) == FLAG_CHANGE_DISAPPEARING) { runChangeTransition(parent, child, DISAPPEARING); } - runDisappearingTransition(parent, child); + if ((mTransitionTypes & FLAG_DISAPPEARING) == FLAG_DISAPPEARING) { + runDisappearingTransition(parent, child); + } } /** diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index fade20c..2154b14 100755 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -150,6 +150,13 @@ public class ValueAnimator extends Animator { private boolean mStarted = false; /** + * Tracks whether we've notified listeners of the onAnimationSTart() event. This can be + * complex to keep track of since we notify listeners at different times depending on + * startDelay and whether start() was called before end(). + */ + private boolean mStartListenersCalled = false; + + /** * Flag that denotes whether the animation is set up and ready to go. Used to * set up animation that has not yet been started. */ @@ -885,6 +892,18 @@ public class ValueAnimator extends Animator { } } + private void notifyStartListeners() { + if (mListeners != null && !mStartListenersCalled) { + ArrayList<AnimatorListener> tmpListeners = + (ArrayList<AnimatorListener>) mListeners.clone(); + int numListeners = tmpListeners.size(); + for (int i = 0; i < numListeners; ++i) { + tmpListeners.get(i).onAnimationStart(this); + } + } + mStartListenersCalled = true; + } + /** * Start the animation playing. This version of start() takes a boolean flag that indicates * whether the animation should play in reverse. The flag is usually false, but may be set @@ -914,15 +933,7 @@ public class ValueAnimator extends Animator { setCurrentPlayTime(getCurrentPlayTime()); mPlayingState = STOPPED; mRunning = true; - - if (mListeners != null) { - ArrayList<AnimatorListener> tmpListeners = - (ArrayList<AnimatorListener>) mListeners.clone(); - int numListeners = tmpListeners.size(); - for (int i = 0; i < numListeners; ++i) { - tmpListeners.get(i).onAnimationStart(this); - } - } + notifyStartListeners(); } animationHandler.sendEmptyMessage(ANIMATION_START); } @@ -941,7 +952,11 @@ public class ValueAnimator extends Animator { || handler.mPendingAnimations.contains(this) || handler.mDelayedAnims.contains(this)) { // Only notify listeners if the animator has actually started - if (mRunning && mListeners != null) { + if ((mStarted || mRunning) && mListeners != null) { + if (!mRunning) { + // If it's not yet running, then start listeners weren't called. Call them now. + notifyStartListeners(); + } ArrayList<AnimatorListener> tmpListeners = (ArrayList<AnimatorListener>) mListeners.clone(); for (AnimatorListener listener : tmpListeners) { @@ -959,6 +974,7 @@ public class ValueAnimator extends Animator { // Special case if the animation has not yet started; get it ready for ending mStartedDelay = false; startAnimation(handler); + mStarted = true; } else if (!mInitialized) { initAnimation(); } @@ -1010,7 +1026,11 @@ public class ValueAnimator extends Animator { handler.mPendingAnimations.remove(this); handler.mDelayedAnims.remove(this); mPlayingState = STOPPED; - if (mRunning && mListeners != null) { + if ((mStarted || mRunning) && mListeners != null) { + if (!mRunning) { + // If it's not yet running, then start listeners weren't called. Call them now. + notifyStartListeners(); + } ArrayList<AnimatorListener> tmpListeners = (ArrayList<AnimatorListener>) mListeners.clone(); int numListeners = tmpListeners.size(); @@ -1020,6 +1040,7 @@ public class ValueAnimator extends Animator { } mRunning = false; mStarted = false; + mStartListenersCalled = false; } /** @@ -1032,12 +1053,7 @@ public class ValueAnimator extends Animator { if (mStartDelay > 0 && mListeners != null) { // Listeners were already notified in start() if startDelay is 0; this is // just for delayed animations - ArrayList<AnimatorListener> tmpListeners = - (ArrayList<AnimatorListener>) mListeners.clone(); - int numListeners = tmpListeners.size(); - for (int i = 0; i < numListeners; ++i) { - tmpListeners.get(i).onAnimationStart(this); - } + notifyStartListeners(); } } diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index c3cceaf..423b02a 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -73,6 +73,18 @@ public class ActivityOptions { public static final String KEY_ANIM_START_Y = "android:animStartY"; /** + * Initial width of the animation. + * @hide + */ + public static final String KEY_ANIM_START_WIDTH = "android:animStartWidth"; + + /** + * Initial height of the animation. + * @hide + */ + public static final String KEY_ANIM_START_HEIGHT = "android:animStartHeight"; + + /** * Callback for when animation is started. * @hide */ @@ -83,7 +95,9 @@ public class ActivityOptions { /** @hide */ public static final int ANIM_CUSTOM = 1; /** @hide */ - public static final int ANIM_THUMBNAIL = 2; + public static final int ANIM_SCALE_UP = 2; + /** @hide */ + public static final int ANIM_THUMBNAIL = 3; private String mPackageName; private int mAnimationType = ANIM_NONE; @@ -92,6 +106,8 @@ public class ActivityOptions { private Bitmap mThumbnail; private int mStartX; private int mStartY; + private int mStartWidth; + private int mStartHeight; private IRemoteCallback mAnimationStartedListener; /** @@ -127,6 +143,34 @@ public class ActivityOptions { } /** + * Create an ActivityOptions specifying an animation where the new + * activity is scaled from a small originating area of the screen to + * its final full representation. + * + * @param source The View that the new activity is animating from. This + * defines the coordinate space for <var>startX</var> and <var>startY</var>. + * @param startX The x starting location of the new activity, relative to <var>source</var>. + * @param startY The y starting location of the activity, relative to <var>source</var>. + * @param startWidth The initial width of the new activity. + * @param startWidth The initial height of the new activity. + * @return Returns a new ActivityOptions object that you can use to + * supply these options as the options Bundle when starting an activity. + */ + public static ActivityOptions makeScaleUpAnimation(View source, + int startX, int startY, int startWidth, int startHeight) { + ActivityOptions opts = new ActivityOptions(); + opts.mPackageName = source.getContext().getPackageName(); + opts.mAnimationType = ANIM_SCALE_UP; + int[] pts = new int[2]; + source.getLocationOnScreen(pts); + opts.mStartX = pts[0] + startX; + opts.mStartY = pts[1] + startY; + opts.mStartWidth = startWidth; + opts.mStartHeight = startHeight; + return opts; + } + + /** * Create an ActivityOptions specifying an animation where a thumbnail * is scaled from a given position to the new activity window that is * being started. @@ -135,8 +179,8 @@ public class ActivityOptions { * defines the coordinate space for <var>startX</var> and <var>startY</var>. * @param thumbnail The bitmap that will be shown as the initial thumbnail * of the animation. - * @param startX The x starting location of the bitmap, in screen coordiantes. - * @param startY The y starting location of the bitmap, in screen coordinates. + * @param startX The x starting location of the bitmap, relative to <var>source</var>. + * @param startY The y starting location of the bitmap, relative to <var>source</var>. * @return Returns a new ActivityOptions object that you can use to * supply these options as the options Bundle when starting an activity. */ @@ -154,8 +198,8 @@ public class ActivityOptions { * defines the coordinate space for <var>startX</var> and <var>startY</var>. * @param thumbnail The bitmap that will be shown as the initial thumbnail * of the animation. - * @param startX The x starting location of the bitmap, in screen coordiantes. - * @param startY The y starting location of the bitmap, in screen coordinates. + * @param startX The x starting location of the bitmap, relative to <var>source</var>. + * @param startY The y starting location of the bitmap, relative to <var>source</var>. * @param listener Optional OnAnimationStartedListener to find out when the * requested animation has started running. If for some reason the animation * is not executed, the callback will happen immediately. @@ -199,6 +243,11 @@ public class ActivityOptions { if (mAnimationType == ANIM_CUSTOM) { mCustomEnterResId = opts.getInt(KEY_ANIM_ENTER_RES_ID, 0); mCustomExitResId = opts.getInt(KEY_ANIM_EXIT_RES_ID, 0); + } else if (mAnimationType == ANIM_SCALE_UP) { + mStartX = opts.getInt(KEY_ANIM_START_X, 0); + mStartY = opts.getInt(KEY_ANIM_START_Y, 0); + mStartWidth = opts.getInt(KEY_ANIM_START_WIDTH, 0); + mStartHeight = opts.getInt(KEY_ANIM_START_HEIGHT, 0); } else if (mAnimationType == ANIM_THUMBNAIL) { mThumbnail = (Bitmap)opts.getParcelable(KEY_ANIM_THUMBNAIL); mStartX = opts.getInt(KEY_ANIM_START_X, 0); @@ -244,6 +293,16 @@ public class ActivityOptions { } /** @hide */ + public int getStartWidth() { + return mStartWidth; + } + + /** @hide */ + public int getStartHeight() { + return mStartHeight; + } + + /** @hide */ public IRemoteCallback getOnAnimationStartListener() { return mAnimationStartedListener; } @@ -281,6 +340,13 @@ public class ActivityOptions { mThumbnail = null; mAnimationStartedListener = null; break; + case ANIM_SCALE_UP: + mAnimationType = otherOptions.mAnimationType; + mStartX = otherOptions.mStartX; + mStartY = otherOptions.mStartY; + mStartWidth = otherOptions.mStartWidth; + mStartHeight = otherOptions.mStartHeight; + break; case ANIM_THUMBNAIL: mAnimationType = otherOptions.mAnimationType; mThumbnail = otherOptions.mThumbnail; @@ -316,6 +382,13 @@ public class ActivityOptions { b.putInt(KEY_ANIM_ENTER_RES_ID, mCustomEnterResId); b.putInt(KEY_ANIM_EXIT_RES_ID, mCustomExitResId); break; + case ANIM_SCALE_UP: + b.putInt(KEY_ANIM_TYPE, mAnimationType); + b.putInt(KEY_ANIM_START_X, mStartX); + b.putInt(KEY_ANIM_START_Y, mStartY); + b.putInt(KEY_ANIM_START_WIDTH, mStartWidth); + b.putInt(KEY_ANIM_START_HEIGHT, mStartHeight); + break; case ANIM_THUMBNAIL: b.putInt(KEY_ANIM_TYPE, mAnimationType); b.putParcelable(KEY_ANIM_THUMBNAIL, mThumbnail); @@ -323,6 +396,7 @@ public class ActivityOptions { b.putInt(KEY_ANIM_START_Y, mStartY); b.putIBinder(KEY_ANIM_START_LISTENER, mAnimationStartedListener != null ? mAnimationStartedListener.asBinder() : null); + break; } return b; } diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 0645aa9..8942135 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -45,6 +45,7 @@ import android.graphics.drawable.Drawable; import android.hardware.ISerialManager; import android.hardware.SensorManager; import android.hardware.SerialManager; +import android.hardware.SystemSensorManager; import android.hardware.input.IInputManager; import android.hardware.input.InputManager; import android.hardware.usb.IUsbManager; @@ -407,7 +408,7 @@ class ContextImpl extends Context { registerService(SENSOR_SERVICE, new ServiceFetcher() { public Object createService(ContextImpl ctx) { - return new SensorManager(ctx.mMainThread.getHandler().getLooper()); + return new SystemSensorManager(ctx.mMainThread.getHandler().getLooper()); }}); registerService(STATUS_BAR_SERVICE, new ServiceFetcher() { diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java index 55f29e6..0713127 100644 --- a/core/java/android/app/DownloadManager.java +++ b/core/java/android/app/DownloadManager.java @@ -347,9 +347,9 @@ public class DownloadManager { private CharSequence mTitle; private CharSequence mDescription; private String mMimeType; - private boolean mRoamingAllowed = true; private int mAllowedNetworkTypes = ~0; // default to all network types allowed - private boolean mAllowedOverMetered = true; + private boolean mRoamingAllowed = true; + private boolean mMeteredAllowed = true; private boolean mIsVisibleInDownloadsUi = true; private boolean mScannable = false; private boolean mUseSystemCache = false; @@ -624,17 +624,6 @@ public class DownloadManager { } /** - * Set whether this download may proceed over a metered network - * connection. By default, metered networks are allowed. - * - * @see ConnectivityManager#isActiveNetworkMetered() - */ - public Request setAllowedOverMetered(boolean allow) { - mAllowedOverMetered = allow; - return this; - } - - /** * Set whether this download may proceed over a roaming connection. By default, roaming is * allowed. * @param allowed whether to allow a roaming connection to be used @@ -646,6 +635,17 @@ public class DownloadManager { } /** + * Set whether this download may proceed over a metered network + * connection. By default, metered networks are allowed. + * + * @see ConnectivityManager#isActiveNetworkMetered() + */ + public Request setAllowedOverMetered(boolean allow) { + mMeteredAllowed = allow; + return this; + } + + /** * Set whether this download should be displayed in the system's Downloads UI. True by * default. * @param isVisible whether to display this download in the Downloads UI @@ -687,10 +687,10 @@ public class DownloadManager { putIfNonNull(values, Downloads.Impl.COLUMN_DESCRIPTION, mDescription); putIfNonNull(values, Downloads.Impl.COLUMN_MIME_TYPE, mMimeType); - // TODO: add COLUMN_ALLOW_METERED and persist values.put(Downloads.Impl.COLUMN_VISIBILITY, mNotificationVisibility); values.put(Downloads.Impl.COLUMN_ALLOWED_NETWORK_TYPES, mAllowedNetworkTypes); values.put(Downloads.Impl.COLUMN_ALLOW_ROAMING, mRoamingAllowed); + values.put(Downloads.Impl.COLUMN_ALLOW_METERED, mMeteredAllowed); values.put(Downloads.Impl.COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI, mIsVisibleInDownloadsUi); return values; @@ -1340,9 +1340,6 @@ public class DownloadManager { case Downloads.Impl.STATUS_FILE_ALREADY_EXISTS_ERROR: return ERROR_FILE_ALREADY_EXISTS; - case Downloads.Impl.STATUS_BLOCKED: - return ERROR_BLOCKED; - default: return ERROR_UNKNOWN; } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 5cce25f..22d84f0 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1681,7 +1681,7 @@ public class Notification implements Parcelable } private RemoteViews makeBigContentView() { - RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(R.layout.notification_template_base); + RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(R.layout.notification_template_big_text); contentView.setTextViewText(R.id.big_text, mBigText); contentView.setViewVisibility(R.id.big_text, View.VISIBLE); @@ -1696,4 +1696,60 @@ public class Notification implements Parcelable return wip; } } + + /** + * Helper class for generating large-format notifications that include a list of (up to 5) strings. + * + * This class is a "rebuilder": It consumes a Builder object and modifies its behavior, like so: + * <pre class="prettyprint"> + * Notification noti = new Notification.DigestStyle( + * new Notification.Builder() + * .setContentTitle("New mail from " + sender.toString()) + * .setContentText(subject) + * .setSmallIcon(R.drawable.new_mail) + * .setLargeIcon(aBitmap)) + * .addLine(str1) + * .addLine(str2) + * .build(); + * </pre> + * + * @see Notification#bigContentView + */ + public static class InboxStyle { + private Builder mBuilder; + private ArrayList<CharSequence> mTexts = new ArrayList<CharSequence>(5); + + public InboxStyle(Builder builder) { + mBuilder = builder; + } + + public InboxStyle addLine(CharSequence cs) { + mTexts.add(cs); + return this; + } + + private RemoteViews makeBigContentView() { + RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(R.layout.notification_template_inbox); + + int[] rowIds = {R.id.inbox_text0, R.id.inbox_text1, R.id.inbox_text2, R.id.inbox_text3, R.id.inbox_text4}; + + int i=0; + while (i < mTexts.size() && i < rowIds.length) { + CharSequence str = mTexts.get(i); + if (str != null && !str.equals("")) { + contentView.setViewVisibility(rowIds[i], View.VISIBLE); + contentView.setTextViewText(rowIds[i], str); + } + i++; + } + + return contentView; + } + + public Notification build() { + Notification wip = mBuilder.getNotification(); + wip.bigContentView = makeBigContentView(); + return wip; + } + } } diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 19e4372..6653336 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -6576,35 +6576,54 @@ public class Intent implements Parcelable, Cloneable { final String action = getAction(); if (ACTION_SEND.equals(action)) { - final Uri stream; + Uri stream = null; try { stream = getParcelableExtra(EXTRA_STREAM); } catch (ClassCastException e) { - return; } - if (stream != null) { + final CharSequence text = getCharSequenceExtra(EXTRA_TEXT); + final String htmlText = getStringExtra(EXTRA_HTML_TEXT); + if (stream != null || text != null || htmlText != null) { final ClipData clipData = new ClipData( - null, new String[] { getType() }, new ClipData.Item(stream)); - + null, new String[] { getType() }, + new ClipData.Item(text, htmlText, null, stream)); setClipData(clipData); addFlags(FLAG_GRANT_READ_URI_PERMISSION); } } else if (ACTION_SEND_MULTIPLE.equals(action)) { - final ArrayList<Uri> streams; + ArrayList<Uri> streams = null; try { streams = getParcelableArrayListExtra(EXTRA_STREAM); } catch (ClassCastException e) { - return; } - if (streams != null && streams.size() > 0) { - final Uri firstStream = streams.get(0); + final ArrayList<CharSequence> texts = getCharSequenceArrayListExtra(EXTRA_TEXT); + final ArrayList<String> htmlTexts = getStringArrayListExtra(EXTRA_HTML_TEXT); + int num = -1; + if (streams != null) { + num = streams.size(); + } + if (texts != null) { + if (num >= 0 && num != texts.size()) { + // Wha...! F- you. + return; + } + num = texts.size(); + } + if (htmlTexts != null) { + if (num >= 0 && num != htmlTexts.size()) { + // Wha...! F- you. + return; + } + num = htmlTexts.size(); + } + if (num > 0) { final ClipData clipData = new ClipData( - null, new String[] { getType() }, new ClipData.Item(firstStream)); + null, new String[] { getType() }, + makeClipItem(streams, texts, htmlTexts, 0)); - final int size = streams.size(); - for (int i = 1; i < size; i++) { - clipData.addItem(new ClipData.Item(streams.get(i))); + for (int i = 1; i < num; i++) { + clipData.addItem(makeClipItem(streams, texts, htmlTexts, i)); } setClipData(clipData); @@ -6612,4 +6631,12 @@ public class Intent implements Parcelable, Cloneable { } } } + + private static ClipData.Item makeClipItem(ArrayList<Uri> streams, ArrayList<CharSequence> texts, + ArrayList<String> htmlTexts, int which) { + Uri uri = streams != null ? streams.get(which) : null; + CharSequence text = texts != null ? texts.get(which) : null; + String htmlText = htmlTexts != null ? htmlTexts.get(which) : null; + return new ClipData.Item(text, htmlText, null, uri); + } } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index b6ebbdf..185fcb9 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3458,9 +3458,9 @@ public class PackageParser { ai.disableCompatibilityMode(); } if (stopped) { - p.applicationInfo.flags |= ApplicationInfo.FLAG_STOPPED; + ai.flags |= ApplicationInfo.FLAG_STOPPED; } else { - p.applicationInfo.flags &= ~ApplicationInfo.FLAG_STOPPED; + ai.flags &= ~ApplicationInfo.FLAG_STOPPED; } if (enabledState == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) { ai.enabled = true; diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java index 254f652..04f6377 100644 --- a/core/java/android/database/sqlite/SQLiteConnection.java +++ b/core/java/android/database/sqlite/SQLiteConnection.java @@ -711,6 +711,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen throw new IllegalArgumentException("sql must not be null."); } + int changedRows = 0; final int cookie = mRecentOperations.beginOperation("executeForChangedRowCount", sql, bindArgs); try { @@ -721,8 +722,9 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen applyBlockGuardPolicy(statement); attachCancellationSignal(cancellationSignal); try { - return nativeExecuteForChangedRowCount( + changedRows = nativeExecuteForChangedRowCount( mConnectionPtr, statement.mStatementPtr); + return changedRows; } finally { detachCancellationSignal(cancellationSignal); } @@ -733,7 +735,9 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen mRecentOperations.failOperation(cookie, ex); throw ex; } finally { - mRecentOperations.endOperation(cookie); + if (mRecentOperations.endOperationDeferLog(cookie)) { + mRecentOperations.logOperation(cookie, "changedRows=" + changedRows); + } } } diff --git a/core/java/android/hardware/LegacySensorManager.java b/core/java/android/hardware/LegacySensorManager.java new file mode 100644 index 0000000..62c194f --- /dev/null +++ b/core/java/android/hardware/LegacySensorManager.java @@ -0,0 +1,434 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.hardware; + +import android.os.RemoteException; +import android.os.ServiceManager; +import android.view.IRotationWatcher; +import android.view.IWindowManager; +import android.view.Surface; + +import java.util.HashMap; +import java.util.List; + +/** + * Helper class for implementing the legacy sensor manager API. + * @hide + */ +@SuppressWarnings("deprecation") +final class LegacySensorManager { + private static boolean sInitialized; + private static IWindowManager sWindowManager; + private static int sRotation = Surface.ROTATION_0; + + private final SensorManager mSensorManager; + + // List of legacy listeners. Guarded by mLegacyListenersMap. + private final HashMap<SensorListener, LegacyListener> mLegacyListenersMap = + new HashMap<SensorListener, LegacyListener>(); + + public LegacySensorManager(SensorManager sensorManager) { + mSensorManager = sensorManager; + + synchronized (SensorManager.class) { + if (!sInitialized) { + sWindowManager = IWindowManager.Stub.asInterface( + ServiceManager.getService("window")); + if (sWindowManager != null) { + // if it's null we're running in the system process + // which won't get the rotated values + try { + sRotation = sWindowManager.watchRotation( + new IRotationWatcher.Stub() { + public void onRotationChanged(int rotation) { + LegacySensorManager.onRotationChanged(rotation); + } + } + ); + } catch (RemoteException e) { + } + } + } + } + } + + public int getSensors() { + int result = 0; + final List<Sensor> fullList = mSensorManager.getFullSensorList(); + for (Sensor i : fullList) { + switch (i.getType()) { + case Sensor.TYPE_ACCELEROMETER: + result |= SensorManager.SENSOR_ACCELEROMETER; + break; + case Sensor.TYPE_MAGNETIC_FIELD: + result |= SensorManager.SENSOR_MAGNETIC_FIELD; + break; + case Sensor.TYPE_ORIENTATION: + result |= SensorManager.SENSOR_ORIENTATION + | SensorManager.SENSOR_ORIENTATION_RAW; + break; + } + } + return result; + } + + public boolean registerListener(SensorListener listener, int sensors, int rate) { + if (listener == null) { + return false; + } + boolean result = false; + result = registerLegacyListener(SensorManager.SENSOR_ACCELEROMETER, + Sensor.TYPE_ACCELEROMETER, listener, sensors, rate) || result; + result = registerLegacyListener(SensorManager.SENSOR_MAGNETIC_FIELD, + Sensor.TYPE_MAGNETIC_FIELD, listener, sensors, rate) || result; + result = registerLegacyListener(SensorManager.SENSOR_ORIENTATION_RAW, + Sensor.TYPE_ORIENTATION, listener, sensors, rate) || result; + result = registerLegacyListener(SensorManager.SENSOR_ORIENTATION, + Sensor.TYPE_ORIENTATION, listener, sensors, rate) || result; + result = registerLegacyListener(SensorManager.SENSOR_TEMPERATURE, + Sensor.TYPE_TEMPERATURE, listener, sensors, rate) || result; + return result; + } + + private boolean registerLegacyListener(int legacyType, int type, + SensorListener listener, int sensors, int rate) { + boolean result = false; + // Are we activating this legacy sensor? + if ((sensors & legacyType) != 0) { + // if so, find a suitable Sensor + Sensor sensor = mSensorManager.getDefaultSensor(type); + if (sensor != null) { + // We do all of this work holding the legacy listener lock to ensure + // that the invariants around listeners are maintained. This is safe + // because neither registerLegacyListener nor unregisterLegacyListener + // are called reentrantly while sensors are being registered or unregistered. + synchronized (mLegacyListenersMap) { + // If we don't already have one, create a LegacyListener + // to wrap this listener and process the events as + // they are expected by legacy apps. + LegacyListener legacyListener = mLegacyListenersMap.get(listener); + if (legacyListener == null) { + // we didn't find a LegacyListener for this client, + // create one, and put it in our list. + legacyListener = new LegacyListener(listener); + mLegacyListenersMap.put(listener, legacyListener); + } + + // register this legacy sensor with this legacy listener + if (legacyListener.registerSensor(legacyType)) { + // and finally, register the legacy listener with the new apis + result = mSensorManager.registerListener(legacyListener, sensor, rate); + } else { + result = true; // sensor already enabled + } + } + } + } + return result; + } + + public void unregisterListener(SensorListener listener, int sensors) { + if (listener == null) { + return; + } + unregisterLegacyListener(SensorManager.SENSOR_ACCELEROMETER, Sensor.TYPE_ACCELEROMETER, + listener, sensors); + unregisterLegacyListener(SensorManager.SENSOR_MAGNETIC_FIELD, Sensor.TYPE_MAGNETIC_FIELD, + listener, sensors); + unregisterLegacyListener(SensorManager.SENSOR_ORIENTATION_RAW, Sensor.TYPE_ORIENTATION, + listener, sensors); + unregisterLegacyListener(SensorManager.SENSOR_ORIENTATION, Sensor.TYPE_ORIENTATION, + listener, sensors); + unregisterLegacyListener(SensorManager.SENSOR_TEMPERATURE, Sensor.TYPE_TEMPERATURE, + listener, sensors); + } + + private void unregisterLegacyListener(int legacyType, int type, + SensorListener listener, int sensors) { + // Are we deactivating this legacy sensor? + if ((sensors & legacyType) != 0) { + // if so, find the corresponding Sensor + Sensor sensor = mSensorManager.getDefaultSensor(type); + if (sensor != null) { + // We do all of this work holding the legacy listener lock to ensure + // that the invariants around listeners are maintained. This is safe + // because neither registerLegacyListener nor unregisterLegacyListener + // are called re-entrantly while sensors are being registered or unregistered. + synchronized (mLegacyListenersMap) { + // do we know about this listener? + LegacyListener legacyListener = mLegacyListenersMap.get(listener); + if (legacyListener != null) { + // unregister this legacy sensor and if we don't + // need the corresponding Sensor, unregister it too + if (legacyListener.unregisterSensor(legacyType)) { + // corresponding sensor not needed, unregister + mSensorManager.unregisterListener(legacyListener, sensor); + + // finally check if we still need the legacyListener + // in our mapping, if not, get rid of it too. + if (!legacyListener.hasSensors()) { + mLegacyListenersMap.remove(listener); + } + } + } + } + } + } + } + + static void onRotationChanged(int rotation) { + synchronized (SensorManager.class) { + sRotation = rotation; + } + } + + static int getRotation() { + synchronized (SensorManager.class) { + return sRotation; + } + } + + private static final class LegacyListener implements SensorEventListener { + private float mValues[] = new float[6]; + private SensorListener mTarget; + private int mSensors; + private final LmsFilter mYawfilter = new LmsFilter(); + + LegacyListener(SensorListener target) { + mTarget = target; + mSensors = 0; + } + + boolean registerSensor(int legacyType) { + if ((mSensors & legacyType) != 0) { + return false; + } + boolean alreadyHasOrientationSensor = hasOrientationSensor(mSensors); + mSensors |= legacyType; + if (alreadyHasOrientationSensor && hasOrientationSensor(legacyType)) { + return false; // don't need to re-register the orientation sensor + } + return true; + } + + boolean unregisterSensor(int legacyType) { + if ((mSensors & legacyType) == 0) { + return false; + } + mSensors &= ~legacyType; + if (hasOrientationSensor(legacyType) && hasOrientationSensor(mSensors)) { + return false; // can't unregister the orientation sensor just yet + } + return true; + } + + boolean hasSensors() { + return mSensors != 0; + } + + private static boolean hasOrientationSensor(int sensors) { + return (sensors & (SensorManager.SENSOR_ORIENTATION + | SensorManager.SENSOR_ORIENTATION_RAW)) != 0; + } + + public void onAccuracyChanged(Sensor sensor, int accuracy) { + try { + mTarget.onAccuracyChanged(getLegacySensorType(sensor.getType()), accuracy); + } catch (AbstractMethodError e) { + // old app that doesn't implement this method + // just ignore it. + } + } + + public void onSensorChanged(SensorEvent event) { + final float v[] = mValues; + v[0] = event.values[0]; + v[1] = event.values[1]; + v[2] = event.values[2]; + int type = event.sensor.getType(); + int legacyType = getLegacySensorType(type); + mapSensorDataToWindow(legacyType, v, LegacySensorManager.getRotation()); + if (type == Sensor.TYPE_ORIENTATION) { + if ((mSensors & SensorManager.SENSOR_ORIENTATION_RAW)!=0) { + mTarget.onSensorChanged(SensorManager.SENSOR_ORIENTATION_RAW, v); + } + if ((mSensors & SensorManager.SENSOR_ORIENTATION)!=0) { + v[0] = mYawfilter.filter(event.timestamp, v[0]); + mTarget.onSensorChanged(SensorManager.SENSOR_ORIENTATION, v); + } + } else { + mTarget.onSensorChanged(legacyType, v); + } + } + + /* + * Helper function to convert the specified sensor's data to the windows's + * coordinate space from the device's coordinate space. + * + * output: 3,4,5: values in the old API format + * 0,1,2: transformed values in the old API format + * + */ + private void mapSensorDataToWindow(int sensor, + float[] values, int orientation) { + float x = values[0]; + float y = values[1]; + float z = values[2]; + + switch (sensor) { + case SensorManager.SENSOR_ORIENTATION: + case SensorManager.SENSOR_ORIENTATION_RAW: + z = -z; + break; + case SensorManager.SENSOR_ACCELEROMETER: + x = -x; + y = -y; + z = -z; + break; + case SensorManager.SENSOR_MAGNETIC_FIELD: + x = -x; + y = -y; + break; + } + values[0] = x; + values[1] = y; + values[2] = z; + values[3] = x; + values[4] = y; + values[5] = z; + + if ((orientation & Surface.ROTATION_90) != 0) { + // handles 90 and 270 rotation + switch (sensor) { + case SensorManager.SENSOR_ACCELEROMETER: + case SensorManager.SENSOR_MAGNETIC_FIELD: + values[0] =-y; + values[1] = x; + values[2] = z; + break; + case SensorManager.SENSOR_ORIENTATION: + case SensorManager.SENSOR_ORIENTATION_RAW: + values[0] = x + ((x < 270) ? 90 : -270); + values[1] = z; + values[2] = y; + break; + } + } + if ((orientation & Surface.ROTATION_180) != 0) { + x = values[0]; + y = values[1]; + z = values[2]; + // handles 180 (flip) and 270 (flip + 90) rotation + switch (sensor) { + case SensorManager.SENSOR_ACCELEROMETER: + case SensorManager.SENSOR_MAGNETIC_FIELD: + values[0] =-x; + values[1] =-y; + values[2] = z; + break; + case SensorManager.SENSOR_ORIENTATION: + case SensorManager.SENSOR_ORIENTATION_RAW: + values[0] = (x >= 180) ? (x - 180) : (x + 180); + values[1] =-y; + values[2] =-z; + break; + } + } + } + + private static int getLegacySensorType(int type) { + switch (type) { + case Sensor.TYPE_ACCELEROMETER: + return SensorManager.SENSOR_ACCELEROMETER; + case Sensor.TYPE_MAGNETIC_FIELD: + return SensorManager.SENSOR_MAGNETIC_FIELD; + case Sensor.TYPE_ORIENTATION: + return SensorManager.SENSOR_ORIENTATION_RAW; + case Sensor.TYPE_TEMPERATURE: + return SensorManager.SENSOR_TEMPERATURE; + } + return 0; + } + } + + private static final class LmsFilter { + private static final int SENSORS_RATE_MS = 20; + private static final int COUNT = 12; + private static final float PREDICTION_RATIO = 1.0f/3.0f; + private static final float PREDICTION_TIME = (SENSORS_RATE_MS*COUNT/1000.0f)*PREDICTION_RATIO; + private float mV[] = new float[COUNT*2]; + private float mT[] = new float[COUNT*2]; + private int mIndex; + + public LmsFilter() { + mIndex = COUNT; + } + + public float filter(long time, float in) { + float v = in; + final float ns = 1.0f / 1000000000.0f; + final float t = time*ns; + float v1 = mV[mIndex]; + if ((v-v1) > 180) { + v -= 360; + } else if ((v1-v) > 180) { + v += 360; + } + /* Manage the circular buffer, we write the data twice spaced + * by COUNT values, so that we don't have to copy the array + * when it's full + */ + mIndex++; + if (mIndex >= COUNT*2) + mIndex = COUNT; + mV[mIndex] = v; + mT[mIndex] = t; + mV[mIndex-COUNT] = v; + mT[mIndex-COUNT] = t; + + float A, B, C, D, E; + float a, b; + int i; + + A = B = C = D = E = 0; + for (i=0 ; i<COUNT-1 ; i++) { + final int j = mIndex - 1 - i; + final float Z = mV[j]; + final float T = 0.5f*(mT[j] + mT[j+1]) - t; + float dT = mT[j] - mT[j+1]; + dT *= dT; + A += Z*dT; + B += T*(T*dT); + C += (T*dT); + D += Z*(T*dT); + E += dT; + } + b = (A*B + C*D) / (E*B + C*C); + a = (E*b - A) / C; + float f = b + PREDICTION_TIME*a; + + // Normalize + f *= (1.0f / 360.0f); + if (((f>=0)?f:-f) >= 0.5f) + f = f - (float)Math.ceil(f + 0.5f) + 1.0f; + if (f < 0) + f += 1.0f; + f *= 360.0f; + return f; + } + } +} diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index 63fb32d..3c70dc6 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -131,7 +131,6 @@ public class Sensor { private float mResolution; private float mPower; private int mMinDelay; - private int mLegacyType; Sensor() { @@ -203,12 +202,4 @@ public class Sensor { mMaxRange = max; mResolution = res; } - - void setLegacyType(int legacyType) { - mLegacyType = legacyType; - } - - int getLegacyType() { - return mLegacyType; - } } diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 3fdf246..aeb46cf 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -16,23 +16,12 @@ package android.hardware; -import android.os.Looper; -import android.os.Process; -import android.os.RemoteException; import android.os.Handler; -import android.os.Message; -import android.os.ServiceManager; import android.util.Log; import android.util.SparseArray; -import android.util.SparseBooleanArray; -import android.util.SparseIntArray; -import android.view.IRotationWatcher; -import android.view.IWindowManager; -import android.view.Surface; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; /** @@ -83,11 +72,19 @@ import java.util.List; * @see Sensor * */ -public class SensorManager -{ - private static final String TAG = "SensorManager"; +public abstract class SensorManager { + /** @hide */ + protected static final String TAG = "SensorManager"; + private static final float[] mTempMatrix = new float[16]; + // Cached lists of sensors by type. Guarded by mSensorListByType. + private final SparseArray<List<Sensor>> mSensorListByType = + new SparseArray<List<Sensor>>(); + + // Legacy sensor manager implementation. Guarded by mSensorListByType during initialization. + private LegacySensorManager mLegacySensorManager; + /* NOTE: sensor IDs must be a power of 2 */ /** @@ -353,340 +350,18 @@ public class SensorManager /** see {@link #remapCoordinateSystem} */ public static final int AXIS_MINUS_Z = AXIS_Z | 0x80; - /*-----------------------------------------------------------------------*/ - - Looper mMainLooper; - @SuppressWarnings("deprecation") - private HashMap<SensorListener, LegacyListener> mLegacyListenersMap = - new HashMap<SensorListener, LegacyListener>(); - - /*-----------------------------------------------------------------------*/ - - private static final int SENSOR_DISABLE = -1; - private static boolean sSensorModuleInitialized = false; - private static ArrayList<Sensor> sFullSensorsList = new ArrayList<Sensor>(); - private static SparseArray<List<Sensor>> sSensorListByType = new SparseArray<List<Sensor>>(); - private static IWindowManager sWindowManager; - private static int sRotation = Surface.ROTATION_0; - /* The thread and the sensor list are global to the process - * but the actual thread is spawned on demand */ - private static SensorThread sSensorThread; - private static int sQueue; - - // Used within this module from outside SensorManager, don't make private - static SparseArray<Sensor> sHandleToSensor = new SparseArray<Sensor>(); - static final ArrayList<ListenerDelegate> sListeners = - new ArrayList<ListenerDelegate>(); - - /*-----------------------------------------------------------------------*/ - - private class SensorEventPool { - private final int mPoolSize; - private final SensorEvent mPool[]; - private int mNumItemsInPool; - - private SensorEvent createSensorEvent() { - // maximal size for all legacy events is 3 - return new SensorEvent(3); - } - - SensorEventPool(int poolSize) { - mPoolSize = poolSize; - mNumItemsInPool = poolSize; - mPool = new SensorEvent[poolSize]; - } - - SensorEvent getFromPool() { - SensorEvent t = null; - synchronized (this) { - if (mNumItemsInPool > 0) { - // remove the "top" item from the pool - final int index = mPoolSize - mNumItemsInPool; - t = mPool[index]; - mPool[index] = null; - mNumItemsInPool--; - } - } - if (t == null) { - // the pool was empty or this item was removed from the pool for - // the first time. In any case, we need to create a new item. - t = createSensorEvent(); - } - return t; - } - - void returnToPool(SensorEvent t) { - synchronized (this) { - // is there space left in the pool? - if (mNumItemsInPool < mPoolSize) { - // if so, return the item to the pool - mNumItemsInPool++; - final int index = mPoolSize - mNumItemsInPool; - mPool[index] = t; - } - } - } - } - - private static SensorEventPool sPool; - - /*-----------------------------------------------------------------------*/ - - static private class SensorThread { - - Thread mThread; - boolean mSensorsReady; - - SensorThread() { - } - - @Override - protected void finalize() { - } - - // must be called with sListeners lock - boolean startLocked() { - try { - if (mThread == null) { - mSensorsReady = false; - SensorThreadRunnable runnable = new SensorThreadRunnable(); - Thread thread = new Thread(runnable, SensorThread.class.getName()); - thread.start(); - synchronized (runnable) { - while (mSensorsReady == false) { - runnable.wait(); - } - } - mThread = thread; - } - } catch (InterruptedException e) { - } - return mThread == null ? false : true; - } - - private class SensorThreadRunnable implements Runnable { - SensorThreadRunnable() { - } - - private boolean open() { - // NOTE: this cannot synchronize on sListeners, since - // it's held in the main thread at least until we - // return from here. - sQueue = sensors_create_queue(); - return true; - } - - public void run() { - //Log.d(TAG, "entering main sensor thread"); - final float[] values = new float[3]; - final int[] status = new int[1]; - final long timestamp[] = new long[1]; - Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_DISPLAY); - - if (!open()) { - return; - } - - synchronized (this) { - // we've open the driver, we're ready to open the sensors - mSensorsReady = true; - this.notify(); - } - - while (true) { - // wait for an event - final int sensor = sensors_data_poll(sQueue, values, status, timestamp); - - int accuracy = status[0]; - synchronized (sListeners) { - if (sensor == -1 || sListeners.isEmpty()) { - // we lost the connection to the event stream. this happens - // when the last listener is removed or if there is an error - if (sensor == -1 && !sListeners.isEmpty()) { - // log a warning in case of abnormal termination - Log.e(TAG, "_sensors_data_poll() failed, we bail out: sensors=" + sensor); - } - // we have no more listeners or polling failed, terminate the thread - sensors_destroy_queue(sQueue); - sQueue = 0; - mThread = null; - break; - } - final Sensor sensorObject = sHandleToSensor.get(sensor); - if (sensorObject != null) { - // report the sensor event to all listeners that - // care about it. - final int size = sListeners.size(); - for (int i=0 ; i<size ; i++) { - ListenerDelegate listener = sListeners.get(i); - if (listener.hasSensor(sensorObject)) { - // this is asynchronous (okay to call - // with sListeners lock held). - listener.onSensorChangedLocked(sensorObject, - values, timestamp, accuracy); - } - } - } - } - } - //Log.d(TAG, "exiting main sensor thread"); - } - } - } - - /*-----------------------------------------------------------------------*/ - - private class ListenerDelegate { - private final SensorEventListener mSensorEventListener; - private final ArrayList<Sensor> mSensorList = new ArrayList<Sensor>(); - private final Handler mHandler; - public SparseBooleanArray mSensors = new SparseBooleanArray(); - public SparseBooleanArray mFirstEvent = new SparseBooleanArray(); - public SparseIntArray mSensorAccuracies = new SparseIntArray(); - - ListenerDelegate(SensorEventListener listener, Sensor sensor, Handler handler) { - mSensorEventListener = listener; - Looper looper = (handler != null) ? handler.getLooper() : mMainLooper; - // currently we create one Handler instance per listener, but we could - // have one per looper (we'd need to pass the ListenerDelegate - // instance to handleMessage and keep track of them separately). - mHandler = new Handler(looper) { - @Override - public void handleMessage(Message msg) { - final SensorEvent t = (SensorEvent)msg.obj; - final int handle = t.sensor.getHandle(); - - switch (t.sensor.getType()) { - // Only report accuracy for sensors that support it. - case Sensor.TYPE_MAGNETIC_FIELD: - case Sensor.TYPE_ORIENTATION: - // call onAccuracyChanged() only if the value changes - final int accuracy = mSensorAccuracies.get(handle); - if ((t.accuracy >= 0) && (accuracy != t.accuracy)) { - mSensorAccuracies.put(handle, t.accuracy); - mSensorEventListener.onAccuracyChanged(t.sensor, t.accuracy); - } - break; - default: - // For other sensors, just report the accuracy once - if (mFirstEvent.get(handle) == false) { - mFirstEvent.put(handle, true); - mSensorEventListener.onAccuracyChanged( - t.sensor, SENSOR_STATUS_ACCURACY_HIGH); - } - break; - } - - mSensorEventListener.onSensorChanged(t); - sPool.returnToPool(t); - } - }; - addSensor(sensor); - } - - Object getListener() { - return mSensorEventListener; - } - - void addSensor(Sensor sensor) { - mSensors.put(sensor.getHandle(), true); - mSensorList.add(sensor); - } - int removeSensor(Sensor sensor) { - mSensors.delete(sensor.getHandle()); - mSensorList.remove(sensor); - return mSensors.size(); - } - boolean hasSensor(Sensor sensor) { - return mSensors.get(sensor.getHandle()); - } - List<Sensor> getSensors() { - return mSensorList; - } - - void onSensorChangedLocked(Sensor sensor, float[] values, long[] timestamp, int accuracy) { - SensorEvent t = sPool.getFromPool(); - final float[] v = t.values; - v[0] = values[0]; - v[1] = values[1]; - v[2] = values[2]; - t.timestamp = timestamp[0]; - t.accuracy = accuracy; - t.sensor = sensor; - Message msg = Message.obtain(); - msg.what = 0; - msg.obj = t; - msg.setAsynchronous(true); - mHandler.sendMessage(msg); - } - } /** * {@hide} */ - public SensorManager(Looper mainLooper) { - mMainLooper = mainLooper; - - - synchronized(sListeners) { - if (!sSensorModuleInitialized) { - sSensorModuleInitialized = true; - - nativeClassInit(); - - sWindowManager = IWindowManager.Stub.asInterface( - ServiceManager.getService("window")); - if (sWindowManager != null) { - // if it's null we're running in the system process - // which won't get the rotated values - try { - sRotation = sWindowManager.watchRotation( - new IRotationWatcher.Stub() { - public void onRotationChanged(int rotation) { - SensorManager.this.onRotationChanged(rotation); - } - } - ); - } catch (RemoteException e) { - } - } - - // initialize the sensor list - sensors_module_init(); - final ArrayList<Sensor> fullList = sFullSensorsList; - int i = 0; - do { - Sensor sensor = new Sensor(); - i = sensors_module_get_next_sensor(sensor, i); - - if (i>=0) { - //Log.d(TAG, "found sensor: " + sensor.getName() + - // ", handle=" + sensor.getHandle()); - sensor.setLegacyType(getLegacySensorType(sensor.getType())); - fullList.add(sensor); - sHandleToSensor.append(sensor.getHandle(), sensor); - } - } while (i>0); - - sPool = new SensorEventPool( sFullSensorsList.size()*2 ); - sSensorThread = new SensorThread(); - } - } + public SensorManager() { } - private int getLegacySensorType(int type) { - switch (type) { - case Sensor.TYPE_ACCELEROMETER: - return SENSOR_ACCELEROMETER; - case Sensor.TYPE_MAGNETIC_FIELD: - return SENSOR_MAGNETIC_FIELD; - case Sensor.TYPE_ORIENTATION: - return SENSOR_ORIENTATION_RAW; - case Sensor.TYPE_TEMPERATURE: - return SENSOR_TEMPERATURE; - } - return 0; - } + /** + * Gets the full list of sensors that are available. + * @hide + */ + protected abstract List<Sensor> getFullSensorList(); /** * @return available sensors. @@ -695,23 +370,7 @@ public class SensorManager */ @Deprecated public int getSensors() { - int result = 0; - final ArrayList<Sensor> fullList = sFullSensorsList; - for (Sensor i : fullList) { - switch (i.getType()) { - case Sensor.TYPE_ACCELEROMETER: - result |= SensorManager.SENSOR_ACCELEROMETER; - break; - case Sensor.TYPE_MAGNETIC_FIELD: - result |= SensorManager.SENSOR_MAGNETIC_FIELD; - break; - case Sensor.TYPE_ORIENTATION: - result |= SensorManager.SENSOR_ORIENTATION | - SensorManager.SENSOR_ORIENTATION_RAW; - break; - } - } - return result; + return getLegacySensorManager().getSensors(); } /** @@ -731,9 +390,9 @@ public class SensorManager public List<Sensor> getSensorList(int type) { // cache the returned lists the first time List<Sensor> list; - final ArrayList<Sensor> fullList = sFullSensorsList; - synchronized(fullList) { - list = sSensorListByType.get(type); + final List<Sensor> fullList = getFullSensorList(); + synchronized (mSensorListByType) { + list = mSensorListByType.get(type); if (list == null) { if (type == Sensor.TYPE_ALL) { list = fullList; @@ -745,7 +404,7 @@ public class SensorManager } } list = Collections.unmodifiableList(list); - sSensorListByType.append(type, list); + mSensorListByType.append(type, list); } } return list; @@ -817,143 +476,40 @@ public class SensorManager */ @Deprecated public boolean registerListener(SensorListener listener, int sensors, int rate) { - if (listener == null) { - return false; - } - boolean result = false; - result = registerLegacyListener(SENSOR_ACCELEROMETER, Sensor.TYPE_ACCELEROMETER, - listener, sensors, rate) || result; - result = registerLegacyListener(SENSOR_MAGNETIC_FIELD, Sensor.TYPE_MAGNETIC_FIELD, - listener, sensors, rate) || result; - result = registerLegacyListener(SENSOR_ORIENTATION_RAW, Sensor.TYPE_ORIENTATION, - listener, sensors, rate) || result; - result = registerLegacyListener(SENSOR_ORIENTATION, Sensor.TYPE_ORIENTATION, - listener, sensors, rate) || result; - result = registerLegacyListener(SENSOR_TEMPERATURE, Sensor.TYPE_TEMPERATURE, - listener, sensors, rate) || result; - return result; - } - - @SuppressWarnings("deprecation") - private boolean registerLegacyListener(int legacyType, int type, - SensorListener listener, int sensors, int rate) - { - if (listener == null) { - return false; - } - boolean result = false; - // Are we activating this legacy sensor? - if ((sensors & legacyType) != 0) { - // if so, find a suitable Sensor - Sensor sensor = getDefaultSensor(type); - if (sensor != null) { - // If we don't already have one, create a LegacyListener - // to wrap this listener and process the events as - // they are expected by legacy apps. - LegacyListener legacyListener = null; - synchronized (mLegacyListenersMap) { - legacyListener = mLegacyListenersMap.get(listener); - if (legacyListener == null) { - // we didn't find a LegacyListener for this client, - // create one, and put it in our list. - legacyListener = new LegacyListener(listener); - mLegacyListenersMap.put(listener, legacyListener); - } - } - // register this legacy sensor with this legacy listener - legacyListener.registerSensor(legacyType); - // and finally, register the legacy listener with the new apis - result = registerListener(legacyListener, sensor, rate); - } - } - return result; + return getLegacySensorManager().registerListener(listener, sensors, rate); } /** - * Unregisters a listener for the sensors with which it is registered. + * Unregisters a listener for all sensors. * * @deprecated This method is deprecated, use - * {@link SensorManager#unregisterListener(SensorEventListener, Sensor)} + * {@link SensorManager#unregisterListener(SensorEventListener)} * instead. * * @param listener * a SensorListener object - * - * @param sensors - * a bit masks of the sensors to unregister from */ @Deprecated - public void unregisterListener(SensorListener listener, int sensors) { - unregisterLegacyListener(SENSOR_ACCELEROMETER, Sensor.TYPE_ACCELEROMETER, - listener, sensors); - unregisterLegacyListener(SENSOR_MAGNETIC_FIELD, Sensor.TYPE_MAGNETIC_FIELD, - listener, sensors); - unregisterLegacyListener(SENSOR_ORIENTATION_RAW, Sensor.TYPE_ORIENTATION, - listener, sensors); - unregisterLegacyListener(SENSOR_ORIENTATION, Sensor.TYPE_ORIENTATION, - listener, sensors); - unregisterLegacyListener(SENSOR_TEMPERATURE, Sensor.TYPE_TEMPERATURE, - listener, sensors); - } - - @SuppressWarnings("deprecation") - private void unregisterLegacyListener(int legacyType, int type, - SensorListener listener, int sensors) - { - if (listener == null) { - return; - } - // do we know about this listener? - LegacyListener legacyListener = null; - synchronized (mLegacyListenersMap) { - legacyListener = mLegacyListenersMap.get(listener); - } - if (legacyListener != null) { - // Are we deactivating this legacy sensor? - if ((sensors & legacyType) != 0) { - // if so, find the corresponding Sensor - Sensor sensor = getDefaultSensor(type); - if (sensor != null) { - // unregister this legacy sensor and if we don't - // need the corresponding Sensor, unregister it too - if (legacyListener.unregisterSensor(legacyType)) { - // corresponding sensor not needed, unregister - unregisterListener(legacyListener, sensor); - // finally check if we still need the legacyListener - // in our mapping, if not, get rid of it too. - synchronized(sListeners) { - boolean found = false; - for (ListenerDelegate i : sListeners) { - if (i.getListener() == legacyListener) { - found = true; - break; - } - } - if (!found) { - synchronized (mLegacyListenersMap) { - mLegacyListenersMap.remove(listener); - } - } - } - } - } - } - } + public void unregisterListener(SensorListener listener) { + unregisterListener(listener, SENSOR_ALL | SENSOR_ORIENTATION_RAW); } /** - * Unregisters a listener for all sensors. + * Unregisters a listener for the sensors with which it is registered. * * @deprecated This method is deprecated, use - * {@link SensorManager#unregisterListener(SensorEventListener)} + * {@link SensorManager#unregisterListener(SensorEventListener, Sensor)} * instead. * * @param listener * a SensorListener object + * + * @param sensors + * a bit masks of the sensors to unregister from */ @Deprecated - public void unregisterListener(SensorListener listener) { - unregisterListener(listener, SENSOR_ALL | SENSOR_ORIENTATION_RAW); + public void unregisterListener(SensorListener listener, int sensors) { + getLegacySensorManager().unregisterListener(listener, sensors); } /** @@ -970,7 +526,11 @@ public class SensorManager * */ public void unregisterListener(SensorEventListener listener, Sensor sensor) { - unregisterListener((Object)listener, sensor); + if (listener == null || sensor == null) { + return; + } + + unregisterListenerImpl(listener, sensor); } /** @@ -984,9 +544,16 @@ public class SensorManager * */ public void unregisterListener(SensorEventListener listener) { - unregisterListener((Object)listener); + if (listener == null) { + return; + } + + unregisterListenerImpl(listener, null); } + /** @hide */ + protected abstract void unregisterListenerImpl(SensorEventListener listener, Sensor sensor); + /** * Registers a {@link android.hardware.SensorEventListener * SensorEventListener} for the given sensor. @@ -1019,31 +586,6 @@ public class SensorManager return registerListener(listener, sensor, rate, null); } - private boolean enableSensorLocked(Sensor sensor, int delay) { - boolean result = false; - for (ListenerDelegate i : sListeners) { - if (i.hasSensor(sensor)) { - String name = sensor.getName(); - int handle = sensor.getHandle(); - result = sensors_enable_sensor(sQueue, name, handle, delay); - break; - } - } - return result; - } - - private boolean disableSensorLocked(Sensor sensor) { - for (ListenerDelegate i : sListeners) { - if (i.hasSensor(sensor)) { - // not an error, it's just that this sensor is still in use - return true; - } - } - String name = sensor.getName(); - int handle = sensor.getHandle(); - return sensors_enable_sensor(sQueue, name, handle, SENSOR_DISABLE); - } - /** * Registers a {@link android.hardware.SensorEventListener * SensorEventListener} for the given sensor. @@ -1081,7 +623,7 @@ public class SensorManager if (listener == null || sensor == null) { return false; } - boolean result = true; + int delay = -1; switch (rate) { case SENSOR_DELAY_FASTEST: @@ -1101,92 +643,12 @@ public class SensorManager break; } - synchronized (sListeners) { - // look for this listener in our list - ListenerDelegate l = null; - for (ListenerDelegate i : sListeners) { - if (i.getListener() == listener) { - l = i; - break; - } - } - - // if we don't find it, add it to the list - if (l == null) { - l = new ListenerDelegate(listener, sensor, handler); - sListeners.add(l); - // if the list is not empty, start our main thread - if (!sListeners.isEmpty()) { - if (sSensorThread.startLocked()) { - if (!enableSensorLocked(sensor, delay)) { - // oops. there was an error - sListeners.remove(l); - result = false; - } - } else { - // there was an error, remove the listener - sListeners.remove(l); - result = false; - } - } else { - // weird, we couldn't add the listener - result = false; - } - } else { - l.addSensor(sensor); - if (!enableSensorLocked(sensor, delay)) { - // oops. there was an error - l.removeSensor(sensor); - result = false; - } - } - } - - return result; - } - - private void unregisterListener(Object listener, Sensor sensor) { - if (listener == null || sensor == null) { - return; - } - - synchronized (sListeners) { - final int size = sListeners.size(); - for (int i=0 ; i<size ; i++) { - ListenerDelegate l = sListeners.get(i); - if (l.getListener() == listener) { - if (l.removeSensor(sensor) == 0) { - // if we have no more sensors enabled on this listener, - // take it off the list. - sListeners.remove(i); - } - break; - } - } - disableSensorLocked(sensor); - } + return registerListenerImpl(listener, sensor, delay, handler); } - private void unregisterListener(Object listener) { - if (listener == null) { - return; - } - - synchronized (sListeners) { - final int size = sListeners.size(); - for (int i=0 ; i<size ; i++) { - ListenerDelegate l = sListeners.get(i); - if (l.getListener() == listener) { - sListeners.remove(i); - // disable all sensors for this listener - for (Sensor sensor : l.getSensors()) { - disableSensorLocked(sensor); - } - break; - } - } - } - } + /** @hide */ + protected abstract boolean registerListenerImpl(SensorEventListener listener, Sensor sensor, + int delay, Handler handler); /** * <p> @@ -1653,228 +1115,11 @@ public class SensorManager * @param p atmospheric pressure * @return Altitude in meters */ - public static float getAltitude(float p0, float p) { + public static float getAltitude(float p0, float p) { final float coef = 1.0f / 5.255f; return 44330.0f * (1.0f - (float)Math.pow(p/p0, coef)); } - - /** - * {@hide} - */ - public void onRotationChanged(int rotation) { - synchronized(sListeners) { - sRotation = rotation; - } - } - - static int getRotation() { - synchronized(sListeners) { - return sRotation; - } - } - - private class LegacyListener implements SensorEventListener { - private float mValues[] = new float[6]; - @SuppressWarnings("deprecation") - private SensorListener mTarget; - private int mSensors; - private final LmsFilter mYawfilter = new LmsFilter(); - - @SuppressWarnings("deprecation") - LegacyListener(SensorListener target) { - mTarget = target; - mSensors = 0; - } - - void registerSensor(int legacyType) { - mSensors |= legacyType; - } - - boolean unregisterSensor(int legacyType) { - mSensors &= ~legacyType; - int mask = SENSOR_ORIENTATION|SENSOR_ORIENTATION_RAW; - if (((legacyType&mask)!=0) && ((mSensors&mask)!=0)) { - return false; - } - return true; - } - - @SuppressWarnings("deprecation") - public void onAccuracyChanged(Sensor sensor, int accuracy) { - try { - mTarget.onAccuracyChanged(sensor.getLegacyType(), accuracy); - } catch (AbstractMethodError e) { - // old app that doesn't implement this method - // just ignore it. - } - } - - @SuppressWarnings("deprecation") - public void onSensorChanged(SensorEvent event) { - final float v[] = mValues; - v[0] = event.values[0]; - v[1] = event.values[1]; - v[2] = event.values[2]; - int legacyType = event.sensor.getLegacyType(); - mapSensorDataToWindow(legacyType, v, SensorManager.getRotation()); - if (event.sensor.getType() == Sensor.TYPE_ORIENTATION) { - if ((mSensors & SENSOR_ORIENTATION_RAW)!=0) { - mTarget.onSensorChanged(SENSOR_ORIENTATION_RAW, v); - } - if ((mSensors & SENSOR_ORIENTATION)!=0) { - v[0] = mYawfilter.filter(event.timestamp, v[0]); - mTarget.onSensorChanged(SENSOR_ORIENTATION, v); - } - } else { - mTarget.onSensorChanged(legacyType, v); - } - } - - /* - * Helper function to convert the specified sensor's data to the windows's - * coordinate space from the device's coordinate space. - * - * output: 3,4,5: values in the old API format - * 0,1,2: transformed values in the old API format - * - */ - private void mapSensorDataToWindow(int sensor, - float[] values, int orientation) { - float x = values[0]; - float y = values[1]; - float z = values[2]; - - switch (sensor) { - case SensorManager.SENSOR_ORIENTATION: - case SensorManager.SENSOR_ORIENTATION_RAW: - z = -z; - break; - case SensorManager.SENSOR_ACCELEROMETER: - x = -x; - y = -y; - z = -z; - break; - case SensorManager.SENSOR_MAGNETIC_FIELD: - x = -x; - y = -y; - break; - } - values[0] = x; - values[1] = y; - values[2] = z; - values[3] = x; - values[4] = y; - values[5] = z; - - if ((orientation & Surface.ROTATION_90) != 0) { - // handles 90 and 270 rotation - switch (sensor) { - case SENSOR_ACCELEROMETER: - case SENSOR_MAGNETIC_FIELD: - values[0] =-y; - values[1] = x; - values[2] = z; - break; - case SENSOR_ORIENTATION: - case SENSOR_ORIENTATION_RAW: - values[0] = x + ((x < 270) ? 90 : -270); - values[1] = z; - values[2] = y; - break; - } - } - if ((orientation & Surface.ROTATION_180) != 0) { - x = values[0]; - y = values[1]; - z = values[2]; - // handles 180 (flip) and 270 (flip + 90) rotation - switch (sensor) { - case SENSOR_ACCELEROMETER: - case SENSOR_MAGNETIC_FIELD: - values[0] =-x; - values[1] =-y; - values[2] = z; - break; - case SENSOR_ORIENTATION: - case SENSOR_ORIENTATION_RAW: - values[0] = (x >= 180) ? (x - 180) : (x + 180); - values[1] =-y; - values[2] =-z; - break; - } - } - } - } - - class LmsFilter { - private static final int SENSORS_RATE_MS = 20; - private static final int COUNT = 12; - private static final float PREDICTION_RATIO = 1.0f/3.0f; - private static final float PREDICTION_TIME = (SENSORS_RATE_MS*COUNT/1000.0f)*PREDICTION_RATIO; - private float mV[] = new float[COUNT*2]; - private float mT[] = new float[COUNT*2]; - private int mIndex; - - public LmsFilter() { - mIndex = COUNT; - } - - public float filter(long time, float in) { - float v = in; - final float ns = 1.0f / 1000000000.0f; - final float t = time*ns; - float v1 = mV[mIndex]; - if ((v-v1) > 180) { - v -= 360; - } else if ((v1-v) > 180) { - v += 360; - } - /* Manage the circular buffer, we write the data twice spaced - * by COUNT values, so that we don't have to copy the array - * when it's full - */ - mIndex++; - if (mIndex >= COUNT*2) - mIndex = COUNT; - mV[mIndex] = v; - mT[mIndex] = t; - mV[mIndex-COUNT] = v; - mT[mIndex-COUNT] = t; - - float A, B, C, D, E; - float a, b; - int i; - - A = B = C = D = E = 0; - for (i=0 ; i<COUNT-1 ; i++) { - final int j = mIndex - 1 - i; - final float Z = mV[j]; - final float T = 0.5f*(mT[j] + mT[j+1]) - t; - float dT = mT[j] - mT[j+1]; - dT *= dT; - A += Z*dT; - B += T*(T*dT); - C += (T*dT); - D += Z*(T*dT); - E += dT; - } - b = (A*B + C*D) / (E*B + C*C); - a = (E*b - A) / C; - float f = b + PREDICTION_TIME*a; - - // Normalize - f *= (1.0f / 360.0f); - if (((f>=0)?f:-f) >= 0.5f) - f = f - (float)Math.ceil(f + 0.5f) + 1.0f; - if (f < 0) - f += 1.0f; - f *= 360.0f; - return f; - } - } - - /** Helper function to compute the angle change between two rotation matrices. * Given a current rotation matrix (R) and a previous rotation matrix * (prevR) computes the rotation around the x,y, and z axes which @@ -2060,14 +1305,66 @@ public class SensorManager Q[3] = rv[2]; } - private static native void nativeClassInit(); + private LegacySensorManager getLegacySensorManager() { + synchronized (mSensorListByType) { + if (mLegacySensorManager == null) { + Log.i(TAG, "This application is using deprecated SensorManager API which will " + + "be removed someday. Please consider switching to the new API."); + mLegacySensorManager = new LegacySensorManager(this); + } + return mLegacySensorManager; + } + } + + /** + * Sensor event pool implementation. + * @hide + */ + protected static final class SensorEventPool { + private final int mPoolSize; + private final SensorEvent mPool[]; + private int mNumItemsInPool; + + private SensorEvent createSensorEvent() { + // maximal size for all legacy events is 3 + return new SensorEvent(3); + } + + SensorEventPool(int poolSize) { + mPoolSize = poolSize; + mNumItemsInPool = poolSize; + mPool = new SensorEvent[poolSize]; + } - private static native int sensors_module_init(); - private static native int sensors_module_get_next_sensor(Sensor sensor, int next); + SensorEvent getFromPool() { + SensorEvent t = null; + synchronized (this) { + if (mNumItemsInPool > 0) { + // remove the "top" item from the pool + final int index = mPoolSize - mNumItemsInPool; + t = mPool[index]; + mPool[index] = null; + mNumItemsInPool--; + } + } + if (t == null) { + // the pool was empty or this item was removed from the pool for + // the first time. In any case, we need to create a new item. + t = createSensorEvent(); + } + return t; + } - // Used within this module from outside SensorManager, don't make private - static native int sensors_create_queue(); - static native void sensors_destroy_queue(int queue); - static native boolean sensors_enable_sensor(int queue, String name, int sensor, int enable); - static native int sensors_data_poll(int queue, float[] values, int[] status, long[] timestamp); + void returnToPool(SensorEvent t) { + synchronized (this) { + // is there space left in the pool? + if (mNumItemsInPool < mPoolSize) { + // if so, return the item to the pool + mNumItemsInPool++; + final int index = mPoolSize - mNumItemsInPool; + mPool[index] = t; + } + } + } + } } diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java new file mode 100644 index 0000000..0204e94 --- /dev/null +++ b/core/java/android/hardware/SystemSensorManager.java @@ -0,0 +1,398 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.hardware; + +import android.os.Looper; +import android.os.Process; +import android.os.Handler; +import android.os.Message; +import android.util.Log; +import android.util.SparseArray; +import android.util.SparseBooleanArray; +import android.util.SparseIntArray; + +import java.util.ArrayList; +import java.util.List; + +/** + * Sensor manager implementation that communicates with the built-in + * system sensors. + * + * @hide + */ +public class SystemSensorManager extends SensorManager { + private static final int SENSOR_DISABLE = -1; + private static boolean sSensorModuleInitialized = false; + private static ArrayList<Sensor> sFullSensorsList = new ArrayList<Sensor>(); + /* The thread and the sensor list are global to the process + * but the actual thread is spawned on demand */ + private static SensorThread sSensorThread; + private static int sQueue; + + // Used within this module from outside SensorManager, don't make private + static SparseArray<Sensor> sHandleToSensor = new SparseArray<Sensor>(); + static final ArrayList<ListenerDelegate> sListeners = + new ArrayList<ListenerDelegate>(); + + // Common pool of sensor events. + static SensorEventPool sPool; + + // Looper associated with the context in which this instance was created. + final Looper mMainLooper; + + /*-----------------------------------------------------------------------*/ + + static private class SensorThread { + + Thread mThread; + boolean mSensorsReady; + + SensorThread() { + } + + @Override + protected void finalize() { + } + + // must be called with sListeners lock + boolean startLocked() { + try { + if (mThread == null) { + mSensorsReady = false; + SensorThreadRunnable runnable = new SensorThreadRunnable(); + Thread thread = new Thread(runnable, SensorThread.class.getName()); + thread.start(); + synchronized (runnable) { + while (mSensorsReady == false) { + runnable.wait(); + } + } + mThread = thread; + } + } catch (InterruptedException e) { + } + return mThread == null ? false : true; + } + + private class SensorThreadRunnable implements Runnable { + SensorThreadRunnable() { + } + + private boolean open() { + // NOTE: this cannot synchronize on sListeners, since + // it's held in the main thread at least until we + // return from here. + sQueue = sensors_create_queue(); + return true; + } + + public void run() { + //Log.d(TAG, "entering main sensor thread"); + final float[] values = new float[3]; + final int[] status = new int[1]; + final long timestamp[] = new long[1]; + Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_DISPLAY); + + if (!open()) { + return; + } + + synchronized (this) { + // we've open the driver, we're ready to open the sensors + mSensorsReady = true; + this.notify(); + } + + while (true) { + // wait for an event + final int sensor = sensors_data_poll(sQueue, values, status, timestamp); + + int accuracy = status[0]; + synchronized (sListeners) { + if (sensor == -1 || sListeners.isEmpty()) { + // we lost the connection to the event stream. this happens + // when the last listener is removed or if there is an error + if (sensor == -1 && !sListeners.isEmpty()) { + // log a warning in case of abnormal termination + Log.e(TAG, "_sensors_data_poll() failed, we bail out: sensors=" + sensor); + } + // we have no more listeners or polling failed, terminate the thread + sensors_destroy_queue(sQueue); + sQueue = 0; + mThread = null; + break; + } + final Sensor sensorObject = sHandleToSensor.get(sensor); + if (sensorObject != null) { + // report the sensor event to all listeners that + // care about it. + final int size = sListeners.size(); + for (int i=0 ; i<size ; i++) { + ListenerDelegate listener = sListeners.get(i); + if (listener.hasSensor(sensorObject)) { + // this is asynchronous (okay to call + // with sListeners lock held). + listener.onSensorChangedLocked(sensorObject, + values, timestamp, accuracy); + } + } + } + } + } + //Log.d(TAG, "exiting main sensor thread"); + } + } + } + + /*-----------------------------------------------------------------------*/ + + private class ListenerDelegate { + private final SensorEventListener mSensorEventListener; + private final ArrayList<Sensor> mSensorList = new ArrayList<Sensor>(); + private final Handler mHandler; + public SparseBooleanArray mSensors = new SparseBooleanArray(); + public SparseBooleanArray mFirstEvent = new SparseBooleanArray(); + public SparseIntArray mSensorAccuracies = new SparseIntArray(); + + ListenerDelegate(SensorEventListener listener, Sensor sensor, Handler handler) { + mSensorEventListener = listener; + Looper looper = (handler != null) ? handler.getLooper() : mMainLooper; + // currently we create one Handler instance per listener, but we could + // have one per looper (we'd need to pass the ListenerDelegate + // instance to handleMessage and keep track of them separately). + mHandler = new Handler(looper) { + @Override + public void handleMessage(Message msg) { + final SensorEvent t = (SensorEvent)msg.obj; + final int handle = t.sensor.getHandle(); + + switch (t.sensor.getType()) { + // Only report accuracy for sensors that support it. + case Sensor.TYPE_MAGNETIC_FIELD: + case Sensor.TYPE_ORIENTATION: + // call onAccuracyChanged() only if the value changes + final int accuracy = mSensorAccuracies.get(handle); + if ((t.accuracy >= 0) && (accuracy != t.accuracy)) { + mSensorAccuracies.put(handle, t.accuracy); + mSensorEventListener.onAccuracyChanged(t.sensor, t.accuracy); + } + break; + default: + // For other sensors, just report the accuracy once + if (mFirstEvent.get(handle) == false) { + mFirstEvent.put(handle, true); + mSensorEventListener.onAccuracyChanged( + t.sensor, SENSOR_STATUS_ACCURACY_HIGH); + } + break; + } + + mSensorEventListener.onSensorChanged(t); + sPool.returnToPool(t); + } + }; + addSensor(sensor); + } + + Object getListener() { + return mSensorEventListener; + } + + void addSensor(Sensor sensor) { + mSensors.put(sensor.getHandle(), true); + mSensorList.add(sensor); + } + int removeSensor(Sensor sensor) { + mSensors.delete(sensor.getHandle()); + mSensorList.remove(sensor); + return mSensors.size(); + } + boolean hasSensor(Sensor sensor) { + return mSensors.get(sensor.getHandle()); + } + List<Sensor> getSensors() { + return mSensorList; + } + + void onSensorChangedLocked(Sensor sensor, float[] values, long[] timestamp, int accuracy) { + SensorEvent t = sPool.getFromPool(); + final float[] v = t.values; + v[0] = values[0]; + v[1] = values[1]; + v[2] = values[2]; + t.timestamp = timestamp[0]; + t.accuracy = accuracy; + t.sensor = sensor; + Message msg = Message.obtain(); + msg.what = 0; + msg.obj = t; + msg.setAsynchronous(true); + mHandler.sendMessage(msg); + } + } + + /** + * {@hide} + */ + public SystemSensorManager(Looper mainLooper) { + mMainLooper = mainLooper; + + synchronized(sListeners) { + if (!sSensorModuleInitialized) { + sSensorModuleInitialized = true; + + nativeClassInit(); + + // initialize the sensor list + sensors_module_init(); + final ArrayList<Sensor> fullList = sFullSensorsList; + int i = 0; + do { + Sensor sensor = new Sensor(); + i = sensors_module_get_next_sensor(sensor, i); + + if (i>=0) { + //Log.d(TAG, "found sensor: " + sensor.getName() + + // ", handle=" + sensor.getHandle()); + fullList.add(sensor); + sHandleToSensor.append(sensor.getHandle(), sensor); + } + } while (i>0); + + sPool = new SensorEventPool( sFullSensorsList.size()*2 ); + sSensorThread = new SensorThread(); + } + } + } + + /** @hide */ + @Override + protected List<Sensor> getFullSensorList() { + return sFullSensorsList; + } + + private boolean enableSensorLocked(Sensor sensor, int delay) { + boolean result = false; + for (ListenerDelegate i : sListeners) { + if (i.hasSensor(sensor)) { + String name = sensor.getName(); + int handle = sensor.getHandle(); + result = sensors_enable_sensor(sQueue, name, handle, delay); + break; + } + } + return result; + } + + private boolean disableSensorLocked(Sensor sensor) { + for (ListenerDelegate i : sListeners) { + if (i.hasSensor(sensor)) { + // not an error, it's just that this sensor is still in use + return true; + } + } + String name = sensor.getName(); + int handle = sensor.getHandle(); + return sensors_enable_sensor(sQueue, name, handle, SENSOR_DISABLE); + } + + /** @hide */ + @Override + protected boolean registerListenerImpl(SensorEventListener listener, Sensor sensor, + int delay, Handler handler) { + boolean result = true; + synchronized (sListeners) { + // look for this listener in our list + ListenerDelegate l = null; + for (ListenerDelegate i : sListeners) { + if (i.getListener() == listener) { + l = i; + break; + } + } + + // if we don't find it, add it to the list + if (l == null) { + l = new ListenerDelegate(listener, sensor, handler); + sListeners.add(l); + // if the list is not empty, start our main thread + if (!sListeners.isEmpty()) { + if (sSensorThread.startLocked()) { + if (!enableSensorLocked(sensor, delay)) { + // oops. there was an error + sListeners.remove(l); + result = false; + } + } else { + // there was an error, remove the listener + sListeners.remove(l); + result = false; + } + } else { + // weird, we couldn't add the listener + result = false; + } + } else if (!l.hasSensor(sensor)) { + l.addSensor(sensor); + if (!enableSensorLocked(sensor, delay)) { + // oops. there was an error + l.removeSensor(sensor); + result = false; + } + } + } + + return result; + } + + /** @hide */ + @Override + protected void unregisterListenerImpl(SensorEventListener listener, Sensor sensor) { + synchronized (sListeners) { + final int size = sListeners.size(); + for (int i=0 ; i<size ; i++) { + ListenerDelegate l = sListeners.get(i); + if (l.getListener() == listener) { + if (sensor == null) { + sListeners.remove(i); + // disable all sensors for this listener + for (Sensor s : l.getSensors()) { + disableSensorLocked(s); + } + } else if (l.removeSensor(sensor) == 0) { + // if we have no more sensors enabled on this listener, + // take it off the list. + sListeners.remove(i); + disableSensorLocked(sensor); + } + break; + } + } + } + } + + private static native void nativeClassInit(); + + private static native int sensors_module_init(); + private static native int sensors_module_get_next_sensor(Sensor sensor, int next); + + // Used within this module from outside SensorManager, don't make private + static native int sensors_create_queue(); + static native void sensors_destroy_queue(int queue); + static native boolean sensors_enable_sensor(int queue, String name, int sensor, int enable); + static native int sensors_data_poll(int queue, float[] values, int[] status, long[] timestamp); +} diff --git a/core/java/android/net/nsd/DnsSdServiceInfo.java b/core/java/android/net/nsd/DnsSdServiceInfo.java index 33c3eb9..66abd3a 100644 --- a/core/java/android/net/nsd/DnsSdServiceInfo.java +++ b/core/java/android/net/nsd/DnsSdServiceInfo.java @@ -22,8 +22,8 @@ import android.os.Parcel; import java.net.InetAddress; /** - * Defines a service based on DNS service discovery - * {@hide} + * A class representing service information for network service discovery + * {@see NsdManager} */ public class DnsSdServiceInfo implements NetworkServiceInfo, Parcelable { @@ -40,56 +40,63 @@ public class DnsSdServiceInfo implements NetworkServiceInfo, Parcelable { public DnsSdServiceInfo() { } + /** @hide */ public DnsSdServiceInfo(String sn, String rt, DnsSdTxtRecord tr) { mServiceName = sn; mServiceType = rt; mTxtRecord = tr; } + /** Get the service name */ @Override - /** @hide */ public String getServiceName() { return mServiceName; } + /** Set the service name */ @Override - /** @hide */ public void setServiceName(String s) { mServiceName = s; } + /** Get the service type */ @Override - /** @hide */ public String getServiceType() { return mServiceType; } + /** Set the service type */ @Override - /** @hide */ public void setServiceType(String s) { mServiceType = s; } + /** @hide */ public DnsSdTxtRecord getTxtRecord() { return mTxtRecord; } + /** @hide */ public void setTxtRecord(DnsSdTxtRecord t) { mTxtRecord = new DnsSdTxtRecord(t); } + /** Get the host address. The host address is valid for a resolved service. */ public InetAddress getHost() { return mHost; } + /** Set the host address */ public void setHost(InetAddress s) { mHost = s; } + /** Get port number. The port number is valid for a resolved service. */ public int getPort() { return mPort; } + /** Set port number */ public void setPort(int p) { mPort = p; } @@ -147,5 +154,4 @@ public class DnsSdServiceInfo implements NetworkServiceInfo, Parcelable { return new DnsSdServiceInfo[size]; } }; - } diff --git a/core/java/android/net/nsd/DnsSdTxtRecord.java b/core/java/android/net/nsd/DnsSdTxtRecord.java index 952e02f..ccb9a91 100644 --- a/core/java/android/net/nsd/DnsSdTxtRecord.java +++ b/core/java/android/net/nsd/DnsSdTxtRecord.java @@ -37,7 +37,6 @@ import java.util.Arrays; * The DnsSdTxtRecord object stores the entire TXT data as a single byte array, traversing it * as need be to implement its various methods. * - * @hide */ public class DnsSdTxtRecord implements Parcelable { private static final byte mSeperator = '='; diff --git a/core/java/android/net/nsd/NsdManager.java b/core/java/android/net/nsd/NsdManager.java index 505f11b..dac8d20 100644 --- a/core/java/android/net/nsd/NsdManager.java +++ b/core/java/android/net/nsd/NsdManager.java @@ -24,29 +24,110 @@ import android.os.Looper; import android.os.Message; import android.os.RemoteException; import android.os.Messenger; +import android.text.TextUtils; import android.util.Log; import com.android.internal.util.AsyncChannel; import com.android.internal.util.Protocol; /** - * The Network Service Discovery Manager class provides the API for service - * discovery. Service discovery enables applications to discover and connect with services - * on a network. Example applications include a game application discovering another instance - * of the game application or a printer application discovering other printers on a network. + * The Network Service Discovery Manager class provides the API to discover services + * on a network. As an example, if device A and device B are connected over a Wi-Fi + * network, a game registered on device A can be discovered by a game on device + * B. Another example use case is an application discovering printers on the network. + * + * <p> The API currently supports DNS based service discovery and discovery is currently + * limited to a local network over Multicast DNS. In future, it will be extended to + * support wide area discovery and other service discovery mechanisms. + * DNS service discovery is described at http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt * * <p> The API is asynchronous and responses to requests from an application are on listener - * callbacks provided by the application. The application needs to do an initialization with - * {@link #initialize} before doing any operation. + * callbacks provided by the application. The application must invoke {@link #initialize} before + * doing any other operation. + * + * <p> There are three main operations the API supports - registration, discovery and resolution. + * <pre> + * Application start + * | + * | <---------------------------------------------- + * initialize() | + * | | + * | Wait until channel connects | + * | before doing any operation | + * | | + * onChannelConnected() __________ | + * | | | + * | | | + * | onServiceRegistered() | | + * Register any local services / | | + * to be advertised with \ | | If application needs to + * registerService() onFailure() | | do any further operations + * | | | again, it needs to + * | | | initialize() connection + * discoverServices() | | to framework again + * | | | + * Maintain a list to track | | + * discovered services | | + * | | | + * |---------> |-> onChannelDisconnected() + * | | | + * | onServiceFound() | + * | | | + * | add service to list | + * | | | + * |<---------- | + * | | + * |---------> | + * | | | + * | onServiceLost() | + * | | | + * | remove service from list | + * | | | + * |<---------- | + * | | + * | | + * | Connect to a service | + * | from list ? | + * | | + * resolveService() | + * | | + * onServiceResolved() | + * | | + * Establish connection to service | + * with the host and port information | + * | | + * | ___________| + * deinitialize() + * when done with all operations + * or before quit + * + * </pre> + * An application that needs to advertise itself over a network for other applications to + * discover it can do so with a call to {@link #registerService}. If Example is a http based + * application that can provide HTML data to peer services, it can register a name "Example" + * with service type "_http._tcp". A successful registration is notified with a callback to + * {@link DnsSdRegisterListener#onServiceRegistered} and a failure to register is notified + * over {@link DnsSdRegisterListener#onFailure} + * + * <p> A peer application looking for http services can initiate a discovery for "_http._tcp" + * with a call to {@link #discoverServices}. A service found is notified with a callback + * to {@link DnsSdDiscoveryListener#onServiceFound} and a service lost is notified on + * {@link DnsSdDiscoveryListener#onServiceLost}. + * + * <p> Once the peer application discovers the "Example" http srevice, and needs to receive data + * from the "Example" application, it can initiate a resolve with {@link #resolveService} to + * resolve the host and port details for the purpose of establishing a connection. A successful + * resolve is notified on {@link DnsSdResolveListener#onServiceResolved} and a failure is notified + * on {@link DnsSdResolveListener#onFailure}. * - * <p> Android currently supports DNS based service discovery and it is limited to a local - * network with the use of multicast DNS. In future, this class will be - * extended to support other service discovery mechanisms. + * Applications can reserve for a service type at + * http://www.iana.org/form/ports-service. Existing services can be found at + * http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml * * Get an instance of this class by calling {@link android.content.Context#getSystemService(String) * Context.getSystemService(Context.NSD_SERVICE)}. - * @hide * + * {@see DnsSdServiceInfo} */ public class NsdManager { private static final String TAG = "NsdManager"; @@ -80,27 +161,32 @@ public class NsdManager { public static final int REGISTER_SERVICE_SUCCEEDED = BASE + 11; /** @hide */ - public static final int UPDATE_SERVICE = BASE + 12; + public static final int UNREGISTER_SERVICE = BASE + 12; /** @hide */ - public static final int UPDATE_SERVICE_FAILED = BASE + 13; + public static final int UNREGISTER_SERVICE_FAILED = BASE + 13; /** @hide */ - public static final int UPDATE_SERVICE_SUCCEEDED = BASE + 14; + public static final int UNREGISTER_SERVICE_SUCCEEDED = BASE + 14; /** @hide */ - public static final int RESOLVE_SERVICE = BASE + 15; + public static final int UPDATE_SERVICE = BASE + 15; /** @hide */ - public static final int RESOLVE_SERVICE_FAILED = BASE + 16; + public static final int UPDATE_SERVICE_FAILED = BASE + 16; /** @hide */ - public static final int RESOLVE_SERVICE_SUCCEEDED = BASE + 17; + public static final int UPDATE_SERVICE_SUCCEEDED = BASE + 17; /** @hide */ - public static final int STOP_RESOLVE = BASE + 18; + public static final int RESOLVE_SERVICE = BASE + 18; /** @hide */ - public static final int STOP_RESOLVE_FAILED = BASE + 19; + public static final int RESOLVE_SERVICE_FAILED = BASE + 19; /** @hide */ - public static final int STOP_RESOLVE_SUCCEEDED = BASE + 20; - + public static final int RESOLVE_SERVICE_SUCCEEDED = BASE + 20; + /** @hide */ + public static final int STOP_RESOLVE = BASE + 21; + /** @hide */ + public static final int STOP_RESOLVE_FAILED = BASE + 22; + /** @hide */ + public static final int STOP_RESOLVE_SUCCEEDED = BASE + 23; /** * Create a new Nsd instance. Applications use @@ -115,36 +201,44 @@ public class NsdManager { } /** + * Passed with onFailure() calls. * Indicates that the operation failed due to an internal error. */ public static final int ERROR = 0; /** - * Indicates that the operation failed because service discovery is unsupported on the device. + * Passed with onFailure() calls. + * Indicates that the operation failed because service discovery + * is unsupported on the device. */ public static final int UNSUPPORTED = 1; /** - * Indicates that the operation failed because the framework is busy and - * unable to service the request. + * Passed with onFailure() calls. + * Indicates that the operation failed because the framework is + * busy and unable to service the request. */ public static final int BUSY = 2; /** + * Passed with onFailure() calls. * Indicates that the operation failed because it is already active. */ public static final int ALREADY_ACTIVE = 3; /** + * Passed with onFailure() calls. * Indicates that the operation failed because maximum limit on * service registrations has reached. */ public static final int MAX_REGS_REACHED = 4; - - /** Interface for callback invocation when framework channel is connected or lost */ public interface ChannelListener { + /** + * The channel to the framework is connected. + * Application can initiate calls into the framework using the channel instance passed. + */ public void onChannelConnected(Channel c); /** * The channel to the framework has been disconnected. @@ -153,6 +247,7 @@ public class NsdManager { public void onChannelDisconnected(); } + /** Generic interface for callback invocation for a success or failure */ public interface ActionListener { public void onFailure(int errorCode); @@ -160,11 +255,12 @@ public class NsdManager { public void onSuccess(); } + /** Interface for callback invocation for service discovery */ public interface DnsSdDiscoveryListener { public void onFailure(int errorCode); - public void onStarted(String registrationType); + public void onStarted(String serviceType); public void onServiceFound(DnsSdServiceInfo serviceInfo); @@ -172,6 +268,7 @@ public class NsdManager { } + /** Interface for callback invocation for service registration */ public interface DnsSdRegisterListener { public void onFailure(int errorCode); @@ -179,6 +276,7 @@ public class NsdManager { public void onServiceRegistered(int registeredId, DnsSdServiceInfo serviceInfo); } + /** @hide */ public interface DnsSdUpdateRegistrationListener { public void onFailure(int errorCode); @@ -186,6 +284,7 @@ public class NsdManager { public void onServiceUpdated(int registeredId, DnsSdTxtRecord txtRecord); } + /** Interface for callback invocation for service resolution */ public interface DnsSdResolveListener { public void onFailure(int errorCode); @@ -208,6 +307,7 @@ public class NsdManager { private DnsSdDiscoveryListener mDnsSdDiscoveryListener; private ActionListener mDnsSdStopDiscoveryListener; private DnsSdRegisterListener mDnsSdRegisterListener; + private ActionListener mDnsSdUnregisterListener; private DnsSdUpdateRegistrationListener mDnsSdUpdateListener; private DnsSdResolveListener mDnsSdResolveListener; private ActionListener mDnsSdStopResolveListener; @@ -279,7 +379,17 @@ public class NsdManager { (DnsSdServiceInfo) message.obj); } break; - case UPDATE_SERVICE_FAILED: + case UNREGISTER_SERVICE_FAILED: + if (mDnsSdUnregisterListener != null) { + mDnsSdUnregisterListener.onFailure(message.arg1); + } + break; + case UNREGISTER_SERVICE_SUCCEEDED: + if (mDnsSdUnregisterListener != null) { + mDnsSdUnregisterListener.onSuccess(); + } + break; + case UPDATE_SERVICE_FAILED: if (mDnsSdUpdateListener != null) { mDnsSdUpdateListener.onFailure(message.arg1); } @@ -319,6 +429,10 @@ public class NsdManager { } } + private static void checkChannel(Channel c) { + if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); + } + /** * Registers the application with the service discovery framework. This function * must be the first to be called before any other operations are performed. No service @@ -327,7 +441,7 @@ public class NsdManager { * * @param srcContext is the context of the source * @param srcLooper is the Looper on which the callbacks are receivied - * @param listener for callback at loss of framework communication. + * @param listener for callback at loss of framework communication. Cannot be null. */ public void initialize(Context srcContext, Looper srcLooper, ChannelListener listener) { Messenger messenger = getMessenger(); @@ -339,88 +453,142 @@ public class NsdManager { } /** - * Set the listener for service discovery. Can be null. - */ - public void setDiscoveryListener(Channel c, DnsSdDiscoveryListener b) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); - c.mDnsSdDiscoveryListener = b; - } - - /** - * Set the listener for stop service discovery. Can be null. - */ - public void setStopDiscoveryListener(Channel c, ActionListener a) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); - c.mDnsSdStopDiscoveryListener = a; - } - - /** - * Set the listener for service registration. Can be null. - */ - public void setRegisterListener(Channel c, DnsSdRegisterListener b) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); - c.mDnsSdRegisterListener = b; - } - - /** - * Set the listener for service registration. Can be null. + * Disconnects application from service discovery framework. No further operations + * will succeed until a {@link #initialize} is called again. + * + * @param c channel initialized with {@link #initialize} */ - public void setUpdateRegistrationListener(Channel c, DnsSdUpdateRegistrationListener b) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); - c.mDnsSdUpdateListener = b; + public void deinitialize(Channel c) { + checkChannel(c); + c.mAsyncChannel.disconnect(); } /** - * Set the listener for service resolution. Can be null. + * Register a service to be discovered by other services. + * + * <p> The function call immediately returns after sending a request to register service + * to the framework. The application is notified of a success to initiate + * discovery through the callback {@link DnsSdRegisterListener#onServiceRegistered} or a failure + * through {@link DnsSdRegisterListener#onFailure}. + * + * @param c is the channel created at {@link #initialize} + * @param serviceType The service type being advertised. + * @param port on which the service is listenering for incoming connections + * @param listener for success or failure callback. Can be null. */ - public void setResolveListener(Channel c, DnsSdResolveListener b) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); - c.mDnsSdResolveListener = b; + public void registerService(Channel c, String serviceName, String serviceType, int port, + DnsSdRegisterListener listener) { + checkChannel(c); + if (TextUtils.isEmpty(serviceName) || TextUtils.isEmpty(serviceType)) { + throw new IllegalArgumentException("Service name or type cannot be empty"); + } + if (port <= 0) { + throw new IllegalArgumentException("Invalid port number"); + } + DnsSdServiceInfo serviceInfo = new DnsSdServiceInfo(serviceName, serviceType, null); + serviceInfo.setPort(port); + c.mDnsSdRegisterListener = listener; + c.mAsyncChannel.sendMessage(REGISTER_SERVICE, serviceInfo); } /** - * Set the listener for stopping service resolution. Can be null. + * Unregister a service registered through {@link #registerService} + * @param c is the channel created at {@link #initialize} + * @param registeredId is obtained at {@link DnsSdRegisterListener#onServiceRegistered} + * @param listener provides callbacks for success or failure. Can be null. */ - public void setStopResolveListener(Channel c, ActionListener b) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); - c.mDnsSdStopResolveListener = b; - } - - public void registerService(Channel c, DnsSdServiceInfo serviceInfo) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); - if (serviceInfo == null) throw new IllegalArgumentException("Null serviceInfo"); - c.mAsyncChannel.sendMessage(REGISTER_SERVICE, serviceInfo); + public void unregisterService(Channel c, int registeredId, ActionListener listener) { + checkChannel(c); + c.mDnsSdUnregisterListener = listener; + c.mAsyncChannel.sendMessage(UNREGISTER_SERVICE, registeredId); } + /** @hide */ public void updateService(Channel c, int registeredId, DnsSdTxtRecord txtRecord) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); + checkChannel(c); c.mAsyncChannel.sendMessage(UPDATE_SERVICE, registeredId, 0, txtRecord); } - public void discoverServices(Channel c, String serviceType) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); - if (c.mDnsSdDiscoveryListener == null) throw new - IllegalStateException("Discovery listener needs to be set first"); + /** + * Initiate service discovery to browse for instances of a service type. Service discovery + * consumes network bandwidth and will continue until the application calls + * {@link #stopServiceDiscovery}. + * + * <p> The function call immediately returns after sending a request to start service + * discovery to the framework. The application is notified of a success to initiate + * discovery through the callback {@link DnsSdDiscoveryListener#onStarted} or a failure + * through {@link DnsSdDiscoveryListener#onFailure}. + * + * <p> Upon successful start, application is notified when a service is found with + * {@link DnsSdDiscoveryListener#onServiceFound} or when a service is lost with + * {@link DnsSdDiscoveryListener#onServiceLost}. + * + * <p> Upon failure to start, service discovery is not active and application does + * not need to invoke {@link #stopServiceDiscovery} + * + * @param c is the channel created at {@link #initialize} + * @param serviceType The service type being discovered. Examples include "_http._tcp" for + * http services or "_ipp._tcp" for printers + * @param listener provides callbacks when service is found or lost. Cannot be null. + */ + public void discoverServices(Channel c, String serviceType, DnsSdDiscoveryListener listener) { + checkChannel(c); + if (listener == null) { + throw new IllegalStateException("Discovery listener needs to be set first"); + } + if (TextUtils.isEmpty(serviceType)) { + throw new IllegalStateException("Service type cannot be empty"); + } DnsSdServiceInfo s = new DnsSdServiceInfo(); s.setServiceType(serviceType); + c.mDnsSdDiscoveryListener = listener; c.mAsyncChannel.sendMessage(DISCOVER_SERVICES, s); } - public void stopServiceDiscovery(Channel c) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); + /** + * Stop service discovery initiated with {@link #discoverServices}. An active service + * discovery is notified to the application with {@link DnsSdDiscoveryListener#onStarted} + * and it stays active until the application invokes a stop service discovery. + * + * <p> Upon failure to start service discovery notified through + * {@link DnsSdDiscoveryListener#onFailure} service discovery is not active and + * application does not need to stop it. + * + * @param c is the channel created at {@link #initialize} + * @param listener notifies success or failure. Can be null. + */ + public void stopServiceDiscovery(Channel c, ActionListener listener) { + checkChannel(c); + c.mDnsSdStopDiscoveryListener = listener; c.mAsyncChannel.sendMessage(STOP_DISCOVERY); } - public void resolveService(Channel c, DnsSdServiceInfo serviceInfo) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); - if (serviceInfo == null) throw new IllegalArgumentException("Null serviceInfo"); - if (c.mDnsSdResolveListener == null) throw new - IllegalStateException("Resolve listener needs to be set first"); + /** + * Resolve a discovered service. An application can resolve a service right before + * establishing a connection to fetch the IP and port details on which to setup + * the connection. + * + * @param c is the channel created at {@link #initialize} + * @param serviceName of the the service + * @param serviceType of the service + * @param listener to receive callback upon success or failure. Cannot be null. + */ + public void resolveService(Channel c, String serviceName, String serviceType, + DnsSdResolveListener listener) { + checkChannel(c); + if (TextUtils.isEmpty(serviceName) || TextUtils.isEmpty(serviceType)) { + throw new IllegalArgumentException("Service name or type cannot be empty"); + } + if (listener == null) throw new + IllegalStateException("Resolve listener cannot be null"); + c.mDnsSdResolveListener = listener; + DnsSdServiceInfo serviceInfo = new DnsSdServiceInfo(serviceName, serviceType, null); c.mAsyncChannel.sendMessage(RESOLVE_SERVICE, serviceInfo); } + /** @hide */ public void stopServiceResolve(Channel c) { - if (c == null) throw new IllegalArgumentException("Channel needs to be initialized"); + checkChannel(c); if (c.mDnsSdResolveListener == null) throw new IllegalStateException("Resolve listener needs to be set first"); c.mAsyncChannel.sendMessage(STOP_RESOLVE); diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 20a731e..98fe06a 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -1324,4 +1324,42 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo return false; } } + + /** + * Return a String describing the calling method and location at a particular stack depth. + * @param callStack the Thread stack + * @param depth the depth of stack to return information for. + * @return the String describing the caller at that depth. + */ + private static String getCaller(StackTraceElement callStack[], int depth) { + // callStack[4] is the caller of the method that called getCallers() + if (4 + depth >= callStack.length) { + return "<bottom of call stack>"; + } + StackTraceElement caller = callStack[4 + depth]; + return caller.getClassName() + "." + caller.getMethodName() + ":" + caller.getLineNumber(); + } + + /** + * Return a string consisting of methods and locations at multiple call stack levels. + * @param depth the number of levels to return, starting with the immediate caller. + * @return a string describing the call stack. + * {@hide} + */ + public static String getCallers(final int depth) { + final StackTraceElement[] callStack = Thread.currentThread().getStackTrace(); + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < depth; i++) { + sb.append(getCaller(callStack, i)).append(" "); + } + return sb.toString(); + } + + /** + * @return a String describing the immediate caller of the calling function. + * {@hide} + */ + public static String getCaller() { + return getCaller(Thread.currentThread().getStackTrace(), 0); + } } diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index af94a37..4645fab 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -33,6 +33,7 @@ public final class Trace { public static final long TRACE_TAG_GRAPHICS = 1L << 1; public static final long TRACE_TAG_INPUT = 1L << 2; public static final long TRACE_TAG_VIEW = 1L << 3; + public static final long TRACE_TAG_WEBVIEW = 1L << 4; private static final long sEnabledTags = nativeGetEnabledTags(); diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index 83799c4..c4aa691 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -756,6 +756,22 @@ public final class CalendarContract { public static final int ATTENDEE_STATUS_DECLINED = 2; public static final int ATTENDEE_STATUS_INVITED = 3; public static final int ATTENDEE_STATUS_TENTATIVE = 4; + + /** + * The identity of the attendee as referenced in + * {@link ContactsContract.CommonDataKinds.Identity#IDENTITY}. + * This is required only if {@link #ATTENDEE_ID_NAMESPACE} is present. Column name. + * <P>Type: STRING</P> + */ + public static final String ATTENDEE_IDENTITY = "attendeeIdentity"; + + /** + * The identity name space of the attendee as referenced in + * {@link ContactsContract.CommonDataKinds.Identity#NAMESPACE}. + * This is required only if {@link #ATTENDEE_IDENTITY} is present. Column name. + * <P>Type: STRING</P> + */ + public static final String ATTENDEE_ID_NAMESPACE = "attendeeIdNamespace"; } /** @@ -773,6 +789,8 @@ public final class CalendarContract { * <li>{@link #ATTENDEE_RELATIONSHIP}</li> * <li>{@link #ATTENDEE_TYPE}</li> * <li>{@link #ATTENDEE_STATUS}</li> + * <li>{@link #ATTENDEE_IDENTITY}</li> + * <li>{@link #ATTENDEE_ID_NAMESPACE}</li> * </ul> */ public static final class Attendees implements BaseColumns, AttendeesColumns, EventsColumns { @@ -1221,12 +1239,17 @@ public final class CalendarContract { Attendees.ATTENDEE_RELATIONSHIP, Attendees.ATTENDEE_TYPE, Attendees.ATTENDEE_STATUS, + Attendees.ATTENDEE_IDENTITY, + Attendees.ATTENDEE_ID_NAMESPACE }; private static final int COLUMN_ATTENDEE_NAME = 0; private static final int COLUMN_ATTENDEE_EMAIL = 1; private static final int COLUMN_ATTENDEE_RELATIONSHIP = 2; private static final int COLUMN_ATTENDEE_TYPE = 3; private static final int COLUMN_ATTENDEE_STATUS = 4; + private static final int COLUMN_ATTENDEE_IDENTITY = 5; + private static final int COLUMN_ATTENDEE_ID_NAMESPACE = 6; + private static final String[] EXTENDED_PROJECTION = new String[] { ExtendedProperties._ID, ExtendedProperties.NAME, @@ -1362,6 +1385,10 @@ public final class CalendarContract { subCursor.getInt(COLUMN_ATTENDEE_TYPE)); attendeeValues.put(Attendees.ATTENDEE_STATUS, subCursor.getInt(COLUMN_ATTENDEE_STATUS)); + attendeeValues.put(Attendees.ATTENDEE_IDENTITY, + subCursor.getInt(COLUMN_ATTENDEE_IDENTITY)); + attendeeValues.put(Attendees.ATTENDEE_ID_NAMESPACE, + subCursor.getInt(COLUMN_ATTENDEE_ID_NAMESPACE)); entity.addSubValue(Attendees.CONTENT_URI, attendeeValues); } } finally { diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java index cd8d51f..31ad12b 100644 --- a/core/java/android/provider/Downloads.java +++ b/core/java/android/provider/Downloads.java @@ -329,6 +329,14 @@ public final class Downloads { public static final String COLUMN_IS_PUBLIC_API = "is_public_api"; /** + * The name of the column holding a bitmask of allowed network types. This is only used for + * public API downloads. + * <P>Type: INTEGER</P> + * <P>Owner can Init/Read</P> + */ + public static final String COLUMN_ALLOWED_NETWORK_TYPES = "allowed_network_types"; + + /** * The name of the column indicating whether roaming connections can be used. This is only * used for public API downloads. * <P>Type: BOOLEAN</P> @@ -337,12 +345,12 @@ public final class Downloads { public static final String COLUMN_ALLOW_ROAMING = "allow_roaming"; /** - * The name of the column holding a bitmask of allowed network types. This is only used for - * public API downloads. - * <P>Type: INTEGER</P> + * The name of the column indicating whether metered connections can be used. This is only + * used for public API downloads. + * <P>Type: BOOLEAN</P> * <P>Owner can Init/Read</P> */ - public static final String COLUMN_ALLOWED_NETWORK_TYPES = "allowed_network_types"; + public static final String COLUMN_ALLOW_METERED = "allow_metered"; /** * Whether or not this download should be displayed in the system's Downloads UI. Defaults @@ -701,7 +709,10 @@ public final class Downloads { * blocked by {@link NetworkPolicyManager}. * * @hide + * @deprecated since behavior now uses + * {@link #STATUS_WAITING_FOR_NETWORK} */ + @Deprecated public static final int STATUS_BLOCKED = 498; /** {@hide} */ diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index 850349b..36c0189 100755 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -611,6 +611,11 @@ public class BluetoothService extends IBluetooth.Stub { /*package*/ void initBluetoothAfterTurningOn() { String discoverable = getProperty("Discoverable", false); String timeout = getProperty("DiscoverableTimeout", false); + if (timeout == null) { + Log.w(TAG, "Null DiscoverableTimeout property"); + // assign a number, anything not 0 + timeout = "1"; + } if (discoverable.equals("true") && Integer.valueOf(timeout) != 0) { setAdapterPropertyBooleanNative("Discoverable", 0); } diff --git a/core/java/android/service/textservice/SpellCheckerService.java b/core/java/android/service/textservice/SpellCheckerService.java index 53ce32d..c579e6e 100644 --- a/core/java/android/service/textservice/SpellCheckerService.java +++ b/core/java/android/service/textservice/SpellCheckerService.java @@ -26,12 +26,18 @@ import android.os.Bundle; import android.os.IBinder; import android.os.Process; import android.os.RemoteException; +import android.text.TextUtils; +import android.text.method.WordIterator; import android.util.Log; import android.view.textservice.SentenceSuggestionsInfo; import android.view.textservice.SuggestionsInfo; import android.view.textservice.TextInfo; +import android.widget.SpellChecker; import java.lang.ref.WeakReference; +import java.text.BreakIterator; +import java.util.ArrayList; +import java.util.Locale; /** * SpellCheckerService provides an abstract base class for a spell checker. @@ -92,6 +98,7 @@ public abstract class SpellCheckerService extends Service { */ public static abstract class Session { private InternalISpellCheckerSession mInternalSession; + private volatile SentenceLevelAdapter mSentenceLevelAdapter; /** * @hide @@ -142,8 +149,8 @@ public abstract class SpellCheckerService extends Service { /** * Get sentence suggestions for specified texts in an array of TextInfo. - * The default implementation returns an array of SentenceSuggestionsInfo by simply - * calling onGetSuggestions. + * The default implementation splits the input text to words and returns + * {@link SentenceSuggestionsInfo} which contains suggestions for each word. * This function will run on the incoming IPC thread. * So, this is not called on the main thread, * but will be called in series on another thread. @@ -156,14 +163,41 @@ public abstract class SpellCheckerService extends Service { */ public SentenceSuggestionsInfo[] onGetSentenceSuggestionsMultiple(TextInfo[] textInfos, int suggestionsLimit) { - final int length = textInfos.length; - final SentenceSuggestionsInfo[] retval = new SentenceSuggestionsInfo[length]; - for (int i = 0; i < length; ++i) { - final SuggestionsInfo si = onGetSuggestions(textInfos[i], suggestionsLimit); - si.setCookieAndSequence(textInfos[i].getCookie(), textInfos[i].getSequence()); - final int N = textInfos[i].getText().length(); - retval[i] = new SentenceSuggestionsInfo( - new SuggestionsInfo[] {si}, new int[]{0}, new int[]{N}); + if (textInfos == null || textInfos.length == 0) { + return SentenceLevelAdapter.EMPTY_SENTENCE_SUGGESTIONS_INFOS; + } + if (DBG) { + Log.d(TAG, "onGetSentenceSuggestionsMultiple: + " + textInfos.length + ", " + + suggestionsLimit); + } + if (mSentenceLevelAdapter == null) { + synchronized(this) { + if (mSentenceLevelAdapter == null) { + final String localeStr = getLocale(); + if (!TextUtils.isEmpty(localeStr)) { + mSentenceLevelAdapter = new SentenceLevelAdapter(new Locale(localeStr)); + } + } + } + } + if (mSentenceLevelAdapter == null) { + return SentenceLevelAdapter.EMPTY_SENTENCE_SUGGESTIONS_INFOS; + } + final int infosSize = textInfos.length; + final SentenceSuggestionsInfo[] retval = new SentenceSuggestionsInfo[infosSize]; + for (int i = 0; i < infosSize; ++i) { + final SentenceLevelAdapter.SentenceTextInfoParams textInfoParams = + mSentenceLevelAdapter.getSplitWords(textInfos[i]); + final ArrayList<SentenceLevelAdapter.SentenceWordItem> mItems = + textInfoParams.mItems; + final int itemsSize = mItems.size(); + final TextInfo[] splitTextInfos = new TextInfo[itemsSize]; + for (int j = 0; j < itemsSize; ++j) { + splitTextInfos[j] = mItems.get(j).mTextInfo; + } + retval[i] = SentenceLevelAdapter.reconstructSuggestions( + textInfoParams, onGetSuggestionsMultiple( + splitTextInfos, suggestionsLimit, true)); } return retval; } @@ -290,4 +324,135 @@ public abstract class SpellCheckerService extends Service { return internalSession; } } + + /** + * Adapter class to accommodate word level spell checking APIs to sentence level spell checking + * APIs used in + * {@link SpellCheckerService.Session#onGetSuggestionsMultiple(TextInfo[], int, boolean)} + */ + private static class SentenceLevelAdapter { + public static final SentenceSuggestionsInfo[] EMPTY_SENTENCE_SUGGESTIONS_INFOS = + new SentenceSuggestionsInfo[] {}; + private static final SuggestionsInfo EMPTY_SUGGESTIONS_INFO = new SuggestionsInfo(0, null); + /** + * Container for split TextInfo parameters + */ + public static class SentenceWordItem { + public final TextInfo mTextInfo; + public final int mStart; + public final int mLength; + public SentenceWordItem(TextInfo ti, int start, int end) { + mTextInfo = ti; + mStart = start; + mLength = end - start; + } + } + + /** + * Container for originally queried TextInfo and parameters + */ + public static class SentenceTextInfoParams { + final TextInfo mOriginalTextInfo; + final ArrayList<SentenceWordItem> mItems; + final int mSize; + public SentenceTextInfoParams(TextInfo ti, ArrayList<SentenceWordItem> items) { + mOriginalTextInfo = ti; + mItems = items; + mSize = items.size(); + } + } + + private final WordIterator mWordIterator; + public SentenceLevelAdapter(Locale locale) { + mWordIterator = new WordIterator(locale); + } + + private SentenceTextInfoParams getSplitWords(TextInfo originalTextInfo) { + final WordIterator wordIterator = mWordIterator; + final CharSequence originalText = originalTextInfo.getText(); + final int cookie = originalTextInfo.getCookie(); + final int start = 0; + final int end = originalText.length(); + final ArrayList<SentenceWordItem> wordItems = new ArrayList<SentenceWordItem>(); + wordIterator.setCharSequence(originalText, 0, originalText.length()); + int wordEnd = wordIterator.following(start); + int wordStart = wordIterator.getBeginning(wordEnd); + if (DBG) { + Log.d(TAG, "iterator: break: ---- 1st word start = " + wordStart + ", end = " + + wordEnd + "\n" + originalText); + } + while (wordStart <= end && wordEnd != BreakIterator.DONE + && wordStart != BreakIterator.DONE) { + if (wordEnd >= start && wordEnd > wordStart) { + final String query = originalText.subSequence(wordStart, wordEnd).toString(); + final TextInfo ti = new TextInfo(query, cookie, query.hashCode()); + wordItems.add(new SentenceWordItem(ti, wordStart, wordEnd)); + if (DBG) { + Log.d(TAG, "Adapter: word (" + (wordItems.size() - 1) + ") " + query); + } + } + wordEnd = wordIterator.following(wordEnd); + if (wordEnd == BreakIterator.DONE) { + break; + } + wordStart = wordIterator.getBeginning(wordEnd); + } + if (originalText.length() >= SpellChecker.WORD_ITERATOR_INTERVAL + && wordItems.size() >= 2) { + if (DBG) { + Log.w(TAG, "Remove possibly divided word: " + + wordItems.get(0).mTextInfo.getText()); + } + wordItems.remove(0); + } + return new SentenceTextInfoParams(originalTextInfo, wordItems); + } + + public static SentenceSuggestionsInfo reconstructSuggestions( + SentenceTextInfoParams originalTextInfoParams, SuggestionsInfo[] results) { + if (results == null || results.length == 0) { + return null; + } + if (DBG) { + Log.w(TAG, "Adapter: onGetSuggestions: got " + results.length); + } + if (originalTextInfoParams == null) { + if (DBG) { + Log.w(TAG, "Adapter: originalTextInfoParams is null."); + } + return null; + } + final int originalCookie = originalTextInfoParams.mOriginalTextInfo.getCookie(); + final int originalSequence = + originalTextInfoParams.mOriginalTextInfo.getSequence(); + + final int querySize = originalTextInfoParams.mSize; + final int[] offsets = new int[querySize]; + final int[] lengths = new int[querySize]; + final SuggestionsInfo[] reconstructedSuggestions = new SuggestionsInfo[querySize]; + for (int i = 0; i < querySize; ++i) { + final SentenceWordItem item = originalTextInfoParams.mItems.get(i); + SuggestionsInfo result = null; + for (int j = 0; j < results.length; ++j) { + final SuggestionsInfo cur = results[j]; + if (cur != null && cur.getSequence() == item.mTextInfo.getSequence()) { + result = cur; + result.setCookieAndSequence(originalCookie, originalSequence); + break; + } + } + offsets[i] = item.mStart; + lengths[i] = item.mLength; + reconstructedSuggestions[i] = result != null ? result : EMPTY_SUGGESTIONS_INFO; + if (DBG) { + final int size = reconstructedSuggestions[i].getSuggestionsCount(); + Log.w(TAG, "reconstructedSuggestions(" + i + ")" + size + ", first = " + + (size > 0 ? reconstructedSuggestions[i].getSuggestionAt(0) + : "<none>") + ", offset = " + offsets[i] + ", length = " + + lengths[i]); + } + } + return new SentenceSuggestionsInfo(reconstructedSuggestions, offsets, lengths); + } + } } diff --git a/core/java/android/view/AccessibilityInteractionController.java b/core/java/android/view/AccessibilityInteractionController.java index ab21b32..6c1a6bf 100644 --- a/core/java/android/view/AccessibilityInteractionController.java +++ b/core/java/android/view/AccessibilityInteractionController.java @@ -602,6 +602,7 @@ final class AccessibilityInteractionController { // tree traversal. return (view.mAttachInfo != null && view.mAttachInfo.mWindowVisibility == View.VISIBLE + && view.getAlpha() > 0 && view.isShown() && view.getGlobalVisibleRect(mViewRootImpl.mTempRect)); } diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 8fe8e40..b70d7b5 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -80,6 +80,8 @@ interface IWindowManager void prepareAppTransition(int transit, boolean alwaysKeepCurrent); int getPendingAppTransition(); void overridePendingAppTransition(String packageName, int enterAnim, int exitAnim); + void overridePendingAppTransitionScaleUp(int startX, int startY, int startWidth, + int startHeight); void overridePendingAppTransitionThumb(in Bitmap srcThumb, int startX, int startY, IRemoteCallback startedCallback); void executeAppTransition(); diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index 32029ba..214dc5c 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -676,7 +676,6 @@ public class TextureView extends View { * * @param surfaceTexture The {@link SurfaceTexture} that the view should use. * @see SurfaceTexture#detachFromGLContext() - * @hide */ public void setSurfaceTexture(SurfaceTexture surfaceTexture) { if (surfaceTexture == null) { diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index d569ba1..0ded5f9 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5814,18 +5814,11 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal * * @see #FOCUSABLES_ALL * @see #FOCUSABLES_TOUCH_MODE - * @see #FOCUSABLES_ACCESSIBILITY */ public void addFocusables(ArrayList<View> views, int direction, int focusableMode) { if (views == null) { return; } - if ((focusableMode & FOCUSABLE_IN_TOUCH_MODE) == FOCUSABLE_IN_TOUCH_MODE) { - if (isFocusable() && (!isInTouchMode() || isFocusableInTouchMode())) { - views.add(this); - return; - } - } if ((focusableMode & FOCUSABLES_ACCESSIBILITY) == FOCUSABLES_ACCESSIBILITY) { if (AccessibilityManager.getInstance(mContext).isEnabled() && includeForAccessibility()) { @@ -5833,14 +5826,14 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal return; } } - if ((focusableMode & FOCUSABLES_ALL) == FOCUSABLES_ALL) { - if (isFocusable()) { - views.add(this); - return; - } - } else { - throw new IllegalArgumentException("Unknow focusable mode: " + focusableMode); + if (!isFocusable()) { + return; + } + if ((focusableMode & FOCUSABLES_TOUCH_MODE) == FOCUSABLES_TOUCH_MODE + && isInTouchMode() && !isFocusableInTouchMode()) { + return; } + views.add(this); } /** diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 5e02b49..6371963 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -4207,6 +4207,9 @@ 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 (mTransition != null) { + mTransition.layoutChange(this); + } super.layout(l, t, r, b); } else { // record the fact that we noop'd it; request layout when transition finishes @@ -4449,8 +4452,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * Returns the basis of alignment during the layout of this view group: * either {@link #COMPONENT_BOUNDS} or {@link #LAYOUT_BOUNDS}. * - * @return whether or not this view group should use the component or layout bounds during - * layout operations + * @return the layout mode to use during layout operations * * @see #setLayoutMode(int) */ @@ -4479,8 +4481,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * value is {@link #LAYOUT_BOUNDS} for target SDK's greater than JellyBean, * {@link #LAYOUT_BOUNDS} otherwise. * - * @return whether or not this view group should use the component or layout bounds during - * layout operations + * @param layoutMode the layout mode to use during layout operations * * @see #getLayoutMode() */ diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index b4554d5..1472993 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -2977,7 +2977,10 @@ public final class ViewRootImpl implements ViewParent, // be when the window is first being added, and mFocused isn't // set yet. final View focused = mView.findFocus(); - if (focused != null && !focused.isFocusableInTouchMode()) { + if (focused != null) { + if (focused.isFocusableInTouchMode()) { + return true; + } final ViewGroup ancestorToTakeFocus = findAncestorToTakeFocusInTouchMode(focused); if (ancestorToTakeFocus != null) { diff --git a/core/java/android/view/textservice/SpellCheckerInfo.java b/core/java/android/view/textservice/SpellCheckerInfo.java index d05c1af..2167862 100644 --- a/core/java/android/view/textservice/SpellCheckerInfo.java +++ b/core/java/android/view/textservice/SpellCheckerInfo.java @@ -45,7 +45,6 @@ public final class SpellCheckerInfo implements Parcelable { private final ResolveInfo mService; private final String mId; private final int mLabel; - private final boolean mSupportsSentenceSpellCheck; /** * The spell checker setting activity's name, used by the system settings to @@ -98,9 +97,6 @@ public final class SpellCheckerInfo implements Parcelable { label = sa.getResourceId(com.android.internal.R.styleable.SpellChecker_label, 0); settingsActivityComponent = sa.getString( com.android.internal.R.styleable.SpellChecker_settingsActivity); - mSupportsSentenceSpellCheck = sa.getBoolean( - com.android.internal.R.styleable.SpellChecker_supportsSentenceSpellCheck, - false); sa.recycle(); final int depth = parser.getDepth(); @@ -142,7 +138,6 @@ public final class SpellCheckerInfo implements Parcelable { */ public SpellCheckerInfo(Parcel source) { mLabel = source.readInt(); - mSupportsSentenceSpellCheck = source.readInt() != 0; mId = source.readString(); mSettingsActivityName = source.readString(); mService = ResolveInfo.CREATOR.createFromParcel(source); @@ -158,13 +153,6 @@ public final class SpellCheckerInfo implements Parcelable { } /** - * @hide - */ - public boolean isSentenceSpellCheckSupported() { - return mSupportsSentenceSpellCheck; - } - - /** * Return the component of the service that implements. */ public ComponentName getComponent() { @@ -188,7 +176,6 @@ public final class SpellCheckerInfo implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mLabel); - dest.writeInt(mSupportsSentenceSpellCheck ? 1 : 0); dest.writeString(mId); dest.writeString(mSettingsActivityName); mService.writeToParcel(dest, flags); diff --git a/core/java/android/view/textservice/SpellCheckerSession.java b/core/java/android/view/textservice/SpellCheckerSession.java index 9dc05e4..628da3c 100644 --- a/core/java/android/view/textservice/SpellCheckerSession.java +++ b/core/java/android/view/textservice/SpellCheckerSession.java @@ -91,8 +91,6 @@ public class SpellCheckerSession { * This meta-data must reference an XML resource. **/ public static final String SERVICE_META_DATA = "android.view.textservice.scs"; - private static final String SUPPORT_SENTENCE_SPELL_CHECK = "SupportSentenceSpellCheck"; - private static final int MSG_ON_GET_SUGGESTION_MULTIPLE = 1; private static final int MSG_ON_GET_SUGGESTION_MULTIPLE_FOR_SENTENCE = 2; @@ -191,7 +189,9 @@ public class SpellCheckerSession { * Get candidate strings for a substring of the specified text. * @param textInfo text metadata for a spell checker * @param suggestionsLimit the maximum number of suggestions that will be returned + * @deprecated use {@link SpellCheckerSession#getSentenceSuggestions(TextInfo[], int)} instead */ + @Deprecated public void getSuggestions(TextInfo textInfo, int suggestionsLimit) { getSuggestions(new TextInfo[] {textInfo}, suggestionsLimit, false); } @@ -201,13 +201,14 @@ public class SpellCheckerSession { * @param textInfos an array of text metadata for a spell checker * @param suggestionsLimit the maximum number of suggestions that will be returned * @param sequentialWords true if textInfos can be treated as sequential words. + * @deprecated use {@link SpellCheckerSession#getSentenceSuggestions(TextInfo[], int)} instead */ + @Deprecated public void getSuggestions( TextInfo[] textInfos, int suggestionsLimit, boolean sequentialWords) { if (DBG) { Log.w(TAG, "getSuggestions from " + mSpellCheckerInfo.getId()); } - // TODO: Handle multiple words suggestions by using WordBreakIterator mSpellCheckerSessionListenerImpl.getSuggestionsMultiple( textInfos, suggestionsLimit, sequentialWords); } @@ -281,7 +282,7 @@ public class SpellCheckerSession { break; case TASK_GET_SUGGESTIONS_MULTIPLE_FOR_SENTENCE: if (DBG) { - Log.w(TAG, "Get suggestions from the spell checker."); + Log.w(TAG, "Get sentence suggestions from the spell checker."); } try { session.onGetSentenceSuggestionsMultiple( @@ -492,11 +493,4 @@ public class SpellCheckerSession { public ISpellCheckerSessionListener getSpellCheckerSessionListener() { return mSpellCheckerSessionListenerImpl; } - - /** - * @return true if the spell checker supports sentence level spell checking APIs - */ - public boolean isSentenceSpellCheckSupported() { - return mSubtype.containsExtraValueKey(SUPPORT_SENTENCE_SPELL_CHECK); - } } diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java index 64fbdd5..ab798e8 100644 --- a/core/java/android/webkit/CallbackProxy.java +++ b/core/java/android/webkit/CallbackProxy.java @@ -1711,7 +1711,7 @@ class CallbackProxy extends Handler { void onIsSupportedCallback(boolean isSupported) { Message msg = obtainMessage(SEARCHBOX_IS_SUPPORTED_CALLBACK); - msg.obj = new Boolean(isSupported); + msg.obj = Boolean.valueOf(isSupported); sendMessage(msg); } diff --git a/core/java/android/webkit/GeolocationPermissions.java b/core/java/android/webkit/GeolocationPermissions.java index 1441541..a916884 100755 --- a/core/java/android/webkit/GeolocationPermissions.java +++ b/core/java/android/webkit/GeolocationPermissions.java @@ -252,7 +252,7 @@ public class GeolocationPermissions { } if (WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName())) { boolean allowed = nativeGetAllowed(origin); - callback.onReceiveValue(new Boolean(allowed)); + callback.onReceiveValue(Boolean.valueOf(allowed)); } else { Map values = new HashMap<String, Object>(); values.put(ORIGIN, origin); diff --git a/core/java/android/webkit/WebCoreThreadWatchdog.java b/core/java/android/webkit/WebCoreThreadWatchdog.java index 0541d5d..655db31 100644 --- a/core/java/android/webkit/WebCoreThreadWatchdog.java +++ b/core/java/android/webkit/WebCoreThreadWatchdog.java @@ -16,6 +16,7 @@ package android.webkit; +import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -146,6 +147,7 @@ class WebCoreThreadWatchdog implements Runnable { break; case TIMED_OUT: + if ((mContext == null) || !(mContext instanceof Activity)) return; new AlertDialog.Builder(mContext) .setMessage(com.android.internal.R.string.webpage_unresponsive) .setPositiveButton(com.android.internal.R.string.force_close, diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 105285c..ba48da1 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -190,15 +190,19 @@ public class WebSettings { } /** - * Sets whether the WebView should use its built-in zoom mechanisms, as - * opposed to separate zoom controls. The built-in zoom mechanisms comprise - * on-screen zoom controls, which are displayed over the WebView's content, - * and the use of a pinch gesture to control zooming. Whether or not these - * on-screen controls are displayed can be set with {@link #setDisplayZoomControls}. - * The separate zoom controls are no longer supported, so it is recommended - * that this setting is always enabled. - * @param enabled Whether the WebView should use the built-in zoom mechanism. - */ + * Sets whether the WebView should use its built-in zoom mechanisms. The + * built-in zoom mechanisms comprise on-screen zoom controls, which are + * displayed over the WebView's content, and the use of a pinch gesture to + * control zooming. Whether or not these on-screen controls are displayed + * can be set with {@link #setDisplayZoomControls}. + * <p> + * The built-in mechanisms are the only currently supported zoom + * mechanisms, so it is recommended that this setting is always enabled. + * @param enabled Whether the WebView should use its built-in zoom mechanisms. + */ + // This method was intended to select between the built-in zoom mechanisms + // and the separate zoom controls. The latter were obtained using + // {@link WebView#getZoomControls}, which is now hidden. public void setBuiltInZoomControls(boolean enabled) { throw new MustOverrideException(); } diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 5498622..bd10cca 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1530,17 +1530,15 @@ public class WebView extends AbsoluteLayout } /** - * Returns a view containing zoom controls i.e. +/- buttons. The caller is - * in charge of installing this view to the view hierarchy. This view will - * become visible when the user starts scrolling via touch and fade away if - * the user does not interact with it. + * Gets the zoom controls for the WebView, as a separate View. The caller is + * responsible for inserting this View into the layout hierarchy. * <p/> - * API version 3 introduces a built-in zoom mechanism that is shown - * automatically by the MapView. This is the preferred approach for - * showing the zoom UI. + * API Level 3 introduced built-in zoom mechanisms for the WebView, as + * opposed to these separate zoom controls. The built-in mechanisms are + * preferred and can be enabled using + * {@link WebSettings#setBuiltInZoomControls}. * - * @deprecated The built-in zoom mechanism is preferred, see - * {@link WebSettings#setBuiltInZoomControls(boolean)}. + * @deprecated The built-in zoom mechanisms are preferred. * @hide since API version 16. */ @Deprecated diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index e2880d6..aea23c0 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -1772,6 +1772,9 @@ public final class WebViewCore { @Override public boolean dispatchWebKitEvent(MotionEvent event, int eventType, int flags) { + if (mNativeClass == 0) { + return false; + } switch (eventType) { case WebViewInputDispatcher.EVENT_TYPE_CLICK: return nativeMouseClick(mNativeClass); diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java index c725b64..a13ee5a 100644 --- a/core/java/android/widget/SpellChecker.java +++ b/core/java/android/widget/SpellChecker.java @@ -24,6 +24,7 @@ import android.text.Spanned; import android.text.method.WordIterator; import android.text.style.SpellCheckSpan; import android.text.style.SuggestionSpan; +import android.util.Log; import android.view.textservice.SentenceSuggestionsInfo; import android.view.textservice.SpellCheckerSession; import android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener; @@ -43,6 +44,8 @@ import java.util.Locale; * @hide */ public class SpellChecker implements SpellCheckerSessionListener { + private static final String TAG = SpellChecker.class.getSimpleName(); + private static final boolean DBG = false; // No more than this number of words will be parsed on each iteration to ensure a minimum // lock of the UI thread @@ -116,7 +119,7 @@ public class SpellChecker implements SpellCheckerSessionListener { null /* Bundle not currently used by the textServicesManager */, mCurrentLocale, this, false /* means any available languages from current spell checker */); - mIsSentenceSpellCheckSupported = mSpellCheckerSession.isSentenceSpellCheckSupported(); + mIsSentenceSpellCheckSupported = true; } // Restore SpellCheckSpans in pool @@ -266,6 +269,12 @@ public class SpellChecker implements SpellCheckerSessionListener { editable.subSequence(start, end).toString(); spellCheckSpan.setSpellCheckInProgress(true); textInfos[textInfosCount++] = new TextInfo(word, mCookie, mIds[i]); + if (DBG) { + Log.d(TAG, "create TextInfo: (" + i + "/" + mLength + ")" + word + + ", cookie = " + mCookie + ", seq = " + + mIds[i] + ", sel start = " + selectionStart + ", sel end = " + + selectionEnd + ", start = " + start + ", end = " + end); + } } } @@ -507,7 +516,20 @@ public class SpellChecker implements SpellCheckerSessionListener { if (regionEnd <= spellCheckStart) { return; } - addSpellCheckSpan(editable, spellCheckStart, regionEnd); + final int selectionStart = Selection.getSelectionStart(editable); + final int selectionEnd = Selection.getSelectionEnd(editable); + if (DBG) { + Log.d(TAG, "addSpellCheckSpan: " + + editable.subSequence(spellCheckStart, regionEnd) + + ", regionEnd = " + regionEnd + ", spellCheckStart = " + + spellCheckStart + ", sel start = " + selectionStart + ", sel end =" + + selectionEnd); + } + // Do not check this word if the user is currently editing it + if (spellCheckStart >= 0 && regionEnd > spellCheckStart + && (selectionEnd < spellCheckStart || selectionStart > regionEnd)) { + addSpellCheckSpan(editable, spellCheckStart, regionEnd); + } } else { while (wordStart <= end) { if (wordEnd >= start && wordEnd > wordStart) { diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java index f1dffa1..1ba6d43 100644 --- a/core/java/com/android/internal/app/ActionBarImpl.java +++ b/core/java/com/android/internal/app/ActionBarImpl.java @@ -51,6 +51,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.Window; import android.view.accessibility.AccessibilityEvent; +import android.view.animation.AnimationUtils; import android.widget.SpinnerAdapter; import java.lang.ref.WeakReference; @@ -596,19 +597,23 @@ public class ActionBarImpl extends ActionBar { if (mCurWindowVisibility == View.VISIBLE && (mShowHideAnimationEnabled || alwaysAnimate)) { mTopVisibilityView.setAlpha(0); + mTopVisibilityView.setTranslationY(-mTopVisibilityView.getHeight()); AnimatorSet anim = new AnimatorSet(); AnimatorSet.Builder b = anim.play(ObjectAnimator.ofFloat(mTopVisibilityView, "alpha", 1)); + b.with(ObjectAnimator.ofFloat(mTopVisibilityView, "translationY", 0)); if (mContentView != null) { b.with(ObjectAnimator.ofFloat(mContentView, "translationY", -mTopVisibilityView.getHeight(), 0)); - mTopVisibilityView.setTranslationY(-mTopVisibilityView.getHeight()); - b.with(ObjectAnimator.ofFloat(mTopVisibilityView, "translationY", 0)); } if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) { mSplitView.setAlpha(0); + mSplitView.setTranslationY(mSplitView.getHeight()); mSplitView.setVisibility(View.VISIBLE); b.with(ObjectAnimator.ofFloat(mSplitView, "alpha", 1)); + b.with(ObjectAnimator.ofFloat(mSplitView, "translationY", 0)); } + anim.setInterpolator(AnimationUtils.loadInterpolator(mContext, + com.android.internal.R.interpolator.decelerate_quad)); anim.addListener(mShowListener); mCurrentShowAnim = anim; anim.start(); @@ -638,16 +643,20 @@ public class ActionBarImpl extends ActionBar { mContainerView.setTransitioning(true); AnimatorSet anim = new AnimatorSet(); AnimatorSet.Builder b = anim.play(ObjectAnimator.ofFloat(mTopVisibilityView, "alpha", 0)); + b.with(ObjectAnimator.ofFloat(mTopVisibilityView, "translationY", + -mTopVisibilityView.getHeight())); if (mContentView != null) { b.with(ObjectAnimator.ofFloat(mContentView, "translationY", 0, -mTopVisibilityView.getHeight())); - b.with(ObjectAnimator.ofFloat(mTopVisibilityView, "translationY", - -mTopVisibilityView.getHeight())); } if (mSplitView != null && mSplitView.getVisibility() == View.VISIBLE) { mSplitView.setAlpha(1); b.with(ObjectAnimator.ofFloat(mSplitView, "alpha", 0)); + b.with(ObjectAnimator.ofFloat(mSplitView, "translationY", + mSplitView.getHeight())); } + anim.setInterpolator(AnimationUtils.loadInterpolator(mContext, + com.android.internal.R.interpolator.accelerate_quad)); anim.addListener(mHideListener); mCurrentShowAnim = anim; anim.start(); diff --git a/core/java/com/android/internal/util/XmlUtils.java b/core/java/com/android/internal/util/XmlUtils.java index e00a853..6a09fe0 100644 --- a/core/java/com/android/internal/util/XmlUtils.java +++ b/core/java/com/android/internal/util/XmlUtils.java @@ -888,4 +888,19 @@ public class XmlUtils ; } } + + public static boolean nextElementWithin(XmlPullParser parser, int outerDepth) + throws IOException, XmlPullParserException { + for (;;) { + int type = parser.next(); + if (type == XmlPullParser.END_DOCUMENT + || (type == XmlPullParser.END_TAG && parser.getDepth() == outerDepth)) { + return false; + } + if (type == XmlPullParser.START_TAG + && parser.getDepth() == outerDepth + 1) { + return true; + } + } + } } diff --git a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java new file mode 100644 index 0000000..adfd3dc --- /dev/null +++ b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java @@ -0,0 +1,405 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.widget; + +import com.android.internal.R; + +import android.animation.Animator; +import android.animation.Animator.AnimatorListener; +import android.animation.AnimatorSet; +import android.animation.ObjectAnimator; +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.util.AttributeSet; +import android.util.Log; +import android.view.View; +import android.view.ViewDebug; +import android.view.ViewGroup; +import android.widget.RemoteViews.RemoteView; + +/** + * A layout that switches between its children based on the requested layout height. + * Each child specifies its minimum and maximum valid height. Results are undefined + * if children specify overlapping ranges. A child may specify the maximum height + * as 'unbounded' to indicate that it is willing to be displayed arbitrarily tall. + * + * <p> + * See {@link SizeAdaptiveLayout.LayoutParams} for a full description of the + * layout parameters used by SizeAdaptiveLayout. + */ +@RemoteView +public class SizeAdaptiveLayout extends ViewGroup { + + private static final String TAG = "SizeAdaptiveLayout"; + private static final boolean DEBUG = false; + private static final long CROSSFADE_TIME = 250; + + // TypedArray indices + private static final int MIN_VALID_HEIGHT = + R.styleable.SizeAdaptiveLayout_Layout_layout_minHeight; + private static final int MAX_VALID_HEIGHT = + R.styleable.SizeAdaptiveLayout_Layout_layout_maxHeight; + + // view state + private View mActiveChild; + private View mLastActive; + + // animation state + private AnimatorSet mTransitionAnimation; + private AnimatorListener mAnimatorListener; + private ObjectAnimator mFadePanel; + private ObjectAnimator mFadeView; + private int mCanceledAnimationCount; + private View mEnteringView; + private View mLeavingView; + // View used to hide larger views under smaller ones to create a uniform crossfade + private View mModestyPanel; + private int mModestyPanelTop; + + public SizeAdaptiveLayout(Context context) { + super(context); + initialize(); + } + + public SizeAdaptiveLayout(Context context, AttributeSet attrs) { + super(context, attrs); + initialize(); + } + + public SizeAdaptiveLayout(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + initialize(); + } + + private void initialize() { + mModestyPanel = new View(getContext()); + // If the SizeAdaptiveLayout has a solid background, use it as a transition hint. + if (getBackground() instanceof ColorDrawable) { + mModestyPanel.setBackgroundDrawable(getBackground()); + } else { + mModestyPanel.setBackgroundColor(Color.BLACK); + } + SizeAdaptiveLayout.LayoutParams layout = + new SizeAdaptiveLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); + mModestyPanel.setLayoutParams(layout); + addView(mModestyPanel); + mFadePanel = ObjectAnimator.ofFloat(mModestyPanel, "alpha", 0f); + mFadeView = ObjectAnimator.ofFloat(null, "alpha", 0f); + mAnimatorListener = new BringToFrontOnEnd(); + mTransitionAnimation = new AnimatorSet(); + mTransitionAnimation.play(mFadeView).with(mFadePanel); + mTransitionAnimation.setDuration(CROSSFADE_TIME); + mTransitionAnimation.addListener(mAnimatorListener); + } + + /** + * Visible for testing + * @hide + */ + public Animator getTransitionAnimation() { + return mTransitionAnimation; + } + + /** + * Visible for testing + * @hide + */ + public View getModestyPanel() { + return mModestyPanel; + } + + @Override + public void onAttachedToWindow() { + mLastActive = null; + // make sure all views start off invisible. + for (int i = 0; i < getChildCount(); i++) { + getChildAt(i).setVisibility(View.GONE); + } + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + if (DEBUG) Log.d(TAG, this + " measure spec: " + + MeasureSpec.toString(heightMeasureSpec)); + View model = selectActiveChild(heightMeasureSpec); + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) model.getLayoutParams(); + if (DEBUG) Log.d(TAG, "active min: " + lp.minHeight + " max: " + lp.maxHeight); + measureChild(model, widthMeasureSpec, heightMeasureSpec); + int childHeight = model.getMeasuredHeight(); + int childWidth = model.getMeasuredHeight(); + int childState = combineMeasuredStates(0, model.getMeasuredState()); + if (DEBUG) Log.d(TAG, "measured child at: " + childHeight); + int resolvedWidth = resolveSizeAndState(childWidth, widthMeasureSpec, childState); + int resolvedheight = resolveSizeAndState(childHeight, heightMeasureSpec, childState); + setMeasuredDimension(resolvedWidth, resolvedheight); + if (DEBUG) Log.d(TAG, "resolved to: " + resolvedheight); + } + + //TODO extend to width and height + private View selectActiveChild(int heightMeasureSpec) { + final int heightMode = MeasureSpec.getMode(heightMeasureSpec); + final int heightSize = MeasureSpec.getSize(heightMeasureSpec); + + View unboundedView = null; + View tallestView = null; + int tallestViewSize = 0; + View smallestView = null; + int smallestViewSize = Integer.MAX_VALUE; + for (int i = 0; i < getChildCount(); i++) { + View child = getChildAt(i); + if (child != mModestyPanel) { + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) child.getLayoutParams(); + if (DEBUG) Log.d(TAG, "looking at " + i + + " with min: " + lp.minHeight + + " max: " + lp.maxHeight); + if (lp.maxHeight == SizeAdaptiveLayout.LayoutParams.UNBOUNDED && + unboundedView == null) { + unboundedView = child; + } + if (lp.maxHeight > tallestViewSize) { + tallestViewSize = lp.maxHeight; + tallestView = child; + } + if (lp.minHeight < smallestViewSize) { + smallestViewSize = lp.minHeight; + smallestView = child; + } + if (heightMode != MeasureSpec.UNSPECIFIED && + heightSize >= lp.minHeight && heightSize <= lp.maxHeight) { + if (DEBUG) Log.d(TAG, " found exact match, finishing early"); + return child; + } + } + } + if (unboundedView != null) { + tallestView = unboundedView; + } + if (heightMode == MeasureSpec.UNSPECIFIED) { + return tallestView; + } + if (heightSize > tallestViewSize) { + return tallestView; + } + return smallestView; + } + + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + if (DEBUG) Log.d(TAG, this + " onlayout height: " + (bottom - top)); + mLastActive = mActiveChild; + int measureSpec = View.MeasureSpec.makeMeasureSpec(bottom - top, + View.MeasureSpec.EXACTLY); + mActiveChild = selectActiveChild(measureSpec); + mActiveChild.setVisibility(View.VISIBLE); + + if (mLastActive != mActiveChild && mLastActive != null) { + if (DEBUG) Log.d(TAG, this + " changed children from: " + mLastActive + + " to: " + mActiveChild); + + mEnteringView = mActiveChild; + mLeavingView = mLastActive; + + mEnteringView.setAlpha(1f); + + mModestyPanel.setAlpha(1f); + mModestyPanel.bringToFront(); + mModestyPanelTop = mLeavingView.getHeight(); + mModestyPanel.setVisibility(View.VISIBLE); + // TODO: mModestyPanel background should be compatible with mLeavingView + + mLeavingView.bringToFront(); + + if (mTransitionAnimation.isRunning()) { + mTransitionAnimation.cancel(); + } + mFadeView.setTarget(mLeavingView); + mFadeView.setFloatValues(0f); + mFadePanel.setFloatValues(0f); + mTransitionAnimation.setupStartValues(); + mTransitionAnimation.start(); + } + final int childWidth = mActiveChild.getMeasuredWidth(); + final int childHeight = mActiveChild.getMeasuredHeight(); + // TODO investigate setting LAYER_TYPE_HARDWARE on mLastActive + mActiveChild.layout(0, 0, 0 + childWidth, 0 + childHeight); + + if (DEBUG) Log.d(TAG, "got modesty offset of " + mModestyPanelTop); + mModestyPanel.layout(0, mModestyPanelTop, 0 + childWidth, mModestyPanelTop + childHeight); + } + + @Override + public LayoutParams generateLayoutParams(AttributeSet attrs) { + if (DEBUG) Log.d(TAG, "generate layout from attrs"); + return new SizeAdaptiveLayout.LayoutParams(getContext(), attrs); + } + + @Override + protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) { + if (DEBUG) Log.d(TAG, "generate default layout from viewgroup"); + return new SizeAdaptiveLayout.LayoutParams(p); + } + + @Override + protected LayoutParams generateDefaultLayoutParams() { + if (DEBUG) Log.d(TAG, "generate default layout from null"); + return new SizeAdaptiveLayout.LayoutParams(); + } + + @Override + protected boolean checkLayoutParams(ViewGroup.LayoutParams p) { + return p instanceof SizeAdaptiveLayout.LayoutParams; + } + + /** + * Per-child layout information associated with ViewSizeAdaptiveLayout. + * + * TODO extend to width and height + * + * @attr ref android.R.styleable#SizeAdaptiveLayout_Layout_layout_minHeight + * @attr ref android.R.styleable#SizeAdaptiveLayout_Layout_layout_maxHeight + */ + public static class LayoutParams extends ViewGroup.LayoutParams { + + /** + * Indicates the minimum valid height for the child. + */ + @ViewDebug.ExportedProperty(category = "layout") + public int minHeight; + + /** + * Indicates the maximum valid height for the child. + */ + @ViewDebug.ExportedProperty(category = "layout") + public int maxHeight; + + /** + * Constant value for maxHeight that indicates there is not maximum height. + */ + public static final int UNBOUNDED = -1; + + /** + * {@inheritDoc} + */ + public LayoutParams(Context c, AttributeSet attrs) { + super(c, attrs); + if (DEBUG) { + Log.d(TAG, "construct layout from attrs"); + for (int i = 0; i < attrs.getAttributeCount(); i++) { + Log.d(TAG, " " + attrs.getAttributeName(i) + " = " + + attrs.getAttributeValue(i)); + } + } + TypedArray a = + c.obtainStyledAttributes(attrs, + R.styleable.SizeAdaptiveLayout_Layout); + + minHeight = a.getDimensionPixelSize(MIN_VALID_HEIGHT, 0); + if (DEBUG) Log.d(TAG, "got minHeight of: " + minHeight); + + try { + maxHeight = a.getLayoutDimension(MAX_VALID_HEIGHT, UNBOUNDED); + if (DEBUG) Log.d(TAG, "got maxHeight of: " + maxHeight); + } catch (Exception e) { + if (DEBUG) Log.d(TAG, "caught exception looking for maxValidHeight " + e); + } + + a.recycle(); + } + + /** + * Creates a new set of layout parameters with the specified width, height + * and valid height bounds. + * + * @param width the width, either {@link #MATCH_PARENT}, + * {@link #WRAP_CONTENT} or a fixed size in pixels + * @param height the height, either {@link #MATCH_PARENT}, + * {@link #WRAP_CONTENT} or a fixed size in pixels + * @param minHeight the minimum height of this child + * @param maxHeight the maximum height of this child + * or {@link #UNBOUNDED} if the child can grow forever + */ + public LayoutParams(int width, int height, int minHeight, int maxHeight) { + super(width, height); + this.minHeight = minHeight; + this.maxHeight = maxHeight; + } + + /** + * {@inheritDoc} + */ + public LayoutParams(int width, int height) { + this(width, height, UNBOUNDED, UNBOUNDED); + } + + /** + * Constructs a new LayoutParams with default values as defined in {@link LayoutParams}. + */ + public LayoutParams() { + this(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED); + } + + /** + * {@inheritDoc} + */ + public LayoutParams(ViewGroup.LayoutParams p) { + super(p); + minHeight = UNBOUNDED; + maxHeight = UNBOUNDED; + } + + public String debug(String output) { + return output + "SizeAdaptiveLayout.LayoutParams={" + + ", max=" + maxHeight + + ", max=" + minHeight + "}"; + } + } + + class BringToFrontOnEnd implements AnimatorListener { + @Override + public void onAnimationEnd(Animator animation) { + if (mCanceledAnimationCount == 0) { + mLeavingView.setVisibility(View.GONE); + mModestyPanel.setVisibility(View.GONE); + mEnteringView.bringToFront(); + mEnteringView = null; + mLeavingView = null; + } else { + mCanceledAnimationCount--; + } + } + + @Override + public void onAnimationCancel(Animator animation) { + mCanceledAnimationCount++; + } + + @Override + public void onAnimationRepeat(Animator animation) { + if (DEBUG) Log.d(TAG, "fade animation repeated: should never happen."); + assert(false); + } + + @Override + public void onAnimationStart(Animator animation) { + } + } +} diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp index 202abf6..9abfb3a 100644 --- a/core/jni/android_hardware_SensorManager.cpp +++ b/core/jni/android_hardware_SensorManager.cpp @@ -179,6 +179,6 @@ using namespace android; int register_android_hardware_SensorManager(JNIEnv *env) { - return jniRegisterNativeMethods(env, "android/hardware/SensorManager", + return jniRegisterNativeMethods(env, "android/hardware/SystemSensorManager", gMethods, NELEM(gMethods)); } diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index ce2cdee..31b914a 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -198,7 +198,7 @@ sp<Surface> Surface_getSurface(JNIEnv* env, jobject clazz) { return surface; } -static void setSurface(JNIEnv* env, jobject clazz, const sp<Surface>& surface) +void setSurface(JNIEnv* env, jobject clazz, const sp<Surface>& surface) { Surface* const p = (Surface*)env->GetIntField(clazz, so.surface); if (surface.get()) { diff --git a/core/res/res/anim/dock_bottom_enter.xml b/core/res/res/anim/dock_bottom_enter.xml index 7a2e94b..74a021b 100644 --- a/core/res/res/anim/dock_bottom_enter.xml +++ b/core/res/res/anim/dock_bottom_enter.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the bottom of the screen is entering. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_quad"> - <translate android:fromYDelta="75%" android:toYDelta="0" + <translate android:fromYDelta="100%" android:toYDelta="0" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_bottom_exit.xml b/core/res/res/anim/dock_bottom_exit.xml index c2fd15c..213b3d9 100644 --- a/core/res/res/anim/dock_bottom_exit.xml +++ b/core/res/res/anim/dock_bottom_exit.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the bottom of the screen is exiting. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"> - <translate android:fromYDelta="0" android:toYDelta="75%" + <translate android:fromYDelta="0" android:toYDelta="100%" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_left_enter.xml b/core/res/res/anim/dock_left_enter.xml index b057f67..4fce35a 100644 --- a/core/res/res/anim/dock_left_enter.xml +++ b/core/res/res/anim/dock_left_enter.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the left of the screen is entering. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_quad"> - <translate android:fromXDelta="-75%" android:toXDelta="0" + <translate android:fromXDelta="-100%" android:toXDelta="0" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_left_exit.xml b/core/res/res/anim/dock_left_exit.xml index 576b1aa..bce203d 100644 --- a/core/res/res/anim/dock_left_exit.xml +++ b/core/res/res/anim/dock_left_exit.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the right of the screen is exiting. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"> - <translate android:fromXDelta="0" android:toXDelta="-75%" + <translate android:fromXDelta="0" android:toXDelta="-100%" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_right_enter.xml b/core/res/res/anim/dock_right_enter.xml index e1bd190..26b8ad6 100644 --- a/core/res/res/anim/dock_right_enter.xml +++ b/core/res/res/anim/dock_right_enter.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the right of the screen is entering. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_quad"> - <translate android:fromXDelta="75%" android:toXDelta="0" + <translate android:fromXDelta="100%" android:toXDelta="0" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_right_exit.xml b/core/res/res/anim/dock_right_exit.xml index 6d778fa..6beda59 100644 --- a/core/res/res/anim/dock_right_exit.xml +++ b/core/res/res/anim/dock_right_exit.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the right of the screen is exiting. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"> - <translate android:fromXDelta="0" android:toXDelta="75%" + <translate android:fromXDelta="0" android:toXDelta="100%" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_top_enter.xml b/core/res/res/anim/dock_top_enter.xml index f2e4cae..594b479 100644 --- a/core/res/res/anim/dock_top_enter.xml +++ b/core/res/res/anim/dock_top_enter.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the top of the screen is entering. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_quad"> - <translate android:fromYDelta="-75%" android:toYDelta="0" + <translate android:fromYDelta="-100%" android:toYDelta="0" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/anim/dock_top_exit.xml b/core/res/res/anim/dock_top_exit.xml index 7373695..b9691f6 100644 --- a/core/res/res/anim/dock_top_exit.xml +++ b/core/res/res/anim/dock_top_exit.xml @@ -19,8 +19,6 @@ <!-- Animation for when a dock window at the top of the screen is exiting. --> <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"> - <translate android:fromYDelta="0" android:toYDelta="-75%" + <translate android:fromYDelta="0" android:toYDelta="-100%" android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime" /> </set> diff --git a/core/res/res/layout/adaptive_notification_wrapper.xml b/core/res/res/layout/adaptive_notification_wrapper.xml new file mode 100644 index 0000000..df9d720 --- /dev/null +++ b/core/res/res/layout/adaptive_notification_wrapper.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2008, 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. +*/ +--> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:textAppearance="?android:attr/dropDownHintAppearance" + android:singleLine="true" + android:layout_marginLeft="3dip" + android:layout_marginTop="3dip" + android:layout_marginRight="3dip" + android:layout_marginBottom="3dip" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> diff --git a/core/res/res/layout/notification_template_base.xml b/core/res/res/layout/notification_template_base.xml index b9710d6..74b3fa9 100644 --- a/core/res/res/layout/notification_template_base.xml +++ b/core/res/res/layout/notification_template_base.xml @@ -15,9 +15,13 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:background="@android:color/background_dark" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="wrap_content" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" > <ImageView android:id="@+id/icon" android:layout_width="@dimen/notification_large_icon_width" diff --git a/core/res/res/layout/notification_template_big_picture.xml b/core/res/res/layout/notification_template_big_picture.xml index 8be84bd..2150096 100644 --- a/core/res/res/layout/notification_template_big_picture.xml +++ b/core/res/res/layout/notification_template_big_picture.xml @@ -15,9 +15,13 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:background="@android:color/background_dark" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="match_parent" + internal:layout_minHeight="65dp" + internal:layout_maxHeight="unbounded" > <ImageView android:id="@+id/big_picture" @@ -30,4 +34,4 @@ android:layout_height="wrap_content" android:layout_marginTop="192dp" /> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/core/res/res/layout/notification_template_big_text.xml b/core/res/res/layout/notification_template_big_text.xml new file mode 100644 index 0000000..3a0bfc7 --- /dev/null +++ b/core/res/res/layout/notification_template_big_text.xml @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:background="@android:color/background_dark" + android:id="@+id/status_bar_latest_event_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + internal:layout_minHeight="65dp" + internal:layout_maxHeight="unbounded" + > + <ImageView android:id="@+id/icon" + android:layout_width="@dimen/notification_large_icon_width" + android:layout_height="@dimen/notification_large_icon_height" + android:background="@android:drawable/notify_panel_notification_icon_bg_tile" + android:scaleType="center" + /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="fill_vertical" + android:layout_marginLeft="@dimen/notification_large_icon_width" + android:minHeight="@dimen/notification_large_icon_height" + android:orientation="vertical" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:gravity="center_vertical" + > + <LinearLayout + android:id="@+id/line1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + > + <TextView android:id="@+id/title" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:layout_weight="1" + /> + <ViewStub android:id="@+id/time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:visibility="gone" + android:layout="@layout/notification_template_part_time" + /> + <ViewStub android:id="@+id/chronometer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:visibility="gone" + android:layout="@layout/notification_template_part_chronometer" + /> + </LinearLayout> + <TextView android:id="@+id/text2" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="-2dp" + android:layout_marginBottom="-2dp" + android:singleLine="true" + android:fadingEdge="horizontal" + android:ellipsize="marquee" + android:visibility="gone" + /> + <TextView android:id="@+id/big_text" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="false" + android:visibility="gone" + /> + <LinearLayout + android:id="@+id/line3" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + > + <TextView android:id="@+id/text" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center" + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + /> + <TextView android:id="@+id/info" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:singleLine="true" + android:gravity="center" + android:paddingLeft="8dp" + /> + <ImageView android:id="@+id/right_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:scaleType="center" + android:paddingLeft="8dp" + android:visibility="gone" + android:drawableAlpha="180" + /> + </LinearLayout> + <ProgressBar + android:id="@android:id/progress" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" + style="?android:attr/progressBarStyleHorizontal" + /> + <LinearLayout + android:id="@+id/actions" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" + > + <!-- actions will be added here --> + </LinearLayout> + </LinearLayout> +</FrameLayout> diff --git a/core/res/res/layout/notification_template_inbox.xml b/core/res/res/layout/notification_template_inbox.xml new file mode 100644 index 0000000..82342d4 --- /dev/null +++ b/core/res/res/layout/notification_template_inbox.xml @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/status_bar_latest_event_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + > + <ImageView android:id="@+id/icon" + android:layout_width="@dimen/notification_large_icon_width" + android:layout_height="@dimen/notification_large_icon_height" + android:background="@android:drawable/notify_panel_notification_icon_bg_tile" + android:scaleType="center" + /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="fill_vertical" + android:layout_marginLeft="@dimen/notification_large_icon_width" + android:minHeight="@dimen/notification_large_icon_height" + android:orientation="vertical" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:gravity="center_vertical" + > + <LinearLayout + android:id="@+id/line1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + > + <TextView android:id="@+id/title" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:layout_weight="1" + /> + <ViewStub android:id="@+id/time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:visibility="gone" + android:layout="@layout/notification_template_part_time" + /> + <ViewStub android:id="@+id/chronometer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:visibility="gone" + android:layout="@layout/notification_template_part_chronometer" + /> + </LinearLayout> + <TextView android:id="@+id/text2" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="-2dp" + android:layout_marginBottom="-2dp" + android:singleLine="true" + android:fadingEdge="horizontal" + android:ellipsize="marquee" + android:visibility="gone" + /> + <TextView android:id="@+id/inbox_text0" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="end" + android:visibility="gone" + /> + <TextView android:id="@+id/inbox_text1" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="end" + android:visibility="gone" + /> + <TextView android:id="@+id/inbox_text2" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="end" + android:visibility="gone" + /> + <TextView android:id="@+id/inbox_text3" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="end" + android:visibility="gone" + /> + <TextView android:id="@+id/inbox_text4" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="end" + android:visibility="gone" + /> + <LinearLayout + android:id="@+id/line3" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + > + <TextView android:id="@+id/text" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center" + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + /> + <TextView android:id="@+id/info" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:singleLine="true" + android:gravity="center" + android:paddingLeft="8dp" + /> + <ImageView android:id="@+id/right_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:scaleType="center" + android:paddingLeft="8dp" + android:visibility="gone" + android:drawableAlpha="180" + /> + </LinearLayout> + <ProgressBar + android:id="@android:id/progress" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" + style="?android:attr/progressBarStyleHorizontal" + /> + <LinearLayout + android:id="@+id/actions" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" + > + <!-- actions will be added here --> + </LinearLayout> + </LinearLayout> +</FrameLayout> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 25fc3a0..d299436 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1007,11 +1007,17 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Voer die vereiste PIN in:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Voeg karakter in"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Onbekend program"</string> <string name="sms_control_title" msgid="7296612781128917719">"Stuur SMS-boodskappe"</string> - <string name="sms_control_message" msgid="4073755190243093924">"\'n Groot aantal SMS-boodskappe word gestuur. Raak OK om voort te gaan, of Kanselleer om op te hou stuur."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Kanselleer"</string> + <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> stuur \'n groot aantal SMS-boodskappe. Wil jy hierdie program toelaat om voort te gaan om boodskappe te stuur?"</string> + <string name="sms_control_yes" msgid="3663725993855816807">"Laat toe"</string> + <string name="sms_control_no" msgid="625438561395534982">"Weier"</string> + <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"Stuur SMS na kortkode?"</string> + <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"Stuur \'n premium SMS?"</string> + <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> wil graag \'n SMS stuur aan <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, wat lyk asof dit \'n SMS-kortkode is.<p>Die stuur van SMS\'e na sommige kortkodes kan veroorsaak dat jou selfoonrekening gedebiteer word vir premium dienste.<p>Wil jy hierdie program toelaat om die boodskap te stuur?"</string> + <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> wil graag \'n SMS stuur aan <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, wat \'n betaalde SMS-kortkode is.<p><b>As jy \'n boodskap na hierdie bestemming stuur, sal jou selfoonrekening gedebiteer word vir betaalde dienste.</b><p>Wil jy hierdie program toelaat om die boodskap te stuur?"</string> + <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"Stuur boodskap"</string> + <string name="sms_short_code_confirm_deny" msgid="6374609298084435887">"Moenie stuur nie"</string> + <string name="sms_short_code_confirm_report" msgid="2588793956061677070">"Gee kwaadwillige program aan"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kaart verwyder"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Die mobielnetwerk sal nie beskikbaar wees nie totdat jy weer begin met \'n geldige SIM-kaart."</string> <string name="sim_done_button" msgid="827949989369963775">"Klaar"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 0764f0e..b2714dd 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"በማንኛውም ጊዜ የማሳያውን መሽከርከር ለመለወጥ ለመተግበሪያው ይፈቅዳሉ፡፡ ለተለመዱ መተግበሪያዎች አያስፈልግም፡፡"</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"የጠቋሚ ፍጥነት ለውጥ"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"መዳፊት ወይም ዱካ መከተያ ጠቋሚ ፍጥነትን በማንኛውም ጊዜ ለመለወጥ ለመተግበሪያው ይፈቅዳሉ፡፡ ለመደበኛ መተግበሪያዎች መቼም ቢሆን አያስፈልግም፡፡"</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"የቁልፍ ሰሌዳ አቀማመጥ ቀይር"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"መተግበሪያው የቁልፍ ሰሌዳ አቀማመጡን እንዲቀይር ይፈቅድለታል። ለመደበኛ መተግበሪያዎች መቼም ቢሆን ሊያስፈልግ አይገባም።"</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"ወደ መተግበሪያዎችን የLinux ምልክቶች ላክ"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"ለሁሉም ተከታታይ ሂደቶች ልከው የሚያቀርቧቸው ሲግናሎችን ለመጠየቅ ለመተግበሪያው ይፈቅዳሉ።"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"ትግበራ ሁልጊዜ አሂድ ላይ አድርግ"</string> @@ -1009,11 +1007,17 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"የሚፈለገውን ፒን ተይብ፦"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"ፒን፦"</string> <string name="select_character" msgid="3365550120617701745">"ቁምፊ አስገባ"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"ያልታወቀ መተግበሪያ"</string> <string name="sms_control_title" msgid="7296612781128917719">"የSMS መልዕክቶች መበላክ ላይ"</string> - <string name="sms_control_message" msgid="4073755190243093924">"በጣም ብዙ የ SMS መልዕክቶቸ ተልከዋል።ለመቀጠል \"እሺ \" ፣ ወይም መላክ ለማቆም\"ተው \" ምረጥ።"</string> - <string name="sms_control_yes" msgid="2532062172402615953">"እሺ"</string> - <string name="sms_control_no" msgid="1715320703137199869">"ይቅር"</string> + <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ቁጥሩ ብዙ የሆኑ የኤስ.ኤም.ኤስ. መልዕቶችን እየላከ ነው። ይሄ መተግበሪያ መልዕክቶችን መላኩን እንዲቀጥል መፍቀድ ትፈልጋለህ?"</string> + <string name="sms_control_yes" msgid="3663725993855816807">"ፍቀድ"</string> + <string name="sms_control_no" msgid="625438561395534982">"ከልክል"</string> + <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"ኤስ.ኤም.ኤስ. ለአጭር ኮድ ይላክ?"</string> + <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"ከፍ ያለ ኤስ.ኤም.ኤስ. ይላክ?"</string> + <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> የጽሑፍ መልዕክት ለ<b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> መላክ ይፈልጋል፣ ይሄ ደግሞ የኤስ.ኤም.ኤስ. አጭር ኮድ ሆኖ ተገኝቷል።<p>የጽሑፍ መልዕክቶች ለሆኑ አጭር ኮዶች መላክ የተንቀሳቃሽ መለያህ ከፍ ላሉ አገልግሎቶች ሊያስከፍለው ይችላል።<p>ይሄ መተግበሪያ መልዕክቱ እንዲልክ መፍቀድ ትፈልጋለህ?"</string> + <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> የጽሑፍ መልዕክት ለ<b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> መላክ ይፈልጋል፣ ይሄ ደግሞ ከፍ ያለ የኤስ.ኤም.ኤስ. አጭር ኮድ ነው።<p><b>መልዕክት ወደዚህ ቦታ መላክ የተንቀሳቃሽ መለያህ ከፍ ላሉ አገልግሎቶች ያስከፍለዋል።</b><p>ይሄ መተግበሪያ መልዕክቱ እንዲልክ መፍቀድ ትፈልጋለህ?"</string> + <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"መልዕክት ላክ"</string> + <string name="sms_short_code_confirm_deny" msgid="6374609298084435887">"አትላክ"</string> + <string name="sms_short_code_confirm_report" msgid="2588793956061677070">"ተንኮል አዘል መተግበሪያ ሪፖርት አድርግ"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM ካርድ ተወግዷል"</string> <string name="sim_removed_message" msgid="2333164559970958645">"በትክክል የገባ SIM ካርድ ድጋሚ እስኪያስጀምሩ የተንቀሳቃሽ ስልክ አውታረመረብ አይገኝም።"</string> <string name="sim_done_button" msgid="827949989369963775">"ተከናውኗል"</string> @@ -1063,10 +1067,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"USB ማረሚያ ላለማንቃት ዳስስ።"</string> <string name="select_input_method" msgid="4653387336791222978">"የግቤት ስልት ምረጥ"</string> <string name="configure_input_methods" msgid="9091652157722495116">"የግቤት ስልቶችን አዘጋጅ"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"የሚዳሰስ የቁልፍ ሰሌዳ"</string> + <string name="hardware" msgid="7517821086888990278">"ሃርድዌር"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"ዕጩዎች"</u></string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index cc3cf93..daef582 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"للسماح للتطبيق بتغيير تدوير الشاشة في أي وقت. لن تكون هناك حاجة إليه مطلقًا مع التطبيقات العادية."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"تغيير سرعة المؤشر"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"للسماح للتطبيق بتغيير سرعة مؤشر الماوس أو لوحة التتبع في أي وقت. لن تكون هناك حاجة إليه مطلقًا مع التطبيقات العادية."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"تغيير تنسيق لوحة مفاتيح"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"للسماح للتطبيق بتغيير تنسيق لوحة المفاتيح. لن تكون هناك حاجة إليه مطلقًا مع التطبيقات العادية."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"إرسال إشارات Linux للتطبيقات"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"للسماح للتطبيق بطلب إرسال الإشارة المزوّدة لجميع العمليات المستمرة."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"تشغيل التطبيق دائمًا"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"اكتب رقم التعريف الشخصي المطلوب:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"رقم التعريف الشخصي:"</string> <string name="select_character" msgid="3365550120617701745">"إدراج حرف"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"تطبيق غير معروف"</string> <string name="sms_control_title" msgid="7296612781128917719">"إرسال رسائل قصيرة SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"تم إرسال عدد كبير من الرسائل القصيرة SMS. المس \"موافق\" للمتابعة، أو \"إلغاء\" لإيقاف الإرسال."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"موافق"</string> - <string name="sms_control_no" msgid="1715320703137199869">"إلغاء"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"تمت إزالة بطاقة SIM"</string> <string name="sim_removed_message" msgid="2333164559970958645">"لن تكون شبكة الجوال متاحة حتى تتم إعادة التشغيل وإدخال بطاقة SIM صالحة."</string> <string name="sim_done_button" msgid="827949989369963775">"تم"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"المس لتعطيل تصحيح أخطاء USB."</string> <string name="select_input_method" msgid="4653387336791222978">"اختيار أسلوب الإدخال"</string> <string name="configure_input_methods" msgid="9091652157722495116">"إعداد أسلوب الإدخال"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"لوحة مفاتيح فعلية"</string> + <string name="hardware" msgid="7517821086888990278">"أجهزة"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" أ ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789 أ ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"العناصر المرشحة"</u></string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 16cb445..c155537 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -1007,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Увядзіце патрэбны PIN-код:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN-код"</string> <string name="select_character" msgid="3365550120617701745">"Уставіць сімвал"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Невядомае прыкладанне"</string> <string name="sms_control_title" msgid="7296612781128917719">"Адпраўка SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Адпраўляецца вялікая колькасць SMS-паведамленняў. Націсніце \"OK\", каб працягнуць, ці \"Адмена\", каб спыніць адпраўку."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"ОК"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Адмяніць"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-карта выдаленая"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Мабільная сетка будзе недаступная да перазагрузкі з дзеючай SIM-картай."</string> <string name="sim_done_button" msgid="827949989369963775">"Гатова"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 83f5e41..7860382 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Въведете задължителния ПИН:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"ПИН:"</string> <string name="select_character" msgid="3365550120617701745">"Вмъкване на знак"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Неизвестно приложение"</string> <string name="sms_control_title" msgid="7296612781128917719">"Изпращане на SMS съобщения"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Изпращат се голям брой SMS съобщения. Докоснете „OK“, за да продължите, или „Отказ“, за да спрете изпращането."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Отказ"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM картата е премахната"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Няма да имате достъп до мобилната мрежа, докато не рестартирате с поставена валидна SIM карта."</string> <string name="sim_done_button" msgid="827949989369963775">"Готово"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index c72c2dd..e266a85 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Permet que l\'aplicació canviï el gir de la pantalla en qualsevol moment. No s\'hauria de necessitar mai per a les aplicacions normals."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"canvi de velocitat del punter"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Permet que l\'aplicació canviï la velocitat del punter del ratolí o del ratolí tàctil en qualsevol moment. No s\'hauria de necessitar mai per a les aplicacions normals."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"canvia la disposició del teclat"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Permet que l\'aplicació canviï la disposició del teclat. En principi mai no serà necessari per a les aplicacions normals."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"envia senyals Linux a les aplicacions"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Permet que l\'aplicació sol·liciti que el senyal subministrat s\'enviï a tots els processos persistents."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"fes que l\'aplicació s\'executi sempre"</string> @@ -1009,11 +1007,17 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Introdueix el PIN sol·licitat:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Insereix un caràcter"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Aplicació desconeguda"</string> <string name="sms_control_title" msgid="7296612781128917719">"S\'estan enviant missatges SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"S\'estan enviant molts missatges SMS. Toca D\'acord per continuar o Cancel·la per aturar l\'enviament."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"D\'acord"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Cancel·la"</string> + <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> està enviant molts missatges SMS. Vols permetre que aquesta aplicació continuï enviant missatges?"</string> + <string name="sms_control_yes" msgid="3663725993855816807">"Permet"</string> + <string name="sms_control_no" msgid="625438561395534982">"Denega"</string> + <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"Vols enviar SMS a codi curt?"</string> + <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"Vols enviar el SMS prèmium?"</string> + <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vol enviar un missatge de text a <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, que sembla que és un codi SMS curt.<p>Si envies missatges de text a codis curts, pot ser que es carreguin serveis prèmium al teu compte mòbil.<p>Vols permetre que aquesta aplicació enviï el missatge?"</string> + <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vol enviar un missatge de text a <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, que és un codi curt SMS prèmium.<p><b>Si envies un missatge a aquesta destinació, es carregaran els serveis prèmium al teu compte mòbil.</b><p>Vols permetre que aquesta aplicació enviï el missatge?"</string> + <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"Envia el missatge"</string> + <string name="sms_short_code_confirm_deny" msgid="6374609298084435887">"No enviïs"</string> + <string name="sms_short_code_confirm_report" msgid="2588793956061677070">"Informa d\'una aplic. maliciosa"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Extracció de la targeta SIM"</string> <string name="sim_removed_message" msgid="2333164559970958645">"La xarxa de telefonia mòbil no estarà disponible fins que no reiniciïs amb una targeta SIM vàlida inserida."</string> <string name="sim_done_button" msgid="827949989369963775">"Fet"</string> @@ -1063,10 +1067,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Toca-ho per desactivar la depuració USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Selecció de mètodes d\'introducció"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Configura els mètodes d\'entrada"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Teclat físic"</string> + <string name="hardware" msgid="7517821086888990278">"Maquinari"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidats"</u></string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 52d10a2..33f91e8 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Zadejte požadovaný kód PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Vkládání znaků"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Neznámá aplikace"</string> <string name="sms_control_title" msgid="7296612781128917719">"Odesílání zpráv SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Odesíláte velký počet zpráv SMS. Dotkněte se možnosti OK, chcete-li pokračovat, nebo možnosti Zrušit, chcete-li odesílání ukončit."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Zrušit"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Karta SIM odebrána"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Mobilní síť bude dostupná až poté, co vložíte platnou kartu SIM a restartujete zařízení."</string> <string name="sim_done_button" msgid="827949989369963775">"Hotovo"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index b0a487b..c5b0e17 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1007,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Skriv den påkrævede pinkode:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"Pinkode:"</string> <string name="select_character" msgid="3365550120617701745">"Indsæt tegn"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Ukendt app"</string> <string name="sms_control_title" msgid="7296612781128917719">"Sender sms-beskeder"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Der sendes et stort antal sms-beskeder. Vælg \"OK\" for at fortsætte eller \"Annuller\" for at stoppe afsendelsen."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Annuller"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kort blev fjernet"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Det mobile netværk er utilgængeligt, indtil du genstarter med et gyldigt SIM-kort."</string> <string name="sim_done_button" msgid="827949989369963775">"Udfør"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 27b88f4..5a24cb3 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Ermöglicht der App, die Bildschirmdrehung jederzeit zu ändern. Sollte nie für normale Apps benötigt werden."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"Zeigergeschwindigkeit ändern"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Ermöglicht der App, jederzeit die Geschwindigkeit des Maus- bzw. Touchpad-Zeigers zu ändern. Sollte nie für normale Apps benötigt werden."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"Tastaturlayout ändern"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Ermöglicht der App, das Tastaturlayout zu ändern. Sollte für normale Apps nie benötigt werden."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"Linux-Signale an Apps senden"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Ermöglicht der App, das Senden des gelieferten Signals an alle andauernden Prozesse zu fordern"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"App permanent ausführen"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Geben Sie die erforderliche PIN ein:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Zeichen einfügen"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Unbekannte App"</string> <string name="sms_control_title" msgid="7296612781128917719">"Kurznachrichten werden gesendet"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Es wird eine große Anzahl an SMS versendet. Tippen Sie zum Fortfahren auf \"OK\" oder tippen Sie auf \"Abbrechen\", um den Sendevorgang zu beenden."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Abbrechen"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-Karte entfernt"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Das Mobilfunknetz ist erst wieder verfügbar, wenn Sie einen Neustart mit einer gültigen SIM-Karte durchführen."</string> <string name="sim_done_button" msgid="827949989369963775">"Fertig"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Zum Deaktivieren von USB-Debugging tippen"</string> <string name="select_input_method" msgid="4653387336791222978">"Eingabemethode wählen"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Eingabemethoden einrichten"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Physische Tastatur"</string> + <string name="hardware" msgid="7517821086888990278">"Hardware"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"Kandidaten"</u></string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 0a5dd69..7c951cc 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Επιτρέπει στην εφαρμογή την αλλαγή της περιστροφής της οθόνης ανά πάσα στιγμή. Δεν απαιτείται για συνήθεις εφαρμογές."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"αλλαγή ταχύτητας δείκτη"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Επιτρέπει στην εφαρμογή την αλλαγή της ταχύτητας του δείκτη του ποντικιού ή της επιφάνειας αφής ανά πάσα στιγμή. Δεν πρέπει να χρησιμοποιείται από συνήθεις εφαρμογές."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"αλλαγή διάταξης πληκτρολογίου"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Επιτρέπει στην εφαρμογή την αλλαγή της διάταξης πληκτρολογίου. Δεν απαιτείται για συνήθεις εφαρμογές."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"αποστολή σημάτων Linux σε εφαρμογές"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Επιτρέπει στην εφαρμογή την αποστολή αιτήματος για την αποστολή του παρεχόμενου σήματος σε όλες τις υπάρχουσες διαδικασίες."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"να εκτελείται συνεχώς η εφαρμογή"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Πληκτρολογήστε τον απαιτούμενο κωδικό PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Εισαγωγή χαρακτήρα"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Άγνωστη εφαρμογή"</string> <string name="sms_control_title" msgid="7296612781128917719">"Αποστολή μηνυμάτων SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Αποστέλλεται μεγάλος αριθμός μηνυμάτων SMS. Αγγίξτε το στοιχείο \"OK\" για συνέχεια, ή το στοιχείο \"Ακύρωση\" για διακοπή της αποστολής."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Ακύρωση"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Η κάρτα SIM αφαιρέθηκε"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Το δίκτυο κινητής τηλεφωνίας δεν θα είναι διαθέσιμο μέχρι να κάνετε επανεκκίνηση αφού τοποθετήσετε μια έγκυρη κάρτα SIM."</string> <string name="sim_done_button" msgid="827949989369963775">"Τέλος"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Αγγίξτε για απενεργοποίηση του εντοπισμού σφαλμάτων USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Επιλογή μεθόδου εισόδου"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Ρύθμιση μεθόδων εισαγωγής"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Φυσικό πληκτρολόγιο"</string> + <string name="hardware" msgid="7517821086888990278">"Υλικό"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"υποψήφιοι"</u></string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index fe5a173..208e96a 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1007,11 +1007,17 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Type the required PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Insert character"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Unknown app"</string> <string name="sms_control_title" msgid="7296612781128917719">"Sending SMS messages"</string> - <string name="sms_control_message" msgid="4073755190243093924">"A large number of SMS messages are being sent. Touch OK to continue or Cancel to stop sending."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Cancel"</string> + <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> is sending a large number of SMS messages. Do you want to allow this app to continue sending messages?"</string> + <string name="sms_control_yes" msgid="3663725993855816807">"Allow"</string> + <string name="sms_control_no" msgid="625438561395534982">"Deny"</string> + <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"Send SMS to short code?"</string> + <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"Send premium SMS?"</string> + <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> would like to send a text message to <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, which appears to be an SMS short code.<p>Sending text messages to some short codes may cause your mobile account to be billed for premium services.<p>do you want to allow this app to send the message?"</string> + <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> would like to send a text message to <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, which is a premium SMS short code.<p><b>Sending a message to this destination will cause your mobile account to be billed for premium services.</b><p>Do you want to allow this app to send the message?"</string> + <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"Send message"</string> + <string name="sms_short_code_confirm_deny" msgid="6374609298084435887">"Don\'t send"</string> + <string name="sms_short_code_confirm_report" msgid="2588793956061677070">"Report malicious app"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM card removed"</string> <string name="sim_removed_message" msgid="2333164559970958645">"The mobile network will be unavailable until you restart with a valid SIM card inserted."</string> <string name="sim_done_button" msgid="827949989369963775">"Done"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index ade6cfb..6f1ee53 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Permite que la aplicación cambie la rotación de la pantalla en cualquier momento. Las aplicaciones normales no deberían necesitar este permiso."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"cambiar velocidad del puntero"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Permite que la aplicación cambie la velocidad del puntero del mouse o el trackpad en cualquier momento. Las aplicaciones normales no deben utilizar este permiso."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"Cambiar el diseño del teclado"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Permite que la aplicación cambie el diseño del teclado. Las aplicaciones normales no deberían necesitar este permiso."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"enviar señales de Linux a las aplicaciones"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Permite que la aplicación solicite que la señal suministrada se envíe a todos los procesos persistentes."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"hacer que la aplicación se ejecute siempre"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Escribe el PIN solicitado:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Insertar caracteres"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Aplicación desconocida"</string> <string name="sms_control_title" msgid="7296612781128917719">"Enviando mensajes SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Se está enviando una gran cantidad de mensajes SMS. Toca \"Aceptar\" para continuar o \"Cancelar\" para detener el envío."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"Aceptar"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Cancelar"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Tarjeta SIM eliminada"</string> <string name="sim_removed_message" msgid="2333164559970958645">"La red para celulares no estará disponible hasta que reinicies, luego de insertar una tarjeta SIM válida."</string> <string name="sim_done_button" msgid="827949989369963775">"Finalizado"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Toca para desactivar la depuración de USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Selecciona el método de introducción"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Configurar métodos de introducción"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Teclado físico"</string> + <string name="hardware" msgid="7517821086888990278">"Hardware"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 8f50660..95e1152 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Permite que la aplicación cambie la rotación de la pantalla en cualquier momento. Las aplicaciones normales no deberían necesitar este permiso."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"cambiar velocidad del puntero"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Permite que la aplicación modifique la velocidad del puntero del ratón o del trackpad en cualquier momento. Las aplicaciones normales no deberían necesitar este permiso."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"cambiar el diseño del teclado"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Permite que la aplicación cambie el diseño del teclado. Las aplicaciones normales no deberían necesitar este permiso."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"enviar señales Linux a aplicaciones"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Permite que la aplicación solicite que la señal suministrada se envíe a todos los procesos persistentes."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"hacer que la aplicación se ejecute siempre"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Escribe el PIN solicitado:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Insertar carácter"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Aplicación desconocida"</string> <string name="sms_control_title" msgid="7296612781128917719">"Enviando mensajes SMS..."</string> - <string name="sms_control_message" msgid="4073755190243093924">"Se va a enviar un número elevado de mensajes SMS. Selecciona Aceptar para continuar o Cancelar para detener el envío."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"Aceptar"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Cancelar"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Tarjeta SIM eliminada"</string> <string name="sim_removed_message" msgid="2333164559970958645">"La red móvil no estará disponible hasta que reinicies el dispositivo con una tarjeta SIM válida."</string> <string name="sim_done_button" msgid="827949989369963775">"Listo"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Tocar para inhabilitar la depuración USB"</string> <string name="select_input_method" msgid="4653387336791222978">"Seleccionar método de introducción"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Ajustar métodos de introducción"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Teclado físico"</string> + <string name="hardware" msgid="7517821086888990278">"Hardware"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 25f3752..a72691f 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -1007,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Sisestage nõutav PIN-kood:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN-kood:"</string> <string name="select_character" msgid="3365550120617701745">"Sisesta tähemärk"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Tundmatu rakendus"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMS-sõnumite saatmine"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Saadetakse suur hulk SMS-sõnumid. Saatmise jätkamiseks valige OK, lõpetamiseks Tühista."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Tühista"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kaart eemaldatud"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Mobiilsidevõrk ei ole saadaval, kuni sisestate kehtiva SIM-kaardi ja taaskäivitate seadme."</string> <string name="sim_done_button" msgid="827949989369963775">"Valmis"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index d60c59d..d33fe74 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"به برنامه اجازه میدهد تا چرخش صفحه را هر وقت بخواهد تغییر دهد. برای برنامههای عادی نیاز نیست."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"تغییر سرعت اشاره گر"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"به برنامه اجازه میدهد تا سرعت ماوس و پد کنترل را هر وقت خواست تغییر دهد. برای برنامههای عادی نیاز نیست."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"تغییر چیدمان صفحه کلید"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"به برنامه اجازه میدهد تا چیدمان صفحه کلید را تغییر دهد. این کار هیچ گاه برای برنامههای عادی نیاز نیست."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"ارسال سیگنالهای Linux به برنامهها"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"به برنامه اجازه میدهد تا درخواست کند سیگنال ارائه شده به همه مراحل دائم ارسال شود."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"همیشه برنامه اجرا شود"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"پین لازم را تایپ کنید:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"پین:"</string> <string name="select_character" msgid="3365550120617701745">"درج نویسه"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"برنامه ناشناخته"</string> <string name="sms_control_title" msgid="7296612781128917719">"ارسال پیامک ها"</string> - <string name="sms_control_message" msgid="4073755190243093924">"تعداد زیادی پیام کوتاه ارسال شده است. برای ادامه، \"تأیید\" را لمس کرده و برای توقف ارسال، \"لغو\" را لمس کنید."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"تأیید"</string> - <string name="sms_control_no" msgid="1715320703137199869">"لغو"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"سیم کارت برداشته شد"</string> <string name="sim_removed_message" msgid="2333164559970958645">"تا وقتی که با یک سیمکارت معتبر راهاندازی مجدد نکنید شبکه تلفن همراه غیر قابل دسترس خواهد بود."</string> <string name="sim_done_button" msgid="827949989369963775">"انجام شد"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"غیرفعال کردن اشکال زدایی USB را لمس کنید."</string> <string name="select_input_method" msgid="4653387336791222978">"انتخاب روش ورودی"</string> <string name="configure_input_methods" msgid="9091652157722495116">"تنظیم روشهای ورودی"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"صفحه کلید فیزیکی"</string> + <string name="hardware" msgid="7517821086888990278">"سختافزار"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"داوطلبین"</u></string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 211fab2..f03e1af 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Antaa sovelluksen muuttaa näytön kiertoa milloin tahansa. Ei tavallisten sovellusten käyttöön."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"muuta osoittimen nopeutta"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Antaa sovelluksen muuttaa hiiren tai kosketuslevyn osoittimen nopeutta milloin tahansa. Ei tavallisten sovellusten käyttöön."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"vaihda näppäimistön asettelua"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Antaa sovelluksen muuttaa näppäimistön asettelua. Ei tavallisten sovellusten käyttöön."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"Linux-signaalien lähettäminen sovelluksille"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Antaa sovelluksen pyytää, että tarjottu signaali lähetetään kaikille käynnissä oleville prosesseille."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"sovelluksen asettaminen aina käynnissä olevaksi"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Kirjoita pyydetty PIN-koodi:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN-koodi:"</string> <string name="select_character" msgid="3365550120617701745">"Lisää merkki"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Tuntematon sovellus"</string> <string name="sms_control_title" msgid="7296612781128917719">"Tekstiviestien lähettäminen"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Olet lähettämässä suurta määrää tekstiviestejä. Jatka koskettamalla OK tai peruuta lähetys valitsemalla Peruuta."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Peruuta"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kortti poistettu"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Mobiiliverkko ei ole käytettävissä, ennen kuin käynnistät uudelleen kelvollisella laitteeseen kytketyllä SIM-kortilla."</string> <string name="sim_done_button" msgid="827949989369963775">"Valmis"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Poista USB-vianetsintä käytöstä koskettamalla tätä."</string> <string name="select_input_method" msgid="4653387336791222978">"Valitse syöttötapa"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Määritä syöttötavat"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Fyysinen näppäimistö"</string> + <string name="hardware" msgid="7517821086888990278">"Laitteisto"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZÅÄÖ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidaatit"</u></string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 787bdda..72ac5f4 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1007,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Saisissez le code PIN requis :"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"Code PIN :"</string> <string name="select_character" msgid="3365550120617701745">"Insérer un caractère"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Application inconnue"</string> <string name="sms_control_title" msgid="7296612781128917719">"Envoi de messages SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Vous êtes sur le point d\'envoyer un grand nombre de SMS. Appuyez sur \"OK\" pour continuer ou sur \"Annuler\" pour interrompre l\'envoi."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Annuler"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Carte SIM retirée"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Le réseau mobile ne sera pas disponible avant le redémarrage avec une carte SIM valide insérée."</string> <string name="sim_done_button" msgid="827949989369963775">"OK"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 1a95f32..e94e286 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"एप्लिकेशन को किसी भी समय स्क्रीन का रोटेशन बदलने देता है. सामान्य एप्लिकेशन के लिए कभी भी आवश्यक नहीं होना चाहिए."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"सूचक गति बदलें"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"एप्लिकेशन को माउस या ट्रैकपैड सूचक गति को किसी भी समय बदलने देता है. सामान्य एप्लिकेशन के लिए कभी भी आवश्यक नहीं होना चाहिए."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"कीबोर्ड लेआउट बदलें"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"एप्लिकेशन को कीबोर्ड लेआउट बदलने देता है. सामान्य एप्लिकेशन के लिए कभी आवश्यक नहीं है."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"एप्लिकेशन को Linux सिग्नल भेजें"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"एप्लिकेशन को यह अनुरोध करने देता है कि दिया गया सिग्नल सभी जारी प्रक्रियाओं को भेजा जाए."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"एप्लिकेशन को हमेशा चलने वाला बनाएं"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"आवश्यक पिन लिखें:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"पिन:"</string> <string name="select_character" msgid="3365550120617701745">"वर्ण सम्मिलित करें"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"अज्ञात एप्लिकेशन"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMS संदेश भेज रहा है"</string> - <string name="sms_control_message" msgid="4073755190243093924">"बड़ी संख्या में SMS संदेश भेजे जा रहे हैं. जारी रखने के लिए ठीक स्पर्श करें, या भेजना बंद करने के लिए रद्द करें स्पर्श करें."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"ठीक"</string> - <string name="sms_control_no" msgid="1715320703137199869">"रद्द करें"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"सिमकार्ड निकाला गया"</string> <string name="sim_removed_message" msgid="2333164559970958645">"मान्य सिम कार्ड डालकर पुन: प्रारंभ करने तक मोबाइल नेटवर्क अनुपलब्ध रहेगा."</string> <string name="sim_done_button" msgid="827949989369963775">"पूर्ण"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"USB डीबग करना अक्षम करने के लिए स्पर्श करें."</string> <string name="select_input_method" msgid="4653387336791222978">"इनपुट पद्धति चुनें"</string> <string name="configure_input_methods" msgid="9091652157722495116">"इनपुट पद्धतियां सेट करें"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"भौतिक कीबोर्ड"</string> + <string name="hardware" msgid="7517821086888990278">"हार्डवेयर"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"उम्मीदवार"</u></string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 0591e04..412bc61 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Upišite potreban PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Umetni znak"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Nepoznata aplikacija"</string> <string name="sms_control_title" msgid="7296612781128917719">"Slanje SMS poruka"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Šalje se velika količina SMS poruka. Dodirnite \"U redu\" za nastavak ili \"Odustani\" za prekid slanja."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"U redu"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Odustani"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM kartica uklonjena"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Mobilna mreža bit će nedostupna do ponovnog pokretanja s umetnutom važećom SIM karticom."</string> <string name="sim_done_button" msgid="827949989369963775">"Gotovo"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 4043aef..c8f039f 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Lehetővé teszi az alkalmazás számára a képernyő elforgatásának bármikori módosítását. A normál alkalmazásoknak erre soha nincs szüksége."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"mutató sebességének módosítása"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Lehetővé teszi az alkalmazás számára, hogy bármikor módosítsa az egér vagy az érintőpad mutatójának sebességét. Normál alkalmazásoknak soha nem lehet rá szükségük."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"billentyűzetkiosztás módosítása"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Lehetővé teszi az alkalmazás számára, hogy módosítsa a billentyűzetkiosztást. Normál alkalmazásoknak alapesetben nem lehet szükségük rá."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"Linux-jelek küldése az alkalmazásoknak"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Lehetővé teszi az alkalmazás számára, hogy a megadott jelet elküldje az összes állandó folyamatnak."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"az alkalmazás állandó futtatása"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Adja meg a szükséges PIN kódot:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN kód:"</string> <string name="select_character" msgid="3365550120617701745">"Karakter beszúrása"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Ismeretlen alkalmazás"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMS-ek küldése"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Nagy számú SMS-t kíván elküldeni. A folytatáshoz érintse meg az \"OK\", a küldés leállításához a \"Mégse\" lehetőséget."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Mégse"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kártya eltávolítva"</string> <string name="sim_removed_message" msgid="2333164559970958645">"A mobilhálózat nem lesz elérhető, amíg újra nem indítja egy érvényes SIM kártya behelyezése után."</string> <string name="sim_done_button" msgid="827949989369963775">"Kész"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Érintse meg az USB hibakeresés kikapcsolásához."</string> <string name="select_input_method" msgid="4653387336791222978">"Beviteli mód kiválasztása"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Beviteli módok beállítása"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Fizikai billentyűzet"</string> + <string name="hardware" msgid="7517821086888990278">"Hardver"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"jelöltek"</u></string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 7a52979..03dac8a 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Ketik PIN yang diminta:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Sisipkan huruf"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Apl tak dikenal"</string> <string name="sms_control_title" msgid="7296612781128917719">"Mengirim pesan SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Pesan SMS dalam jumlah besar sedang dikirimkan. Sentuh Oke untuk melanjutkan, atau Batal untuk menghentikan pengiriman."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"Oke"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Batal"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Kartu SIM dihapus"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Jaringan seluler tidak akan tersedia sampai Anda memulai lagi dengan memasukkan kartu SIM yang valid."</string> <string name="sim_done_button" msgid="827949989369963775">"Selesai"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 9073bf1..e9e5924 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1007,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Inserisci il PIN richiesto:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Inserisci carattere"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Applicazione sconosciuta"</string> <string name="sms_control_title" msgid="7296612781128917719">"Invio SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"È in corso l\'invio di numerosi SMS. Tocca \"OK\" per continuare oppure \"Annulla\" per interrompere l\'invio."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Annulla"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Scheda SIM rimossa"</string> <string name="sim_removed_message" msgid="2333164559970958645">"La rete mobile non sarà disponibile finché non eseguirai il riavvio con una scheda SIM valida inserita."</string> <string name="sim_done_button" msgid="827949989369963775">"Fine"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 714f203..731546c 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"מאפשר ליישום לשנות את הסיבוב של המסך בכל עת. הרשאה זו לעולם אינה נחוצה ליישומים רגילים."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"שינוי מהירות המצביע"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"מאפשר ליישום לשנות את המהירות של מצביע העכבר או לוח המגע בכל עת. יישומים רגילים לא אמורים לעולם להזדקק להרשאה זו."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"שנה את פריסת המקלדת"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"מאפשר ליישום לשנות את פריסת המקלדת. הרשאה זו לעולם אינה אמורה להיות נחוצה עבור יישומים רגילים."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"שליחת אותות Linux ליישומים"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"מאפשר ליישום לבקש שהאות שנקלט יישלח לכל התהליכים המתמשכים."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"הגדרת היישום לפעול תמיד"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"הקלד את קוד ה-PIN הנדרש."</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"הוסף תו"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"יישום לא ידוע"</string> <string name="sms_control_title" msgid="7296612781128917719">"שולח הודעות SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"מתבצעת כעת שליחה של מספר גדול של הודעות SMS. גע באפשרות \'אישור\' כדי להמשיך, או \'ביטול\' כדי לעצור את השליחה."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"אישור"</string> - <string name="sms_control_no" msgid="1715320703137199869">"ביטול"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"כרטיס ה-SIM הוסר"</string> <string name="sim_removed_message" msgid="2333164559970958645">"הרשת הסלולרית לא תהיה זמינה עד שתפעיל מחדש לאחר הכנסת כרטיס SIM חוקי."</string> <string name="sim_done_button" msgid="827949989369963775">"סיום"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"גע כדי להשבית את ניקוי הבאגים בהתקן ה-USB."</string> <string name="select_input_method" msgid="4653387336791222978">"בחר שיטת הזנה"</string> <string name="configure_input_methods" msgid="9091652157722495116">"הגדר שיטות קלט"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"מקלדת פיזית"</string> + <string name="hardware" msgid="7517821086888990278">"חומרה"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"מועמדים"</u></string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index a5db38b..e9d3558 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"いつでも画面の向きを変更することをアプリに許可します。通常のアプリでは不要です。"</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"ポインタの速度の変更"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"マウスまたはトラックパッドのポインタの速度をいつでも変更することをアプリに許可します。通常のアプリでは不要です。"</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"キーボードレイアウトの変更"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"キーボードレイアウトの変更をアプリに許可します。通常のアプリでは不要です。"</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"アプリへのLinuxシグナルの送信"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"受信したシグナルをすべての継続プロセスに送信するようリクエストすることをアプリに許可します。"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"アプリの常時実行"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"必要なPINを入力してください:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"文字を挿入"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"不明なアプリ"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMSメッセージの送信中"</string> - <string name="sms_control_message" msgid="4073755190243093924">"大量のSMSメッセージを送信しようとしています。[OK]で送信、[キャンセル]で中止します。"</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"キャンセル"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIMカードが取り外されました"</string> <string name="sim_removed_message" msgid="2333164559970958645">"有効なSIMカードを挿入して再起動するまでは、モバイルネットワークは利用できません。"</string> <string name="sim_done_button" msgid="827949989369963775">"完了"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"タップしてUSBデバッグを無効にします。"</string> <string name="select_input_method" msgid="4653387336791222978">"入力方法の選択"</string> <string name="configure_input_methods" msgid="9091652157722495116">"入力方法をセットアップ"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"物理キーボード"</string> + <string name="hardware" msgid="7517821086888990278">"ハードウェア"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"候補"</u></string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 4f580ba..02ab306 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"앱이 언제든지 화면 회전을 변경할 수 있도록 허용합니다. 일반 앱에는 필요하지 않습니다."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"포인터 속도 변경"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"앱이 언제든지 마우스 또는 트랙패드 포인터의 속도를 변경할 수 있도록 허용합니다. 일반 앱에는 필요하지 않습니다."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"키보드 레이아웃 변경"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"앱이 키보드 레이아웃을 변경할 수 있도록 허용합니다. 일반 앱에는 필요하지 않습니다."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"앱에 Linux 시그널 보내기"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"제공된 시그널을 모든 영구 프로세스로 전송하는 것을 앱이 요청할 수 있도록 허용합니다."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"앱이 항상 실행되도록 설정"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"필수 PIN 입력:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"문자 삽입"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"알 수 없는 앱"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMS 메시지를 보내는 중"</string> - <string name="sms_control_message" msgid="4073755190243093924">"SMS 메시지를 대량 전송 중입니다. 계속하려면 \'확인\'을 터치하고 전송을 중지하려면 \'취소\'를 터치하세요."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"확인"</string> - <string name="sms_control_no" msgid="1715320703137199869">"취소"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM 카드 제거됨"</string> <string name="sim_removed_message" msgid="2333164559970958645">"유효한 SIM 카드를 삽입하여 다시 시작할 때까지 모바일 네트워크를 사용할 수 없습니다."</string> <string name="sim_done_button" msgid="827949989369963775">"완료"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"USB 디버깅을 사용하지 않으려면 터치하세요."</string> <string name="select_input_method" msgid="4653387336791222978">"입력 방법 선택"</string> <string name="configure_input_methods" msgid="9091652157722495116">"입력 방법 설정"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"물리적 키보드"</string> + <string name="hardware" msgid="7517821086888990278">"하드웨어"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"가능한 원인"</u></string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index c588fa6..3d389d8 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Leidžiama programai bet kada kaitalioti ekraną. Įprastoms programoms to neturėtų prireikti."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"keisti žymiklio greitį"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Leidžiama programai keisti pelės ar sensorinio pulto žymiklio greitį. Įprastoms programoms to neturėtų prireikti."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"keisti klaviatūros išdėstymą"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Leidžiama programai pakeisti klaviatūros išdėstymą. Įprastoms programoms to neturėtų prireikti."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"siųsti „Linux“ signalus programoms"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Leidžiama programai pateikti užklausą, kad teikiamas signalas būtų siunčiamas visiems nuolatiniams procesams."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"nustatyti, kad programa būtų visada vykdoma"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Įveskite reikiamą PIN kodą:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN kodas:"</string> <string name="select_character" msgid="3365550120617701745">"Įterpti simbolį"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Nežinoma programa"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMS pranešimų siuntimas"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Siunčiama daug SMS pranešimų. Palieskite „Gerai“, jei norite tęsti, arba „Atšaukti“, jei norite sustabdyti siuntimą."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"Gerai"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Atšaukti"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM kortelė pašalinta"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Mobilusis tinklas bus nepasiekiamas, kol nepaleisite iš naujo įdėję tinkamą SIM kortelę."</string> <string name="sim_done_button" msgid="827949989369963775">"Atlikta"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Palieskite, kad neleistumėte USB derinimo."</string> <string name="select_input_method" msgid="4653387336791222978">"Pasirinkite įvesties metodą"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Nustatyti įvesties metodus"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Fizinė klaviatūra"</string> + <string name="hardware" msgid="7517821086888990278">"Apar. įr."</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AĄBCČDEĘĖFGHIĮYJKLMNOPRSŠTUŲŪVZŽ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789AĄBCČDEĘĖFGHIĮYJKLMNOPRSŠTUŲŪVZŽ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidatai"</u></string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index d710347..05d0dbe 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Ļauj lietotnei jebkurā laikā mainīt ekrāna pozīciju. Parastajām lietotnēm tas nekad nav nepieciešams."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"Rādītāja ātruma mainīšana"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Ļauj lietotnei jebkurā laikā mainīt peles vai skārienpaliktņa rādītāja ātrumu. Parastajām lietotnēm tas nekad nav nepieciešams."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"Tastatūras izkārtojuma maiņa"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Ļauj lietotnei mainīt tastatūras izkārtojumu. Parastajām lietotnēm tas nekad nav nepieciešams."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"sūtīt Linux signālus lietotnēm"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Ļauj lietotnei pieprasīt, lai piegādātais signāls tiktu sūtīts visiem pastāvīgajiem procesiem."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"likt lietotnei vienmēr darboties"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Ierakstiet pieprasīto PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Ievietojiet rakstzīmi"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Nezināma lietotne"</string> <string name="sms_control_title" msgid="7296612781128917719">"Īsziņu sūtīšana"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Tiek sūtīts daudz īsziņu. Pieskarieties Labi, lai turpinātu, vai Atcelt, lai apturētu sūtīšanu."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"Labi"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Atcelt"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM karte ir izņemta."</string> <string name="sim_removed_message" msgid="2333164559970958645">"Mobilais tīkls nebūs pieejams līdz brīdim, kad restartēsiet ierīci ar ievietotu derīgu SIM karti."</string> <string name="sim_done_button" msgid="827949989369963775">"Gatavs"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Pieskarieties, lai atspējotu USB atkļūdošanu."</string> <string name="select_input_method" msgid="4653387336791222978">"Ievades metodes izvēle"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Iestatīt ievades metodes"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Fiziskā tastatūra"</string> + <string name="hardware" msgid="7517821086888990278">"Aparatūra"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AĀBCČDEĒFGĢHIĪJKĶLĻMNŅOPRSŠTUŪVZŽ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789AĀBCČDEĒFGĢHIĪJKĶLĻMNŅOPRSŠTUŪVZŽ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidāti"</u></string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 38fc473..f0f5630 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Membenarkan apl untuk menukar putaran skrin pada bila-bila masa. Tidak sekali-kali diperlukan untuk apl biasa."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"tukar kelajuan penuding"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Membenarkan apl untuk menukar kelajuan penunjuk tetikus atau pad jejak pada bila-bila masa. Tidak sekali-kali diperlukan untuk apl biasa."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"tukar susun atur papan kekunci"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Membenarkan apl menukar susun atur papan kekunci. Tidak sekali-kali diperlukan untuk apl biasa."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"hantar isyarat Linux kepada apl"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Membenarkan apl meminta isyarat yang dibekalkan dihantar kepada semua proses yang berterusan."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"buatkan apl sentiasa berjalan"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Taipkan PIN yang diperlukan:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Masukkan aksara"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Apl tidak diketahui"</string> <string name="sms_control_title" msgid="7296612781128917719">"Menghantar mesej SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Sejumlah besar mesej SMS sedang dihantar. Sentuh \"OK\" untuk meneruskan atau \"Batal\" untuk menghentikan penghantaran."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Batal"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Kad SIM dikeluarkan"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Rangkaian mudah alih tidak akan tersedia sehingga anda mula semula dengan kad SIM yang sah dimasukkan."</string> <string name="sim_done_button" msgid="827949989369963775">"Selesai"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Sentuh untuk melumpuhkan penyahpepijatan USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Pilih kaedah input"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Sediakan kaedah input"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Papan kekunci fizikal"</string> + <string name="hardware" msgid="7517821086888990278">"Perkakasan"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"calon"</u></string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index df05f01..6609d29 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Skriv inn påkrevd PIN-kode:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Sett inn tegn"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Ukjent app"</string> <string name="sms_control_title" msgid="7296612781128917719">"Sender SMS-meldinger"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Et stort antall SMS-meldinger sendes. Trykk på OK for å fortsette, eller trykk på Avbryt for å avbryte sendingen."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Avbryt"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kort er fjernet"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Det mobile nettverket forblir utilgjengelig inntil du starter på nytt med et gyldig SIM-kort."</string> <string name="sim_done_button" msgid="827949989369963775">"Fullført"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 3d48936..1c8809a 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Hiermee kan de app de rotatie van het scherm op elk moment wijzigen. Nooit vereist voor normale apps."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"aanwijzersnelheid wijzigen"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Hiermee kan de app de snelheid van de muis- of trackpadaanwijzer op elk moment wijzigen. Nooit vereist voor normale apps."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"toetsenbordindeling wijzigen"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Hiermee kan de app de toetsenbordindeling wijzigen. Nooit vereist voor normale apps."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"Linux-signalen verzenden naar apps"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Hiermee kan de app ervoor zorgen dat het geleverde signaal wordt verzonden naar alle persistente processen."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"app altijd laten uitvoeren"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Voer de gewenste pincode in:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"Pincode"</string> <string name="select_character" msgid="3365550120617701745">"Teken invoegen"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Onbekende app"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMS-berichten verzenden"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Er wordt een groot aantal sms\'jes verzonden. Raak \'OK\' aan om door te gaan of \'Annuleren\' om de verzending te stoppen."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Annuleren"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Simkaart verwijderd"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Het mobiele netwerk is niet beschikbaar totdat u het apparaat opnieuw start met een geldige simkaart."</string> <string name="sim_done_button" msgid="827949989369963775">"Gereed"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Raak deze optie aan om USB-foutopsporing uit te schakelen."</string> <string name="select_input_method" msgid="4653387336791222978">"Invoermethode selecteren"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Invoermethoden instellen"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Fysiek toetsenbord"</string> + <string name="hardware" msgid="7517821086888990278">"Hardware"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidaten"</u></string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index d566c14..83b7aba 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Pozwala aplikacji na zmianę obrotu ekranu w dowolnym momencie. To uprawnienie nie powinno być potrzebne zwykłym aplikacjom."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"zmiana szybkości wskaźnika"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Pozwala aplikacji zmienić szybkość wskaźnika myszy lub touchpada w dowolnym momencie. Nieprzeznaczone dla zwykłych aplikacji."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"zmiana układu klawiatury"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Zezwala aplikacji na zmianę układu klawiatury. Nieprzeznaczone dla zwykłych aplikacji."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"wysyłanie sygnałów systemu Linux do aplikacji"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Pozwala aplikacji na żądanie, aby dostarczony sygnał został wysłany do wszystkich trwałych procesów."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"sprawianie, że aplikacja jest cały czas uruchomiona"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Wpisz wymagany kod PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"Kod PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Wstaw znak"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Nieznana aplikacja"</string> <string name="sms_control_title" msgid="7296612781128917719">"Wysyłanie wiadomości SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Wysyłana jest duża liczba wiadomości SMS. Dotknij OK, aby kontynuować, lub Anuluj, aby zatrzymać wysyłanie."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Anuluj"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Karta SIM wyjęta"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Sieć komórkowa będzie niedostępna do chwili ponownego uruchomienia urządzenia z użyciem ważnej karty SIM."</string> <string name="sim_done_button" msgid="827949989369963775">"Gotowe"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Dotknij, aby wyłączyć debugowanie USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Wybierz metodę wprowadzania"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Konfiguruj metody wprowadzania"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Klawiatura fizyczna"</string> + <string name="hardware" msgid="7517821086888990278">"Sprzęt"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandydaci"</u></string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 0f55711..8f2f78f 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Permite que a aplicação altere a rotação do ecrã em qualquer momento. Nunca deve ser necessário para aplicações normais."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"alterar a veloc. do ponteiro"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Permite à aplicação mudar em qualquer altura a velocidade do ponteiro do rato ou do trackpad. Nunca deverá ser necessário para aplicações normais."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"alterar o esquema de teclado"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Permite que a aplicação altere o esquema de teclado. Nunca deverá ser necessário para aplicações normais."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"enviar sinais Linux para aplicações"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Permite à aplicação pedir que o sinal fornecido seja enviado a todos os processos persistentes."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"fazer com que a aplicação seja sempre executada"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Introduza o PIN solicitado:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Introduzir carácter"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Aplicação desconhecida"</string> <string name="sms_control_title" msgid="7296612781128917719">"A enviar mensagens SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Está a ser enviado um grande número de mensagens SMS. Toque em “OK” para continuar ou “Cancelar” para parar o envio."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Cancelar"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Cartão SIM removido"</string> <string name="sim_removed_message" msgid="2333164559970958645">"A rede de telemóvel estará indisponível até que reinicie o aparelho com um cartão SIM válido inserido."</string> <string name="sim_done_button" msgid="827949989369963775">"Concluído"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Toque para desativar a depuração USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Escolher o método de entrada"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Configurar métodos de introdução"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Teclado físico"</string> + <string name="hardware" msgid="7517821086888990278">"Hardware"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 1beb4e7..4d770b5 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Permite que o aplicativo gire a tela a qualquer momento. Nunca deve ser necessário para aplicativos normais."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"alterar velocidade do ponteiro"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Permite que o aplicativo altere a velocidade do cursos do mouse ou trackpad a qualquer momento. Nunca deve ser necessário para aplicativos normais."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"alterar layout do teclado"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Permite que o aplicativo altere o layout do teclado. Não será necessário para aplicativos normais."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"enviar sinais para aplicativos Linux"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Permite que o aplicativo solicite o envio do sinal fornecido a todos os processos persistentes."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"sempre executar o aplicativo"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Digite o PIN obrigatório:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Inserir caractere"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Aplicativo desconhecido"</string> <string name="sms_control_title" msgid="7296612781128917719">"Enviando mensagens SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Muitas mensagens SMS estão sendo enviadas. Selecione \"OK\" para continuar ou \"Cancelar\" para interromper o envio."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Cancelar"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Cartão SIM removido"</string> <string name="sim_removed_message" msgid="2333164559970958645">"A rede móvel ficará indisponível até que você reinicie com um cartão SIM válido inserido."</string> <string name="sim_done_button" msgid="827949989369963775">"Concluído"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Toque para desativar a depuração do USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Selecione o método de entrada"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Configurar métodos de entrada"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Teclado físico"</string> + <string name="hardware" msgid="7517821086888990278">"Hardware"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index 637e4b1..6f066de 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -1489,13 +1489,27 @@ <!-- no translation found for wifi_p2p_show_pin_message (8530563323880921094) --> <skip /> <string name="select_character" msgid="3365550120617701745">"Inserir in caracter"</string> - <!-- no translation found for sms_control_default_app_name (3058577482636640465) --> - <skip /> <string name="sms_control_title" msgid="7296612781128917719">"Trametter messadis SMS"</string> - <!-- no translation found for sms_control_message (4073755190243093924) --> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> <skip /> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Interrumper"</string> <!-- no translation found for sim_removed_title (6227712319223226185) --> <skip /> <!-- no translation found for sim_removed_message (2333164559970958645) --> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 0f773a5..3772861 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Introduceţi codul PIN necesar:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"Cod PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Introduceţi caracterul"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Aplicaţie necunoscută"</string> <string name="sms_control_title" msgid="7296612781128917719">"Se trimit mesaje SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"În acest moment se trimit multe mesaje SMS. Atingeţi „OK” pentru a continua sau „Anulaţi” pentru a opri trimiterea."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Anulaţi"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Card SIM eliminat"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Reţeaua mobilă va fi indisponibilă până când reporniţi cu o cartelă SIM validă introdusă."</string> <string name="sim_done_button" msgid="827949989369963775">"Terminat"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 7b7c95b..b967620 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Приложение сможет менять ориентацию экрана. Это разрешение не используется обычными приложениями."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"изменять скорость указателя"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Приложение сможет в любой момент изменить скорость движения указателя мыши или сенсорной панели. Это разрешение не используется обычными приложениями."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"менять раскладку автоматически"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Разрешить автоматическую смену раскладки клавиатуры (используется лишь в некоторых приложениях)."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"отправка сигналов Linux приложениям"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Приложение сможет запрашивать передачу полученного сигнала всем постоянным процессам."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"постоянная работа приложения"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Введите PIN-код:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN-код:"</string> <string name="select_character" msgid="3365550120617701745">"Введите символ"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Неизвестное приложение"</string> <string name="sms_control_title" msgid="7296612781128917719">"Отправка SMS-сообщений"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Отправляется большое количество SMS-сообщений. Нажмите \"ОК\", чтобы продолжить отправку, или \"Отмена\", чтобы прекратить ее."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"ОК"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Отмена"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-карта удалена"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Пока вы не вставите действующую SIM-карту, мобильная сеть будет недоступна."</string> <string name="sim_done_button" msgid="827949989369963775">"Готово"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Нажмите, чтобы отключить отладку по USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Выберите способ ввода"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Настройка способов ввода"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Физическая клавиатура"</string> + <string name="hardware" msgid="7517821086888990278">"Аппаратура"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"варианты"</u></string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index a2ac96e..1bf7a17 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Umožňuje aplikácii kedykoľvek zmeniť otáčanie obrazovky. Bežné aplikácie by toto nastavenie nemali nikdy potrebovať."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"zmena rýchlosti ukazovateľa"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Umožňuje aplikácii kedykoľvek zmeniť rýchlosť kurzora myši alebo touchpadu. Bežné aplikácie by toto nastavenie nemali nikdy potrebovať."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"zmeniť rozloženie klávesnice"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Umožňuje aplikácii zmeniť rozloženie klávesnice. Bežné aplikácie by toto nastavenie nemali nikdy potrebovať."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"odoslať aplikáciám signály systému Linux"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Umožňuje aplikácii vyžiadať odoslanie poskytnutého signálu všetkým trvalým procesom."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"nastaviť, aby bola aplikácia neustále spustená"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Zadajte požadovaný kód PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Vkladanie znakov"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Neznáma aplikácia"</string> <string name="sms_control_title" msgid="7296612781128917719">"Odosielanie správ SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Odosiela sa veľký počet správ SMS. Ak chcete pokračovať, dotknite sa tlačidla OK. Ak chcete odosielanie ukončiť, dotknite sa tlačidla Zrušiť."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Zrušiť"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Karta SIM bola odobraná"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Mobilná sieť nebude k dispozícii, kým nevložíte platnú kartu SIM a zariadenie nereštartujete."</string> <string name="sim_done_button" msgid="827949989369963775">"Hotovo"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Dotknutím zakážete ladenie USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Zvoliť metódu vstupu"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Nastavenie metód vstupu"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Fyzická klávesnica"</string> + <string name="hardware" msgid="7517821086888990278">"Hardvér"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AÁÄBCČDĎDZDŽEÉFGHCHIÍJKLĽMNŇOÓÔPRŔSŠTŤUÚVWXYÝZŽ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidáti"</u></string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 2b452ae..152d1c1 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Programu omogoča, da kadar koli zasuka zaslon. Ne uporabljajte za navadne programe."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"spreminjanje hitrosti kazalca"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Programu omogoča spreminjanje hitrosti kazalca miške ali sledilne ploščice. Tega ni treba nikoli uporabiti za navadne programe."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"spreminjanje postavitve tipkovnice"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Aplikaciji omogoča, da kadar koli spremeni postavitev tipkovnice. Običajne aplikacije tega ne potrebujejo."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"pošiljanje signalov Linuxa programom"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Programu omogoča, da zahteva, da je posredovani signal poslan vsem trajnim procesom."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"neprekinjeno izvajanje programov"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Vnesite zahtevano kodo PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Vstavljanje znaka"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Neznan program"</string> <string name="sms_control_title" msgid="7296612781128917719">"Pošiljanje sporočil SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"V pošiljanju je veliko sporočil SMS. Če želite nadaljevati, izberite »V redu«. Če želite pošiljanje ustaviti, izberite »Prekliči«."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"V redu"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Prekliči"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Kartica SIM odstranjena"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Mobilno omrežje ne bo na voljo, dokler naprave vnovič ne zaženete z veljavno kartico SIM."</string> <string name="sim_done_button" msgid="827949989369963775">"Dokončano"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Dotaknite se, če želite onemogočiti iskanje in odpravljanje napak prek vrat USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Izberite način vnosa"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Nastavi načine vnosa"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Fizična tipkovnica"</string> + <string name="hardware" msgid="7517821086888990278">"Strojna oprema"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidati"</u></string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 0fdce67..9e63b31 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Унесите потребни PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Уметање знака"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Непозната апликација"</string> <string name="sms_control_title" msgid="7296612781128917719">"Слање SMS порука"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Шаље се велики број SMS порука. Додирните Потврди да бисте наставили или Откажи да бисте зауставили слање."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"Потврди"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Откажи"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM картица је уклоњена"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Мобилна мрежа неће бити доступна док не покренете систем поново уз уметање важеће SIM картице."</string> <string name="sim_done_button" msgid="827949989369963775">"Готово"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 2c4efc5..3db9ec7 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Gör att appen när som helst kan ändra skärmläget. Behövs inte för vanliga appar."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"ändra markörens hastighet"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Tillåter att appen när som helst ändrar hastigheten för musens eller styrplattans markör. Ska inte behövas för vanliga appar."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"ändra tangentbordslayout"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Tillåter att appen ändrar tangentbordets layout. Ska inte behövas för vanliga appar."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"skicka Linux-signaler till appar"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Tillåter att appen begär att den angivna signalen skickas till alla beständiga processer."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"se till att appen alltid körs"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Ange den obligatoriska PIN-koden:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN-kod:"</string> <string name="select_character" msgid="3365550120617701745">"Infoga tecken"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Okänd app"</string> <string name="sms_control_title" msgid="7296612781128917719">"Skickar SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Flera SMS skickas. Tryck på OK om du vill fortsätta eller på Avbryt om du vill avsluta sändningen."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Avbryt"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kortet togs bort"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Det mobila nätverket kommer inte att vara tillgängligt förrän du startar om med ett giltigt SIM-kort."</string> <string name="sim_done_button" msgid="827949989369963775">"Klar"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Tryck om du vill inaktivera USB-felsökning."</string> <string name="select_input_method" msgid="4653387336791222978">"Välj inmatningsmetod"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Konfigurera inmatningsmetoder"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Fysiskt tangentbord"</string> + <string name="hardware" msgid="7517821086888990278">"Maskinvara"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidater"</u></string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 41345bd..20bc2c6 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Inaruhusu programu kubadilisha mzunguko wa skrini wakati wowote. Kamwe hazihitajiki kwa programu za kawaida."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"Badilisha kasi ya pointa"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Inaruhusu programu kubadilisha kasi ya kielekezi cha kipanya au pedi ya kufuatilia wakati wowote. Kamwe haitahitajika kwa programu za kawaida."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"badilisha mpangilio wa kibodi"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Inaruhusu programu kubadilisha mpangilio wa kibodi. Haipaswi kamwe kuhitajika kwa rogramu za kawaida."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"Tuma ishara za Linux kwa programu"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Inaruhusu programu kuomba ishara iliyotolewa kutumwa kwa michakato inyoendelea."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"Fanya programu kuendeshwa kila mara"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Charaza PIN inayohitajika:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Ingiza kibambo"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Programu isiyojulikana"</string> <string name="sms_control_title" msgid="7296612781128917719">"Inatuma ujumbe wa SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Idadi kubwa ya jumbe za SMS inatumwa. Gusa SAWA kuendelea, au Ghairi kuwacha kutuma."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"Sawa"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Ghairi"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Kadi ya SIM imeondolewa"</string> <string name="sim_removed_message" msgid="2333164559970958645">"mtandao wa simu hutapatika hadi uanzishe upya na SIM kadi halali iliyoingizwa."</string> <string name="sim_done_button" msgid="827949989369963775">"Kwisha"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Gusa ili kulemaza utatuaji wa USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Chagua njia ya ingizo"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Weka mbinu za ingizo"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Kibodi halisi"</string> + <string name="hardware" msgid="7517821086888990278">"Maunzi"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"wagombeaji"</u></string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 3f479e5..0884fb7 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"พิมพ์ PIN ที่ต้องการ:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"ใส่อักขระ"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"แอปพลิเคชันที่ไม่รู้จัก"</string> <string name="sms_control_title" msgid="7296612781128917719">"กำลังส่งข้อความ SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"กำลังส่งข้อความ SMS จำนวนมาก แตะ \"ตกลง\" เพื่อทำงานต่อหรือ \"ยกเลิก\" เพื่อหยุดส่ง"</string> - <string name="sms_control_yes" msgid="2532062172402615953">"ตกลง"</string> - <string name="sms_control_no" msgid="1715320703137199869">"ยกเลิก"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"นำซิมการ์ดออกแล้ว"</string> <string name="sim_removed_message" msgid="2333164559970958645">"เครือข่ายมือถือจะไม่สามารถใช้งานได้จนกว่าคุณจะรีสตาร์ทโดยใส่ซิมการ์ดที่ถูกต้องแล้ว"</string> <string name="sim_done_button" msgid="827949989369963775">"เสร็จสิ้น"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index a5d3f08..26f7d5e 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Pinapayagan ang app na baguhin ang pag-ikot ng screen anumang oras. Hindi kailanman dapat na kailanganin para sa normal na apps."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"baguhin ang bilis ng pointer"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Pinapayagan ang app na baguhin ang bilis ng mouse o trackpad pointer anumang oras. Hindi kailanman dapat na kailanganin para sa normal na apps."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"baguhin ang layout ng keyboard"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Pinapayagan ang app na baguhin ang layout ng keyboard. Hindi kailanman dapat na kailanganin para sa mga normal na app."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"magpadala ng mga signal ng Linux sa apps"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Pinapayagan ang app na hilinging maipadala ang ibinigay na signal sa lahat ng nagpapatuloy na proseso."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"palaging patakbuhin ang app"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"I-type ang kinakailangang PIN:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Magpasok ng character"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Hindi kilalang app"</string> <string name="sms_control_title" msgid="7296612781128917719">"Nagpapadala ng mga SMS na mensahe"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Ipinapadala ang malaking bilang ng mga mensaheng SMS. Pindutin ang OK upang magpatuloy, o Kanselahin upang ihinto ang pagpapadala."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Kanselahin"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Naalis ang SIM card"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Hindi magiging available ang mobile network hanggang mag-restart ka gamit ang isang may-bisang SIM card"</string> <string name="sim_done_button" msgid="827949989369963775">"Tapos na"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Pindutin upang huwag paganahin ang pag-debug ng USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Pumili ng pamamaraan ng pag-input"</string> <string name="configure_input_methods" msgid="9091652157722495116">"I-set up paraan ng pag-input"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Aktwal na keyboard"</string> + <string name="hardware" msgid="7517821086888990278">"Hardware"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"mga kandidato"</u></string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 86c1a70..8abf38d 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Uygulamaya, istediği zaman ekran dönüşünü değiştirme izni verir. Normal uygulamalar için gerekli değildir."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"işaretçi hızını değiştir"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Uygulamaya, istediği zaman fare veya izleme yüzeyi işaretçi hızını değiştirme izni verir. Normal uygulamalar için gerekli değildir."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"klavye düzenini değiştir"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Uygulamaya klavye düzenini değiştirme izni verir. Normal uygulamalar için hiçbir zaman gerekmez."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"uygulamalara Linux sinyalleri gönder"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Uygulamaya, sağlanan sinyalin tüm kalıcı işlemlere gönderilmesini isteme izni verir."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"uygulamayı her zaman çalıştır"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Gerekli PIN\'i yazın:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Karakter ekle"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Bilinmeyen uygulama"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMS mesajları gönderiliyor"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Çok sayıda SMS mesajı gönderiliyor. Devam etmek için Tamam\'a, göndermeyi durdurmak için İptal\'e dokunun."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"Tamam"</string> - <string name="sms_control_no" msgid="1715320703137199869">"İptal"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM kart çıkarıldı"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Geçerli bir SIM kart yerleştirilmiş olarak yeniden başlatana kadar mobil ağ kullanılamayacak."</string> <string name="sim_done_button" msgid="827949989369963775">"Tamamlandı"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"USB hata ayıklama özelliğini devre dışı bırakmak için dokunun."</string> <string name="select_input_method" msgid="4653387336791222978">"Giriş yöntemini seçin"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Giriş yöntemlerini ayarla"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Fiziksel klavye"</string> + <string name="hardware" msgid="7517821086888990278">"Donanım"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"adaylar"</u></string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 154468c..5504176 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Введіть потрібний PIN-код:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN-код:"</string> <string name="select_character" msgid="3365550120617701745">"Вставл-ня символу"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Невідома програма"</string> <string name="sms_control_title" msgid="7296612781128917719">"Надсил. SMS повідомлень"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Надсилається велика кількість SMS повідомлень. Торкніться \"OK\", щоб продовжити, або \"Скасувати\", щоб припинити надсилання."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Скасувати"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-карту вилучено"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Мобільна мережа буде недоступна, поки ви не здійсните перезапуск, вставивши дійсну SIM-карту."</string> <string name="sim_done_button" msgid="827949989369963775">"Готово"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index cbad241..96e97f6 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Cho phép ứng dụng thay đổi độ xoay màn hình bất cứ lúc nào. Không cần thiết cho các ứng dụng thông thường."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"thay đổi tốc độ con trỏ"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Cho phép ứng dụng thay đổi tốc độ của chuột hoặc con trỏ trên ô di chuột bất kỳ lúc nào. Không cần thiết cho các ứng dụng thông thường."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"thay đổi bố cục bàn phím"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Cho phép các ứng dụng thay đổi bố cục bàn phím. Không bao giờ cần thiết cho các ứng dụng bình thường."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"gửi tín hiệu Linux đến ứng dụng"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Cho phép ứng dụng yêu cầu tín hiệu đã cung cấp được gửi đến tất cả các quá trình liên tục."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"đặt ứng dụng luôn chạy"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Nhập PIN bắt buộc:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"Mã PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Chèn ký tự"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"Ứng dụng không xác định"</string> <string name="sms_control_title" msgid="7296612781128917719">"Đang gửi tin nhắn SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Một lượng lớn các tin nhắn SMS đang được gửi. Chạm OK để tiếp tục hoặc Hủy để ngừng gửi."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Hủy"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"Đã xóa thẻ SIM"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Mạng di động sẽ không khả dụng cho đến khi bạn khởi động lại với thẻ SIM hợp lệ được lắp."</string> <string name="sim_done_button" msgid="827949989369963775">"Xong"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Chạm để vô hiệu hóa gỡ lỗi USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Chọn phương thức nhập"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Thiết lập phương thức nhập"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Bàn phím thực"</string> + <string name="hardware" msgid="7517821086888990278">"Phần cứng"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"ứng viên"</u></string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index cb612e1..08a15e4 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"允许应用随时更改屏幕的旋转状态。普通应用绝不需要此权限。"</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"更改指针速度"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"允许应用随时更改鼠标或触控板指针速度。普通应用绝不需要此权限。"</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"更改键盘布局"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"允许应用更改键盘布局。普通应用绝不需要此权限。"</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"向应用发送 Linux 信号"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"允许应用请求将提供的信号发送给所有持续的进程。"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"让应用始终运行"</string> @@ -1009,11 +1007,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"键入所需的 PIN："</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN："</string> <string name="select_character" msgid="3365550120617701745">"插入字符"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"未知应用"</string> <string name="sms_control_title" msgid="7296612781128917719">"正在发送短信"</string> - <string name="sms_control_message" msgid="4073755190243093924">"正在发送大量短信。触摸“确定”继续，或触摸“取消”停止发送。"</string> - <string name="sms_control_yes" msgid="2532062172402615953">"确定"</string> - <string name="sms_control_no" msgid="1715320703137199869">"取消"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"已移除 SIM 卡"</string> <string name="sim_removed_message" msgid="2333164559970958645">"移动网络不可用。请插入有效的 SIM 卡并重新启动。"</string> <string name="sim_done_button" msgid="827949989369963775">"完成"</string> @@ -1063,10 +1077,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"触摸以停用 USB 调试。"</string> <string name="select_input_method" msgid="4653387336791222978">"选择输入法"</string> <string name="configure_input_methods" msgid="9091652157722495116">"设置输入法"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"物理键盘"</string> + <string name="hardware" msgid="7517821086888990278">"硬件"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"候选"</u></string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index c2ae68e..0468534 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1009,11 +1009,27 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"請輸入必要的 PIN："</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN："</string> <string name="select_character" msgid="3365550120617701745">"插入字元"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"不明的應用程式"</string> <string name="sms_control_title" msgid="7296612781128917719">"傳送 SMS 簡訊"</string> - <string name="sms_control_message" msgid="4073755190243093924">"即將傳送大量的 SMS 簡訊。輕觸 [確定] 可繼續傳送，或輕觸 [取消] 停止傳送。"</string> - <string name="sms_control_yes" msgid="2532062172402615953">"確定"</string> - <string name="sms_control_no" msgid="1715320703137199869">"取消"</string> + <!-- no translation found for sms_control_message (3867899169651496433) --> + <skip /> + <!-- no translation found for sms_control_yes (3663725993855816807) --> + <skip /> + <!-- no translation found for sms_control_no (625438561395534982) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_title (1666863092640877318) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_title (3811263856304367838) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_message (5616409294907295407) --> + <skip /> + <!-- no translation found for sms_premium_short_code_confirm_message (6214083016284738667) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_allow (8957573662645722940) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_deny (6374609298084435887) --> + <skip /> + <!-- no translation found for sms_short_code_confirm_report (2588793956061677070) --> + <skip /> <string name="sim_removed_title" msgid="6227712319223226185">"SIM 卡已移除"</string> <string name="sim_removed_message" msgid="2333164559970958645">"您必須先插入有效的 SIM 卡再重新啟動手機，才能使用行動網路。"</string> <string name="sim_done_button" msgid="827949989369963775">"完成"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index eea53ec..c910d4a 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -286,10 +286,8 @@ <string name="permdesc_setOrientation" msgid="3046126619316671476">"Ivumela insiza ukuthi iguqule ukujikeleza kweskrini nganoma isiphi isikhathi. Akudingakeli izinsiza ezejwayelekile."</string> <string name="permlab_setPointerSpeed" msgid="9175371613322562934">"guqula isivinini sesikhombi"</string> <string name="permdesc_setPointerSpeed" msgid="6866563234274104233">"Ivumela insiza ukuthi iguqule ijubane legundane noma lendawo yokukhomba ngomunwe. Akufanele kudingakele izinsiza ezijwayelekile."</string> - <!-- no translation found for permlab_setKeyboardLayout (4778731703600909340) --> - <skip /> - <!-- no translation found for permdesc_setKeyboardLayout (8480016771134175879) --> - <skip /> + <string name="permlab_setKeyboardLayout" msgid="4778731703600909340">"shintsha isendlalelo sekhibhodi"</string> + <string name="permdesc_setKeyboardLayout" msgid="8480016771134175879">"Ivumela uhlelo lokusebenza ukushintsha isendlalelo sekhibhodi. Kufanele ingadingi izinhlelo zokusebenzia ezivamile."</string> <string name="permlab_signalPersistentProcesses" msgid="4539002991947376659">"Thumela imifanekiso ye-Linu ezinsizeni"</string> <string name="permdesc_signalPersistentProcesses" msgid="4896992079182649141">"Ivumela insiza ukuthi icele ukuthi isiginali ethunyelwe idluliselwe kuzo zonke izinqubeko ezisalelayo."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"yenza insiza ukuthi ihlale isebenza"</string> @@ -1009,11 +1007,17 @@ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Faka i-PIN edingekayo:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> <string name="select_character" msgid="3365550120617701745">"Faka uhlamvu"</string> - <string name="sms_control_default_app_name" msgid="3058577482636640465">"insiza engaziwa"</string> <string name="sms_control_title" msgid="7296612781128917719">"Ithumela imiyalezo ye-SMS"</string> - <string name="sms_control_message" msgid="4073755190243093924">"Inani eliphezulu lwama-SMS liyathunyelwa. Khetha \"KULUNGILE\" ukuqhubeka, noma \"Khansela\" ukumisa ukuthumela."</string> - <string name="sms_control_yes" msgid="2532062172402615953">"KULUNGILE"</string> - <string name="sms_control_no" msgid="1715320703137199869">"Khansela"</string> + <string name="sms_control_message" msgid="3867899169651496433">"I-<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ithumela inombolo enkulu yemilayezo ye-SMS. Ufuna ukuvumela lolu hlelo lokusebenza ukuqhubeka ukuthumela imilayezo?"</string> + <string name="sms_control_yes" msgid="3663725993855816807">"Vumela"</string> + <string name="sms_control_no" msgid="625438561395534982">"Nqaba"</string> + <string name="sms_short_code_confirm_title" msgid="1666863092640877318">"Thumela ikhodi efushane?"</string> + <string name="sms_premium_short_code_confirm_title" msgid="3811263856304367838">"Ukuthumela i-SMS ye-premium?"</string> + <string name="sms_short_code_confirm_message" msgid="5616409294907295407">"I-<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ithanda ukuthumela umlayezo wombhalo ku-<b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, okubonakala sengathi ikhodi ye-SMS efushane.<p>Ukuthumela umlayezo wombhalo kungabangela i-akhawunti yeselula yakho ukuthi ikhokheliswe amasevisi e-premium.<p>Ufuna ukuvumela uhlelo lokusebenza ukuthumela umlayezo?"</string> + <string name="sms_premium_short_code_confirm_message" msgid="6214083016284738667">"I-<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ithanda ukuthumela umlayezo wombhalo ku-<b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>, okuyikhodi efushane ye-SMS ye-premium.<p><b>Ukuthumela umlayezo kule ndawo kuzobangela i-akhawunti yeselula yakho ukuthi ikhokheliswe amasevisi e-premium.</b><p>Ufuna ukuvumela lolu hlelo lokusebenza ukuthumela umlayezo?"</string> + <string name="sms_short_code_confirm_allow" msgid="8957573662645722940">"Thumela umlayezo?"</string> + <string name="sms_short_code_confirm_deny" msgid="6374609298084435887">"Ungathumeli"</string> + <string name="sms_short_code_confirm_report" msgid="2588793956061677070">"Bika uhlelo lokusebenza olungalungile"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Ikhadi le-SIM likhishiwe"</string> <string name="sim_removed_message" msgid="2333164559970958645">"Inethiwekhi yeselula ngeke itholakale kuwena kuze kube uqala kabusha ufake ikhadi le-SIM elifanele."</string> <string name="sim_done_button" msgid="827949989369963775">"Kwenziwe"</string> @@ -1063,10 +1067,8 @@ <string name="adb_active_notification_message" msgid="1016654627626476142">"Thinta ukwenza ukuthi ukudibhaga kwe-USB kungasebenzi."</string> <string name="select_input_method" msgid="4653387336791222978">"Khetha indlela yokufaka"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Izilungiselelo zezindlela zokufakwayo"</string> - <!-- no translation found for use_physical_keyboard (6203112478095117625) --> - <skip /> - <!-- no translation found for hardware (7517821086888990278) --> - <skip /> + <string name="use_physical_keyboard" msgid="6203112478095117625">"Ukwakheka kwekhibhodi"</string> + <string name="hardware" msgid="7517821086888990278">"I-Hardware"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"abahlanganyeli"</u></string> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index de24d10..6f489d4 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2367,8 +2367,6 @@ <!-- Component name of an activity that allows the user to modify the settings for this service. --> <attr name="settingsActivity"/> - <!-- Set true when the spell checker supports sentence level spell checking. --> - <attr name="supportsSentenceSpellCheck" format="boolean" /> </declare-styleable> <!-- This is the subtype of the spell checker. Subtype can describe locales (e.g. en_US, fr_FR...) --> @@ -5382,6 +5380,21 @@ </declare-styleable> <!-- =============================== --> + <!-- SizeAdaptiveLayout class attributes --> + <!-- =============================== --> + <eat-comment /> + <declare-styleable name="SizeAdaptiveLayout_Layout"> + <!-- The maximum valid height for this item. --> + <attr name="layout_maxHeight" format="dimension"> + <!-- Indicates that the view may be resized arbitrarily large. --> + <enum name="unbounded" value="-1" /> + </attr> + <!-- The minimum valid height for this item. --> + <attr name="layout_minHeight" format="dimension" /> + </declare-styleable> + <declare-styleable name="SizeAdaptiveLayout" /> + + <!-- =============================== --> <!-- LockPatternView class attributes --> <!-- =============================== --> <eat-comment /> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 4a5e442..b564b97 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -205,6 +205,11 @@ <java-symbol type="id" name="big_picture" /> <java-symbol type="id" name="big_text" /> <java-symbol type="id" name="chronometer" /> + <java-symbol type="id" name="inbox_text0" /> + <java-symbol type="id" name="inbox_text1" /> + <java-symbol type="id" name="inbox_text2" /> + <java-symbol type="id" name="inbox_text3" /> + <java-symbol type="id" name="inbox_text4" /> <java-symbol type="attr" name="actionModeShareDrawable" /> <java-symbol type="attr" name="alertDialogCenterButtons" /> @@ -1083,8 +1088,10 @@ <java-symbol type="layout" name="notification_intruder_content" /> <java-symbol type="layout" name="notification_template_base" /> <java-symbol type="layout" name="notification_template_big_picture" /> + <java-symbol type="layout" name="notification_template_big_text" /> <java-symbol type="layout" name="notification_template_part_time" /> <java-symbol type="layout" name="notification_template_part_chronometer" /> + <java-symbol type="layout" name="notification_template_inbox" /> <java-symbol type="anim" name="slide_in_child_bottom" /> <java-symbol type="anim" name="slide_in_right" /> @@ -3588,8 +3595,6 @@ <public type="attr" name="parentActivityName" /> - <public type="attr" name="supportsSentenceSpellCheck" /> - <public type="attr" name="importantForAccessibility"/> </resources> diff --git a/core/tests/coretests/res/drawable/abe.jpg b/core/tests/coretests/res/drawable/abe.jpg Binary files differnew file mode 100644 index 0000000..1f978a9 --- /dev/null +++ b/core/tests/coretests/res/drawable/abe.jpg diff --git a/core/tests/coretests/res/drawable/gettysburg.png b/core/tests/coretests/res/drawable/gettysburg.png Binary files differnew file mode 100644 index 0000000..7a2d596 --- /dev/null +++ b/core/tests/coretests/res/drawable/gettysburg.png diff --git a/core/tests/coretests/res/layout/size_adaptive.xml b/core/tests/coretests/res/layout/size_adaptive.xml new file mode 100644 index 0000000..03d0574 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.internal.widget.SizeAdaptiveLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:id="@+id/multi1" + android:layout_width="match_parent" + android:layout_height="64dp" > + + <include + android:id="@+id/one_u" + layout="@layout/size_adaptive_one_u" + android:layout_width="fill_parent" + android:layout_height="64dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" + /> + + <include + android:id="@+id/four_u" + layout="@layout/size_adaptive_four_u" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + internal:layout_minHeight="65dp" + internal:layout_maxHeight="unbounded"/> + +</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_color.xml b/core/tests/coretests/res/layout/size_adaptive_color.xml new file mode 100644 index 0000000..cdb7a59 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_color.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.internal.widget.SizeAdaptiveLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:background="#ffffff" + android:id="@+id/multi1" + android:layout_width="match_parent" + android:layout_height="64dp" > + + <include + android:id="@+id/one_u" + layout="@layout/size_adaptive_one_u" + android:layout_width="fill_parent" + android:layout_height="64dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" + /> + + <include + android:id="@+id/four_u" + layout="@layout/size_adaptive_four_u" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + internal:layout_minHeight="65dp" + internal:layout_maxHeight="unbounded"/> + +</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_four_u.xml b/core/tests/coretests/res/layout/size_adaptive_four_u.xml new file mode 100644 index 0000000..232b921 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_four_u.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/gridLayout4" + android:layout_width="match_parent" + android:layout_height="256dp" + android:background="#000000" + android:columnCount="2" + android:padding="1dp" > + + <ImageView + android:id="@+id/actor" + android:layout_width="62dp" + android:layout_height="62dp" + android:layout_row="0" + android:layout_column="0" + android:layout_rowSpan="2" + android:contentDescription="@string/actor" + android:src="@drawable/abe" /> + + <TextView + android:layout_width="0dp" + android:id="@+id/name" + android:layout_row="0" + android:layout_column="1" + android:layout_gravity="fill_horizontal" + android:padding="3dp" + android:text="@string/actor" + android:textColor="#ffffff" + android:textStyle="bold" /> + + <ImageView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_row="1" + android:layout_column="1" + android:layout_gravity="fill_horizontal" + android:padding="5dp" + android:adjustViewBounds="true" + android:background="#555555" + android:scaleType="centerCrop" + android:src="@drawable/gettysburg" + android:contentDescription="@string/caption" /> + + <TextView + android:layout_width="0dp" + android:id="@+id/note" + android:layout_row="2" + android:layout_column="1" + android:layout_gravity="fill_horizontal" + android:padding="3dp" + android:singleLine="true" + android:text="@string/first" + android:textColor="#ffffff" /> +</GridLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_four_u_text.xml b/core/tests/coretests/res/layout/size_adaptive_four_u_text.xml new file mode 100644 index 0000000..93a10de --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_four_u_text.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/gridLayout4" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="#000000" + android:columnCount="2" + android:padding="1dp" + android:orientation="horizontal" > + + <ImageView + android:id="@+id/actor" + android:layout_width="62dp" + android:layout_height="62dp" + android:layout_row="0" + android:layout_column="0" + android:layout_rowSpan="2" + android:contentDescription="@string/actor" + android:src="@drawable/abe" /> + + <TextView + android:layout_width="0dp" + android:id="@+id/name" + android:layout_row="0" + android:layout_column="1" + android:layout_gravity="fill_horizontal" + android:padding="3dp" + android:text="@string/actor" + android:textColor="#ffffff" + android:textStyle="bold" /> + + <TextView + android:id="@+id/note" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_column="1" + android:layout_gravity="fill_horizontal" + android:layout_marginTop="5dp" + android:layout_row="1" + android:padding="3dp" + android:singleLine="false" + android:text="@string/first" + android:textColor="#ffffff" /> + + </GridLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_gappy.xml b/core/tests/coretests/res/layout/size_adaptive_gappy.xml new file mode 100644 index 0000000..d5e3b41 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_gappy.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.internal.widget.SizeAdaptiveLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:id="@+id/multi_with_gap" + android:layout_width="match_parent" + android:layout_height="64dp" > + + <include + android:id="@+id/one_u" + layout="@layout/size_adaptive_one_u" + android:layout_width="fill_parent" + android:layout_height="64dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" + /> + + <include + android:id="@+id/four_u" + layout="@layout/size_adaptive_four_u" + android:layout_width="fill_parent" + android:layout_height="256dp" + internal:layout_minHeight="128dp" + internal:layout_maxHeight="unbounded"/> + +</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_large_only.xml b/core/tests/coretests/res/layout/size_adaptive_large_only.xml new file mode 100644 index 0000000..cf58265 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_large_only.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.internal.widget.SizeAdaptiveLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:id="@+id/large_only_multi" + android:layout_width="match_parent" + android:layout_height="64dp" > + + <include + android:id="@+id/four_u" + layout="@layout/size_adaptive_four_u" + android:layout_width="fill_parent" + android:layout_height="256dp" + internal:layout_minHeight="65dp" + internal:layout_maxHeight="unbounded"/> + +</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_one_u.xml b/core/tests/coretests/res/layout/size_adaptive_one_u.xml new file mode 100644 index 0000000..b6fe4a0 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_one_u.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/gridLayout1" + android:layout_width="match_parent" + android:layout_height="64dp" + android:background="#000000" + android:columnCount="3" + android:padding="1dp" + android:rowCount="2" > + + <ImageView + android:id="@+id/actor" + android:layout_width="62dp" + android:layout_height="62dp" + android:layout_column="0" + android:layout_row="0" + android:layout_rowSpan="2" + android:contentDescription="@string/actor" + android:src="@drawable/abe" /> + + <TextView + android:id="@+id/name" + android:layout_gravity="fill" + android:padding="3dp" + android:text="@string/actor" + android:textColor="#ffffff" + android:textStyle="bold" /> + + <ImageView + android:layout_width="62dp" + android:layout_height="62dp" + android:layout_gravity="fill_vertical" + android:layout_rowSpan="2" + android:adjustViewBounds="true" + android:background="#555555" + android:padding="2dp" + android:scaleType="fitXY" + android:src="@drawable/gettysburg" + android:contentDescription="@string/caption" /> + + <TextView + android:id="@+id/note" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_gravity="fill" + android:layout_marginTop="5dp" + android:padding="3dp" + android:singleLine="true" + android:text="@string/first" + android:textColor="#ffffff" /> + +</GridLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_one_u_text.xml b/core/tests/coretests/res/layout/size_adaptive_one_u_text.xml new file mode 100644 index 0000000..df54eb6 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_one_u_text.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/gridLayout1" + android:layout_width="match_parent" + android:layout_height="64dp" + android:background="#000000" + android:columnCount="2" + android:padding="1dp" + android:rowCount="2" > + + <ImageView + android:id="@+id/actor" + android:layout_width="62dp" + android:layout_height="62dp" + android:layout_column="0" + android:layout_row="0" + android:layout_rowSpan="2" + android:contentDescription="@string/actor" + android:src="@drawable/abe" /> + + <TextView + android:id="@+id/name" + android:layout_gravity="fill" + android:padding="3dp" + android:text="@string/actor" + android:textColor="#ffffff" + android:textStyle="bold" /> + + <TextView + android:id="@+id/note" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_gravity="fill" + android:layout_marginTop="5dp" + android:padding="3dp" + android:singleLine="true" + android:text="@string/first" + android:textColor="#ffffff" /> + +</GridLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_overlapping.xml b/core/tests/coretests/res/layout/size_adaptive_overlapping.xml new file mode 100644 index 0000000..4abe8b0 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_overlapping.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.internal.widget.SizeAdaptiveLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:id="@+id/multi_with_overlap" + android:layout_width="match_parent" + android:layout_height="64dp" > + + <include + android:id="@+id/one_u" + layout="@layout/size_adaptive_one_u" + android:layout_width="fill_parent" + android:layout_height="64dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" + /> + + <include + android:id="@+id/four_u" + layout="@layout/size_adaptive_four_u" + android:layout_width="fill_parent" + android:layout_height="256dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="256dp"/> + +</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_singleton.xml b/core/tests/coretests/res/layout/size_adaptive_singleton.xml new file mode 100644 index 0000000..eba387f --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_singleton.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.internal.widget.SizeAdaptiveLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:layout_width="match_parent" + android:layout_height="64dp" > + + <include + android:id="@+id/one_u" + layout="@layout/size_adaptive_one_u_text" + android:layout_width="fill_parent" + android:layout_height="64dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" + /> + +</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_text.xml b/core/tests/coretests/res/layout/size_adaptive_text.xml new file mode 100644 index 0000000..a9f0ba9 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_text.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.internal.widget.SizeAdaptiveLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:id="@+id/multi1" + android:layout_width="match_parent" + android:layout_height="64dp" > + + <include + android:id="@+id/one_u" + layout="@layout/size_adaptive_one_u_text" + android:layout_width="fill_parent" + android:layout_height="64dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" + /> + + <include + android:id="@+id/four_u" + layout="@layout/size_adaptive_four_u_text" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + internal:layout_minHeight="65dp" + internal:layout_maxHeight="unbounded"/> + +</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_three_way.xml b/core/tests/coretests/res/layout/size_adaptive_three_way.xml new file mode 100644 index 0000000..1eb5396 --- /dev/null +++ b/core/tests/coretests/res/layout/size_adaptive_three_way.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.internal.widget.SizeAdaptiveLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:internal="http://schemas.android.com/apk/prv/res/android" + android:id="@+id/three_way_multi" + android:layout_width="match_parent" + android:layout_height="64dp" > + + <include + android:id="@+id/one_u" + layout="@layout/size_adaptive_one_u" + android:layout_width="fill_parent" + android:layout_height="64dp" + internal:layout_minHeight="64dp" + internal:layout_maxHeight="64dp" + /> + + <include + android:id="@+id/two_u" + layout="@layout/size_adaptive_four_u" + android:layout_width="fill_parent" + android:layout_height="128dp" + internal:layout_minHeight="65dp" + internal:layout_maxHeight="128dp"/> + + <include + android:id="@+id/four_u" + layout="@layout/size_adaptive_four_u" + android:layout_width="fill_parent" + android:layout_height="256dp" + internal:layout_minHeight="129dp" + internal:layout_maxHeight="unbounded"/> + +</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/values/strings.xml b/core/tests/coretests/res/values/strings.xml index 71f3520..ce0d9a2 100644 --- a/core/tests/coretests/res/values/strings.xml +++ b/core/tests/coretests/res/values/strings.xml @@ -131,4 +131,8 @@ <string name="textview_hebrew_text">םמab?!</string> + <!-- SizeAdaptiveLayout --> + <string name="first">Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.</string> + <string name="actor">Abe Lincoln</string> + <string name="caption">Lincoln adressing the crowd at Gettysburgh</string> </resources> diff --git a/core/tests/coretests/src/android/animation/EventsTest.java b/core/tests/coretests/src/android/animation/EventsTest.java index 701a3f0..8df711b 100644 --- a/core/tests/coretests/src/android/animation/EventsTest.java +++ b/core/tests/coretests/src/android/animation/EventsTest.java @@ -173,8 +173,7 @@ public abstract class EventsTest // This should only be called on an animation that has been started and not // yet canceled or ended assertFalse(mCanceled); - assertTrue(mRunning); - assertTrue(mStarted); + assertTrue(mRunning || mStarted); mCanceled = true; } @@ -182,8 +181,7 @@ public abstract class EventsTest public void onAnimationEnd(Animator animation) { // This should only be called on an animation that has been started and not // yet ended - assertTrue(mRunning); - assertTrue(mStarted); + assertTrue(mRunning || mStarted); mRunning = false; mStarted = false; super.onAnimationEnd(animation); @@ -210,11 +208,12 @@ public abstract class EventsTest } /** - * Verify that calling end on an unstarted animator does nothing. + * Verify that calling end on an unstarted animator starts/ends an animator. */ @UiThreadTest @SmallTest public void testEnd() throws Exception { + mRunning = true; // end() implicitly starts an unstarted animator mAnimator.end(); } @@ -496,6 +495,7 @@ public abstract class EventsTest mRunning = true; mAnimator.start(); mAnimator.end(); + mRunning = true; // end() implicitly starts an unstarted animator mAnimator.end(); mFuture.release(); } catch (junit.framework.AssertionFailedError e) { @@ -544,6 +544,7 @@ public abstract class EventsTest mRunning = true; mAnimator.start(); mAnimator.end(); + mRunning = true; // end() implicitly starts an unstarted animator mAnimator.end(); mFuture.release(); } catch (junit.framework.AssertionFailedError e) { diff --git a/core/tests/coretests/src/com/android/internal/os/DebugTest.java b/core/tests/coretests/src/com/android/internal/os/DebugTest.java new file mode 100644 index 0000000..88c7d1b --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/os/DebugTest.java @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.os; + +import android.os.Debug; + +import android.test.suitebuilder.annotation.SmallTest; +import junit.framework.TestCase; + +@SmallTest +public class DebugTest extends TestCase { + + private final static String EXPECTED_GET_CALLER = + "com\\.android\\.internal\\.os\\.DebugTest\\.testGetCaller:\\d\\d"; + private final static String EXPECTED_GET_CALLERS = + "com\\.android\\.internal\\.os\\.DebugTest.callDepth3:\\d\\d " + + "com\\.android\\.internal\\.os\\.DebugTest.callDepth2:\\d\\d " + + "com\\.android\\.internal\\.os\\.DebugTest.callDepth1:\\d\\d "; + + /** + * @return String consisting of the caller to this method. + */ + private String callDepth0() { + return Debug.getCaller(); + } + + public void testGetCaller() { + assertTrue(callDepth0().matches(EXPECTED_GET_CALLER)); + } + + /** + * @return String consisting of the callers to this method. + */ + private String callDepth4() { + return Debug.getCallers(3); + } + + private String callDepth3() { + return callDepth4(); + } + + private String callDepth2() { + return callDepth3(); + } + + private String callDepth1() { + return callDepth2(); + } + + public void testGetCallers() { + assertTrue(callDepth1().matches(EXPECTED_GET_CALLERS)); + } +} diff --git a/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java b/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java new file mode 100644 index 0000000..fc83e4a --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java @@ -0,0 +1,446 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.widget; + +import com.android.frameworks.coretests.R; + +import android.content.Context; +import android.graphics.drawable.ColorDrawable; +import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; +import android.view.LayoutInflater; +import android.view.View; + +import com.android.internal.widget.SizeAdaptiveLayout; + + +public class SizeAdaptiveLayoutTest extends AndroidTestCase { + + private LayoutInflater mInflater; + private int mOneU; + private int mFourU; + private SizeAdaptiveLayout mSizeAdaptiveLayout; + private View mSmallView; + private View mMediumView; + private View mLargeView; + + @Override + protected void setUp() throws Exception { + super.setUp(); + + // inflate the layout + final Context context = getContext(); + mInflater = LayoutInflater.from(context); + mOneU = 64; + mFourU = 4 * mOneU; + } + + private void inflate(int resource){ + mSizeAdaptiveLayout = (SizeAdaptiveLayout) mInflater.inflate(resource, null); + mSizeAdaptiveLayout.onAttachedToWindow(); + + mSmallView = mSizeAdaptiveLayout.findViewById(R.id.one_u); + mMediumView = mSizeAdaptiveLayout.findViewById(R.id.two_u); + mLargeView = mSizeAdaptiveLayout.findViewById(R.id.four_u); + } + + /** + * The name 'test preconditions' is a convention to signal that if this + * test doesn't pass, the test case was not set up properly and it might + * explain any and all failures in other tests. This is not guaranteed + * to run before other tests, as junit uses reflection to find the tests. + */ + @SmallTest + public void testPreconditions() { + assertNotNull(mInflater); + + inflate(R.layout.size_adaptive); + assertNotNull(mSizeAdaptiveLayout); + assertNotNull(mSmallView); + assertNotNull(mLargeView); + } + + @SmallTest + public void testOpenLarge() { + inflate(R.layout.size_adaptive); + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + int height = (int) lp.minHeight + 10; + + measureAndLayout(height); + + assertEquals("4U should be visible", + View.VISIBLE, + mLargeView.getVisibility()); + assertEquals("1U should be gone", + View.GONE, + mSmallView.getVisibility()); + } + + @SmallTest + public void testOpenSmall() { + inflate(R.layout.size_adaptive); + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); + int height = (int) lp.minHeight; + + measureAndLayout(height); + + assertEquals("1U should be visible", + View.VISIBLE, + mSmallView.getVisibility()); + assertEquals("4U should be gone", + View.GONE, + mLargeView.getVisibility()); + } + + @SmallTest + public void testOpenTooSmall() { + inflate(R.layout.size_adaptive); + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); + int height = (int) lp.minHeight - 10; + + measureAndLayout(height); + + assertEquals("1U should be visible", + View.VISIBLE, + mSmallView.getVisibility()); + assertEquals("4U should be gone", + View.GONE, + mLargeView.getVisibility()); + } + + @SmallTest + public void testOpenTooBig() { + inflate(R.layout.size_adaptive); + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + lp.maxHeight = 500; + mLargeView.setLayoutParams(lp); + int height = (int) (lp.minHeight + 10); + + measureAndLayout(height); + + assertEquals("4U should be visible", + View.VISIBLE, + mLargeView.getVisibility()); + assertEquals("1U should be gone", + View.GONE, + mSmallView.getVisibility()); + } + + @SmallTest + public void testOpenWrapContent() { + inflate(R.layout.size_adaptive_text); + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + int height = (int) lp.minHeight + 10; + + // manually measure it, and lay it out + int measureSpec = View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.AT_MOST); + mSizeAdaptiveLayout.measure(500, measureSpec); + assertTrue("should not be forced to 4U", + mSizeAdaptiveLayout.getMeasuredHeight() < mFourU); + } + + @SmallTest + public void testOpenOneUOnlySmall() { + inflate(R.layout.size_adaptive_singleton); + assertNull("largeView should be NULL in the singleton layout", mLargeView); + + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); + int height = (int) lp.minHeight - 10; + + measureAndLayout(height); + + assertEquals("1U should be visible", + View.VISIBLE, + mSmallView.getVisibility()); + } + + @SmallTest + public void testOpenOneUOnlyLarge() { + inflate(R.layout.size_adaptive_singleton); + assertNull("largeView should be NULL in the singleton layout", mLargeView); + + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); + int height = (int) lp.maxHeight + 10; + + measureAndLayout(height); + + assertEquals("1U should be visible", + View.VISIBLE, + mSmallView.getVisibility()); + } + + @SmallTest + public void testOpenOneUOnlyJustRight() { + inflate(R.layout.size_adaptive_singleton); + assertNull("largeView should be NULL in the singleton layout", mLargeView); + + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); + int height = (int) lp.minHeight; + + measureAndLayout(height); + + assertEquals("1U should be visible", + View.VISIBLE, + mSmallView.getVisibility()); + } + + @SmallTest + public void testOpenFourUOnlySmall() { + inflate(R.layout.size_adaptive_large_only); + assertNull("smallView should be NULL in the singleton layout", mSmallView); + + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + int height = (int) lp.minHeight - 10; + + measureAndLayout(height); + + assertEquals("4U should be visible", + View.VISIBLE, + mLargeView.getVisibility()); + } + + @SmallTest + public void testOpenFourUOnlyLarge() { + inflate(R.layout.size_adaptive_large_only); + assertNull("smallView should be NULL in the singleton layout", mSmallView); + + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + int height = (int) lp.maxHeight + 10; + + measureAndLayout(height); + + assertEquals("4U should be visible", + View.VISIBLE, + mLargeView.getVisibility()); + } + + @SmallTest + public void testOpenFourUOnlyJustRight() { + inflate(R.layout.size_adaptive_large_only); + assertNull("smallView should be NULL in the singleton layout", mSmallView); + + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + int height = (int) lp.minHeight; + + measureAndLayout(height); + + assertEquals("4U should be visible", + View.VISIBLE, + mLargeView.getVisibility()); + } + + @SmallTest + public void testOpenIntoAGap() { + inflate(R.layout.size_adaptive_gappy); + + SizeAdaptiveLayout.LayoutParams smallParams = + (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); + SizeAdaptiveLayout.LayoutParams largeParams = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + assertTrue("gappy layout should have a gap", + smallParams.maxHeight + 10 < largeParams.minHeight); + int height = (int) smallParams.maxHeight + 10; + + measureAndLayout(height); + + assertTrue("one and only one view should be visible", + mLargeView.getVisibility() != mSmallView.getVisibility()); + // behavior is undefined in this case. + } + + @SmallTest + public void testOpenIntoAnOverlap() { + inflate(R.layout.size_adaptive_overlapping); + + SizeAdaptiveLayout.LayoutParams smallParams = + (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); + SizeAdaptiveLayout.LayoutParams largeParams = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + assertEquals("overlapping layout should overlap", + smallParams.minHeight, + largeParams.minHeight); + int height = (int) smallParams.maxHeight; + + measureAndLayout(height); + + assertTrue("one and only one view should be visible", + mLargeView.getVisibility() != mSmallView.getVisibility()); + assertEquals("1U should get priority in an overlap because it is first", + View.VISIBLE, + mSmallView.getVisibility()); + } + + @SmallTest + public void testOpenThreeWayViewSmall() { + inflate(R.layout.size_adaptive_three_way); + assertNotNull("mMediumView should not be NULL in the three view layout", mMediumView); + + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); + int height = (int) lp.minHeight; + + measureAndLayout(height); + + assertEquals("1U should be visible", + View.VISIBLE, + mSmallView.getVisibility()); + assertEquals("2U should be gone", + View.GONE, + mMediumView.getVisibility()); + assertEquals("4U should be gone", + View.GONE, + mLargeView.getVisibility()); + } + + @SmallTest + public void testOpenThreeWayViewMedium() { + inflate(R.layout.size_adaptive_three_way); + assertNotNull("mMediumView should not be NULL in the three view layout", mMediumView); + + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mMediumView.getLayoutParams(); + int height = (int) lp.minHeight; + + measureAndLayout(height); + + assertEquals("1U should be gone", + View.GONE, + mSmallView.getVisibility()); + assertEquals("2U should be visible", + View.VISIBLE, + mMediumView.getVisibility()); + assertEquals("4U should be gone", + View.GONE, + mLargeView.getVisibility()); + } + + @SmallTest + public void testOpenThreeWayViewLarge() { + inflate(R.layout.size_adaptive_three_way); + assertNotNull("mMediumView should not be NULL in the three view layout", mMediumView); + + SizeAdaptiveLayout.LayoutParams lp = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + int height = (int) lp.minHeight; + + measureAndLayout(height); + + assertEquals("1U should be gone", + View.GONE, + mSmallView.getVisibility()); + assertEquals("2U should be gone", + View.GONE, + mMediumView.getVisibility()); + assertEquals("4U should be visible", + View.VISIBLE, + mLargeView.getVisibility()); + } + + @SmallTest + public void testResizeWithoutAnimation() { + inflate(R.layout.size_adaptive); + + SizeAdaptiveLayout.LayoutParams largeParams = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + int startHeight = (int) largeParams.minHeight + 10; + int endHeight = (int) largeParams.minHeight + 10; + + measureAndLayout(startHeight); + + assertEquals("4U should be visible", + View.VISIBLE, + mLargeView.getVisibility()); + assertFalse("There should be no animation on initial rendering.", + mSizeAdaptiveLayout.getTransitionAnimation().isRunning()); + + measureAndLayout(endHeight); + + assertEquals("4U should still be visible", + View.VISIBLE, + mLargeView.getVisibility()); + assertFalse("There should be no animation on scale within a view.", + mSizeAdaptiveLayout.getTransitionAnimation().isRunning()); + } + + @SmallTest + public void testResizeWithAnimation() { + inflate(R.layout.size_adaptive); + + SizeAdaptiveLayout.LayoutParams smallParams = + (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); + SizeAdaptiveLayout.LayoutParams largeParams = + (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); + int startHeight = (int) largeParams.minHeight + 10; + int endHeight = (int) smallParams.maxHeight; + + measureAndLayout(startHeight); + + assertEquals("4U should be visible", + View.VISIBLE, + mLargeView.getVisibility()); + assertFalse("There should be no animation on initial rendering.", + mSizeAdaptiveLayout.getTransitionAnimation().isRunning()); + + measureAndLayout(endHeight); + + assertEquals("1U should now be visible", + View.VISIBLE, + mSmallView.getVisibility()); + assertTrue("There should be an animation on scale between views.", + mSizeAdaptiveLayout.getTransitionAnimation().isRunning()); + } + + @SmallTest + public void testModestyPanelChangesColorWhite() { + inflate(R.layout.size_adaptive_color); + View panel = mSizeAdaptiveLayout.getModestyPanel(); + assertTrue("ModestyPanel should have a ColorDrawable background", + panel.getBackground() instanceof ColorDrawable); + ColorDrawable panelColor = (ColorDrawable) panel.getBackground(); + ColorDrawable salColor = (ColorDrawable) mSizeAdaptiveLayout.getBackground(); + assertEquals("ModestyPanel color should match the SizeAdaptiveLayout", + panelColor.getColor(), salColor.getColor()); + } + + @SmallTest + public void testModestyPanelHasDefault() { + inflate(R.layout.size_adaptive); + View panel = mSizeAdaptiveLayout.getModestyPanel(); + assertNull("SizeAdaptiveLayout should have no background for this test", + mSizeAdaptiveLayout.getBackground()); + assertTrue("ModestyPanel should have a ColorDrawable background", + panel.getBackground() instanceof ColorDrawable); + } + + private void measureAndLayout(int height) { + // manually measure it, and lay it out + int measureSpec = View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.AT_MOST); + mSizeAdaptiveLayout.measure(500, measureSpec); + mSizeAdaptiveLayout.layout(0, 0, 500, height); + } +} |
