diff options
128 files changed, 933 insertions, 679 deletions
diff --git a/api/current.txt b/api/current.txt index 16e4a09099f4..f13c80aa28a5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28310,7 +28310,7 @@ package android.view.transition { public class TransitionValues { ctor public TransitionValues(); - field public final java.util.HashMap values; + field public final java.util.Map values; field public android.view.View view; } diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index b4a12c4bdbff..12fcdcfc7b57 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -822,7 +822,7 @@ public class AccountManager { * {@link android.Manifest.permission#USE_CREDENTIALS}. * * @param account The account to fetch an auth token for - * @param authTokenType The auth token type, see {#link getAuthToken} + * @param authTokenType The auth token type, see {@link #getAuthToken getAuthToken()} * @param notifyAuthFailure If true, display a notification and return null * if authentication fails; if false, prompt and wait for the user to * re-enter correct credentials before returning diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index f8ae616501bb..e370e4aff985 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -1024,8 +1024,10 @@ public class ValueAnimator extends Animator { mStarted = false; mStartListenersCalled = false; mPlayingBackwards = false; - Trace.asyncTraceEnd(Trace.TRACE_TAG_VIEW, getNameForTrace(), - System.identityHashCode(this)); + if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) { + Trace.asyncTraceEnd(Trace.TRACE_TAG_VIEW, getNameForTrace(), + System.identityHashCode(this)); + } } /** @@ -1033,8 +1035,10 @@ public class ValueAnimator extends Animator { * called on the UI thread. */ private void startAnimation(AnimationHandler handler) { - Trace.asyncTraceBegin(Trace.TRACE_TAG_VIEW, getNameForTrace(), - System.identityHashCode(this)); + if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) { + Trace.asyncTraceBegin(Trace.TRACE_TAG_VIEW, getNameForTrace(), + System.identityHashCode(this)); + } initAnimation(); handler.mAnimations.add(this); if (mStartDelay > 0 && mListeners != null) { diff --git a/core/java/android/util/ArrayMap.java b/core/java/android/util/ArrayMap.java index 6da75469713a..edda77938578 100644 --- a/core/java/android/util/ArrayMap.java +++ b/core/java/android/util/ArrayMap.java @@ -206,6 +206,16 @@ public final class ArrayMap<K, V> implements Map<K, V> { } mSize = 0; } + /** + * Create a new ArrayMap with the mappings from the given ArrayMap. + */ + public ArrayMap(ArrayMap map) { + this(); + if (map != null) { + putAll(map); + } + } + /** * Make the array map empty. All storage is released. diff --git a/core/java/android/view/transition/Crossfade.java b/core/java/android/view/transition/Crossfade.java index babf58f59a8f..7a55b0de4ce6 100644 --- a/core/java/android/view/transition/Crossfade.java +++ b/core/java/android/view/transition/Crossfade.java @@ -26,13 +26,14 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; +import android.util.ArrayMap; import android.util.Log; import android.view.SurfaceView; import android.view.TextureView; import android.view.View; import android.view.ViewGroup; -import java.util.HashMap; +import java.util.Map; /** * This transition captures bitmap representations of target views before and @@ -60,8 +61,8 @@ public class Crossfade extends Transition { return false; } final View view = startValues.view; - HashMap<String, Object> startVals = startValues.values; - HashMap<String, Object> endVals = endValues.values; + Map<String, Object> startVals = startValues.values; + Map<String, Object> endVals = endValues.values; Bitmap startBitmap = (Bitmap) startVals.get(PROPNAME_BITMAP); Bitmap endBitmap = (Bitmap) endVals.get(PROPNAME_BITMAP); Drawable startDrawable = (Drawable) startVals.get(PROPNAME_DRAWABLE); @@ -85,8 +86,8 @@ public class Crossfade extends Transition { if (startValues == null || endValues == null) { return null; } - HashMap<String, Object> startVals = startValues.values; - HashMap<String, Object> endVals = endValues.values; + Map<String, Object> startVals = startValues.values; + Map<String, Object> endVals = endValues.values; final View view = endValues.view; Rect startBounds = (Rect) startVals.get(PROPNAME_BOUNDS); diff --git a/core/java/android/view/transition/Move.java b/core/java/android/view/transition/Move.java index 3bd57bd0d624..1d05419c4613 100644 --- a/core/java/android/view/transition/Move.java +++ b/core/java/android/view/transition/Move.java @@ -24,10 +24,12 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; +import android.util.ArrayMap; +import android.util.Log; import android.view.View; import android.view.ViewGroup; -import java.util.HashMap; +import java.util.Map; /** * This transition captures the layout bounds of target views before and after @@ -42,6 +44,7 @@ public class Move extends Transition { int[] tempLocation = new int[2]; boolean mResizeClip = false; boolean mReparent = false; + private static final String LOG_TAG = "Move"; private static RectEvaluator sRectEvaluator = new RectEvaluator(); @@ -114,6 +117,13 @@ public class Move extends Transition { int endHeight = endBottom - endTop; int numChanges = 0; if (startWidth != 0 && startHeight != 0 && endWidth != 0 && endHeight != 0) { + if (Transition.DBG) { + Log.v(LOG_TAG, "Target = " + endValues.view); + Log.v(LOG_TAG, " start bounds: " + startLeft + ", " + startTop + ", " + + startRight + ", " + startBottom); + Log.v(LOG_TAG, " end bounds: " + endLeft + ", " + endTop + ", " + + endRight + ", " + endBottom); + } if (startLeft != endLeft) ++numChanges; if (startTop != endTop) ++numChanges; if (startRight != endRight) ++numChanges; @@ -207,8 +217,8 @@ public class Move extends Transition { if (startValues == null || endValues == null) { return false; } - HashMap<String, Object> startParentVals = startValues.values; - HashMap<String, Object> endParentVals = endValues.values; + Map<String, Object> startParentVals = startValues.values; + Map<String, Object> endParentVals = endValues.values; ViewGroup startParent = (ViewGroup) startParentVals.get(PROPNAME_PARENT); ViewGroup endParent = (ViewGroup) endParentVals.get(PROPNAME_PARENT); if (startParent == null || endParent == null) { diff --git a/core/java/android/view/transition/Recolor.java b/core/java/android/view/transition/Recolor.java index 7048be96094a..45407e1f2872 100644 --- a/core/java/android/view/transition/Recolor.java +++ b/core/java/android/view/transition/Recolor.java @@ -20,11 +20,12 @@ import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; +import android.util.ArrayMap; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import java.util.HashMap; +import java.util.Map; /** * This transition tracks changes during scene changes to the @@ -86,8 +87,8 @@ public class Recolor extends Transition { } ObjectAnimator anim = null; final View view = endValues.view; - HashMap<String, Object> startVals = startValues.values; - HashMap<String, Object> endVals = endValues.values; + Map<String, Object> startVals = startValues.values; + Map<String, Object> endVals = endValues.values; Drawable startBackground = (Drawable) startVals.get(PROPNAME_BACKGROUND); Drawable endBackground = (Drawable) endVals.get(PROPNAME_BACKGROUND); if (startBackground instanceof ColorDrawable && endBackground instanceof ColorDrawable) { diff --git a/core/java/android/view/transition/TextChange.java b/core/java/android/view/transition/TextChange.java index 0ba2412dad91..ac2852cbb3db 100644 --- a/core/java/android/view/transition/TextChange.java +++ b/core/java/android/view/transition/TextChange.java @@ -18,10 +18,11 @@ package android.view.transition; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; +import android.util.ArrayMap; import android.view.ViewGroup; import android.widget.TextView; -import java.util.HashMap; +import java.util.Map; /** * This transition tracks changes to the text in TextView targets. If the text @@ -51,8 +52,8 @@ public class TextChange extends Transition { return false; } final TextView view = (TextView) endValues.view; - HashMap<String, Object> startVals = startValues.values; - HashMap<String, Object> endVals = endValues.values; + Map<String, Object> startVals = startValues.values; + Map<String, Object> endVals = endValues.values; String startText = (String) startVals.get(PROPNAME_TEXT); String endText = (String) endVals.get(PROPNAME_TEXT); if (!startText.equals(endText)) { @@ -69,8 +70,8 @@ public class TextChange extends Transition { return null; } final TextView view = (TextView) endValues.view; - HashMap<String, Object> startVals = startValues.values; - HashMap<String, Object> endVals = endValues.values; + Map<String, Object> startVals = startValues.values; + Map<String, Object> endVals = endValues.values; final String startText = (String) startVals.get(PROPNAME_TEXT); final String endText = (String) endVals.get(PROPNAME_TEXT); if (!startText.equals(endText)) { diff --git a/core/java/android/view/transition/Transition.java b/core/java/android/view/transition/Transition.java index 150c218c366b..45919425efba 100644 --- a/core/java/android/view/transition/Transition.java +++ b/core/java/android/view/transition/Transition.java @@ -18,6 +18,7 @@ package android.view.transition; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.TimeInterpolator; +import android.util.ArrayMap; import android.util.LongSparseArray; import android.util.SparseArray; import android.view.SurfaceView; @@ -28,7 +29,6 @@ import android.view.ViewOverlay; import android.widget.ListView; import java.util.ArrayList; -import java.util.HashMap; /** * A Transition holds information about animations that will be run on its @@ -62,14 +62,13 @@ public abstract class Transition { TimeInterpolator mInterpolator = null; int[] mTargetIds; View[] mTargets; - // TODO: sparse arrays instead of hashmaps? - private HashMap<View, TransitionValues> mStartValues = - new HashMap<View, TransitionValues>(); + private ArrayMap<View, TransitionValues> mStartValues = + new ArrayMap<View, TransitionValues>(); private SparseArray<TransitionValues> mStartIdValues = new SparseArray<TransitionValues>(); private LongSparseArray<TransitionValues> mStartItemIdValues = new LongSparseArray<TransitionValues>(); - private HashMap<View, TransitionValues> mEndValues = - new HashMap<View, TransitionValues>(); + private ArrayMap<View, TransitionValues> mEndValues = + new ArrayMap<View, TransitionValues>(); private SparseArray<TransitionValues> mEndIdValues = new SparseArray<TransitionValues>(); private LongSparseArray<TransitionValues> mEndItemIdValues = new LongSparseArray<TransitionValues>(); @@ -78,6 +77,10 @@ public abstract class Transition { private ArrayList<TransitionValues> mPlayStartValuesList = new ArrayList<TransitionValues>(); private ArrayList<TransitionValues> mPlayEndValuesList = new ArrayList<TransitionValues>(); + // Track all animators in use in case the transition gets canceled and needs to + // cancel running animators + private ArrayList<Animator> mCurrentAnimators = new ArrayList<Animator>(); + // Number of per-target instances of this Transition currently running. This count is // determined by calls to startTransition() and endTransition() int mNumInstances = 0; @@ -223,15 +226,15 @@ public abstract class Transition { * * @hide */ - protected void prePlay(ViewGroup sceneRoot, HashMap<View, TransitionValues> startValues, + protected void prePlay(ViewGroup sceneRoot, ArrayMap<View, TransitionValues> startValues, SparseArray<TransitionValues> startIdValues, LongSparseArray<TransitionValues> startItemIdValues, - HashMap<View, TransitionValues> endValues, + ArrayMap<View, TransitionValues> endValues, SparseArray<TransitionValues> endIdValues, LongSparseArray<TransitionValues> endItemIdValues) { mPlayStartValuesList.clear(); mPlayEndValuesList.clear(); - HashMap<View, TransitionValues> endCopy = new HashMap<View, TransitionValues>(endValues); + ArrayMap<View, TransitionValues> endCopy = new ArrayMap<View, TransitionValues>(endValues); SparseArray<TransitionValues> endIdCopy = new SparseArray<TransitionValues>(endIdValues.size()); for (int i = 0; i < endIdValues.size(); ++i) { @@ -388,10 +391,10 @@ public abstract class Transition { * @hide */ protected void play(ViewGroup sceneRoot, - final HashMap<View, TransitionValues> startValues, + final ArrayMap<View, TransitionValues> startValues, final SparseArray<TransitionValues> startIdValues, final LongSparseArray<TransitionValues> startItemIdValues, - final HashMap<View, TransitionValues> endValues, + final ArrayMap<View, TransitionValues> endValues, final SparseArray<TransitionValues> endIdValues, final LongSparseArray<TransitionValues> endItemIdValues) { @@ -401,13 +404,30 @@ public abstract class Transition { TransitionValues start = mPlayStartValuesList.get(i); TransitionValues end = mPlayEndValuesList.get(i); startTransition(); - animate(play(sceneRoot, start, end)); + runAnimator(play(sceneRoot, start, end)); } mPlayStartValuesList.clear(); mPlayEndValuesList.clear(); endTransition(); } + private void runAnimator(Animator animator) { + if (animator != null) { + // TODO: could be a single listener instance for all of them since it uses the param + animator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + mCurrentAnimators.add(animation); + } + @Override + public void onAnimationEnd(Animator animation) { + mCurrentAnimators.remove(animation); + } + }); + animate(animator); + } + } + /** * Captures the current scene of values for the properties that this * transition monitors. These values can be either the start or end @@ -534,10 +554,14 @@ public abstract class Transition { captureValues(values, start); if (start) { mStartValues.put(view, values); - mStartIdValues.put(id, values); + if (id >= 0) { + mStartIdValues.put(id, values); + } } else { mEndValues.put(view, values); - mEndIdValues.put(id, values); + if (id >= 0) { + mEndIdValues.put(id, values); + } } } } @@ -599,14 +623,18 @@ public abstract class Transition { if (start) { if (!isListViewItem) { mStartValues.put(view, values); - mStartIdValues.put((int) id, values); + if (id >= 0) { + mStartIdValues.put((int) id, values); + } } else { mStartItemIdValues.put(id, values); } } else { if (!isListViewItem) { mEndValues.put(view, values); - mEndIdValues.put((int) id, values); + if (id >= 0) { + mEndIdValues.put((int) id, values); + } } else { mEndItemIdValues.put(id, values); } @@ -660,11 +688,6 @@ public abstract class Transition { } animator.addListener(new AnimatorListenerAdapter() { @Override - public void onAnimationCancel(Animator animation) { - cancelTransition(); - } - - @Override public void onAnimationEnd(Animator animation) { endTransition(); animation.removeListener(this); @@ -763,6 +786,7 @@ public abstract class Transition { mEndValues.clear(); mEndIdValues.clear(); mEndItemIdValues.clear(); + mCurrentAnimators.clear(); } } @@ -773,6 +797,11 @@ public abstract class Transition { protected void cancelTransition() { // TODO: how does this work with instances? // TODO: this doesn't actually do *anything* yet + int numAnimators = mCurrentAnimators.size(); + for (int i = 0; i < numAnimators; ++i) { + Animator animator = mCurrentAnimators.get(i); + animator.cancel(); + } onTransitionCancel(); if (mListeners != null && mListeners.size() > 0) { ArrayList<TransitionListener> tmpListeners = diff --git a/core/java/android/view/transition/TransitionGroup.java b/core/java/android/view/transition/TransitionGroup.java index 363872a1e027..8ff46b63e1c6 100644 --- a/core/java/android/view/transition/TransitionGroup.java +++ b/core/java/android/view/transition/TransitionGroup.java @@ -17,13 +17,13 @@ package android.view.transition; import android.animation.Animator; import android.util.AndroidRuntimeException; +import android.util.ArrayMap; import android.util.LongSparseArray; import android.util.SparseArray; import android.view.View; import android.view.ViewGroup; import java.util.ArrayList; -import java.util.HashMap; /** * A TransitionGroup is a parent of child transitions (including other @@ -106,8 +106,30 @@ public class TransitionGroup extends Transition { int numTransitions = transitions.length; for (int i = 0; i < numTransitions; ++i) { mTransitions.add(transitions[i]); + if (mDuration >= 0) { + transitions[0].setDuration(mDuration); + } + } + } + } + + /** + * Setting a non-negative duration on a TransitionGroup causes all of the child + * transitions (current and future) to inherit this duration. + * + * @param duration The length of the animation, in milliseconds. + * @return This transitionGroup object. + */ + @Override + public Transition setDuration(long duration) { + super.setDuration(duration); + if (mDuration >= 0) { + int numTransitions = mTransitions.size(); + for (int i = 0; i < numTransitions; ++i) { + mTransitions.get(i).setDuration(duration); } } + return this; } /** @@ -161,10 +183,10 @@ public class TransitionGroup extends Transition { */ @Override protected void prePlay(ViewGroup sceneRoot, - HashMap<View, TransitionValues> startValues, + ArrayMap<View, TransitionValues> startValues, SparseArray<TransitionValues> startIdValues, LongSparseArray<TransitionValues> startItemIdValues, - HashMap<View, TransitionValues> endValues, + ArrayMap<View, TransitionValues> endValues, SparseArray<TransitionValues> endIdValues, LongSparseArray<TransitionValues> endItemIdValues) { for (Transition childTransition : mTransitions) { @@ -178,10 +200,10 @@ public class TransitionGroup extends Transition { */ @Override protected void play(ViewGroup sceneRoot, - final HashMap<View, TransitionValues> startValues, + final ArrayMap<View, TransitionValues> startValues, final SparseArray<TransitionValues> startIdValues, final LongSparseArray<TransitionValues> startItemIdValues, - final HashMap<View, TransitionValues> endValues, + final ArrayMap<View, TransitionValues> endValues, final SparseArray<TransitionValues> endIdValues, final LongSparseArray<TransitionValues> endItemIdValues) { setupStartEndListeners(); @@ -281,6 +303,15 @@ public class TransitionGroup extends Transition { } @Override + protected void cancelTransition() { + super.cancelTransition(); + int numTransitions = mTransitions.size(); + for (int i = 0; i < numTransitions; ++i) { + mTransitions.get(i).cancelTransition(); + } + } + + @Override String toString(String indent) { String result = super.toString(indent); for (int i = 0; i < mTransitions.size(); ++i) { diff --git a/core/java/android/view/transition/TransitionInflater.java b/core/java/android/view/transition/TransitionInflater.java index a5f583657872..dc930d5fb2e9 100644 --- a/core/java/android/view/transition/TransitionInflater.java +++ b/core/java/android/view/transition/TransitionInflater.java @@ -19,6 +19,7 @@ import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; +import android.util.ArrayMap; import android.util.AttributeSet; import android.util.SparseArray; import android.util.Xml; @@ -30,7 +31,6 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; /** * This class inflates scenes and transitions from resource files. @@ -40,8 +40,8 @@ public class TransitionInflater { // We only need one inflater for any given context. Also, this allows us to associate // ids with unique instances per-Context, used to avoid re-inflating // already-inflated resources into new/different instances - private static final HashMap<Context, TransitionInflater> sInflaterMap = - new HashMap<Context, TransitionInflater>(); + private static final ArrayMap<Context, TransitionInflater> sInflaterMap = + new ArrayMap<Context, TransitionInflater>(); private Context mContext; // TODO: do we need id maps for transitions and transitionMgrs as well? diff --git a/core/java/android/view/transition/TransitionManager.java b/core/java/android/view/transition/TransitionManager.java index 5a1991cdcf90..4971a92466b3 100644 --- a/core/java/android/view/transition/TransitionManager.java +++ b/core/java/android/view/transition/TransitionManager.java @@ -15,11 +15,10 @@ */ package android.view.transition; +import android.util.ArrayMap; import android.view.ViewGroup; import android.view.ViewTreeObserver; -import java.util.HashMap; - /** * This class manages the set of transitions that fire when there is a * change of {@link Scene}. To use the manager, add scenes along with @@ -37,9 +36,11 @@ public class TransitionManager { private static final Transition sDefaultTransition = new AutoTransition(); private Transition mDefaultTransition = new AutoTransition(); - HashMap<Scene, Transition> mSceneTransitions = new HashMap<Scene, Transition>(); - HashMap<Scene, HashMap<Scene, Transition>> mScenePairTransitions = - new HashMap<Scene, HashMap<Scene, Transition>>(); + ArrayMap<Scene, Transition> mSceneTransitions = new ArrayMap<Scene, Transition>(); + ArrayMap<Scene, ArrayMap<Scene, Transition>> mScenePairTransitions = + new ArrayMap<Scene, ArrayMap<Scene, Transition>>(); + static ArrayMap<ViewGroup, Transition> sRunningTransitions = + new ArrayMap<ViewGroup, Transition>(); /** * Sets the transition to be used for any scene change for which no @@ -89,9 +90,9 @@ public class TransitionManager { * using {@link AutoTransition}. */ public void setTransition(Scene fromScene, Scene toScene, Transition transition) { - HashMap<Scene, Transition> sceneTransitionMap = mScenePairTransitions.get(toScene); + ArrayMap<Scene, Transition> sceneTransitionMap = mScenePairTransitions.get(toScene); if (sceneTransitionMap == null) { - sceneTransitionMap = new HashMap<Scene, Transition>(); + sceneTransitionMap = new ArrayMap<Scene, Transition>(); mScenePairTransitions.put(toScene, sceneTransitionMap); } sceneTransitionMap.put(fromScene, transition); @@ -114,7 +115,7 @@ public class TransitionManager { // TODO: cached in Scene instead? long-term, cache in View itself Scene currScene = sceneRoot.getCurrentScene(); if (currScene != null) { - HashMap<Scene, Transition> sceneTransitionMap = mScenePairTransitions.get(scene); + ArrayMap<Scene, Transition> sceneTransitionMap = mScenePairTransitions.get(scene); if (sceneTransitionMap != null) { transition = sceneTransitionMap.get(currScene); if (transition != null) { @@ -141,6 +142,11 @@ public class TransitionManager { final ViewGroup sceneRoot = scene.getSceneRoot(); + Transition runningTransition = sRunningTransitions.get(sceneRoot); + if (runningTransition != null) { + runningTransition.cancelTransition(); + } + // Capture current values if (transition != null) { transition.captureValues(sceneRoot, true); @@ -159,6 +165,14 @@ public class TransitionManager { observer.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { public boolean onPreDraw() { sceneRoot.getViewTreeObserver().removeOnPreDrawListener(this); + // Add to running list, handle end to remove it + sRunningTransitions.put(sceneRoot, transition); + transition.addListener(new Transition.TransitionListenerAdapter() { + @Override + public void onTransitionEnd(Transition transition) { + sRunningTransitions.remove(sceneRoot); + } + }); transition.captureValues(sceneRoot, false); transition.play(sceneRoot); return true; diff --git a/core/java/android/view/transition/TransitionValues.java b/core/java/android/view/transition/TransitionValues.java index 120ace80ae36..1ef6bf438e14 100644 --- a/core/java/android/view/transition/TransitionValues.java +++ b/core/java/android/view/transition/TransitionValues.java @@ -15,15 +15,16 @@ */ package android.view.transition; +import android.util.ArrayMap; import android.view.View; import android.view.ViewGroup; -import java.util.HashMap; +import java.util.Map; /** * Data structure which holds cached values for the transition. * The view field is the target which all of the values pertain to. - * The values field is a hashmap which holds information for fields + * The values field is a map which holds information for fields * according to names selected by the transitions. These names should * be unique to avoid clobbering values stored by other transitions, * such as the convention project:transition_name:property_name. For @@ -48,7 +49,7 @@ public class TransitionValues { /** * The set of values tracked by transitions for this scene */ - public final HashMap<String, Object> values = new HashMap<String, Object>(); + public final Map<String, Object> values = new ArrayMap<String, Object>(); @Override public String toString() { diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index ba85c1a2c095..cc1309b3708a 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2428,7 +2428,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te * @return True if the selector should be shown */ boolean shouldShowSelector() { - return (!isInTouchMode()) || touchModeDrawsInPressedState(); + return (!isInTouchMode()) || (touchModeDrawsInPressedState() && isPressed()); } private void drawSelector(Canvas canvas) { @@ -3055,15 +3055,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mTouchMode = TOUCH_MODE_SCROLL; mMotionCorrection = deltaY > 0 ? mTouchSlop : -mTouchSlop; } - final Handler handler = getHandler(); - // Handler should not be null unless the AbsListView is not attached to a - // window, which would make it very hard to scroll it... but the monkeys - // say it's possible. - if (handler != null) { - handler.removeCallbacks(mPendingCheckForLongPress); - } + removeCallbacks(mPendingCheckForLongPress); setPressed(false); - View motionView = getChildAt(mMotionPosition - mFirstPosition); + final View motionView = getChildAt(mMotionPosition - mFirstPosition); if (motionView != null) { motionView.setPressed(false); } @@ -3457,8 +3451,26 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te case TOUCH_MODE_TAP: case TOUCH_MODE_DONE_WAITING: // Check if we have moved far enough that it looks more like a - // scroll than a tap - startScrollIfNeeded(y); + // scroll than a tap. If so, we'll enter scrolling mode. + if (startScrollIfNeeded(y)) { + break; + } + // Otherwise, check containment within list bounds. If we're + // outside bounds, cancel any active presses. + final float x = ev.getX(); + final boolean inList = (x > mListPadding.left) + && (x < getWidth() - mListPadding.right); + if (!inList) { + setPressed(false); + final View motionView = getChildAt(mMotionPosition - mFirstPosition); + if (motionView != null) { + motionView.setPressed(false); + } + removeCallbacks(mTouchMode == TOUCH_MODE_DOWN ? + mPendingCheckForTap : mPendingCheckForLongPress); + mTouchMode = TOUCH_MODE_DONE_WAITING; + updateSelectorState(); + } break; case TOUCH_MODE_SCROLL: case TOUCH_MODE_OVERSCROLL: @@ -3474,69 +3486,66 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te case TOUCH_MODE_DONE_WAITING: final int motionPosition = mMotionPosition; final View child = getChildAt(motionPosition - mFirstPosition); - - final float x = ev.getX(); - final boolean inList = x > mListPadding.left && x < getWidth() - mListPadding.right; - - if (child != null && !child.hasFocusable() && inList) { + if (child != null) { if (mTouchMode != TOUCH_MODE_DOWN) { child.setPressed(false); } - if (mPerformClick == null) { - mPerformClick = new PerformClick(); - } + final float x = ev.getX(); + final boolean inList = x > mListPadding.left && x < getWidth() - mListPadding.right; + if (inList && !child.hasFocusable()) { + if (mPerformClick == null) { + mPerformClick = new PerformClick(); + } - final AbsListView.PerformClick performClick = mPerformClick; - performClick.mClickMotionPosition = motionPosition; - performClick.rememberWindowAttachCount(); + final AbsListView.PerformClick performClick = mPerformClick; + performClick.mClickMotionPosition = motionPosition; + performClick.rememberWindowAttachCount(); - mResurrectToPosition = motionPosition; + mResurrectToPosition = motionPosition; - if (mTouchMode == TOUCH_MODE_DOWN || mTouchMode == TOUCH_MODE_TAP) { - final Handler handler = getHandler(); - if (handler != null) { - handler.removeCallbacks(mTouchMode == TOUCH_MODE_DOWN ? + if (mTouchMode == TOUCH_MODE_DOWN || mTouchMode == TOUCH_MODE_TAP) { + removeCallbacks(mTouchMode == TOUCH_MODE_DOWN ? mPendingCheckForTap : mPendingCheckForLongPress); - } - mLayoutMode = LAYOUT_NORMAL; - if (!mDataChanged && mAdapter.isEnabled(motionPosition)) { - mTouchMode = TOUCH_MODE_TAP; - setSelectedPositionInt(mMotionPosition); - layoutChildren(); - child.setPressed(true); - positionSelector(mMotionPosition, child); - setPressed(true); - if (mSelector != null) { - Drawable d = mSelector.getCurrent(); - if (d != null && d instanceof TransitionDrawable) { - ((TransitionDrawable) d).resetTransition(); - } - } - if (mTouchModeReset != null) { - removeCallbacks(mTouchModeReset); - } - mTouchModeReset = new Runnable() { - @Override - public void run() { - mTouchModeReset = null; - mTouchMode = TOUCH_MODE_REST; - child.setPressed(false); - setPressed(false); - if (!mDataChanged) { - performClick.run(); + mLayoutMode = LAYOUT_NORMAL; + if (!mDataChanged && mAdapter.isEnabled(motionPosition)) { + mTouchMode = TOUCH_MODE_TAP; + setSelectedPositionInt(mMotionPosition); + layoutChildren(); + child.setPressed(true); + positionSelector(mMotionPosition, child); + setPressed(true); + if (mSelector != null) { + Drawable d = mSelector.getCurrent(); + if (d != null && d instanceof TransitionDrawable) { + ((TransitionDrawable) d).resetTransition(); } } - }; - postDelayed(mTouchModeReset, - ViewConfiguration.getPressedStateDuration()); - } else { - mTouchMode = TOUCH_MODE_REST; - updateSelectorState(); + if (mTouchModeReset != null) { + removeCallbacks(mTouchModeReset); + } + mTouchModeReset = new Runnable() { + @Override + public void run() { + mTouchModeReset = null; + mTouchMode = TOUCH_MODE_REST; + child.setPressed(false); + setPressed(false); + if (!mDataChanged) { + performClick.run(); + } + } + }; + postDelayed(mTouchModeReset, + ViewConfiguration.getPressedStateDuration()); + } else { + mTouchMode = TOUCH_MODE_REST; + updateSelectorState(); + } + return; + } else if (!mDataChanged && mAdapter.isEnabled(motionPosition)) { + performClick.run(); } - return; - } else if (!mDataChanged && mAdapter.isEnabled(motionPosition)) { - performClick.run(); } } mTouchMode = TOUCH_MODE_REST; @@ -3619,12 +3628,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te // Need to redraw since we probably aren't drawing the selector anymore invalidate(); - - final Handler handler = getHandler(); - if (handler != null) { - handler.removeCallbacks(mPendingCheckForLongPress); - } - + removeCallbacks(mPendingCheckForLongPress); recycleVelocityTracker(); mActivePointerId = INVALID_POINTER; @@ -3658,17 +3662,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te default: mTouchMode = TOUCH_MODE_REST; setPressed(false); - View motionView = this.getChildAt(mMotionPosition - mFirstPosition); + final View motionView = this.getChildAt(mMotionPosition - mFirstPosition); if (motionView != null) { motionView.setPressed(false); } clearScrollingCache(); - - final Handler handler = getHandler(); - if (handler != null) { - handler.removeCallbacks(mPendingCheckForLongPress); - } - + removeCallbacks(mPendingCheckForLongPress); recycleVelocityTracker(); } diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index f940226a1a60..fd3dc037d77f 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -16,22 +16,21 @@ package android.widget; +import android.util.ArrayMap; import com.android.internal.R; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Comparator; -import java.util.HashMap; import java.util.SortedSet; import java.util.TreeSet; import android.content.Context; -import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Rect; import android.os.Build; import android.util.AttributeSet; -import android.util.Pools.SimplePool; +import android.util.Pools.SynchronizedPool; import android.util.SparseArray; import android.view.Gravity; import android.view.View; @@ -42,7 +41,6 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.RemoteViews.RemoteView; import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; -import static android.util.Log.d; /** * A Layout where the positions of the children can be described in relation to each other or to the @@ -83,10 +81,6 @@ import static android.util.Log.d; */ @RemoteView public class RelativeLayout extends ViewGroup { - private static final String LOG_TAG = "RelativeLayout"; - - private static final boolean DEBUG_GRAPH = false; - public static final int TRUE = -1; /** @@ -212,8 +206,8 @@ public class RelativeLayout extends ViewGroup { private SortedSet<View> mTopToBottomLeftToRightSet = null; private boolean mDirtyHierarchy; - private View[] mSortedHorizontalChildren = new View[0]; - private View[] mSortedVerticalChildren = new View[0]; + private View[] mSortedHorizontalChildren; + private View[] mSortedVerticalChildren; private final DependencyGraph mGraph = new DependencyGraph(); // Compatibility hack. Old versions of the platform had problems @@ -360,42 +354,26 @@ public class RelativeLayout extends ViewGroup { } private void sortChildren() { - int count = getChildCount(); - if (mSortedVerticalChildren.length != count) mSortedVerticalChildren = new View[count]; - if (mSortedHorizontalChildren.length != count) mSortedHorizontalChildren = new View[count]; + final int count = getChildCount(); + if (mSortedVerticalChildren == null || mSortedVerticalChildren.length != count) { + mSortedVerticalChildren = new View[count]; + } + + if (mSortedHorizontalChildren == null || mSortedHorizontalChildren.length != count) { + mSortedHorizontalChildren = new View[count]; + } final DependencyGraph graph = mGraph; graph.clear(); for (int i = 0; i < count; i++) { - final View child = getChildAt(i); - graph.add(child); - } - - if (DEBUG_GRAPH) { - d(LOG_TAG, "=== Sorted vertical children"); - graph.log(getResources(), RULES_VERTICAL); - d(LOG_TAG, "=== Sorted horizontal children"); - graph.log(getResources(), RULES_HORIZONTAL); + graph.add(getChildAt(i)); } graph.getSortedViews(mSortedVerticalChildren, RULES_VERTICAL); graph.getSortedViews(mSortedHorizontalChildren, RULES_HORIZONTAL); - - if (DEBUG_GRAPH) { - d(LOG_TAG, "=== Ordered list of vertical children"); - for (View view : mSortedVerticalChildren) { - DependencyGraph.printViewId(getResources(), view); - } - d(LOG_TAG, "=== Ordered list of horizontal children"); - for (View view : mSortedHorizontalChildren) { - DependencyGraph.printViewId(getResources(), view); - } - } } - // TODO: we need to find another way to implement RelativeLayout - // This implementation cannot handle every case @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { if (mDirtyHierarchy) { @@ -900,8 +878,6 @@ public class RelativeLayout extends ViewGroup { } else if (childParams.alignWithParent && rules[LEFT_OF] != 0) { if (myWidth >= 0) { childParams.mRight = myWidth - mPaddingRight - childParams.rightMargin; - } else { - // FIXME uh oh... } } @@ -926,8 +902,6 @@ public class RelativeLayout extends ViewGroup { } else if (childParams.alignWithParent && rules[ALIGN_RIGHT] != 0) { if (myWidth >= 0) { childParams.mRight = myWidth - mPaddingRight - childParams.rightMargin; - } else { - // FIXME uh oh... } } @@ -938,8 +912,6 @@ public class RelativeLayout extends ViewGroup { if (0 != rules[ALIGN_PARENT_RIGHT]) { if (myWidth >= 0) { childParams.mRight = myWidth - mPaddingRight - childParams.rightMargin; - } else { - // FIXME uh oh... } } } @@ -958,8 +930,6 @@ public class RelativeLayout extends ViewGroup { } else if (childParams.alignWithParent && rules[ABOVE] != 0) { if (myHeight >= 0) { childParams.mBottom = myHeight - mPaddingBottom - childParams.bottomMargin; - } else { - // FIXME uh oh... } } @@ -984,8 +954,6 @@ public class RelativeLayout extends ViewGroup { } else if (childParams.alignWithParent && rules[ALIGN_BOTTOM] != 0) { if (myHeight >= 0) { childParams.mBottom = myHeight - mPaddingBottom - childParams.bottomMargin; - } else { - // FIXME uh oh... } } @@ -996,8 +964,6 @@ public class RelativeLayout extends ViewGroup { if (0 != rules[ALIGN_PARENT_BOTTOM]) { if (myHeight >= 0) { childParams.mBottom = myHeight - mPaddingBottom - childParams.bottomMargin; - } else { - // FIXME uh oh... } } @@ -1677,8 +1643,10 @@ public class RelativeLayout extends ViewGroup { sorted[index++] = view; - final HashMap<Node, DependencyGraph> dependents = node.dependents; - for (Node dependent : dependents.keySet()) { + final ArrayMap<Node, DependencyGraph> dependents = node.dependents; + final int count = dependents.size(); + for (int i = 0; i < count; i++) { + final Node dependent = dependents.keyAt(i); final SparseArray<Node> dependencies = dependent.dependencies; dependencies.remove(key); @@ -1756,61 +1724,6 @@ public class RelativeLayout extends ViewGroup { } /** - * Prints the dependency graph for the specified rules. - * - * @param resources The context's resources to print the ids. - * @param rules The list of rules to take into account. - */ - void log(Resources resources, int... rules) { - final ArrayDeque<Node> roots = findRoots(rules); - for (Node node : roots) { - printNode(resources, node); - } - } - - static void printViewId(Resources resources, View view) { - if (view.getId() != View.NO_ID) { - d(LOG_TAG, resources.getResourceEntryName(view.getId())); - } else { - d(LOG_TAG, "NO_ID"); - } - } - - private static void appendViewId(Resources resources, Node node, StringBuilder buffer) { - if (node.view.getId() != View.NO_ID) { - buffer.append(resources.getResourceEntryName(node.view.getId())); - } else { - buffer.append("NO_ID"); - } - } - - private static void printNode(Resources resources, Node node) { - if (node.dependents.size() == 0) { - printViewId(resources, node.view); - } else { - for (Node dependent : node.dependents.keySet()) { - StringBuilder buffer = new StringBuilder(); - appendViewId(resources, node, buffer); - printdependents(resources, dependent, buffer); - } - } - } - - private static void printdependents(Resources resources, Node node, StringBuilder buffer) { - buffer.append(" -> "); - appendViewId(resources, node, buffer); - - if (node.dependents.size() == 0) { - d(LOG_TAG, buffer.toString()); - } else { - for (Node dependent : node.dependents.keySet()) { - StringBuilder subBuffer = new StringBuilder(buffer); - printdependents(resources, dependent, subBuffer); - } - } - } - - /** * A node in the dependency graph. A node is a view, its list of dependencies * and its list of dependents. * @@ -1826,7 +1739,8 @@ public class RelativeLayout extends ViewGroup { * The list of dependents for this node; a dependent is a node * that needs this node to be processed first. */ - final HashMap<Node, DependencyGraph> dependents = new HashMap<Node, DependencyGraph>(); + final ArrayMap<Node, DependencyGraph> dependents = + new ArrayMap<Node, DependencyGraph>(); /** * The list of dependencies for this node. @@ -1839,7 +1753,8 @@ public class RelativeLayout extends ViewGroup { // The pool is static, so all nodes instances are shared across // activities, that's why we give it a rather high limit private static final int POOL_LIMIT = 100; - private static final SimplePool<Node> sPool = new SimplePool<Node>(POOL_LIMIT); + private static final SynchronizedPool<Node> sPool = + new SynchronizedPool<Node>(POOL_LIMIT); static Node acquire(View view) { Node node = sPool.acquire(); diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index b1692d7900d4..12d0c49aca3b 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -146,6 +146,13 @@ import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; * view for editing. * * <p> + * To allow users to copy some or all of the TextView's value and paste it somewhere else, set the + * XML attribute {@link android.R.styleable#TextView_textIsSelectable + * android:textIsSelectable} to "true" or call + * {@link #setTextIsSelectable setTextIsSelectable(true)}. The {@code textIsSelectable} flag + * allows users to make selection gestures in the TextView, which in turn triggers the system's + * built-in copy/paste controls. + * <p> * <b>XML attributes</b> * <p> * See {@link android.R.styleable#TextView TextView Attributes}, @@ -548,7 +555,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private InputFilter[] mFilters = NO_FILTERS; private volatile Locale mCurrentSpellCheckerLocaleCache; - private final ReentrantLock mCurrentTextServicesLocaleLock = new ReentrantLock(); // It is possible to have a selection even when mEditor is null (programmatically set, like when // a link is pressed). These highlight-related fields do not go in mEditor. @@ -4862,17 +4868,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } /** - * When a TextView is used to display a useful piece of information to the user (such as a - * contact's address), it should be made selectable, so that the user can select and copy this - * content. - * - * Use {@link #setTextIsSelectable(boolean)} or the - * {@link android.R.styleable#TextView_textIsSelectable} XML attribute to make this TextView - * selectable (text is not selectable by default). * - * Note that this method simply returns the state of this flag. Although this flag has to be set - * in order to select text in non-editable TextView, the content of an {@link EditText} can - * always be selected, independently of the value of this flag. + * Returns the state of the {@code textIsSelectable} flag (See + * {@link #setTextIsSelectable setTextIsSelectable()}). Although you have to set this flag + * to allow users to select and copy text in a non-editable TextView, the content of an + * {@link EditText} can always be selected, independently of the value of this flag. + * <p> * * @return True if the text displayed in this TextView can be selected by the user. * @@ -4883,16 +4884,28 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } /** - * Sets whether or not (default) the content of this view is selectable by the user. - * - * Note that this methods affect the {@link #setFocusable(boolean)}, - * {@link #setFocusableInTouchMode(boolean)} {@link #setClickable(boolean)} and - * {@link #setLongClickable(boolean)} states and you may want to restore these if they were - * customized. - * - * See {@link #isTextSelectable} for details. - * - * @param selectable Whether or not the content of this TextView should be selectable. + * Sets whether the content of this view is selectable by the user. The default is + * {@code false}, meaning that the content is not selectable. + * <p> + * When you use a TextView to display a useful piece of information to the user (such as a + * contact's address), make it selectable, so that the user can select and copy its + * content. You can also use set the XML attribute + * {@link android.R.styleable#TextView_textIsSelectable} to "true". + * <p> + * When you call this method to set the value of {@code textIsSelectable}, it sets + * the flags {@code focusable}, {@code focusableInTouchMode}, {@code clickable}, + * and {@code longClickable} to the same value. These flags correspond to the attributes + * {@link android.R.styleable#View_focusable android:focusable}, + * {@link android.R.styleable#View_focusableInTouchMode android:focusableInTouchMode}, + * {@link android.R.styleable#View_clickable android:clickable}, and + * {@link android.R.styleable#View_longClickable android:longClickable}. To restore any of these + * flags to a state you had set previously, call one or more of the following methods: + * {@link #setFocusable(boolean) setFocusable()}, + * {@link #setFocusableInTouchMode(boolean) setFocusableInTouchMode()}, + * {@link #setClickable(boolean) setClickable()} or + * {@link #setLongClickable(boolean) setLongClickable()}. + * + * @param selectable Whether the content of this TextView should be selectable. */ public void setTextIsSelectable(boolean selectable) { if (!selectable && mEditor == null) return; // false is default value with no edit data @@ -8023,16 +8036,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } private void updateTextServicesLocaleAsync() { + // AsyncTask.execute() uses a serial executor which means we don't have + // to lock around updateTextServicesLocaleLocked() to prevent it from + // being executed n times in parallel. AsyncTask.execute(new Runnable() { @Override public void run() { - if (mCurrentTextServicesLocaleLock.tryLock()) { - try { - updateTextServicesLocaleLocked(); - } finally { - mCurrentTextServicesLocaleLock.unlock(); - } - } + updateTextServicesLocaleLocked(); } }); } diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index c3b1ac5a58cf..39915f95a08b 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Huidige gebruiker <xliff:g id="NAME">%1$s</xliff:g> ."</string> <string name="owner_name" msgid="2716755460376028154">"Eienaar"</string> <string name="error_message_title" msgid="4510373083082500195">"Fout"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Hierdie program werk nie met rekeninge vir beperkte profiele nie"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Geen program gevind om hierdie handeling te hanteer nie"</string> <string name="revoke" msgid="5404479185228271586">"Herroep"</string> </resources> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 12cfbf49e284..327f1cb9c142 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"የአሁኑ ተጠቃሚ <xliff:g id="NAME">%1$s</xliff:g>።"</string> <string name="owner_name" msgid="2716755460376028154">"ባለቤት"</string> <string name="error_message_title" msgid="4510373083082500195">"ስህተት"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"ይህ መተግበሪያ የተገደቡ መገለጫዎች መለያዎችን አይደግፍም"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"ይህን እርምጃ የሚያከናውን ምንም መተግበሪያ አልተገኘም"</string> <string name="revoke" msgid="5404479185228271586">"ሻር"</string> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 9b2f2842f93e..19f2d6a757fc 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1498,7 +1498,7 @@ <string name="user_switched" msgid="3768006783166984410">"المستخدم الحالي <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"المالك"</string> <string name="error_message_title" msgid="4510373083082500195">"خطأ"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"هذا التطبيق لا يتوافق مع حسابات الملفات الشخصية المقيدة"</string> + <string name="app_no_restricted_accounts" msgid="5739463249673727736">"لا يتوافق هذا التطبيق مع حسابات الملفات الشخصية المقيدة"</string> <string name="app_not_found" msgid="3429141853498927379">"لم يتم العثور على تطبيق يمكنه التعامل مع هذا الإجراء."</string> <string name="revoke" msgid="5404479185228271586">"إلغاء"</string> </resources> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 5cb4c43c55a0..ab0db231b26f 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -1498,7 +1498,7 @@ <string name="user_switched" msgid="3768006783166984410">"Бягучы карыстальнік <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Уладальнік"</string> <string name="error_message_title" msgid="4510373083082500195">"Памылка"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Гэтае прыкладанне не падтрымлівае уліковыя запісы для карыстальнікаў з абмежаваннямi"</string> + <string name="app_no_restricted_accounts" msgid="5739463249673727736">"Гэта прыкладанне не падтрымлівае ўліковыя запісы для профiляў з абмежаваннямі"</string> <string name="app_not_found" msgid="3429141853498927379">"Прыкладанне для гэтага дзеяння не знойдзенае"</string> <string name="revoke" msgid="5404479185228271586">"Ануляваць"</string> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index afa6c118acf9..4d8a5cce0d3a 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Текущ потребител <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Собственик"</string> <string name="error_message_title" msgid="4510373083082500195">"Грешка"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Това приложение не поддържа профили за потребителски профили с ограничена функционалност"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Няма намерено приложение за извършване на това действие"</string> <string name="revoke" msgid="5404479185228271586">"Отмяна"</string> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index aaa911de3204..4eaf0685db36 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -565,8 +565,8 @@ <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"Permet que l\'aplicació pugui canviar l\'estat de connectivitat de la xarxa."</string> <string name="permlab_changeTetherState" msgid="5952584964373017960">"Canvia la connectivitat d\'ancoratge a xarxa"</string> <string name="permdesc_changeTetherState" msgid="1524441344412319780">"Permet que l\'aplicació canviï l\'estat de la connectivitat de la xarxa d\'ancoratge."</string> - <string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"canviar la configuració d\'ús de dades de referència"</string> - <string name="permdesc_changeBackgroundDataSetting" msgid="5347729578468744379">"Permet que l\'aplicació canviï la configuració d\'ús de les dades de fons."</string> + <string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"canviar la configuració d\'ús de dades en segon pla"</string> + <string name="permdesc_changeBackgroundDataSetting" msgid="5347729578468744379">"Permet que l\'aplicació canviï la configuració d\'ús de les dades en segon pla."</string> <string name="permlab_accessWifiState" msgid="5202012949247040011">"veure connexions Wi-Fi"</string> <string name="permdesc_accessWifiState" msgid="5002798077387803726">"Permet que l\'aplicació visualitzi informació sobre les xarxes Wi-Fi, com ara si la Wi-Fi està activada i el nom dels dispositius Wi-Fi connectats."</string> <string name="permlab_changeWifiState" msgid="6550641188749128035">"connectar-se a xarxes Wi-Fi i desconnectar-se"</string> @@ -1406,7 +1406,7 @@ <string name="data_usage_mobile_limit_snoozed_title" msgid="279240572165412168">"S\'ha superat el límit de dades mòbils"</string> <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"S\'ha superat el límit de dades Wi-Fi"</string> <string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"<xliff:g id="SIZE">%s</xliff:g> per sobre del límit especif."</string> - <string name="data_usage_restricted_title" msgid="5965157361036321914">"Dades de referència restringides"</string> + <string name="data_usage_restricted_title" msgid="5965157361036321914">"Dades en segon pla restringides"</string> <string name="data_usage_restricted_body" msgid="6741521330997452990">"Toca per eliminar la restricció."</string> <string name="ssl_certificate" msgid="6510040486049237639">"Certificat de seguretat"</string> <string name="ssl_certificate_is_valid" msgid="6825263250774569373">"Aquest certificat és vàlid."</string> @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Usuari actual: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Propietari"</string> <string name="error_message_title" msgid="4510373083082500195">"Error"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"L\'aplicació no és compatible amb comptes de perfils restringits."</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"No s\'ha trobat cap aplicació per processar aquesta acció"</string> <string name="revoke" msgid="5404479185228271586">"Revoca"</string> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index abe6dad10c2c..91498cd948f7 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Aktuální uživatel je <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Vlastník"</string> <string name="error_message_title" msgid="4510373083082500195">"Chyba"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Tato aplikace nepodporuje účty pro omezené profily."</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Aplikace potřebná k provedení této akce nebyla nalezena"</string> <string name="revoke" msgid="5404479185228271586">"Zrušit"</string> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index e00597a14e53..081fd2a6bfd7 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Nuværende bruger <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Ejer"</string> <string name="error_message_title" msgid="4510373083082500195">"Fejl"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Denne applikation understøtter ikke konti for begrænsede profiler"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Der blev ikke fundet nogen applikation, der kan håndtere denne handling"</string> <string name="revoke" msgid="5404479185228271586">"Tilbagekald"</string> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 655d5d0ef6ff..53db449f42ed 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -940,7 +940,7 @@ <string name="oneMonthDurationPast" msgid="7396384508953779925">"Vor 1 Monat"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Vor mehr als 1 Monat"</string> <plurals name="num_seconds_ago"> - <item quantity="one" msgid="4869870056547896011">"Vor 1 Sekunde"</item> + <item quantity="one" msgid="4869870056547896011">"vor 1 Sekunde"</item> <item quantity="other" msgid="3903706804349556379">"vor <xliff:g id="COUNT">%d</xliff:g> Sekunden"</item> </plurals> <plurals name="num_minutes_ago"> @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Aktueller Nutzer <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="owner_name" msgid="2716755460376028154">"Eigentümer"</string> <string name="error_message_title" msgid="4510373083082500195">"Fehler"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Diese App unterstützt keine Konten für eingeschränkte Profile."</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Für diese Aktion wurde keine App gefunden."</string> <string name="revoke" msgid="5404479185228271586">"Aufheben"</string> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 5135847cf095..78a707f58e9b 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Τρέχων χρήστης <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Κάτοχος"</string> <string name="error_message_title" msgid="4510373083082500195">"Σφάλμα"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Αυτή η εφαρμογή δεν υποστηρίζει λογαριασμούς για περιορισμένα προφίλ"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Δεν υπάρχει εφαρμογή για τη διαχείριση αυτής της ενέργειας"</string> <string name="revoke" msgid="5404479185228271586">"Ανάκληση"</string> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 2d5e70c06a85..b8c0d501aed3 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1498,7 +1498,7 @@ <string name="user_switched" msgid="3768006783166984410">"Current user <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Owner"</string> <string name="error_message_title" msgid="4510373083082500195">"Error"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"This application does not support accounts for restricted profiles"</string> + <string name="app_no_restricted_accounts" msgid="5739463249673727736">"This app doesn\'t support accounts for restricted profiles"</string> <string name="app_not_found" msgid="3429141853498927379">"No application found to handle this action"</string> <string name="revoke" msgid="5404479185228271586">"Revoke"</string> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 501d56f866b1..49f6e1f83d6f 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Usuario actual: <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="owner_name" msgid="2716755460376028154">"Propietario"</string> <string name="error_message_title" msgid="4510373083082500195">"Error"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Esta aplicación no admite cuentas de perfiles restringidos."</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"No se encontró una aplicación para manejar esta acción."</string> <string name="revoke" msgid="5404479185228271586">"Revocar"</string> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 0685e66400a5..0a704c3c97d6 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Usuario actual: <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="owner_name" msgid="2716755460376028154">"Propietario"</string> <string name="error_message_title" msgid="4510373083082500195">"Error"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Esta aplicación no admite cuentas de perfiles restringidos"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"No se ha encontrado ninguna aplicación que pueda realizar esta acción."</string> <string name="revoke" msgid="5404479185228271586">"Revocar"</string> </resources> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index b1997d15cba3..8f6911c4d527 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Praegune kasutaja <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Omanik"</string> <string name="error_message_title" msgid="4510373083082500195">"Viga"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"See rakendus ei toeta piiratud profiilide kontosid"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Selle toimingu käsitlemiseks ei leitud ühtegi rakendust"</string> <string name="revoke" msgid="5404479185228271586">"Tühista"</string> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index b47bf9f82326..170e9aef9e7b 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1498,7 +1498,7 @@ <string name="user_switched" msgid="3768006783166984410">"کاربر کنونی <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"دارنده"</string> <string name="error_message_title" msgid="4510373083082500195">"خطا"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"این برنامه از حسابهای متعلق به نمایههای محدود پشتیبانی نمیکند"</string> + <string name="app_no_restricted_accounts" msgid="5739463249673727736">"این برنامه از حسابهای متعلق به نمایههای محدود پشتیبانی نمیکند"</string> <string name="app_not_found" msgid="3429141853498927379">"برنامهای برای انجام این عملکرد موجود نیست"</string> <string name="revoke" msgid="5404479185228271586">"لغو"</string> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index feeed5393ba1..15a5f95184a9 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Nykyinen käyttäjä: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Omistaja"</string> <string name="error_message_title" msgid="4510373083082500195">"Virhe"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Tämä sovellus ei tue rajoitettujen profiilien tilejä"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Tätä toimintoa käsittelevää sovellusta ei löydy"</string> <string name="revoke" msgid="5404479185228271586">"Peruuta"</string> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 97e0a821e761..9afa938c0817 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Utilisateur actuel : <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="owner_name" msgid="2716755460376028154">"Propriétaire"</string> <string name="error_message_title" msgid="4510373083082500195">"Erreur"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Les comptes des profils limités ne sont pas acceptés pour cette application."</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Aucune application trouvée pour gérer cette action."</string> <string name="revoke" msgid="5404479185228271586">"Révoquer"</string> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index b135c2edbdd4..4df3a5b9295a 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"वर्तमान उपयोगकर्ता <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"स्वामी"</string> <string name="error_message_title" msgid="4510373083082500195">"त्रुटि"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"यह एप्लिकेशन प्रतिबंधित प्रोफ़ाइल के खातों का समर्थन नहीं करता है"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"इस कार्यवाही को प्रबंधित करने के लिए कोई एप्लिकेशन नहीं मिला"</string> <string name="revoke" msgid="5404479185228271586">"निरस्त करें"</string> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index f033a1661e5c..a7208eedfe0a 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Trenutačni korisnik <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Vlasnik"</string> <string name="error_message_title" msgid="4510373083082500195">"Pogreška"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Aplikacija ne podržava račune za ograničene profile"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Nije pronađena aplikacija za upravljanje ovom radnjom"</string> <string name="revoke" msgid="5404479185228271586">"Opozovi"</string> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 516241fca824..3060fd17b65f 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"<xliff:g id="NAME">%1$s</xliff:g> az aktuális felhasználó."</string> <string name="owner_name" msgid="2716755460376028154">"Tulajdonos"</string> <string name="error_message_title" msgid="4510373083082500195">"Hiba"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Ez az alkalmazás nem támogatja a korlátozott profilokkal rendelkező fiókokat"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Nincs megfelelő alkalmazás a művelet elvégzésére."</string> <string name="revoke" msgid="5404479185228271586">"Visszavonás"</string> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 812d016d3f3c..55040785bc18 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Pengguna saat ini <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Pemilik"</string> <string name="error_message_title" msgid="4510373083082500195">"Kesalahan"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Aplikasi ini tidak mendukung akun untuk profil yang dibatasi"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Tidak ada aplikasi yang ditemukan untuk menangani tindakan ini"</string> <string name="revoke" msgid="5404479185228271586">"Cabut"</string> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 05bed06c650e..a1e8bfce2024 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Utente corrente <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Proprietario"</string> <string name="error_message_title" msgid="4510373083082500195">"Errore"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Questa applicazione non supporta account relativi a profili con limitazioni"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Nessuna applicazione trovata in grado di gestire questa azione"</string> <string name="revoke" msgid="5404479185228271586">"Revoca"</string> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 1e0e2045ea06..d48f84658805 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"המשתמש הנוכחי <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"בעלים"</string> <string name="error_message_title" msgid="4510373083082500195">"שגיאה"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"היישום הזה לא תומך בחשבונות עבור פרופילים מוגבלים"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"לא נמצא יישום שתומך בפעולה זו"</string> <string name="revoke" msgid="5404479185228271586">"בטל"</string> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 3241159ac7fe..993292450cc8 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"現在のユーザーは<xliff:g id="NAME">%1$s</xliff:g>です。"</string> <string name="owner_name" msgid="2716755460376028154">"所有者"</string> <string name="error_message_title" msgid="4510373083082500195">"エラー"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"このアプリでは制限付きプロフィールのアカウントはサポートしていません"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"この操作を行うアプリが見つかりません"</string> <string name="revoke" msgid="5404479185228271586">"取り消し"</string> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index b6e07c81962f..f66fb33de312 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"현재 사용자는 <xliff:g id="NAME">%1$s</xliff:g>님입니다."</string> <string name="owner_name" msgid="2716755460376028154">"소유자"</string> <string name="error_message_title" msgid="4510373083082500195">"오류"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"이 애플리케이션은 제한된 프로필의 계정을 지원하지 않습니다."</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"이 작업을 처리하는 애플리케이션을 찾을 수 없습니다."</string> <string name="revoke" msgid="5404479185228271586">"취소"</string> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 2ad059820e08..d4019f3d3361 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Dabartinis naudotojas: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Savininkas"</string> <string name="error_message_title" msgid="4510373083082500195">"Klaida"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Ši programa nepalaiko apribotų profilių paskyrų"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Nerasta programa šiam veiksmui apdoroti"</string> <string name="revoke" msgid="5404479185228271586">"Anuliuoti"</string> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index de300378d067..dac8a7bf96f7 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Pašreizējais lietotājs: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Īpašnieks"</string> <string name="error_message_title" msgid="4510373083082500195">"Kļūda"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Šajā lietojumprogrammā netiek atbalstīti ierobežotu profilu konti."</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Netika atrasta neviena lietojumprogramma, kas var veikt šo darbību."</string> <string name="revoke" msgid="5404479185228271586">"Atsaukt"</string> </resources> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index b518ea9679fa..bcc94931d2b5 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Pengguna semasa <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Pemilik"</string> <string name="error_message_title" msgid="4510373083082500195">"Ralat"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Apl ini tidak menyokong akaun untuk profil yang disekat"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Tidak menemui aplikasi untuk mengendalikan tindakan ini"</string> <string name="revoke" msgid="5404479185228271586">"Batalkan"</string> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 080a05c35a57..5993cc953c96 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Gjeldende bruker: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Eier"</string> <string name="error_message_title" msgid="4510373083082500195">"Feil"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Denne appen støtter ikke kontoer for begrensede profiler"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Finner ingen apper som kan utføre denne handlingen"</string> <string name="revoke" msgid="5404479185228271586">"Opphev"</string> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 299658e859bc..b8e5deb21634 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Huidige gebruiker <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Eigenaar"</string> <string name="error_message_title" msgid="4510373083082500195">"Fout"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Deze app biedt geen ondersteuning voor accounts voor beperkte profielen"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Er is geen app gevonden om deze actie uit te voeren"</string> <string name="revoke" msgid="5404479185228271586">"Intrekken"</string> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 78977633b631..642237c5477a 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Bieżący użytkownik: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Właściciel"</string> <string name="error_message_title" msgid="4510373083082500195">"Błąd"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Ta aplikacja nie obsługuje kont w przypadku profili z ograniczeniami"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Nie znaleziono aplikacji do obsługi tej akcji"</string> <string name="revoke" msgid="5404479185228271586">"Cofnij"</string> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 6d7624846c62..ff912b99f6c5 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"<xliff:g id="NAME">%1$s</xliff:g> do utilizador atual."</string> <string name="owner_name" msgid="2716755460376028154">"Proprietário"</string> <string name="error_message_title" msgid="4510373083082500195">"Erro"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Esta aplicação não suporta contas de perfis restritos"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Não foram encontradas aplicações para executar esta ação"</string> <string name="revoke" msgid="5404479185228271586">"Revogar"</string> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 87306046d475..96988848f7e6 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Usuário atual <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Proprietário"</string> <string name="error_message_title" msgid="4510373083082500195">"Erro"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Este aplicativo não suporta contas para perfis restritos"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Nenhum aplicativo encontrado para executar a ação"</string> <string name="revoke" msgid="5404479185228271586">"Revogar"</string> </resources> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index 4404d8752cac..b2a0bcaf5ba2 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -2435,7 +2435,7 @@ <skip /> <!-- no translation found for error_message_title (4510373083082500195) --> <skip /> - <!-- no translation found for app_no_restricted_accounts (4011285085817350390) --> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> <skip /> <!-- no translation found for app_not_found (3429141853498927379) --> <skip /> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 4267fe13eb72..b7866f659e4d 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Utilizator curent: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Proprietar"</string> <string name="error_message_title" msgid="4510373083082500195">"Eroare"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Această aplicație nu acceptă conturi pentru profilurile cu permisiuni limitate"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Nicio aplicație pentru gestionarea acestei acțiuni"</string> <string name="revoke" msgid="5404479185228271586">"Revocați"</string> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index b05bef78947b..3b8b907a764b 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Выбран аккаунт пользователя <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Владелец"</string> <string name="error_message_title" msgid="4510373083082500195">"Ошибка"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Это приложение не поддерживается в аккаунтах для профилей с ограниченным доступом"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Невозможно обработать это действие"</string> <string name="revoke" msgid="5404479185228271586">"Отменить"</string> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 96b44f7a4be6..2d62a471fe2a 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1498,7 +1498,7 @@ <string name="user_switched" msgid="3768006783166984410">"Aktuálny používateľ je <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Vlastník"</string> <string name="error_message_title" msgid="4510373083082500195">"Chyba"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Táto aplikácia nepodporuje účty pre profily s obmedzením"</string> + <string name="app_no_restricted_accounts" msgid="5739463249673727736">"Táto aplikácia nepodporuje účty pre profily s obmedzením"</string> <string name="app_not_found" msgid="3429141853498927379">"Aplikácia potrebná na spracovanie tejto akcie sa nenašla"</string> <string name="revoke" msgid="5404479185228271586">"Odvolať"</string> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 5280b0608641..fd0b91fa2871 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Trenutni uporabnik <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Lastnik"</string> <string name="error_message_title" msgid="4510373083082500195">"Napaka"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Ta aplikacija ne podpira računov za profile z omejitvami"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Najdena ni bila nobena aplikacija za izvedbo tega dejanja"</string> <string name="revoke" msgid="5404479185228271586">"Prekliči"</string> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 79a3d87e35f8..742375f4ba9c 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Актуелни корисник <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Власник"</string> <string name="error_message_title" msgid="4510373083082500195">"Грешка"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Ова апликација не подржава налоге за ограничене профиле"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Није пронађена ниједна апликација која би могла да обави ову радњу"</string> <string name="revoke" msgid="5404479185228271586">"Опозови"</string> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 0775d0aa8d30..1a316bdb6b56 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Nuvarande användare: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Ägare"</string> <string name="error_message_title" msgid="4510373083082500195">"Fel"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Den här appen stöder inte konton för begränsade profiler"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Ingen app som kan hantera åtgärden hittades"</string> <string name="revoke" msgid="5404479185228271586">"Återkalla"</string> </resources> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 450e6a31a355..bf03bdc978ef 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Mtumiaji wa sasa <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Mmiliki"</string> <string name="error_message_title" msgid="4510373083082500195">"Hitilafu"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Programu hii haiwezi kutumiwa na akaunti za wasifu zilizowekewa vikwazo"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Hakuna programu iliyopatikana ili kushughulikia kitendo hiki"</string> <string name="revoke" msgid="5404479185228271586">"Batilisha"</string> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index fd3ab94c86f4..f917448cbdbb 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1498,7 +1498,7 @@ <string name="user_switched" msgid="3768006783166984410">"ผู้ใช้ปัจจุบัน <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="owner_name" msgid="2716755460376028154">"เจ้าของ"</string> <string name="error_message_title" msgid="4510373083082500195">"ข้อผิดพลาด"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"แอปพลิเคชันนี้ไม่สนับสนุนบัญชีที่มีโปรไฟล์ที่ถูกจำกัด"</string> + <string name="app_no_restricted_accounts" msgid="5739463249673727736">"แอปนี้ไม่สนับสนุนบัญชีที่มีโปรไฟล์ที่ถูกจำกัด"</string> <string name="app_not_found" msgid="3429141853498927379">"ไม่พบแอปพลิเคชันสำหรับการทำงานนี้"</string> <string name="revoke" msgid="5404479185228271586">"เพิกถอน"</string> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index ce462193c62c..53aaa0e94493 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Kasalukuyang user <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"May-ari"</string> <string name="error_message_title" msgid="4510373083082500195">"Error"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Hindi sinusuportahan ng application na ito ang mga account para sa mga pinaghihigpitang profile"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Walang nakitang application na mangangasiwa sa pagkilos na ito"</string> <string name="revoke" msgid="5404479185228271586">"Bawiin"</string> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index c6e8519d6bd5..1c25ab76e46f 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Geçerli kullanıcı: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Sahibi"</string> <string name="error_message_title" msgid="4510373083082500195">"Hata"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Bu uygulama kısıtlanmış profillerin hesaplarını desteklemez"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Bu eylemi gerçekleştirecek bir uygulama bulunamadı"</string> <string name="revoke" msgid="5404479185228271586">"İptal et"</string> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 216a9b19e70c..90705821c252 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Поточний користувач: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Власник"</string> <string name="error_message_title" msgid="4510373083082500195">"Помилка"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Ця програма не підтримує облікові записи для обмежених профілів"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Не знайдено програму для обробки цієї дії"</string> <string name="revoke" msgid="5404479185228271586">"Анулювати"</string> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 7f076b964821..5d4f0a706083 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"Người dùng hiện tại <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Chủ sở hữu"</string> <string name="error_message_title" msgid="4510373083082500195">"Lỗi"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Ứng dụng này không hỗ trợ tài khoản cho các tiểu sử bị hạn chế"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"Không tìm thấy ứng dụng nào để xử lý tác vụ này"</string> <string name="revoke" msgid="5404479185228271586">"Thu hồi"</string> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 2e93751e45cc..9878860add48 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -451,17 +451,17 @@ <string name="permlab_installLocationProvider" msgid="6578101199825193873">"允许安装位置信息提供程序"</string> <string name="permdesc_installLocationProvider" msgid="9066146120470591509">"创建用于测试的模拟位置源或安装新的位置提供程序。此权限可让该应用覆盖由其他位置源（如 GPS）或位置提供程序返回的位置和/或状态信息。"</string> <string name="permlab_accessFineLocation" msgid="1191898061965273372">"精确位置（基于 GPS 和网络）"</string> - <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"允许该应用通过全球定位系统 (GPS) 或网络位置信息源（例如基站和 Wi-Fi）获取您的精确位置信息。您必须在设备上开启这些位置服务，应用才能获得位置信息。应用会使用此类服务确定您的位置，这可能会消耗更多电量。"</string> + <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"允许该应用通过全球定位系统 (GPS) 或网络位置信息源（例如基站和 WLAN）获取您的精确位置信息。您必须在设备上开启这些位置服务，应用才能获得位置信息。应用会使用此类服务确定您的位置，这可能会消耗更多电量。"</string> <string name="permlab_accessCoarseLocation" msgid="4887895362354239628">"大致位置（基于网络）"</string> - <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"允许该应用获取您的大致位置信息。这类位置信息来自于使用网络位置信息源（例如基站和 Wi-Fi）的位置服务。您必须在设备上开启这些位置服务，应用才能获得位置信息。应用会使用此类服务确定您的大概位置。"</string> + <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"允许该应用获取您的大致位置信息。这类位置信息来自于使用网络位置信息源（例如基站和 WLAN）的位置服务。您必须在设备上开启这些位置服务，应用才能获得位置信息。应用会使用此类服务确定您的大概位置。"</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"访问 SurfaceFlinger"</string> <string name="permdesc_accessSurfaceFlinger" msgid="1041619516733293551">"允许应用使用 SurfaceFlinger 低级功能。"</string> <string name="permlab_readFrameBuffer" msgid="6690504248178498136">"读取帧缓冲区"</string> <string name="permdesc_readFrameBuffer" msgid="4937405521809454680">"允许应用读取帧缓冲区的内容。"</string> - <string name="permlab_configureWifiDisplay" msgid="5595661694746742168">"配置 Wi-Fi 显示设备"</string> - <string name="permdesc_configureWifiDisplay" msgid="7916815158690218065">"允许应用配置并连接到 Wi-Fi 显示设备。"</string> - <string name="permlab_controlWifiDisplay" msgid="393641276723695496">"控制 Wi-Fi 显示设备"</string> - <string name="permdesc_controlWifiDisplay" msgid="4543912292681826986">"允许应用控制 Wi-Fi 显示设备的基础功能。"</string> + <string name="permlab_configureWifiDisplay" msgid="5595661694746742168">"配置 WLAN 显示设备"</string> + <string name="permdesc_configureWifiDisplay" msgid="7916815158690218065">"允许应用配置并连接到 WLAN 显示设备。"</string> + <string name="permlab_controlWifiDisplay" msgid="393641276723695496">"控制 WLAN 显示设备"</string> + <string name="permdesc_controlWifiDisplay" msgid="4543912292681826986">"允许应用控制 WLAN 显示设备的基础功能。"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"更改您的音频设置"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"允许该应用修改全局音频设置，例如音量和用于输出的扬声器。"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"录音"</string> @@ -567,13 +567,13 @@ <string name="permdesc_changeTetherState" msgid="1524441344412319780">"允许应用更改绑定网络连接的状态。"</string> <string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"更改后台数据使用设置"</string> <string name="permdesc_changeBackgroundDataSetting" msgid="5347729578468744379">"允许应用更改后台数据使用设置。"</string> - <string name="permlab_accessWifiState" msgid="5202012949247040011">"查看 Wi-Fi 连接"</string> - <string name="permdesc_accessWifiState" msgid="5002798077387803726">"允许该应用查看 Wi-Fi 网络的相关信息，例如是否启用了 Wi-Fi 以及连接的 Wi-Fi 设备的名称。"</string> - <string name="permlab_changeWifiState" msgid="6550641188749128035">"连接 Wi-Fi 和断开连接"</string> - <string name="permdesc_changeWifiState" msgid="7137950297386127533">"允许该应用与 Wi-Fi 接入点建立和断开连接，以及更改 Wi-Fi 网络的设备配置。"</string> - <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"允许接收 Wi-Fi 多播"</string> - <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"允许该应用使用多播地址接收发送到 Wi-Fi 网络上所有设备（而不仅仅是您的平板电脑）的数据包。该操作的耗电量比非多播模式要大。"</string> - <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"允许该应用使用多播地址接收发送到 Wi-Fi 网络上所有设备（而不仅仅是您的手机）的数据包。该操作的耗电量比非多播模式要大。"</string> + <string name="permlab_accessWifiState" msgid="5202012949247040011">"查看 WLAN 连接"</string> + <string name="permdesc_accessWifiState" msgid="5002798077387803726">"允许该应用查看 WLAN 网络的相关信息，例如是否启用了 WLAN 以及连接的 WLAN 设备的名称。"</string> + <string name="permlab_changeWifiState" msgid="6550641188749128035">"连接 WLAN 和断开连接"</string> + <string name="permdesc_changeWifiState" msgid="7137950297386127533">"允许该应用与 WLAN 接入点建立和断开连接，以及更改 WLAN 网络的设备配置。"</string> + <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"允许接收 WLAN 多播"</string> + <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"允许该应用使用多播地址接收发送到 WLAN 网络上所有设备（而不仅仅是您的平板电脑）的数据包。该操作的耗电量比非多播模式要大。"</string> + <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"允许该应用使用多播地址接收发送到 WLAN 网络上所有设备（而不仅仅是您的手机）的数据包。该操作的耗电量比非多播模式要大。"</string> <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"访问蓝牙设置"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"允许应用配置本地蓝牙平板电脑，以及发现远程设备并进行配对。"</string> <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"允许应用配置本地蓝牙手机，以及发现远程设备并进行配对。"</string> @@ -1130,23 +1130,23 @@ <string name="ringtone_picker_title" msgid="3515143939175119094">"铃声"</string> <string name="ringtone_unknown" msgid="5477919988701784788">"未知铃声"</string> <plurals name="wifi_available"> - <item quantity="one" msgid="6654123987418168693">"有可用的 Wi-Fi 网络"</item> - <item quantity="other" msgid="4192424489168397386">"有可用的 Wi-Fi 网络"</item> + <item quantity="one" msgid="6654123987418168693">"有可用的 WLAN 网络"</item> + <item quantity="other" msgid="4192424489168397386">"有可用的 WLAN 网络"</item> </plurals> <plurals name="wifi_available_detailed"> - <item quantity="one" msgid="1634101450343277345">"打开可用的 Wi-Fi 网络"</item> - <item quantity="other" msgid="7915895323644292768">"打开可用的 Wi-Fi 网络"</item> + <item quantity="one" msgid="1634101450343277345">"打开可用的 WLAN 网络"</item> + <item quantity="other" msgid="7915895323644292768">"打开可用的 WLAN 网络"</item> </plurals> - <string name="wifi_available_sign_in" msgid="4029489716605255386">"登录到 Wi-Fi 网络"</string> + <string name="wifi_available_sign_in" msgid="4029489716605255386">"登录到 WLAN 网络"</string> <string name="network_available_sign_in" msgid="8495155593358054676">"登录网络"</string> <!-- no translation found for network_available_sign_in_detailed (8000081941447976118) --> <skip /> - <string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"无法连接到 Wi-Fi"</string> + <string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"无法连接到 WLAN"</string> <string name="wifi_watchdog_network_disabled_detailed" msgid="5548780776418332675">" 互联网连接状况不佳。"</string> - <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"Wi-Fi Direct"</string> - <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"启动 Wi-Fi Direct。此操作将会关闭 Wi-Fi 客户端/热点。"</string> - <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"无法启动 Wi-Fi Direct。"</string> - <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"已启用 Wi-Fi Direct"</string> + <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"WLAN Direct"</string> + <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"启动 WLAN Direct。此操作将会关闭 WLAN 客户端/热点。"</string> + <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"无法启动 WLAN Direct。"</string> + <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"已启用 WLAN Direct"</string> <string name="wifi_p2p_enabled_notification_message" msgid="1638949953993894335">"通过触摸进行设置"</string> <string name="accept" msgid="1645267259272829559">"接受"</string> <string name="decline" msgid="2112225451706137894">"拒绝"</string> @@ -1156,8 +1156,8 @@ <string name="wifi_p2p_to_message" msgid="248968974522044099">"收件人："</string> <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"键入所需的 PIN："</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN："</string> - <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="8012981257742232475">"平板电脑连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”时会暂时断开与 Wi-Fi 的连接"</string> - <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="7363907213787469151">"手机连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>时会暂时断开与 Wi-Fi 的连接。"</string> + <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="8012981257742232475">"平板电脑连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”时会暂时断开与 WLAN 的连接"</string> + <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="7363907213787469151">"手机连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>时会暂时断开与 WLAN 的连接。"</string> <string name="select_character" msgid="3365550120617701745">"插入字符"</string> <string name="sms_control_title" msgid="7296612781128917719">"正在发送短信"</string> <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>在发送大量短信。是否允许该应用继续发送短信？"</string> @@ -1399,12 +1399,12 @@ <string name="data_usage_3g_limit_title" msgid="7093334419518706686">"2G-3G 数据已停用"</string> <string name="data_usage_4g_limit_title" msgid="7636489436819470761">"4G 数据已停用"</string> <string name="data_usage_mobile_limit_title" msgid="7869402519391631884">"移动数据已停用"</string> - <string name="data_usage_wifi_limit_title" msgid="8992154736441284865">"Wi-Fi 数据网络已停用"</string> + <string name="data_usage_wifi_limit_title" msgid="8992154736441284865">"WLAN 数据网络已停用"</string> <string name="data_usage_limit_body" msgid="3317964706973601386">"触摸可启用。"</string> <string name="data_usage_3g_limit_snoozed_title" msgid="7026739121138005231">"已超出 2G-3G 数据流量限制"</string> <string name="data_usage_4g_limit_snoozed_title" msgid="1106562779311209039">"已超出 4G 数据使用上限"</string> <string name="data_usage_mobile_limit_snoozed_title" msgid="279240572165412168">"已超出移动数据流量上限"</string> - <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"超出了 Wi-Fi 数据流量上限"</string> + <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"超出了 WLAN 数据流量上限"</string> <string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"超出规定上限 <xliff:g id="SIZE">%s</xliff:g>。"</string> <string name="data_usage_restricted_title" msgid="5965157361036321914">"后台数据受限制"</string> <string name="data_usage_restricted_body" msgid="6741521330997452990">"触摸可去除限制。"</string> @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"当前用户是<xliff:g id="NAME">%1$s</xliff:g>。"</string> <string name="owner_name" msgid="2716755460376028154">"机主"</string> <string name="error_message_title" msgid="4510373083082500195">"错误"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"此应用不支持受限个人资料的帐户"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"找不到可处理此操作的应用"</string> <string name="revoke" msgid="5404479185228271586">"撤消"</string> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 5d55678775e2..f175fc14aed1 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1498,7 +1498,8 @@ <string name="user_switched" msgid="3768006783166984410">"目前的使用者是 <xliff:g id="NAME">%1$s</xliff:g>。"</string> <string name="owner_name" msgid="2716755460376028154">"擁有者"</string> <string name="error_message_title" msgid="4510373083082500195">"錯誤"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"這個應用程式不支援設有限制的個人資料所屬帳戶"</string> + <!-- no translation found for app_no_restricted_accounts (5739463249673727736) --> + <skip /> <string name="app_not_found" msgid="3429141853498927379">"找不到支援此操作的應用程式"</string> <string name="revoke" msgid="5404479185228271586">"撤銷"</string> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index df86b742f971..eed5e040c6ba 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1498,7 +1498,7 @@ <string name="user_switched" msgid="3768006783166984410">"Umsebenzisi wamanje <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="owner_name" msgid="2716755460376028154">"Umnikazi"</string> <string name="error_message_title" msgid="4510373083082500195">"Iphutha"</string> - <string name="app_no_restricted_accounts" msgid="4011285085817350390">"Lolu hlelo lokusebenza alusekeli ama-akhawunti wamaphrofayela akhawulelwe"</string> + <string name="app_no_restricted_accounts" msgid="5739463249673727736">"Lolu hlelo lokusebenza alusekeli ama-akhawunti wamaphrofayela akhawulelwe"</string> <string name="app_not_found" msgid="3429141853498927379">"Alukho uhlelo lokusebenza olutholakele lokuphatha lesi senzo"</string> <string name="revoke" msgid="5404479185228271586">"Chitha"</string> </resources> diff --git a/core/tests/ConnectivityManagerTest/AndroidManifest.xml b/core/tests/ConnectivityManagerTest/AndroidManifest.xml index a63a4539d255..54881d53c240 100644 --- a/core/tests/ConnectivityManagerTest/AndroidManifest.xml +++ b/core/tests/ConnectivityManagerTest/AndroidManifest.xml @@ -32,11 +32,7 @@ </intent-filter> </activity> </application> - <!-- default test runner --> - <instrumentation android:name="android.test.InstrumentationTestRunner" - android:targetPackage="com.android.connectivitymanagertest" - android:label="default instrumentation test runner" - /> + <!-- This declares that this app uses the instrumentation test runner targeting the package of connectivitymanagertest. To run the tests use the command: @@ -68,6 +64,16 @@ android:label="Test runner for Connectivity Manager Stress Tests" /> + <!-- run associate test: + "adb shell am instrument -e ssid <ssid> -e password <password> + -e ecurity-type [OPEN|WEP64|WEP128|WPA_TKIP|WPA2_AES] -e frequency-band [2.4|5.0|auto] + -w com.android.connectivitymanagertest/.WifiAssociationTestRunner" + --> + <instrumentation android:name=".WifiAssociationTestRunner" + android:targetPackage="com.android.connectivitymanagertest" + android:label="Test runner for Wifi association test" + /> + <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/WifiAssociationTestRunner.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/WifiAssociationTestRunner.java new file mode 100644 index 000000000000..722df2e21f81 --- /dev/null +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/WifiAssociationTestRunner.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2013, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.connectivitymanagertest; + +import android.content.Context; +import android.net.wifi.WifiManager; +import android.os.Bundle; +import android.test.InstrumentationTestRunner; +import android.test.InstrumentationTestSuite; +import android.util.Log; + +import com.android.connectivitymanagertest.functional.WifiAssociationTest; + +import junit.framework.TestSuite; +import junit.framework.Assert; + +/** + * Instrumentation Test Runner for wifi association test. + * The instrument will set frequency band if it is necessary + * + * To run the association tests: + * + * adb shell am instrument -e ssid <ssid> -e password <password> \ + * -e security-type [OPEN|WEP64|WEP128|WPA_TKIP|WPA2_AES] -e frequency-band [2.4|5.0|auto] + * -w com.android.connectivitymanagertest/.WifiAssociationTestRunner" + */ +public class WifiAssociationTestRunner extends InstrumentationTestRunner { + private static final String TAG = "WifiAssociationTestRunner"; + public int mBand; + + @Override + public TestSuite getAllTests() { + TestSuite suite = new InstrumentationTestSuite(this); + suite.addTestSuite(WifiAssociationTest.class); + return suite; + } + + @Override + public ClassLoader getLoader() { + return WifiAssociationTestRunner.class.getClassLoader(); + } + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + Bundle arguments = icicle; + String mFrequencyBand = arguments.getString("frequency-band"); + if (mFrequencyBand != null) { + setFrequencyBand(mFrequencyBand); + } + } + + private void setFrequencyBand(String band) { + WifiManager mWifiManager = (WifiManager)getContext().getSystemService(Context.WIFI_SERVICE); + if (band.equals("2.4")) { + Log.v(TAG, "set frequency band to 2.4"); + mBand = WifiManager.WIFI_FREQUENCY_BAND_2GHZ; + } else if (band.equals("5.0")) { + Log.v(TAG, "set frequency band to 5.0"); + mBand = WifiManager.WIFI_FREQUENCY_BAND_5GHZ; + } else if (band.equals("auto")) { + Log.v(TAG, "set frequency band to auto"); + mBand = WifiManager.WIFI_FREQUENCY_BAND_AUTO; + } else { + Assert.fail("invalid frequency band"); + } + int currentFreq = mWifiManager.getFrequencyBand(); + if (mBand == currentFreq) { + Log.v(TAG, "frequency band has been set"); + return; + } + mWifiManager.setFrequencyBand(mBand, true); + } +} diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java index 87a98bf734e3..f12e62e1fc4b 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java @@ -17,6 +17,7 @@ package com.android.connectivitymanagertest.functional; import com.android.connectivitymanagertest.ConnectivityManagerTestActivity; +import com.android.connectivitymanagertest.WifiAssociationTestRunner; import android.content.Context; import android.os.Bundle; @@ -27,22 +28,19 @@ import android.net.wifi.WifiConfiguration.AuthAlgorithm; import android.net.wifi.WifiConfiguration.GroupCipher; import android.net.wifi.WifiConfiguration.PairwiseCipher; import android.net.wifi.WifiConfiguration.Protocol; -import android.net.wifi.WifiConfiguration.Status; import android.net.wifi.WifiManager; import android.net.ConnectivityManager; -import android.net.NetworkInfo; import android.net.NetworkInfo.State; import android.test.suitebuilder.annotation.LargeTest; import android.test.ActivityInstrumentationTestCase2; -import android.test.InstrumentationTestRunner; import android.util.Log; /** * Test Wi-Fi connection with different configuration * To run this tests: - * adb shell am instrument -e ssid <ssid> -e password <password> - * -e security-type <security-type> - * -w com.android.connectivitymanagertest/android.test.InstrumentationTestRunner + * * adb shell am instrument -e ssid <ssid> -e password <password> \ + * -e security-type [OPEN|WEP64|WEP128|WPA_TKIP|WPA2_AES] -e frequency-band [2.4|5.0|auto] + * -w com.android.connectivitymanagertest/.WifiAssociationTestRunner" */ public class WifiAssociationTest extends ActivityInstrumentationTestCase2<ConnectivityManagerTestActivity> { @@ -51,6 +49,8 @@ public class WifiAssociationTest private String mSsid = null; private String mPassword = null; private String mSecurityType = null; + private String mFrequencyBand = null; + private int mBand; private WifiManager mWifiManager = null; enum SECURITY_TYPE { @@ -64,15 +64,18 @@ public class WifiAssociationTest @Override public void setUp() throws Exception { super.setUp(); - InstrumentationTestRunner mRunner = (InstrumentationTestRunner)getInstrumentation(); + WifiAssociationTestRunner mRunner = (WifiAssociationTestRunner)getInstrumentation(); mWifiManager = (WifiManager) mRunner.getContext().getSystemService(Context.WIFI_SERVICE); mAct = getActivity(); Bundle arguments = mRunner.getArguments(); mSecurityType = arguments.getString("security-type"); mSsid = arguments.getString("ssid"); mPassword = arguments.getString("password"); + mFrequencyBand = arguments.getString("frequency-band"); + mBand = mRunner.mBand; assertNotNull("Security type is empty", mSecurityType); assertNotNull("Ssid is empty", mSsid); + validateFrequencyBand(); // enable Wifi and verify wpa_supplicant is started assertTrue("enable Wifi failed", mAct.enableWifi()); sleep(2 * ConnectivityManagerTestActivity.SHORT_TIMEOUT, @@ -88,6 +91,14 @@ public class WifiAssociationTest super.tearDown(); } + private void validateFrequencyBand() { + if (mFrequencyBand != null) { + int currentFreq = mWifiManager.getFrequencyBand(); + Log.v(TAG, "read frequency band: " + currentFreq); + assertTrue("device frequency band is not set successfully", (mBand == currentFreq)); + } + } + /** * Connect to the provided Wi-Fi network * @param config is the network configuration diff --git a/docs/html/distribute/googleplay/spotlight/index.jd b/docs/html/distribute/googleplay/spotlight/index.jd index a248deab0a3a..b83080ea30f6 100644 --- a/docs/html/distribute/googleplay/spotlight/index.jd +++ b/docs/html/distribute/googleplay/spotlight/index.jd @@ -13,7 +13,36 @@ header.hide=0 overflow: auto; clear:both; margin-bottom:40px; - margin-top:30px;""> + margin-top:30px;"> + <div style="padding:0 0 0 29px;"> + <h4>Developer Story: redBus.in</h4> + <img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px height:78px; + width: 78px; + float: left; + margin: 17px 20px 9px 0;" src= + "//lh4.ggpht.com/kvI2XfzBPGBDASvxvP18MCCj7YPEmLcG4nh1BlYW4XzaW12gg3iXtcM2ZqDnAfLLB9ed=w124"> + <div style="width:700px;"> + <p style="margin-top:26px; + margin-bottom:12px;"> + Bangalore-based developers <a href="//play-next-dogfood.corp.google.com/store/apps/details?id=in.redbus.android">redBus.in</a> are bringing the sophistication and convenience of air-travel booking to bus transit. Hear how Android is helping them deliver a superior travel experience to millions of daily bus riders in India.</p> + </div> + <iframe style="float:left; + margin-right:24px; + margin-top:14px;" width="700" height="394" src= + "http://www.youtube.com/embed/O8i4HUw7JYA?HD=1;rel=0;origin=developer.android.com;" frameborder="0" allowfullscreen> + </iframe> + </div> +</div> + +<div style="background: #F0F0F0; + border-top: 1px solid #DDD; + padding: 0px 0 24px 0; + overflow: auto; + clear:both; + margin-bottom:40px; + margin-top:30px;"> <div style="padding:0 0 0 29px;"> <h4>Developer Story: Smule</h4> <img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px; @@ -42,7 +71,7 @@ header.hide=0 overflow: auto; clear:both; margin-bottom:-10px; - margin-top:30px;""> + margin-top:30px;"> <div style="padding:0 0 0 29px;"> <h4>Developer Story: Robot Invader</h4> <img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px; diff --git a/docs/html/index.jd b/docs/html/index.jd index 343528344d52..af271ee79349 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -42,7 +42,7 @@ page.metaDescription=The official site for Android developers. Provides the Andr <script type="text/javascript"> var params = { allowScriptAccess: "always" }; var atts = { id: "ytapiplayer" }; - swfobject.embedSWF("//www.youtube.com/v/RRelFvc6Czo?enablejsapi=1&playerapiid=ytplayer&version=3&HD=1;rel=0;showinfo=0;modestbranding;origin=developer.android.com;autohide=1", + swfobject.embedSWF("//www.youtube.com/v/O8i4HUw7JYA?enablejsapi=1&playerapiid=ytplayer&version=3&HD=1;rel=0;showinfo=0;modestbranding;origin=developer.android.com;autohide=1", "ytapiplayer", "600", "338", "8", null, null, params, atts); // Callback used to pause/resume carousel based on video state @@ -71,9 +71,8 @@ page.metaDescription=The official site for Android developers. Provides the Andr </div> </div> <div class="content-right col-4"> - <h1 style="white-space:nowrap;line-height:1em;">Developer Story: Smule</h1> - <p>The creators of AutoRap, Magic Piano, and Songify talk about launching on - Android and the explosive global growth they’ve seen on Google Play.</p> + <h1 style="white-space:nowrap;line-height:1.2em;">Developer Story: <br />redBus.in</h1> + <p>Bangalore-based developers redBus.in talk about how Android is helping them deliver a superior booking and travel experience to millions of daily bus riders in India.</p> </div> </li> <li class="item carousel-home"> diff --git a/media/java/android/media/audiofx/AudioEffect.java b/media/java/android/media/audiofx/AudioEffect.java index 031326ea138e..52c0c2d9f5fa 100644 --- a/media/java/android/media/audiofx/AudioEffect.java +++ b/media/java/android/media/audiofx/AudioEffect.java @@ -193,10 +193,14 @@ public class AudioEffect { * The effect descriptor contains information on a particular effect implemented in the * audio framework:<br> * <ul> - * <li>type: UUID identifying the effect type</li> + * <li>type: UUID identifying the effect type. May be one of: + * {@link AudioEffect#EFFECT_TYPE_AEC}, {@link AudioEffect#EFFECT_TYPE_AGC}, + * {@link AudioEffect#EFFECT_TYPE_BASS_BOOST}, {@link AudioEffect#EFFECT_TYPE_ENV_REVERB}, + * {@link AudioEffect#EFFECT_TYPE_EQUALIZER}, {@link AudioEffect#EFFECT_TYPE_NS}, + * {@link AudioEffect#EFFECT_TYPE_PRESET_REVERB}, {@link AudioEffect#EFFECT_TYPE_VIRTUALIZER}. + * </li> * <li>uuid: UUID for this particular implementation</li> - * <li>connectMode: {@link #EFFECT_INSERT}, {@link #EFFECT_AUXILIARY} or - * {at_link #EFFECT_PRE_PROCESSING}</li> + * <li>connectMode: {@link #EFFECT_INSERT} or {@link #EFFECT_AUXILIARY}</li> * <li>name: human readable effect name</li> * <li>implementor: human readable effect implementor name</li> * </ul> @@ -208,6 +212,19 @@ public class AudioEffect { public Descriptor() { } + /** + * @param type UUID identifying the effect type. May be one of: + * {@link AudioEffect#EFFECT_TYPE_AEC}, {@link AudioEffect#EFFECT_TYPE_AGC}, + * {@link AudioEffect#EFFECT_TYPE_BASS_BOOST}, {@link AudioEffect#EFFECT_TYPE_ENV_REVERB}, + * {@link AudioEffect#EFFECT_TYPE_EQUALIZER}, {@link AudioEffect#EFFECT_TYPE_NS}, + * {@link AudioEffect#EFFECT_TYPE_PRESET_REVERB}, + * {@link AudioEffect#EFFECT_TYPE_VIRTUALIZER}. + * @param uuid UUID for this particular implementation + * @param connectMode {@link #EFFECT_INSERT} or {@link #EFFECT_AUXILIARY} + * @param name human readable effect name + * @param implementor human readable effect implementor name + * + */ public Descriptor(String type, String uuid, String connectMode, String name, String implementor) { this.type = UUID.fromString(type); @@ -234,13 +251,14 @@ public class AudioEffect { */ public UUID uuid; /** - * Indicates if the effect is of insert category {@link #EFFECT_INSERT}, auxiliary - * category {@link #EFFECT_AUXILIARY} or pre processing category - * {at_link #EFFECT_PRE_PROCESSING}. Insert effects (Typically an Equalizer) are applied + * Indicates if the effect is of insert category {@link #EFFECT_INSERT} or auxiliary + * category {@link #EFFECT_AUXILIARY}. + * Insert effects (typically an {@link Equalizer}) are applied * to the entire audio source and usually not shared by several sources. Auxiliary effects * (typically a reverberator) are applied to part of the signal (wet) and the effect output * is added to the original signal (dry). - * Audio pre processing are applied to audio captured on a particular AudioRecord. + * Audio pre processing are applied to audio captured on a particular + * {@link android.media.AudioRecord}. */ public String connectMode; /** diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index f20f03f93220..0ca5f9826eed 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"OUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Kennisgewings verskyn hier"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Verkry enige tyd toegang tot hulle deur af te sleep."\n"Sleep weer af vir stelselkontroles."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Sleep op vanaf onderkant van skerm om stelselbalk te wys"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Sleep onderkant van skerm om balk te wys"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Sleep van regterkant van skerm af om stelselbalk te wys"</string> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 96f9a2580816..4308ec3cc7e8 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"ራስ-ሰር"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"ማሳወቂያዎች እዚህ ላይ ይታያሉ"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"ወደ ታች በማንሸራተት በማንኛውም ጊዜ ይድረሱባቸው።"\n"Swipe የስርዓት መቆጣጠሪያዎችን ለማምጣት እንደገና ወደ ታች ያንሸራትቱ።"</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"የስርዓት አሞሌውን ለማሳየት ከማያ ገጹ ታችኛው ክፍል ጀምረው ወደላይ ያንሸራትቱ"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"አሞሌውን ለማሳየት የማያ ገጹ ታችኛው ክፍል ያንሸራትቱ"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"አሞሌውን ለማሳየት ከማያ ገጹ ቀኝ ክፍል ጀምረው ያንሸራትቱ"</string> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 5611fdf12ef2..1f0c75717bfd 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"تلقائي"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"تظهر الإشعارات هنا"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"يمكنك الدخول إليها في أي وقت بالتمرير السريع إلى أسفل."\n"يمكنك التمرير السريع إلى أسفل مرة أخرى للوصول إلى عناصر تحكم النظام."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"مرر سريعًا من أسفل الشاشة لإظهار شريط النظام"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"مرر سريعًا أسفل الشاشة لإظهار الشريط"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"مرر سريعًا من يمين الشاشة لإظهار شريط النظام"</string> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 90c649c61deb..b45ddb6624d3 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"АЎТА"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Апавяшчэнні з\'яўляюцца тут"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Атрымлівайце доступ да іх у любы час, праводзячы пальцам уніз."\n"Правядзіце пальцам уніз яшчэ раз, каб атрымаць доступ да сродкаў кіравання сістэмай."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Правядзіце па экрану знізу ўверх, каб адлюстраваць сістэмны радок"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Правядзіце па ніжняй частцы экрану, каб адлюстраваць радок"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Правядзіце ад правага краю экрану, каб адлюстраваць сістэмны радок"</string> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 361c0f8f8697..c161fbd834fa 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"АВТ."</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Известията се показват тук"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Осъществявайте достъп до тях по всяко време, като прекарате пръст надолу."\n"Направете го отново за системните контроли."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Прекарайте пръст нагоре от долната част на екрана, за да се покаже системната лента"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Прекарайте пръст от долната част на екрана, за да се покаже лентата"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Прекарайте пръст отдясно на екрана, за да се покаже системната лента"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 648dad22b840..5cf131df69bf 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMÀTICA"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Les notificacions apareixen aquí"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Accedeix-hi en qualsevol moment: només has de fer lliscar el dit cap avall."\n"Torna a fer lliscar el dit cap avall per fer que es mostrin els controls del sistema."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Fes lliscar el dit des de la part inferior de la pantalla perquè es mostri la barra del sistema"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Fes lliscar el dit des de la part inferior de la pantalla perquè es mostri la barra"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Fes lliscar el dit des de la dreta de la pantalla perquè es mostri la barra del sistema"</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 5b982b7caa62..0f03db1142e6 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMATICKY"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Zde se zobrazují oznámení"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Můžete je kdykoli zobrazit tím, že přejedete prstem dolů."\n"Přejedete-li prstem dolů ještě jednou, zobrazí se ovládací prvky systému."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Systémový panel zobrazíte přejetím ze spodní části obrazovky nahoru"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Panel zobrazíte přejetím zdola nahoru"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Systémový panel zobrazíte přejetím z pravé strany obrazovky"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index f3b7988b94c0..b6a92a6100be 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Underretninger vises her"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Få adgang til dem når som helst ved at stryge ned."\n"Stryg ned igen for at komme til systemindstillingerne."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Stryg op fra bunden af skærmen for at vise systembjælken."</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Stryg bunden af skærmen for at vise bjælken"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Stryg fra skærmens højre side for at vise systembjælken"</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 43c2d3d93d3c..3a3c4515d805 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Benachrichtigungen erscheinen hier"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Greifen Sie jederzeit auf sie zu, indem Sie nach unten wischen."\n"Wischen Sie für Systemeinstellungen erneut nach unten."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Zum Einblenden der Systemleiste auf dem Display von unten nach oben wischen"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Zum Einblenden der Leiste nach oben wischen"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Zum Einblenden der Systemleiste auf dem Display von rechts nach links wischen"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index fc26cc9eb6f8..befd927287f3 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"ΑΥΤΟΜΑΤΗ"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Οι ειδοποιήσεις εμφανίζονται εδώ"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Μεταβείτε σε αυτές ανά πάσα στιγμή σύροντας προς τα κάτω."\n"Σύρετε ξανά προς τα κάτω για τα στοιχεία ελέγχου συστήματος."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Σύρετε προς τα επάνω από το κάτω μέρος της οθόνης για να εμφανίσετε τη γραμμή συστήματος"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Σύρετε από το κάτω μέρος της οθόνης για να εμφανίσετε τη γραμμή"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Σύρετε από τη δεξιά πλευρά της οθόνης για να εμφανίσετε τη γραμμή συστήματος"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index a5d55c8bf03d..1427c87c7e22 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Notifications appear here"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Access them any time by swiping down."\n"Swipe down again for system controls."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Swipe up from bottom of screen to reveal system bar"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Swipe bottom of screen to reveal bar"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Swipe from right of screen to reveal system bar"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index a0ec3d16846d..21c6e7505086 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMÁTICO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Las notificaciones aparecen aquí."</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Desliza el dedo hacia abajo para acceder al contenido."\n"Vuelve a deslizar el dedo hacia abajo para acceder a los controles del sistema."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Desliza el dedo hacia arriba desde la parte inferior de la pantalla para mostrar la barra del sistema."</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Desliza el dedo desde la parte inferior de la pantalla para mostrar la barra."</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Desliza el dedo desde la parte derecha de la pantalla para mostrar la barra del sistema."</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index e00ceb262657..b2cb95271a6c 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Las notificaciones aparecen aquí"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Desliza el dedo hacia abajo para acceder al contenido."\n"Vuelve a deslizar el dedo hacia abajo para acceder a los controles del sistema."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Desliza la pantalla hacia arriba desde la parte inferior para mostrar la barra del sistema"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Desliza la parte inferior de la pantalla para mostrar la barra"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Desliza la pantalla desde la derecha para mostrar la barra del sistema"</string> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 8a89dba24734..e2324b56e296 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMAATNE"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Märguanded ilmuvad siia"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Juurdepääs igal ajal sõrmega alla pühkides."\n"Süsteemi juhtnuppude jaoks pühkige uuesti alla."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Süsteemiriba kuvamiseks pühkige ekraani allosast üles"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Riba kuvamiseks pühkige ekraani allosas"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Süsteemiriba kuvamiseks pühkige ekraani paremast servast"</string> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 6ef3be184416..a3eb06bb9cc0 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"خودکار"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"اعلانها در اینجا نمایش داده میشوند"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"با کشیدن انگشت به طرف پایین به آنها دسترسی پیدا کنید."\n"برای کنترلهای سیستم دوباره انگشت خود را به سمت پایین بکشید."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"برای آشکارسازی نوار سیستم انگشت خود را از پایین صفحه به بالا بکشید"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"برای آشکارسازی نوار انگشت خود را روی پایین صفحه بکشید"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"برای آشکارسازی نوار سیستم انگشت خود را از سمت راست صفحه بکشید"</string> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index a0c0110bfa21..c9759708a134 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Ilmoitukset näkyvät tässä"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Näet ilmoitukset liu\'uttamalla sormea alas ruudulla."\n"Voit palauttaa järjestelmän ohjaimet näkyviin liu\'uttamalla sormea alas uudelleen."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Tuo järjestelmäpalkki näkyviin liu\'uttamalla ruudun alalaidasta ylöspäin"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Tuo palkki näkyviin liu\'uttamalla ruudun alaosasta"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Tuo järjestelmäpalkki näkyviin liu\'uttamalla ruudun oikeasta laidasta vasemmalle"</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 907419a74ec5..3b7f798ccd53 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMATIQUE"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Les notifications s’affichent ici"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Accédez-y à tout moment en faisant glisser le doigt vers le bas."\n"Répétez l\'opération pour accéder aux commandes du système."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Faites glisser votre doigt de bas en haut sur l\'écran pour afficher la barre système."</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Faites glisser votre doigt au bas de l\'écran pour afficher la barre."</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Faites glisser votre doigt de droite à gauche sur l\'écran pour afficher la barre système."</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 654d11119f9f..05fffc364f51 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"स्वत:"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"सूचनाएं यहां दिखाई देती हैं"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"नीचे स्वाइप करके उन तक कभी भी पहुंचें."\n"सिस्टम नियंत्रणों के लिए पुन: नीचे स्वाइप करें."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"सिस्टम बार दिखाने के लिए स्क्रीन के नीचे से ऊपर की ओर स्वाइप करें"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"बार दिखाने के लिए स्क्रीन के नीचे स्वाइप करें"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"सिस्टम बार दिखाने के लिए स्क्रीन की दाईं ओर से स्वाइप करें"</string> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 1db255207a7d..0f7f92fa636d 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMATSKI"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Obavijesti se prikazuju ovdje"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Pristupite im u bilo kojem trenutku tako da prstom trznete prema dolje. "\n"Ponovo prstom trznite prema dolje za kontrole sustava."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Prijeđite prstom od dna zaslona prema gore da bi se prikazala traka sustava"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Prijeđite prstom po dnu zaslona da bi se prikazala traka"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Prijeđite prstom od desne strane zaslona da bi se prikazala traka sustava"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 9421ebc89999..82b3ddd85e37 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"automatikus"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Az értesítések itt jelennek meg."</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Bármikor elérheti őket, ha lefelé húzza az ujját."\n"Húzza le az ujját még egyszer a rendszerbeállítások eléréséhez."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Csúsztassa ujját a képernyő aljától felfelé a rendszersáv megjelenítéséhez"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Csúsztassa ujját a képernyő alján a sáv megjelenítéséhez"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Csúsztassa ujját a képernyő jobb oldalától a rendszersáv megjelenítéséhez"</string> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 85956cc69784..d9597da1839e 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"OTOMATIS"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Pemberitahuan muncul di sini"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Akses kapan saja dengan menggesek ke bawah."\n"Gesek ke bawah sekali lagi untuk kontrol sistem."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Gesek ke atas dari bagian bawah layar untuk membuka bilah sistem"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Gesek bagian bawah layar untuk membuka bilah"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Gesek dari bagian kanan layar untuk membuka bilah sistem"</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index d255f5a7f806..6ef9a8e13922 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Le notifiche vengono visualizzate qui"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Puoi accedervi in qualsiasi momento scorrendo verso il basso."\n"Fai scorrere di nuovo verso il basso per visualizzare i controlli del sistema."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Fai scorrere il dito verso l\'alto dalla parte inferiore dello schermo per visualizzare la barra di sistema"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Fai scorrere parte inferiore dello schermo per visualizzare la barra"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Fai scorrere il dito dalla parte destra dello schermo per visualizzare la barra di sistema"</string> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 1e4f6b7eb927..8a3f15508c7f 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"אוטומטי"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"הודעות מופיעות כאן"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"גש אליהם בכל עת על ידי החלקה למטה."\n"החלק למטה שוב למעבר למרכז הבקרה של המערכת."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"החלק מעלה מתחתית המסך כדי להציג את סרגל המערכת"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"החלק מתחתית המסך כדי להציג את הסרגל"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"החלק מצד ימין של המסך כדי להציג את סרגל המערכת"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index e51796271851..95f24fdd29d3 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"自動"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"ここに通知が表示されます"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"下にスワイプすると、いつでも通知を表示できます。"\n"システムを管理するにはもう一度下にスワイプしてください。"</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"システムバーを表示するには、画面下部から上方向にスワイプします"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"バーを表示するには、画面下部からスワイプします"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"システムバーを表示するには、画面右からスワイプします"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 77c1ebc13999..dc82a01a467d 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"자동"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"알림이 여기에 표시됨"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"아래로 스와이프하여 언제든 액세스하세요."\n"한 번 더 아래로 스와이프하면 시스템 관리로 이동합니다."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"화면 하단에서 위로 스와이프하여 시스템 표시줄 표시"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"화면 하단에서 스와이프하여 표시줄 표시"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"화면 오른쪽에서 스와이프하여 시스템 표시줄 표시"</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 193df423eaa8..b2c5d2c1ccb5 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMATINIS"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Pranešimai rodomi čia"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Perbraukę žemyn bet kuriuo metu pasieksite pranešimus."\n"Jei norite naudoti sistemos valdiklius, perbraukite žemyn dar kartą."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Jei norite, kad būtų rodoma sistemos juosta, perbraukite aukštyn iš ekrano apačios"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Jei norite, kad būtų rodoma juosta, perbraukite ekrano apačioje"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Jei norite, kad būtų rodoma sistemos juosta, perbraukite iš ekrano dešinės"</string> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index e40bbcd5e55a..41d1158f795c 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMĀTISKI"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Šeit tiek rādīti paziņojumi"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Piekļūstiet tiem jebkurā laikā, velkot uz leju."\n"Vēlreiz velciet, lai tiktu parādītas sistēmas vadīklas."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Velciet augšup no ekrāna apakšdaļas, lai tiktu parādīta sistēmas josla."</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Velciet no ekrāna apakšdaļas, lai tiktu parādīta josla."</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Velciet no ekrāna labās malas, lai tiktu parādīta sistēmas josla."</string> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 4d1f2ee95e49..cabd7b55ad2e 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Pemberitahuan dipaparkan di sini"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Akses panel pada bila-bila masa dengan meleret ke bawah."\n"Leret ke bawah sekali lagi untuk mendapatkan kawalan sistem."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Leret ke atas dari bahagian bawah skrin untuk mendedahkan bar sistem"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Leret ke bahagian bawah skrin untuk mendedahkan bar"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Leret dari kanan skrin untuk mendedahkan bar sistem"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 35681739a1f3..31953c30b924 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Varslene vises her"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Bruk dem når som helst ved å sveipe nedover."\n"Sveip nedover igjen for å gå til systemkontrollene."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Sveip opp fra bunnen av skjermen for å få frem systemfeltet"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Sveip på bunnen av skjermen for å få frem feltet"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Sveip fra høyre på skjermen for å få frem systemfeltet"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 265f0dbc76ae..6661bfa9d351 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMATISCH"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Meldingen worden hier weergegeven"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"U kunt de meldingen op elk gewenst moment openen door met uw vinger omlaag te vegen."\n"Veeg nogmaals met uw vinger omlaag om de systeembesturingselementen weer te geven."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Veeg omhoog vanaf de onderkant van het scherm om de systeembalk weer te geven"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Veeg onderkant van scherm om balk weer te geven"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Veeg vanaf de rechterkant van het scherm om de systeembalk weer te geven"</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 4667bafccfd4..c97372d5ad76 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMATYCZNA"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Tutaj pokazują się powiadomienia"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Możesz je otworzyć w dowolnej chwili, przesuwając w dół."\n"Przesuń jeszcze raz w dół, by otworzyć ustawienia systemowe."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Przesuń palcem od dołu ekranu, by odkryć pasek systemu"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Przesuń palcem dół ekranu, by odkryć pasek"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Przesuń palcem od prawej strony ekranu, by odkryć pasek systemu"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index bf7e71fa2e70..eba6c18d45ee 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMÁTICO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"As notificações são apresentadas aqui"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Pode aceder em qualquer altura, deslizando rapidamente para baixo com o dedo."\n"Deslize novamente para baixo para aceder aos controlos do sistema."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Deslize p/ cima a partir da parte inferior do ecrã p/ revelar a barra do sistema"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Deslize da parte inferior do ecrã p/ revelar a barra"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Deslize da direita do ecrã p/ revelar a barra do sistema"</string> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 6f784fc70567..93b0e2dc9f8a 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"As notificações aparecem aqui"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Acesse a qualquer momento deslizando para baixo."\n"Deslize para baixo novamente para acessar os controles do sistema."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Deslize de cima para baixo na tela para ver a barra do sistema"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Deslize para baixo para ver a barra"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Deslize da direita para a esquerda na tela para ver a barra do sistema"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 093c19f9986f..7faa2e4869ff 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMAT"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Notificările se afişează aici"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Accesaţi-le oricând glisând în jos."\n"Glisaţi în jos din nou pentru comenzile sistemului."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Glisați în sus din partea inferioară a ecranului pentru a afișa bara de sistem"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Glisați dinspre partea inferioară a ecranului pentru a afișa bara"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Glisați din partea dreaptă a ecranului pentru a afișa bara de sistem"</string> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 72458d56d660..2ca195ac2f63 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -207,10 +207,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"АВТОНАСТРОЙКА"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Это панель уведомлений"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Ее можно открыть, пролистнув экран вниз."\n"Чтобы открыть настройки, проведите пальцем вниз ещё раз."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Чтобы увидеть строку состояния, проведите пальцем от нижней части экрана вверх"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Чтобы увидеть строку состояния, проведите по экрану снизу вверх"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Чтобы увидеть строку состояния, проведите пальцем по экрану справа налево"</string> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 61028979f472..e5e1d58ec524 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMATICKY"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Tu sa zobrazujú upozornenia"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Môžete ich kedykoľvek zobraziť tak, že posuniete prstom nadol."\n"Ak posuniete prstom nadol ešte raz, zobrazia sa ovládacie prvky systému."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Systémový panel zobrazíte posunutím z dolnej časti obrazovky smerom nahor"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Panel zobrazíte posunutím zdola nahor"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Systémový panel zobrazíte posunutím z pravej strany obrazovky"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 8a25d3499f21..5a0f46afcb9e 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"SAMODEJNO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Obvestila so prikazana tukaj"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Do njih lahko kadar koli dostopate tako, da povlečete navzdol."\n"Za prikaz sistemskih kontrolnikov znova povlecite navzdol."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Povlecite navzgor z dna zaslona, da prikažete sistemsko vrstico"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Prikažite vrstico tako, da povlečete na dnu zaslona"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Sistemsko vrstico prikažete tako, da povlečete z desne strani zaslona"</string> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index fb19c44e9183..6a209d05e9ec 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"АУТОМАТСКА"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Обавештења се појављују овде"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Приступите им у било ком тренутку листањем надоле."\n"Поново листајте надоле да би се приказале системске контроле."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Превуците нагоре од доњег дела екрана да би се приказала системска трака"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Превуците од доњег дела екрана да би се приказала трака"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Превуците од десне стране екрана да би се приказала системска трака"</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 28ac2ab63bb3..b1c1cf645a2a 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Meddelanden visas här"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Du kommer åt dem när som helst genom att dra nedåt."\n"Dra nedåt igen om du vill visa systemkontroller."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Dra uppåt från skärmens nederkant om du vill visa systemfältet"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Dra uppåt på skärmen om du vill visa fältet"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Dra från högersidan av skärmen om du vill visa systemfältet"</string> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 6e8416718aed..2c8100d67903 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -201,10 +201,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"KIOTOMATIKI"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Arifa zitaonekana hapa"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Wafikie wakati wowote kwa kupapasa chini."\n"Papasa chini tena kupata vidhibiti vya mfumo."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Papasa kwenda juu kutoka chini ya skrini ili kuonyesha upau wa mfumo"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Papasa chini ya skrini ili kuonyesha upau"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Papasa kutoka kulia kwa skrini ili kuonyesha upau wa mfumo"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index b09f0d9ae072..f36e07f8e1bb 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"อัตโนมัติ"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"การแจ้งเตือนจะแสดงขึ้นที่นี่"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"เข้าถึงได้ทุกเมื่อด้วยการกวาดนิ้วลง"\n"กวาดนิ้วลงอีกครั้งสำหรับการควบคุมระบบ"</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"กวาดขึ้นจากด้านล่างของหน้าจอเพื่อแสดงแถบระบบ"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"กวาดด้านล่างของหน้าจอเพื่อแสดงแถบ"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"กวาดจากด้านขวาของหน้าจอเพื่อแสดงแถบระบบ"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 71be8eaa6e86..68b7896adc82 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Dito lumalabas ang mga notification"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"I-access ang mga ito anumang oras sa pamamagitan ng pag-swipe pababa."\n"Muling mag-swipe pababa para sa mga kontrol ng system."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Mag-swipe pataas mula sa ibaba ng screen upang ipakita ang system bar"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Mag-swipe sa ibaba ng screen upang ipakita ang bar"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Mag-swipe mula sa kanan ng screen upang ipakita ang system bar"</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 86be4790bf52..0017a9e76194 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"OTOMATİK"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Bildirimler burada görünür"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Aşağıya hızlıca kaydırarak bunlara istediğiniz zaman erişebilirsiniz."\n"Sistem denetimleri için tekrar hızlıca aşağı kaydırın."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Sistem çubuğunu görüntülemek için ekranın altında yukarı doğru hızlıca kaydırın"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Çubuğu görüntülemek için ekranın altından hızlıca kaydırın"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Sistem çubuğunu görüntülemek için ekranın sağından hızlıca kaydırın"</string> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index c669811e7d1f..a9b0fe7dfe32 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"АВТО"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Сповіщення з’являються тут"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Отримуйте до них доступ будь-коли, провівши пальцем униз."\n"Знову проведіть униз, щоб відкрити елементи керування системи."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Проведіть пальцем угору від низу екрана, щоб з’явився системний рядок"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Проведіть від низу екрана, щоб з’явився рядок"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Проведіть пальцем справа наліво на екрані, щоб з’явився системний рядок"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 62dbbe94422d..38f6036184f8 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"TỰ ĐỘNG"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Thông báo xuất hiện tại đây"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Truy cập vào chúng bất kỳ lúc nào bằng cách vuốt xuống."\n"Vuốt lại xuống để hiển thị các điều khiển hệ thống."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Vuốt lên từ cuối màn hình để hiển thị thanh hệ thống"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Vuốt cuối màn hình để hiển thị thanh"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Vuốt từ bên phải màn hình để hiển thị thanh hệ thống"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index d0f1c3bcf829..18814c7cc4e0 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -40,7 +40,7 @@ <string name="invalid_charger" msgid="4549105996740522523">"不支持 USB 充电功能。"\n"只能使用随附的充电器充电。"</string> <string name="battery_low_why" msgid="7279169609518386372">"电量使用情况"</string> <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"设置"</string> - <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> + <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"WLAN"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"飞行模式"</string> <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"自动旋转屏幕"</string> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"静音"</string> @@ -100,12 +100,12 @@ <string name="accessibility_data_two_bars" msgid="6166018492360432091">"数据信号强度为两格。"</string> <string name="accessibility_data_three_bars" msgid="9167670452395038520">"数据信号强度为三格。"</string> <string name="accessibility_data_signal_full" msgid="2708384608124519369">"数据信号满格。"</string> - <string name="accessibility_wifi_off" msgid="3177380296697933627">"已关闭 Wi-Fi。"</string> - <string name="accessibility_no_wifi" msgid="1425476551827924474">"Wi-Fi 连接已断开。"</string> - <string name="accessibility_wifi_one_bar" msgid="7735893178010724377">"Wi-Fi 信号强度为一格。"</string> - <string name="accessibility_wifi_two_bars" msgid="4994274250497262434">"Wi-Fi 信号强度为两格。"</string> - <string name="accessibility_wifi_three_bars" msgid="3495755044276588384">"Wi-Fi 信号强度为三格。"</string> - <string name="accessibility_wifi_signal_full" msgid="6853561303586480376">"Wi-Fi 信号满格。"</string> + <string name="accessibility_wifi_off" msgid="3177380296697933627">"已关闭 WLAN。"</string> + <string name="accessibility_no_wifi" msgid="1425476551827924474">"WLAN 连接已断开。"</string> + <string name="accessibility_wifi_one_bar" msgid="7735893178010724377">"WLAN 信号强度为一格。"</string> + <string name="accessibility_wifi_two_bars" msgid="4994274250497262434">"WLAN 信号强度为两格。"</string> + <string name="accessibility_wifi_three_bars" msgid="3495755044276588384">"WLAN 信号强度为三格。"</string> + <string name="accessibility_wifi_signal_full" msgid="6853561303586480376">"WLAN 信号满格。"</string> <string name="accessibility_no_wimax" msgid="4329180129727630368">"无 WiMAX 信号。"</string> <string name="accessibility_wimax_one_bar" msgid="4170994299011863648">"WiMAX 信号强度为一格。"</string> <string name="accessibility_wimax_two_bars" msgid="9176236858336502288">"WiMAX 信号强度为两格。"</string> @@ -130,7 +130,7 @@ <string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string> <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"漫游中"</string> <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string> - <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string> + <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"WLAN"</string> <string name="accessibility_no_sim" msgid="8274017118472455155">"无 SIM 卡。"</string> <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"蓝牙共享网络。"</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"飞行模式。"</string> @@ -164,7 +164,7 @@ <string name="data_usage_disabled_dialog" msgid="3853117269051806280">"您已达到指定的数据流量上限。"\n\n"如果您重新启用数据，运营商可能会收取相应的费用。"</string> <string name="data_usage_disabled_dialog_enable" msgid="7729772039208664606">"重新启用数据连接"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="1940231521274147771">"未连接互联网"</string> - <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"Wi-Fi 已连接"</string> + <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"WLAN 已连接"</string> <string name="gps_notification_searching_text" msgid="8574247005642736060">"正在搜索 GPS"</string> <string name="gps_notification_found_text" msgid="4619274244146446464">"已通过 GPS 确定位置"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string> @@ -195,20 +195,17 @@ <string name="quick_settings_settings_label" msgid="5326556592578065401">"设置"</string> <string name="quick_settings_time_label" msgid="4635969182239736408">"时间"</string> <string name="quick_settings_user_label" msgid="5238995632130897840">"我"</string> - <string name="quick_settings_wifi_label" msgid="9135344704899546041">"Wi-Fi"</string> + <string name="quick_settings_wifi_label" msgid="9135344704899546041">"WLAN"</string> <string name="quick_settings_wifi_not_connected" msgid="7171904845345573431">"未连接"</string> <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"无网络"</string> - <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi 已关闭"</string> - <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"Wi-Fi 显示"</string> + <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"WLAN 已关闭"</string> + <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"WLAN 显示"</string> <string name="quick_settings_wifi_display_no_connection_label" msgid="2355298740765736918">"无线显示"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"亮度"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"自动"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"通知会显示在这里"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"向下滑动可随时查看通知。"\n"再次向下滑动可使用系统控制功能。"</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"从屏幕底部向上滑动即可显示系统栏"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"从底部向上滑可显示系统栏"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"从屏幕右侧向左滑动即可显示系统栏"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 8677e6429fc0..af3e4693a0d7 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -205,10 +205,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"自動"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"系統會在這裡顯示通知"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"向下滑動即可隨時存取通知。"\n"再次向下滑動即可使用系統控制項。"</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"從螢幕底部向上滑動即可顯示系統列"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"從螢幕底部滑動即可顯示系統列"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"從螢幕右側滑動即可顯示系統列"</string> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 5bba7db095fd..af790a3b86ed 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -203,10 +203,7 @@ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"OKUZENZAKALELAYO"</string> <string name="status_bar_help_title" msgid="1199237744086469217">"Izaziso zivela lapha"</string> <string name="status_bar_help_text" msgid="7874607155052076323">"Kufinyelele noma kunini ngokuswayiphela phansi."\n"Swayiphela phansi futhi ngezilawuli zesistimu."</string> - <!-- no translation found for hideybar_confirmation_message_bottom (4678097945183429216) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_bottom_short (4014207345313478943) --> - <skip /> - <!-- no translation found for hideybar_confirmation_message_right (5359586491708388067) --> - <skip /> + <string name="hideybar_confirmation_message_bottom" msgid="4678097945183429216">"Swayipha kusukela ngaphansi kwesikrini ukuze uveze ibha yesistimu"</string> + <string name="hideybar_confirmation_message_bottom_short" msgid="4014207345313478943">"Swayipha ngaphansi kwesikrini ukuze uveze ibha"</string> + <string name="hideybar_confirmation_message_right" msgid="5359586491708388067">"Swayipha kusukela ngakwesokudla ukuze uveze ibha yesistimu"</string> </resources> diff --git a/tests/TransitionTests/AndroidManifest.xml b/tests/TransitionTests/AndroidManifest.xml index 8cd36bf4f429..be6b145e2bc7 100644 --- a/tests/TransitionTests/AndroidManifest.xml +++ b/tests/TransitionTests/AndroidManifest.xml @@ -205,6 +205,13 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> + <activity android:label="InterruptionTest" + android:name="InterruptionTest"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> </application> diff --git a/tests/TransitionTests/res/layout/interruption.xml b/tests/TransitionTests/res/layout/interruption.xml new file mode 100644 index 000000000000..9fdb27af86fc --- /dev/null +++ b/tests/TransitionTests/res/layout/interruption.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <RadioGroup android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <RadioButton android:id="@+id/scene1RB" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/state1" + android:onClick="onRadioButtonClicked"/> + <RadioButton android:id="@+id/scene2RB" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/state2" + android:onClick="onRadioButtonClicked"/> + <RadioButton android:id="@+id/scene3RB" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/state3" + android:onClick="onRadioButtonClicked"/> + <RadioButton android:id="@+id/scene4RB" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/state4" + android:onClick="onRadioButtonClicked"/> + </RadioGroup> + + <LinearLayout + android:orientation="vertical" + android:id="@+id/sceneRoot" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/interruption_inner_1"/> + + </LinearLayout> + + +</LinearLayout>
\ No newline at end of file diff --git a/tests/TransitionTests/res/layout/interruption_inner_1.xml b/tests/TransitionTests/res/layout/interruption_inner_1.xml new file mode 100644 index 000000000000..990a7fdb0d31 --- /dev/null +++ b/tests/TransitionTests/res/layout/interruption_inner_1.xml @@ -0,0 +1,13 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/buttonContainer"> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/button" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:text="@string/state1"/> + +</RelativeLayout>
\ No newline at end of file diff --git a/tests/TransitionTests/res/layout/interruption_inner_2.xml b/tests/TransitionTests/res/layout/interruption_inner_2.xml new file mode 100644 index 000000000000..d18b5571be1f --- /dev/null +++ b/tests/TransitionTests/res/layout/interruption_inner_2.xml @@ -0,0 +1,13 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/buttonContainer"> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:id="@+id/button" + android:layout_alignParentRight="true" + android:text="@string/state2"/> + +</RelativeLayout>
\ No newline at end of file diff --git a/tests/TransitionTests/res/layout/interruption_inner_3.xml b/tests/TransitionTests/res/layout/interruption_inner_3.xml new file mode 100644 index 000000000000..70bd02cb53ac --- /dev/null +++ b/tests/TransitionTests/res/layout/interruption_inner_3.xml @@ -0,0 +1,13 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/buttonContainer"> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/button" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:text="@string/state3"/> + +</RelativeLayout>
\ No newline at end of file diff --git a/tests/TransitionTests/res/layout/interruption_inner_4.xml b/tests/TransitionTests/res/layout/interruption_inner_4.xml new file mode 100644 index 000000000000..85265fcfb6d2 --- /dev/null +++ b/tests/TransitionTests/res/layout/interruption_inner_4.xml @@ -0,0 +1,13 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/buttonContainer"> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/button" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:text="@string/state4"/> + +</RelativeLayout>
\ No newline at end of file diff --git a/tests/TransitionTests/res/values/strings.xml b/tests/TransitionTests/res/values/strings.xml index e251d5c99f34..3be243bbcdd4 100644 --- a/tests/TransitionTests/res/values/strings.xml +++ b/tests/TransitionTests/res/values/strings.xml @@ -39,4 +39,8 @@ <string name="shortText2">Not much text here</string> <string name="longText1">This is the beginning of the Spring of my discontent. In the event of a real emergency, you would be notified by email. Fear not, for death comes swiftly.</string> <string name="longText2">When do we get to eat? I like all things, especially following strong leaders, and mangy cats. Break glass in emergency. The purpose of a framework is to provide the facilities and functionality of a powerful toolkit with the simplicity of a refrigerator.</string> + <string name="state1">State 1</string> + <string name="state2">State 2</string> + <string name="state3">State 3</string> + <string name="state4">State 4</string> </resources> diff --git a/tests/TransitionTests/src/com/android/transitiontests/ChangingText.java b/tests/TransitionTests/src/com/android/transitiontests/ChangingText.java index 3bb710021052..05bed5fc17ad 100644 --- a/tests/TransitionTests/src/com/android/transitiontests/ChangingText.java +++ b/tests/TransitionTests/src/com/android/transitiontests/ChangingText.java @@ -29,10 +29,8 @@ import android.view.transition.TransitionManager; public class ChangingText extends Activity { - Button mRemovingButton, mInvisibleButton, mGoneButton; Scene mScene1, mScene2; ViewGroup mSceneRoot; - Fade fader; TransitionGroup mChanger; @Override diff --git a/tests/TransitionTests/src/com/android/transitiontests/InterruptionTest.java b/tests/TransitionTests/src/com/android/transitiontests/InterruptionTest.java new file mode 100644 index 000000000000..47cf00220a04 --- /dev/null +++ b/tests/TransitionTests/src/com/android/transitiontests/InterruptionTest.java @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.transitiontests; + +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import android.view.ViewGroup; +import android.view.transition.AutoTransition; +import android.view.transition.Move; +import android.view.transition.Scene; +import android.view.transition.TextChange; +import android.view.transition.Transition; +import android.view.transition.TransitionGroup; +import android.view.transition.TransitionManager; +import android.widget.RadioButton; + +public class InterruptionTest extends Activity { + + RadioButton mScene1RB, mScene2RB, mScene3RB, mScene4RB; + private Scene mScene1; + private Scene mScene2; + private Scene mScene3; + private Scene mScene4; + Transition mAutoTransition = new AutoTransition(); + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.interruption); + + View container = (View) findViewById(R.id.container); + ViewGroup sceneRoot = (ViewGroup) findViewById(R.id.sceneRoot); + + mScene1 = new Scene(sceneRoot, R.layout.interruption_inner_1, this); + mScene2 = new Scene(sceneRoot, R.layout.interruption_inner_2, this); + mScene3 = new Scene(sceneRoot, R.layout.interruption_inner_3, this); + mScene4 = new Scene(sceneRoot, R.layout.interruption_inner_4, this); + + mScene1RB = (RadioButton) findViewById(R.id.scene1RB); + mScene2RB = (RadioButton) findViewById(R.id.scene2RB); + mScene3RB = (RadioButton) findViewById(R.id.scene3RB); + mScene4RB = (RadioButton) findViewById(R.id.scene4RB); + + sceneRoot.setCurrentScene(mScene1); + + mAutoTransition.setDuration(1500); + } + + public void onRadioButtonClicked(View clickedButton) { + if (clickedButton == mScene1RB) { + TransitionManager.go(mScene1, mAutoTransition); + } else if (clickedButton == mScene2RB) { + TransitionManager.go(mScene2, mAutoTransition); + } else if (clickedButton == mScene3RB) { + TransitionManager.go(mScene3, mAutoTransition); + } else { + TransitionManager.go(mScene4, mAutoTransition); + } + } +} |