Merge "Add activity to show the result of tests."
diff --git a/api/current.txt b/api/current.txt
index df74b45..e9c5727 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18115,7 +18115,7 @@
method public boolean importFile(int, java.lang.String);
method public boolean importFile(int, android.os.ParcelFileDescriptor);
method public boolean open(android.hardware.usb.UsbDeviceConnection);
- method public boolean sendObject(int, android.os.ParcelFileDescriptor);
+ method public boolean sendObject(int, int, android.os.ParcelFileDescriptor);
method public android.mtp.MtpObjectInfo sendObjectInfo(android.mtp.MtpObjectInfo);
}
diff --git a/api/system-current.txt b/api/system-current.txt
index bcae74b..e234970 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -19627,7 +19627,7 @@
method public boolean importFile(int, java.lang.String);
method public boolean importFile(int, android.os.ParcelFileDescriptor);
method public boolean open(android.hardware.usb.UsbDeviceConnection);
- method public boolean sendObject(int, android.os.ParcelFileDescriptor);
+ method public boolean sendObject(int, int, android.os.ParcelFileDescriptor);
method public android.mtp.MtpObjectInfo sendObjectInfo(android.mtp.MtpObjectInfo);
}
diff --git a/cmds/dpm/src/com/android/commands/dpm/Dpm.java b/cmds/dpm/src/com/android/commands/dpm/Dpm.java
index f9b3419..471fa3b 100644
--- a/cmds/dpm/src/com/android/commands/dpm/Dpm.java
+++ b/cmds/dpm/src/com/android/commands/dpm/Dpm.java
@@ -107,7 +107,7 @@
private void runSetDeviceOwner() throws RemoteException {
ComponentName component = parseComponentName(nextArgRequired());
- mDevicePolicyManager.setActiveAdmin(component, true /*refreshing*/, UserHandle.USER_OWNER);
+ mDevicePolicyManager.setActiveAdmin(component, true /*refreshing*/, UserHandle.USER_SYSTEM);
String packageName = component.getPackageName();
try {
@@ -117,7 +117,7 @@
}
} catch (Exception e) {
// Need to remove the admin that we just added.
- mDevicePolicyManager.removeActiveAdmin(component, UserHandle.USER_OWNER);
+ mDevicePolicyManager.removeActiveAdmin(component, UserHandle.USER_SYSTEM);
throw e;
}
System.out.println("Success: Device owner set to package " + packageName);
diff --git a/core/java/android/animation/AnimationHandler.java b/core/java/android/animation/AnimationHandler.java
new file mode 100644
index 0000000..7778c35
--- /dev/null
+++ b/core/java/android/animation/AnimationHandler.java
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.animation;
+
+import android.os.SystemClock;
+import android.util.ArrayMap;
+import android.view.Choreographer;
+
+import java.util.ArrayList;
+
+/**
+ * This custom, static handler handles the timing pulse that is shared by all active
+ * ValueAnimators. This approach ensures that the setting of animation values will happen on the
+ * same thread that animations start on, and that all animations will share the same times for
+ * calculating their values, which makes synchronizing animations possible.
+ *
+ * The handler uses the Choreographer by default for doing periodic callbacks. A custom
+ * AnimationFrameCallbackProvider can be set on the handler to provide timing pulse that
+ * may be independent of UI frame update. This could be useful in testing.
+ *
+ * @hide
+ */
+public class AnimationHandler {
+ /**
+ * Internal per-thread collections used to avoid set collisions as animations start and end
+ * while being processed.
+ * @hide
+ */
+ private final ArrayMap<AnimationFrameCallback, Long> mDelayedCallbackStartTime =
+ new ArrayMap<>();
+ private final ArrayList<AnimationFrameCallback> mAnimationCallbacks =
+ new ArrayList<>();
+ private final ArrayList<AnimationFrameCallback> mCommitCallbacks =
+ new ArrayList<>();
+ private AnimationFrameCallbackProvider mProvider;
+
+ private final Choreographer.FrameCallback mFrameCallback = new Choreographer.FrameCallback() {
+ @Override
+ public void doFrame(long frameTimeNanos) {
+ doAnimationFrame(getProvider().getFrameTime());
+ if (mAnimationCallbacks.size() > 0) {
+ getProvider().postFrameCallback(this);
+ }
+ }
+ };
+
+ public final static ThreadLocal<AnimationHandler> sAnimatorHandler = new ThreadLocal<>();
+ private boolean mListDirty = false;
+
+ public static AnimationHandler getInstance() {
+ if (sAnimatorHandler.get() == null) {
+ sAnimatorHandler.set(new AnimationHandler());
+ }
+ return sAnimatorHandler.get();
+ }
+
+ /**
+ * By default, the Choreographer is used to provide timing for frame callbacks. A custom
+ * provider can be used here to provide different timing pulse.
+ */
+ public void setProvider(AnimationFrameCallbackProvider provider) {
+ if (provider == null) {
+ mProvider = new MyFrameCallbackProvider();
+ } else {
+ mProvider = provider;
+ }
+ }
+
+ private AnimationFrameCallbackProvider getProvider() {
+ if (mProvider == null) {
+ mProvider = new MyFrameCallbackProvider();
+ }
+ return mProvider;
+ }
+
+ /**
+ * Register to get a callback on the next frame after the delay.
+ */
+ public void addAnimationFrameCallback(final AnimationFrameCallback callback, long delay) {
+ if (mAnimationCallbacks.size() == 0) {
+ getProvider().postFrameCallback(mFrameCallback);
+ }
+ if (!mAnimationCallbacks.contains(callback)) {
+ mAnimationCallbacks.add(callback);
+ }
+
+ if (delay > 0) {
+ mDelayedCallbackStartTime.put(callback, (SystemClock.uptimeMillis() + delay));
+ }
+ }
+
+ /**
+ * Register to get a one shot callback for frame commit timing. Frame commit timing is the
+ * time *after* traversals are done, as opposed to the animation frame timing, which is
+ * before any traversals. This timing can be used to adjust the start time of an animation
+ * when expensive traversals create big delta between the animation frame timing and the time
+ * that animation is first shown on screen.
+ *
+ * Note this should only be called when the animation has already registered to receive
+ * animation frame callbacks. This callback will be guaranteed to happen *after* the next
+ * animation frame callback.
+ */
+ public void addOneShotCommitCallback(final AnimationFrameCallback callback) {
+ if (!mCommitCallbacks.contains(callback)) {
+ mCommitCallbacks.add(callback);
+ }
+ }
+
+ /**
+ * Removes the given callback from the list, so it will no longer be called for frame related
+ * timing.
+ */
+ public void removeCallback(AnimationFrameCallback callback) {
+ mCommitCallbacks.remove(callback);
+ mDelayedCallbackStartTime.remove(callback);
+ int id = mAnimationCallbacks.indexOf(callback);
+ if (id >= 0) {
+ mAnimationCallbacks.set(id, null);
+ mListDirty = true;
+ }
+ }
+
+ private void doAnimationFrame(long frameTime) {
+ int size = mAnimationCallbacks.size();
+ long currentTime = SystemClock.uptimeMillis();
+ for (int i = 0; i < size; i++) {
+ final AnimationFrameCallback callback = mAnimationCallbacks.get(i);
+ if (callback == null) {
+ continue;
+ }
+ if (isCallbackDue(callback, currentTime)) {
+ callback.doAnimationFrame(frameTime);
+ if (mCommitCallbacks.contains(callback)) {
+ getProvider().postCommitCallback(new Runnable() {
+ @Override
+ public void run() {
+ commitAnimationFrame(callback, getProvider().getFrameTime());
+ }
+ });
+ }
+ }
+ }
+ cleanUpList();
+ }
+
+ private void commitAnimationFrame(AnimationFrameCallback callback, long frameTime) {
+ if (!mDelayedCallbackStartTime.containsKey(callback) &&
+ mCommitCallbacks.contains(callback)) {
+ callback.commitAnimationFrame(frameTime);
+ mCommitCallbacks.remove(callback);
+ }
+ }
+
+ /**
+ * Remove the callbacks from mDelayedCallbackStartTime once they have passed the initial delay
+ * so that they can start getting frame callbacks.
+ *
+ * @return true if they have passed the initial delay or have no delay, false otherwise.
+ */
+ private boolean isCallbackDue(AnimationFrameCallback callback, long currentTime) {
+ Long startTime = mDelayedCallbackStartTime.get(callback);
+ if (startTime == null) {
+ return true;
+ }
+ if (startTime < currentTime) {
+ mDelayedCallbackStartTime.remove(callback);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Return the number of callbacks that have registered for frame callbacks.
+ */
+ public static int getAnimationCount() {
+ AnimationHandler handler = sAnimatorHandler.get();
+ if (handler == null) {
+ return 0;
+ }
+ return handler.getCallbackSize();
+ }
+
+ public static void setFrameDelay(long delay) {
+ getInstance().getProvider().setFrameDelay(delay);
+ }
+
+ public static long getFrameDelay() {
+ return getInstance().getProvider().getFrameDelay();
+ }
+
+ void autoCancelBasedOn(ObjectAnimator objectAnimator) {
+ for (int i = mAnimationCallbacks.size() - 1; i >= 0; i--) {
+ AnimationFrameCallback cb = mAnimationCallbacks.get(i);
+ if (cb == null) {
+ continue;
+ }
+ if (objectAnimator.shouldAutoCancel(cb)) {
+ ((Animator) mAnimationCallbacks.get(i)).cancel();
+ }
+ }
+ }
+
+ private void cleanUpList() {
+ if (mListDirty) {
+ for (int i = mAnimationCallbacks.size() - 1; i >= 0; i--) {
+ if (mAnimationCallbacks.get(i) == null) {
+ mAnimationCallbacks.remove(i);
+ }
+ }
+ mListDirty = false;
+ }
+ }
+
+ private int getCallbackSize() {
+ int count = 0;
+ int size = mAnimationCallbacks.size();
+ for (int i = size - 1; i >= 0; i--) {
+ if (mAnimationCallbacks.get(i) != null) {
+ count++;
+ }
+ }
+ return count;
+ }
+
+ /**
+ * Default provider of timing pulse that uses Choreographer for frame callbacks.
+ */
+ private class MyFrameCallbackProvider implements AnimationFrameCallbackProvider {
+
+ final Choreographer mChoreographer = Choreographer.getInstance();
+
+ @Override
+ public void postFrameCallback(Choreographer.FrameCallback callback) {
+ mChoreographer.postFrameCallback(callback);
+ }
+
+ @Override
+ public void postCommitCallback(Runnable runnable) {
+ mChoreographer.postCallback(Choreographer.CALLBACK_COMMIT, runnable, null);
+ }
+
+ @Override
+ public long getFrameTime() {
+ return mChoreographer.getFrameTime();
+ }
+
+ @Override
+ public long getFrameDelay() {
+ return Choreographer.getFrameDelay();
+ }
+
+ @Override
+ public void setFrameDelay(long delay) {
+ Choreographer.setFrameDelay(delay);
+ }
+ }
+
+ /**
+ * Callbacks that receives notifications for animation timing and frame commit timing.
+ */
+ interface AnimationFrameCallback {
+ /**
+ * Run animation based on the frame time.
+ * @param frameTime The frame start time, in the {@link SystemClock#uptimeMillis()} time
+ * base.
+ */
+ void doAnimationFrame(long frameTime);
+
+ /**
+ * This notifies the callback of frame commit time. Frame commit time is the time after
+ * traversals happen, as opposed to the normal animation frame time that is before
+ * traversals. This is used to compensate expensive traversals that happen as the
+ * animation starts. When traversals take a long time to complete, the rendering of the
+ * initial frame will be delayed (by a long time). But since the startTime of the
+ * animation is set before the traversal, by the time of next frame, a lot of time would
+ * have passed since startTime was set, the animation will consequently skip a few frames
+ * to respect the new frameTime. By having the commit time, we can adjust the start time to
+ * when the first frame was drawn (after any expensive traversals) so that no frames
+ * will be skipped.
+ *
+ * @param frameTime The frame time after traversals happen, if any, in the
+ * {@link SystemClock#uptimeMillis()} time base.
+ */
+ void commitAnimationFrame(long frameTime);
+ }
+
+ /**
+ * The intention for having this interface is to increase the testability of ValueAnimator.
+ * Specifically, we can have a custom implementation of the interface below and provide
+ * timing pulse without using Choreographer. That way we could use any arbitrary interval for
+ * our timing pulse in the tests.
+ *
+ * @hide
+ */
+ public interface AnimationFrameCallbackProvider {
+ void postFrameCallback(Choreographer.FrameCallback callback);
+ void postCommitCallback(Runnable runnable);
+ long getFrameTime();
+ long getFrameDelay();
+ void setFrameDelay(long delay);
+ }
+}
diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java
index f9333739..26c886e 100644
--- a/core/java/android/animation/ObjectAnimator.java
+++ b/core/java/android/animation/ObjectAnimator.java
@@ -25,6 +25,7 @@
import android.util.Property;
import java.lang.ref.WeakReference;
+import java.util.ArrayList;
/**
* This subclass of {@link ValueAnimator} provides support for animating properties on target objects.
@@ -809,37 +810,7 @@
@Override
public void start() {
- // See if any of the current active/pending animators need to be canceled
- AnimationHandler handler = sAnimationHandler.get();
- if (handler != null) {
- int numAnims = handler.mAnimations.size();
- for (int i = numAnims - 1; i >= 0; i--) {
- if (handler.mAnimations.get(i) instanceof ObjectAnimator) {
- ObjectAnimator anim = (ObjectAnimator) handler.mAnimations.get(i);
- if (anim.mAutoCancel && hasSameTargetAndProperties(anim)) {
- anim.cancel();
- }
- }
- }
- numAnims = handler.mPendingAnimations.size();
- for (int i = numAnims - 1; i >= 0; i--) {
- if (handler.mPendingAnimations.get(i) instanceof ObjectAnimator) {
- ObjectAnimator anim = (ObjectAnimator) handler.mPendingAnimations.get(i);
- if (anim.mAutoCancel && hasSameTargetAndProperties(anim)) {
- anim.cancel();
- }
- }
- }
- numAnims = handler.mDelayedAnims.size();
- for (int i = numAnims - 1; i >= 0; i--) {
- if (handler.mDelayedAnims.get(i) instanceof ObjectAnimator) {
- ObjectAnimator anim = (ObjectAnimator) handler.mDelayedAnims.get(i);
- if (anim.mAutoCancel && hasSameTargetAndProperties(anim)) {
- anim.cancel();
- }
- }
- }
- }
+ AnimationHandler.getInstance().autoCancelBasedOn(this);
if (DBG) {
Log.d(LOG_TAG, "Anim target, duration: " + getTarget() + ", " + getDuration());
for (int i = 0; i < mValues.length; ++i) {
@@ -852,6 +823,20 @@
super.start();
}
+ boolean shouldAutoCancel(AnimationHandler.AnimationFrameCallback anim) {
+ if (anim == null) {
+ return false;
+ }
+
+ if (anim instanceof ObjectAnimator) {
+ ObjectAnimator objAnim = (ObjectAnimator) anim;
+ if (objAnim.mAutoCancel && hasSameTargetAndProperties(objAnim)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* This function is called immediately before processing the first animation
* frame of an animation. If there is a nonzero <code>startDelay</code>, the
diff --git a/core/java/android/animation/TimeAnimator.java b/core/java/android/animation/TimeAnimator.java
index 1ba68df..113a21f 100644
--- a/core/java/android/animation/TimeAnimator.java
+++ b/core/java/android/animation/TimeAnimator.java
@@ -37,7 +37,7 @@
}
@Override
- boolean animationFrame(long currentTime) {
+ boolean animateBasedOnTime(long currentTime) {
if (mListener != null) {
long totalTime = currentTime - mStartTime;
long deltaTime = (mPreviousTime < 0) ? 0 : (currentTime - mPreviousTime);
@@ -52,7 +52,7 @@
long currentTime = AnimationUtils.currentAnimationTimeMillis();
mStartTime = Math.max(mStartTime, currentTime - playTime);
mStartTimeCommitted = true; // do not allow start time to be compensated for jank
- animationFrame(currentTime);
+ animateBasedOnTime(currentTime);
}
/**
diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java
index 35a8816..da9a8c8 100644
--- a/core/java/android/animation/ValueAnimator.java
+++ b/core/java/android/animation/ValueAnimator.java
@@ -21,7 +21,6 @@
import android.os.Trace;
import android.util.AndroidRuntimeException;
import android.util.Log;
-import android.view.Choreographer;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.AnimationUtils;
import android.view.animation.LinearInterpolator;
@@ -64,7 +63,7 @@
* </div>
*/
@SuppressWarnings("unchecked")
-public class ValueAnimator extends Animator {
+public class ValueAnimator extends Animator implements AnimationHandler.AnimationFrameCallback {
private static final String TAG = "ValueAnimator";
private static final boolean DEBUG = false;
@@ -74,14 +73,6 @@
private static float sDurationScale = 1.0f;
/**
- * Values used with internal variable mPlayingState to indicate the current state of an
- * animation.
- */
- static final int STOPPED = 0; // Not yet playing
- static final int RUNNING = 1; // Playing normally
- static final int SEEKED = 2; // Seeked to some time value
-
- /**
* Internal variables
* NOTE: This object implements the clone() method, making a deep copy of any referenced
* objects. As other non-trivial fields are added to this class, make sure to add logic
@@ -130,15 +121,6 @@
*/
private boolean mResumed = false;
-
- // The static sAnimationHandler processes the internal timing loop on which all animations
- // are based
- /**
- * @hide
- */
- protected static ThreadLocal<AnimationHandler> sAnimationHandler =
- new ThreadLocal<AnimationHandler>();
-
// The time interpolator to be used if none is set on the animation
private static final TimeInterpolator sDefaultInterpolator =
new AccelerateDecelerateInterpolator();
@@ -170,25 +152,9 @@
private float mCurrentFraction = 0f;
/**
- * Tracks whether a startDelay'd animation has begun playing through the startDelay.
+ * Tracks the time (in milliseconds) when the last frame arrived.
*/
- private boolean mStartedDelay = false;
-
- /**
- * Tracks the time at which the animation began playing through its startDelay. This is
- * different from the mStartTime variable, which is used to track when the animation became
- * active (which is when the startDelay expired and the animation was added to the active
- * animations list).
- */
- private long mDelayStartTime;
-
- /**
- * Flag that represents the current state of the animation. Used to figure out when to start
- * an animation (if state == STOPPED). Also used to end an animation that
- * has been cancel()'d or end()'d since the last animation frame. Possible values are
- * STOPPED, RUNNING, SEEKED.
- */
- int mPlayingState = STOPPED;
+ private long mLastFrameTime = 0;
/**
* Additional playing state to indicate whether an animator has been start()'d. There is
@@ -219,16 +185,21 @@
*/
boolean mInitialized = false;
+ /**
+ * Flag that tracks whether animation has been requested to end.
+ */
+ private boolean mAnimationEndRequested = false;
+
//
// Backing variables
//
// How long the animation should last in ms
- private long mDuration = (long)(300 * sDurationScale);
private long mUnscaledDuration = 300;
+ private long mDuration = (long)(mUnscaledDuration * sDurationScale);
// The amount of time in ms to delay starting the animation after start() is called
- private long mStartDelay = 0;
+ long mStartDelay = 0;
private long mUnscaledStartDelay = 0;
// The number of times the animation will repeat. The default is 0, which means the animation
@@ -285,7 +256,6 @@
*/
public static final int INFINITE = -1;
-
/**
* @hide
*/
@@ -539,7 +509,6 @@
}
}
-
/**
* Sets the length of the animation. The default duration is 300 milliseconds.
*
@@ -644,9 +613,8 @@
long currentTime = AnimationUtils.currentAnimationTimeMillis();
mStartTime = currentTime - seekTime;
mStartTimeCommitted = true; // do not allow start time to be compensated for jank
- if (mPlayingState != RUNNING) {
+ if (!mRunning) {
mSeekFraction = fraction;
- mPlayingState = SEEKED;
}
if (mPlayingBackwards) {
fraction = 1f - fraction;
@@ -662,168 +630,13 @@
* @return The current position in time of the animation.
*/
public long getCurrentPlayTime() {
- if (!mInitialized || mPlayingState == STOPPED) {
+ if (!mInitialized || !mStarted) {
return 0;
}
return AnimationUtils.currentAnimationTimeMillis() - mStartTime;
}
/**
- * This custom, static handler handles the timing pulse that is shared by
- * all active animations. This approach ensures that the setting of animation
- * values will happen on the UI thread and that all animations will share
- * the same times for calculating their values, which makes synchronizing
- * animations possible.
- *
- * The handler uses the Choreographer for executing periodic callbacks.
- *
- * @hide
- */
- @SuppressWarnings("unchecked")
- protected static class AnimationHandler {
- // The per-thread list of all active animations
- /** @hide */
- protected final ArrayList<ValueAnimator> mAnimations = new ArrayList<ValueAnimator>();
-
- // Used in doAnimationFrame() to avoid concurrent modifications of mAnimations
- private final ArrayList<ValueAnimator> mTmpAnimations = new ArrayList<ValueAnimator>();
-
- // The per-thread set of animations to be started on the next animation frame
- /** @hide */
- protected final ArrayList<ValueAnimator> mPendingAnimations = new ArrayList<ValueAnimator>();
-
- /**
- * Internal per-thread collections used to avoid set collisions as animations start and end
- * while being processed.
- * @hide
- */
- protected final ArrayList<ValueAnimator> mDelayedAnims = new ArrayList<ValueAnimator>();
- private final ArrayList<ValueAnimator> mEndingAnims = new ArrayList<ValueAnimator>();
- private final ArrayList<ValueAnimator> mReadyAnims = new ArrayList<ValueAnimator>();
-
- private final Choreographer mChoreographer;
- private boolean mAnimationScheduled;
- private long mLastFrameTime;
-
- private AnimationHandler() {
- mChoreographer = Choreographer.getInstance();
- }
-
- /**
- * Start animating on the next frame.
- */
- public void start() {
- scheduleAnimation();
- }
-
- void doAnimationFrame(long frameTime) {
- mLastFrameTime = frameTime;
-
- // mPendingAnimations holds any animations that have requested to be started
- // We're going to clear mPendingAnimations, but starting animation may
- // cause more to be added to the pending list (for example, if one animation
- // starting triggers another starting). So we loop until mPendingAnimations
- // is empty.
- while (mPendingAnimations.size() > 0) {
- ArrayList<ValueAnimator> pendingCopy =
- (ArrayList<ValueAnimator>) mPendingAnimations.clone();
- mPendingAnimations.clear();
- int count = pendingCopy.size();
- for (int i = 0; i < count; ++i) {
- ValueAnimator anim = pendingCopy.get(i);
- // If the animation has a startDelay, place it on the delayed list
- if (anim.mStartDelay == 0) {
- anim.startAnimation(this);
- } else {
- mDelayedAnims.add(anim);
- }
- }
- }
-
- // Next, process animations currently sitting on the delayed queue, adding
- // them to the active animations if they are ready
- int numDelayedAnims = mDelayedAnims.size();
- for (int i = 0; i < numDelayedAnims; ++i) {
- ValueAnimator anim = mDelayedAnims.get(i);
- if (anim.delayedAnimationFrame(frameTime)) {
- mReadyAnims.add(anim);
- }
- }
- int numReadyAnims = mReadyAnims.size();
- if (numReadyAnims > 0) {
- for (int i = 0; i < numReadyAnims; ++i) {
- ValueAnimator anim = mReadyAnims.get(i);
- anim.startAnimation(this);
- anim.mRunning = true;
- mDelayedAnims.remove(anim);
- }
- mReadyAnims.clear();
- }
-
- // Now process all active animations. The return value from animationFrame()
- // tells the handler whether it should now be ended
- int numAnims = mAnimations.size();
- for (int i = 0; i < numAnims; ++i) {
- mTmpAnimations.add(mAnimations.get(i));
- }
- for (int i = 0; i < numAnims; ++i) {
- ValueAnimator anim = mTmpAnimations.get(i);
- if (mAnimations.contains(anim) && anim.doAnimationFrame(frameTime)) {
- mEndingAnims.add(anim);
- }
- }
- mTmpAnimations.clear();
- if (mEndingAnims.size() > 0) {
- for (int i = 0; i < mEndingAnims.size(); ++i) {
- mEndingAnims.get(i).endAnimation(this);
- }
- mEndingAnims.clear();
- }
-
- // Schedule final commit for the frame.
- mChoreographer.postCallback(Choreographer.CALLBACK_COMMIT, mCommit, null);
-
- // If there are still active or delayed animations, schedule a future call to
- // onAnimate to process the next frame of the animations.
- if (!mAnimations.isEmpty() || !mDelayedAnims.isEmpty()) {
- scheduleAnimation();
- }
- }
-
- void commitAnimationFrame(long frameTime) {
- final long adjustment = frameTime - mLastFrameTime;
- final int numAnims = mAnimations.size();
- for (int i = 0; i < numAnims; ++i) {
- mAnimations.get(i).commitAnimationFrame(adjustment);
- }
- }
-
- private void scheduleAnimation() {
- if (!mAnimationScheduled) {
- mChoreographer.postCallback(Choreographer.CALLBACK_ANIMATION, mAnimate, null);
- mAnimationScheduled = true;
- }
- }
-
- // Called by the Choreographer.
- final Runnable mAnimate = new Runnable() {
- @Override
- public void run() {
- mAnimationScheduled = false;
- doAnimationFrame(mChoreographer.getFrameTime());
- }
- };
-
- // Called by the Choreographer.
- final Runnable mCommit = new Runnable() {
- @Override
- public void run() {
- commitAnimationFrame(mChoreographer.getFrameTime());
- }
- };
- }
-
- /**
* The amount of time, in milliseconds, to delay starting the animation after
* {@link #start()} is called.
*
@@ -859,7 +672,7 @@
* @return the requested time between frames, in milliseconds
*/
public static long getFrameDelay() {
- return Choreographer.getFrameDelay();
+ return AnimationHandler.getInstance().getFrameDelay();
}
/**
@@ -875,7 +688,7 @@
* @param frameDelay the requested time between frames, in milliseconds
*/
public static void setFrameDelay(long frameDelay) {
- Choreographer.setFrameDelay(frameDelay);
+ AnimationHandler.getInstance().setFrameDelay(frameDelay);
}
/**
@@ -1104,24 +917,13 @@
mPlayingBackwards = (mCurrentIteration % 2) != 0;
}
}
- int prevPlayingState = mPlayingState;
- mPlayingState = STOPPED;
mStarted = true;
- mStartedDelay = false;
mPaused = false;
+ mRunning = false;
+ mAnimationEndRequested = false;
updateScaledDuration(); // in case the scale factor has changed since creation time
- AnimationHandler animationHandler = getOrCreateAnimationHandler();
- animationHandler.mPendingAnimations.add(this);
- if (mStartDelay == 0) {
- // This sets the initial value of the animation, prior to actually starting it running
- if (prevPlayingState != SEEKED) {
- setCurrentPlayTime(0);
- }
- mPlayingState = STOPPED;
- mRunning = true;
- notifyStartListeners();
- }
- animationHandler.start();
+ AnimationHandler animationHandler = AnimationHandler.getInstance();
+ animationHandler.addAnimationFrameCallback(this, mStartDelay);
}
@Override
@@ -1131,41 +933,48 @@
@Override
public void cancel() {
+ if (Looper.myLooper() == null) {
+ throw new AndroidRuntimeException("Animators may only be run on Looper threads");
+ }
+
+ // If end has already been requested, through a previous end() or cancel() call, no-op
+ // until animation starts again.
+ if (mAnimationEndRequested) {
+ return;
+ }
+
// Only cancel if the animation is actually running or has been started and is about
// to run
- AnimationHandler handler = getOrCreateAnimationHandler();
- if (mPlayingState != STOPPED
- || handler.mPendingAnimations.contains(this)
- || handler.mDelayedAnims.contains(this)) {
- // Only notify listeners if the animator has actually started
- if ((mStarted || mRunning) && mListeners != null) {
- if (!mRunning) {
- // If it's not yet running, then start listeners weren't called. Call them now.
- notifyStartListeners();
- }
- ArrayList<AnimatorListener> tmpListeners =
- (ArrayList<AnimatorListener>) mListeners.clone();
- for (AnimatorListener listener : tmpListeners) {
- listener.onAnimationCancel(this);
- }
+ // Only notify listeners if the animator has actually started
+ if ((mStarted || mRunning) && mListeners != null) {
+ if (!mRunning) {
+ // If it's not yet running, then start listeners weren't called. Call them now.
+ notifyStartListeners();
}
- endAnimation(handler);
+ ArrayList<AnimatorListener> tmpListeners =
+ (ArrayList<AnimatorListener>) mListeners.clone();
+ for (AnimatorListener listener : tmpListeners) {
+ listener.onAnimationCancel(this);
+ }
}
+ endAnimation();
+
}
@Override
public void end() {
- AnimationHandler handler = getOrCreateAnimationHandler();
- if (!handler.mAnimations.contains(this) && !handler.mPendingAnimations.contains(this)) {
+ if (Looper.myLooper() == null) {
+ throw new AndroidRuntimeException("Animators may only be run on Looper threads");
+ }
+ if (!mRunning) {
// Special case if the animation has not yet started; get it ready for ending
- mStartedDelay = false;
- startAnimation(handler);
+ startAnimation();
mStarted = true;
} else if (!mInitialized) {
initAnimation();
}
animateValue(mPlayingBackwards ? 0f : 1f);
- endAnimation(handler);
+ endAnimation();
}
@Override
@@ -1188,7 +997,7 @@
@Override
public boolean isRunning() {
- return (mPlayingState == RUNNING || mRunning);
+ return mRunning;
}
@Override
@@ -1206,7 +1015,7 @@
@Override
public void reverse() {
mPlayingBackwards = !mPlayingBackwards;
- if (mPlayingState == RUNNING) {
+ if (mRunning) {
long currentTime = AnimationUtils.currentAnimationTimeMillis();
long currentPlayTime = currentTime - mStartTime;
long timeLeft = mDuration - currentPlayTime;
@@ -1231,13 +1040,15 @@
/**
* Called internally to end an animation by removing it from the animations list. Must be
* called on the UI thread.
- * @hide
*/
- protected void endAnimation(AnimationHandler handler) {
- handler.mAnimations.remove(this);
- handler.mPendingAnimations.remove(this);
- handler.mDelayedAnims.remove(this);
- mPlayingState = STOPPED;
+ private void endAnimation() {
+ if (mAnimationEndRequested) {
+ return;
+ }
+ AnimationHandler handler = AnimationHandler.getInstance();
+ handler.removeCallback(this);
+
+ mAnimationEndRequested = true;
mPaused = false;
if ((mStarted || mRunning) && mListeners != null) {
if (!mRunning) {
@@ -1267,16 +1078,14 @@
* Called internally to start an animation by adding it to the active animations list. Must be
* called on the UI thread.
*/
- private void startAnimation(AnimationHandler handler) {
+ private void startAnimation() {
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) {
- // Listeners were already notified in start() if startDelay is 0; this is
- // just for delayed animations
+ mRunning = true;
+ if (mListeners != null) {
notifyStartListeners();
}
}
@@ -1288,53 +1097,16 @@
return "animator";
}
-
- /**
- * Internal function called to process an animation frame on an animation that is currently
- * sleeping through its <code>startDelay</code> phase. The return value indicates whether it
- * should be woken up and put on the active animations queue.
- *
- * @param currentTime The current animation time, used to calculate whether the animation
- * has exceeded its <code>startDelay</code> and should be started.
- * @return True if the animation's <code>startDelay</code> has been exceeded and the animation
- * should be added to the set of active animations.
- */
- private boolean delayedAnimationFrame(long currentTime) {
- if (!mStartedDelay) {
- mStartedDelay = true;
- mDelayStartTime = currentTime;
- }
- if (mPaused) {
- if (mPauseTime < 0) {
- mPauseTime = currentTime;
- }
- return false;
- } else if (mResumed) {
- mResumed = false;
- if (mPauseTime > 0) {
- // Offset by the duration that the animation was paused
- mDelayStartTime += (currentTime - mPauseTime);
- }
- }
- long deltaTime = currentTime - mDelayStartTime;
- if (deltaTime > mStartDelay) {
- // startDelay ended - start the anim and record the mStartTime appropriately
- mStartTime = mDelayStartTime + mStartDelay;
- mStartTimeCommitted = true; // do not allow start time to be compensated for jank
- mPlayingState = RUNNING;
- return true;
- }
- return false;
- }
-
/**
* Applies an adjustment to the animation to compensate for jank between when
* the animation first ran and when the frame was drawn.
+ * @hide
*/
- void commitAnimationFrame(long adjustment) {
+ public void commitAnimationFrame(long frameTime) {
if (!mStartTimeCommitted) {
mStartTimeCommitted = true;
- if (mPlayingState == RUNNING && adjustment > 0) {
+ long adjustment = frameTime - mLastFrameTime;
+ if (adjustment > 0) {
mStartTime += adjustment;
if (DEBUG) {
Log.d(TAG, "Adjusted start time by " + adjustment + " ms: " + toString());
@@ -1353,13 +1125,11 @@
*
* @param currentTime The current time, as tracked by the static timing handler
* @return true if the animation's duration, including any repetitions due to
- * <code>repeatCount</code>, has been exceeded and the animation should be ended.
+ * <code>repeatCount</code> has been exceeded and the animation should be ended.
*/
- boolean animationFrame(long currentTime) {
+ boolean animateBasedOnTime(long currentTime) {
boolean done = false;
- switch (mPlayingState) {
- case RUNNING:
- case SEEKED:
+ if (mRunning) {
float fraction = mDuration > 0 ? (float)(currentTime - mStartTime) / mDuration : 1f;
if (mDuration == 0 && mRepeatCount != INFINITE) {
// Skip to the end
@@ -1394,9 +1164,7 @@
fraction = 1f - fraction;
}
animateValue(fraction);
- break;
}
-
return done;
}
@@ -1405,10 +1173,15 @@
*
* @param frameTime The frame time.
* @return true if the animation has ended.
+ * @hide
*/
- final boolean doAnimationFrame(long frameTime) {
- if (mPlayingState == STOPPED) {
- mPlayingState = RUNNING;
+ public final void doAnimationFrame(long frameTime) {
+ mLastFrameTime = frameTime;
+ AnimationHandler handler = AnimationHandler.getInstance();
+ if (!mRunning) {
+ // First frame
+ handler.addOneShotCommitCallback(this);
+ startAnimation();
if (mSeekFraction < 0) {
mStartTime = frameTime;
} else {
@@ -1422,7 +1195,7 @@
if (mPauseTime < 0) {
mPauseTime = frameTime;
}
- return false;
+ return;
} else if (mResumed) {
mResumed = false;
if (mPauseTime > 0) {
@@ -1430,13 +1203,18 @@
mStartTime += (frameTime - mPauseTime);
mStartTimeCommitted = false; // allow start time to be compensated for jank
}
+ handler.addOneShotCommitCallback(this);
}
// The frame time might be before the start time during the first frame of
// an animation. The "current time" must always be on or after the start
// time to avoid animating frames at negative time intervals. In practice, this
// is very rare and only happens when seeking backwards.
final long currentTime = Math.max(frameTime, mStartTime);
- return animationFrame(currentTime);
+ boolean finished = animateBasedOnTime(currentTime);
+
+ if (finished) {
+ endAnimation();
+ }
}
/**
@@ -1488,8 +1266,6 @@
anim.mReversing = false;
anim.mCurrentIteration = 0;
anim.mInitialized = false;
- anim.mPlayingState = STOPPED;
- anim.mStartedDelay = false;
anim.mStarted = false;
anim.mRunning = false;
anim.mPaused = false;
@@ -1497,9 +1273,10 @@
anim.mStartListenersCalled = false;
anim.mStartTime = 0;
anim.mStartTimeCommitted = false;
+ anim.mAnimationEndRequested = false;
anim.mPauseTime = 0;
+ anim.mLastFrameTime = 0;
anim.mCurrentFraction = 0;
- anim.mDelayStartTime = 0;
PropertyValuesHolder[] oldValues = mValues;
if (oldValues != null) {
@@ -1540,32 +1317,7 @@
* @hide
*/
public static int getCurrentAnimationsCount() {
- AnimationHandler handler = sAnimationHandler.get();
- return handler != null ? handler.mAnimations.size() : 0;
- }
-
- /**
- * Clear all animations on this thread, without canceling or ending them.
- * This should be used with caution.
- *
- * @hide
- */
- public static void clearAllAnimations() {
- AnimationHandler handler = sAnimationHandler.get();
- if (handler != null) {
- handler.mAnimations.clear();
- handler.mPendingAnimations.clear();
- handler.mDelayedAnims.clear();
- }
- }
-
- private static AnimationHandler getOrCreateAnimationHandler() {
- AnimationHandler handler = sAnimationHandler.get();
- if (handler == null) {
- handler = new AnimationHandler();
- sAnimationHandler.set(handler);
- }
- return handler;
+ return AnimationHandler.getAnimationCount();
}
@Override
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 07fa52c..a4e1135 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2761,6 +2761,15 @@
}
/**
+ * Activates this activity, hence bringing it to the top and giving it focus.
+ * Note: This will only work for activities which are located on the freeform desktop.
+ * @hide
+ */
+ public void activateActivity() throws RemoteException {
+ ActivityManagerNative.getDefault().activateActivity(mToken);
+ }
+
+ /**
* Called to process key events. You can override this to intercept all
* key events before they are dispatched to the window. Be sure to call
* this implementation for key events that should be handled normally.
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index b003b31..1f1f356 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -827,10 +827,18 @@
return true;
}
+ case ACTIVATE_ACTIVITY_TRANSACTION: {
+ data.enforceInterface(IActivityManager.descriptor);
+ IBinder token = data.readStrongBinder();
+ activateActivity(token);
+ reply.writeNoException();
+ return true;
+ }
+
case SET_FOCUSED_TASK_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
int taskId = data.readInt();
- setFocusedStack(taskId);
+ setFocusedTask(taskId);
reply.writeNoException();
return true;
}
@@ -3623,6 +3631,18 @@
return focusedStackId;
}
@Override
+ public void activateActivity(IBinder token) throws RemoteException
+ {
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ data.writeInterfaceToken(IActivityManager.descriptor);
+ data.writeStrongBinder(token);
+ mRemote.transact(ACTIVATE_ACTIVITY_TRANSACTION, data, reply, 0);
+ reply.readException();
+ data.recycle();
+ reply.recycle();
+ }
+ @Override
public void setFocusedTask(int taskId) throws RemoteException
{
Parcel data = Parcel.obtain();
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index fe79629..412e3cd 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1727,7 +1727,8 @@
String[] libDirs, int displayId, Configuration overrideConfiguration,
LoadedApk pkgInfo) {
return mResourcesManager.getTopLevelResources(resDir, splitResDirs, overlayDirs, libDirs,
- displayId, overrideConfiguration, pkgInfo.getCompatibilityInfo());
+ displayId, overrideConfiguration, pkgInfo.getCompatibilityInfo(),
+ pkgInfo.getClassLoader());
}
final Handler getHandler() {
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 235f294..fca5567 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1838,7 +1838,7 @@
resources = mResourcesManager.getTopLevelResources(packageInfo.getResDir(),
packageInfo.getSplitResDirs(), packageInfo.getOverlayDirs(),
packageInfo.getApplicationInfo().sharedLibraryFiles, displayId,
- overrideConfiguration, compatInfo);
+ overrideConfiguration, compatInfo, packageInfo.getClassLoader());
}
}
mResources = resources;
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index d355219..47abf26 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -147,6 +147,7 @@
public boolean isInHomeStack(int taskId) throws RemoteException;
public void setFocusedStack(int stackId) throws RemoteException;
public int getFocusedStackId() throws RemoteException;
+ public void activateActivity(IBinder token) throws RemoteException;
public void setFocusedTask(int taskId) throws RemoteException;
public void registerTaskStackListener(ITaskStackListener listener) throws RemoteException;
public int getTaskForActivity(IBinder token, boolean onlyRoot) throws RemoteException;
@@ -892,4 +893,5 @@
int REPORT_SIZE_CONFIGURATIONS = IBinder.FIRST_CALL_TRANSACTION + 345;
int GET_ACTIVITY_BOUNDS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 346;
int SET_ACTIVITY_BOUNDS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 347;
+ int ACTIVATE_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 348;
}
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index 2117597..1605b3e 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -157,7 +157,8 @@
*/
Resources getTopLevelResources(String resDir, String[] splitResDirs,
String[] overlayDirs, String[] libDirs, int displayId,
- Configuration overrideConfiguration, CompatibilityInfo compatInfo) {
+ Configuration overrideConfiguration, CompatibilityInfo compatInfo,
+ ClassLoader classLoader) {
final float scale = compatInfo.applicationScale;
Configuration overrideConfigCopy = (overrideConfiguration != null)
? new Configuration(overrideConfiguration) : null;
@@ -237,7 +238,7 @@
} else {
config = getConfiguration();
}
- r = new Resources(assets, dm, config, compatInfo);
+ r = new Resources(assets, dm, config, compatInfo, classLoader);
if (DEBUG) Slog.i(TAG, "Created app resources " + resDir + " " + r + ": "
+ r.getConfiguration() + " appScale=" + r.getCompatibilityInfo().applicationScale);
diff --git a/core/java/android/content/pm/UserInfo.java b/core/java/android/content/pm/UserInfo.java
index 2aae1de..7392563 100644
--- a/core/java/android/content/pm/UserInfo.java
+++ b/core/java/android/content/pm/UserInfo.java
@@ -77,7 +77,7 @@
public static final int FLAG_DISABLED = 0x00000040;
- public static final int NO_PROFILE_GROUP_ID = -1;
+ public static final int NO_PROFILE_GROUP_ID = UserHandle.USER_NULL;
public int id;
public int serialNumber;
@@ -87,6 +87,7 @@
public long creationTime;
public long lastLoggedInTime;
public int profileGroupId;
+ public int restrictedProfileParentId;
/** User is only partially created. */
public boolean partial;
@@ -102,6 +103,7 @@
this.flags = flags;
this.iconPath = iconPath;
this.profileGroupId = NO_PROFILE_GROUP_ID;
+ this.restrictedProfileParentId = NO_PROFILE_GROUP_ID;
}
public boolean isPrimary() {
@@ -206,6 +208,7 @@
dest.writeInt(partial ? 1 : 0);
dest.writeInt(profileGroupId);
dest.writeInt(guestToRemove ? 1 : 0);
+ dest.writeInt(restrictedProfileParentId);
}
public static final Parcelable.Creator<UserInfo> CREATOR
@@ -229,5 +232,6 @@
partial = source.readInt() != 0;
profileGroupId = source.readInt();
guestToRemove = source.readInt() != 0;
+ restrictedProfileParentId = source.readInt();
}
}
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index ae92108..e29bd2c 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -20,6 +20,7 @@
import android.annotation.ColorInt;
import android.annotation.StyleRes;
import android.annotation.StyleableRes;
+import android.graphics.drawable.DrawableInflater;
import android.icu.text.PluralRules;
import com.android.internal.util.GrowingArrayUtils;
import com.android.internal.util.XmlUtils;
@@ -142,6 +143,9 @@
private final ConfigurationBoundResourceCache<StateListAnimator> mStateListAnimatorCache =
new ConfigurationBoundResourceCache<>(this);
+ /** Used to inflate drawable objects from XML. */
+ private DrawableInflater mDrawableInflater;
+
private TypedValue mTmpValue = new TypedValue();
private boolean mPreloading;
@@ -150,6 +154,7 @@
private final XmlBlock[] mCachedXmlBlocks = new XmlBlock[4];
final AssetManager mAssets;
+ final ClassLoader mClassLoader;
final DisplayMetrics mMetrics = new DisplayMetrics();
private final Configuration mConfiguration = new Configuration();
@@ -204,6 +209,17 @@
}
/**
+ * @return the inflater used to create drawable objects
+ * @hide Pending API finalization.
+ */
+ public final DrawableInflater getDrawableInflater() {
+ if (mDrawableInflater == null) {
+ mDrawableInflater = new DrawableInflater(this, mClassLoader);
+ }
+ return mDrawableInflater;
+ }
+
+ /**
* Used by AnimatorInflater.
*
* @hide
@@ -245,7 +261,7 @@
* selecting/computing resource values (optional).
*/
public Resources(AssetManager assets, DisplayMetrics metrics, Configuration config) {
- this(assets, metrics, config, CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO);
+ this(assets, metrics, config, CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO, null);
}
/**
@@ -257,11 +273,15 @@
* @param config Desired device configuration to consider when
* selecting/computing resource values (optional).
* @param compatInfo this resource's compatibility info. Must not be null.
+ * @param classLoader class loader for the package used to load custom
+ * resource classes, may be {@code null} to use system
+ * class loader
* @hide
*/
public Resources(AssetManager assets, DisplayMetrics metrics, Configuration config,
- CompatibilityInfo compatInfo) {
+ CompatibilityInfo compatInfo, @Nullable ClassLoader classLoader) {
mAssets = assets;
+ mClassLoader = classLoader == null ? ClassLoader.getSystemClassLoader() : classLoader;
mMetrics.setToDefaults();
if (compatInfo != null) {
mCompatibilityInfo = compatInfo;
@@ -2803,6 +2823,7 @@
private Resources() {
mAssets = AssetManager.getSystem();
+ mClassLoader = ClassLoader.getSystemClassLoader();
// NOTE: Intentionally leaving this uninitialized (all values set
// to zero), so that anyone who tries to do something that requires
// metrics will get a very wrong value.
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index a4e6219..ec0cc6d 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1038,11 +1038,13 @@
type = "enableDUN";
result = TYPE_MOBILE_DUN;
} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)) {
- type = "enableSUPL";
+ type = "enableSUPL";
result = TYPE_MOBILE_SUPL;
- } else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)) {
- type = "enableMMS";
- result = TYPE_MOBILE_MMS;
+ // back out this hack for mms as they no longer need this and it's causing
+ // device slowdowns - b/23350688 (note, supl still needs this)
+ //} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)) {
+ // type = "enableMMS";
+ // result = TYPE_MOBILE_MMS;
} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
type = "enableHIPRI";
result = TYPE_MOBILE_HIPRI;
diff --git a/core/java/android/net/NetworkScorerAppManager.java b/core/java/android/net/NetworkScorerAppManager.java
index 29daf35..ec76b8a 100644
--- a/core/java/android/net/NetworkScorerAppManager.java
+++ b/core/java/android/net/NetworkScorerAppManager.java
@@ -94,8 +94,9 @@
PackageManager pm = context.getPackageManager();
// Only apps installed under the primary user of the device can be scorers.
+ // TODO: http://b/23422763
List<ResolveInfo> receivers =
- pm.queryBroadcastReceivers(SCORE_INTENT, 0 /* flags */, UserHandle.USER_OWNER);
+ pm.queryBroadcastReceivers(SCORE_INTENT, 0 /* flags */, UserHandle.USER_SYSTEM);
for (ResolveInfo receiver : receivers) {
// This field is a misnomer, see android.content.pm.ResolveInfo#activityInfo
final ActivityInfo receiverInfo = receiver.activityInfo;
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 80169a9..4ad9d6d 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -169,7 +169,7 @@
/**
* Current version of checkin data format.
*/
- static final String CHECKIN_VERSION = "14";
+ static final String CHECKIN_VERSION = "15";
/**
* Old version, we hit 9 and ran out of room, need to remove.
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 849f5de..64e2505 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -927,6 +927,28 @@
}
/**
+ * Creates a restricted profile with the specified name.
+ *
+ * @param name profile's name
+ * @return UserInfo object for the created user, or null if the user could not be created.
+ * @hide
+ */
+ public UserInfo createRestrictedProfile(String name) {
+ try {
+ if (isSplitSystemUser()) {
+ return mService.createProfileForUser(name, UserInfo.FLAG_RESTRICTED,
+ UserHandle.getCallingUserId());
+ } else {
+ return mService.createProfileForUser(name, UserInfo.FLAG_RESTRICTED,
+ UserHandle.USER_SYSTEM);
+ }
+ } catch (RemoteException e) {
+ Log.w(TAG, "Could not create a restricted profile", e);
+ }
+ return null;
+ }
+
+ /**
* @hide
* Marks the guest user for deletion to allow a new guest to be created before deleting
* the current user who is a guest.
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index cf937e1..f9387b3 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1115,13 +1115,18 @@
*/
public int getOffsetForHorizontal(int line, float horiz) {
// TODO: use Paint.getOffsetForAdvance to avoid binary search
- int max = getLineEnd(line) - 1;
- int min = getLineStart(line);
+ final int lineEndOffset = getLineEnd(line);
+ final int max;
+ if (line == getLineCount() - 1) {
+ max = lineEndOffset;
+ } else {
+ max = mPaint.getTextRunCursor(mText, 0, mText.length(),
+ isRtlCharAt(lineEndOffset) ? Paint.DIRECTION_RTL : Paint.DIRECTION_LTR,
+ lineEndOffset, Paint.CURSOR_BEFORE);
+ }
+ final int min = getLineStart(line);
Directions dirs = getLineDirections(line);
- if (line == getLineCount() - 1)
- max++;
-
int best = min;
float bestdist = Math.abs(getPrimaryHorizontal(best) - horiz);
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index f6119e2..420f7a1 100644
--- a/core/java/android/view/ThreadedRenderer.java
+++ b/core/java/android/view/ThreadedRenderer.java
@@ -407,6 +407,10 @@
nRegisterAnimatingRenderNode(mRootNode.mNativeRenderNode, animator.mNativeRenderNode);
}
+ public void serializeDisplayListTree() {
+ nSerializeDisplayListTree(mNativeProxy);
+ }
+
@Override
protected void finalize() throws Throwable {
try {
@@ -532,6 +536,8 @@
private static native void nStopDrawing(long nativeProxy);
private static native void nNotifyFramePending(long nativeProxy);
+ private static native void nSerializeDisplayListTree(long nativeProxy);
+
private static native void nDumpProfileInfo(long nativeProxy, FileDescriptor fd,
@DumpFlags int dumpFlags);
private static native void nDumpProfileData(byte[] data, FileDescriptor fd);
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index aa20dfb..8bbaf36 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2276,6 +2276,9 @@
*/
void outputDisplayList(View view) {
view.mRenderNode.output();
+ if (mAttachInfo.mHardwareRenderer != null) {
+ ((ThreadedRenderer)mAttachInfo.mHardwareRenderer).serializeDisplayListTree();
+ }
}
/**
@@ -6519,6 +6522,19 @@
return false;
}
+ /**
+ * Force the window to report its next draw.
+ * <p>
+ * This method is only supposed to be used to speed up the interaction from SystemUI and window
+ * manager when waiting for the first frame to be drawn when turning on the screen. DO NOT USE
+ * unless you fully understand this interaction.
+ * @hide
+ */
+ public void setReportNextDraw() {
+ mReportNextDraw = true;
+ invalidate();
+ }
+
void changeCanvasOpacity(boolean opaque) {
Log.d(TAG, "changeCanvasOpacity: opaque=" + opaque);
if (mAttachInfo.mHardwareRenderer != null) {
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 1a9fb34..7a3d882 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -510,6 +510,11 @@
* @param newBounds The new target bounds of the activity in task or stack.
*/
void setActivityBounds(Rect newBounds) throws RemoteException;
+
+ /**
+ * Activates this activity, hence bringing it to the top and giving it focus.
+ */
+ void activateActivity() throws RemoteException;
}
public Window(Context context) {
diff --git a/core/java/android/widget/SimpleMonthView.java b/core/java/android/widget/SimpleMonthView.java
index 6e04eac..e9325ef 100644
--- a/core/java/android/widget/SimpleMonthView.java
+++ b/core/java/android/widget/SimpleMonthView.java
@@ -26,6 +26,7 @@
import android.graphics.Paint.Style;
import android.graphics.Rect;
import android.graphics.Typeface;
+import android.icu.text.SimpleDateFormat;
import android.os.Bundle;
import android.text.TextPaint;
import android.text.format.DateFormat;
@@ -43,7 +44,6 @@
import com.android.internal.widget.ExploreByTouchHelper;
import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Locale;
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index fc56163..7a64377 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8765,12 +8765,9 @@
public void onPopulateAccessibilityEventInternal(AccessibilityEvent event) {
super.onPopulateAccessibilityEventInternal(event);
- final boolean isPassword = hasPasswordTransformationMethod();
- if (!isPassword || shouldSpeakPasswordsForAccessibility()) {
- final CharSequence text = getTextForAccessibility();
- if (!TextUtils.isEmpty(text)) {
- event.getText().add(text);
- }
+ final CharSequence text = getTextForAccessibility();
+ if (!TextUtils.isEmpty(text)) {
+ event.getText().add(text);
}
}
@@ -8921,10 +8918,7 @@
final boolean isPassword = hasPasswordTransformationMethod();
info.setPassword(isPassword);
-
- if (!isPassword || shouldSpeakPasswordsForAccessibility()) {
- info.setText(getTextForAccessibility());
- }
+ info.setText(getTextForAccessibility());
if (mBufferType == BufferType.EDITABLE) {
info.setEditable(true);
@@ -9156,18 +9150,30 @@
}
/**
- * Gets the text reported for accessibility purposes.
+ * Returns the text that should be exposed to accessibility services.
+ * <p>
+ * This approximates what is displayed visually. If the user has specified
+ * that accessibility services should speak passwords, this method will
+ * bypass any password transformation method and return unobscured text.
*
- * @return The accessibility text.
- *
- * @hide
+ * @return the text that should be exposed to accessibility services, may
+ * be {@code null} if no text is set
*/
- public CharSequence getTextForAccessibility() {
- CharSequence text = getText();
- if (TextUtils.isEmpty(text)) {
- text = getHint();
+ @Nullable
+ private CharSequence getTextForAccessibility() {
+ // If the text is empty, we must be showing the hint text.
+ if (TextUtils.isEmpty(mText)) {
+ return mHint;
}
- return text;
+
+ // Check whether we need to bypass the transformation
+ // method and expose unobscured text.
+ if (hasPasswordTransformationMethod() && shouldSpeakPasswordsForAccessibility()) {
+ return mText;
+ }
+
+ // Otherwise, speak whatever text is being displayed.
+ return mTransformed;
}
void sendAccessibilityEventTypeViewTextChanged(CharSequence beforeText,
diff --git a/core/java/com/android/internal/util/StateMachine.java b/core/java/com/android/internal/util/StateMachine.java
index 229407e..6816646 100644
--- a/core/java/com/android/internal/util/StateMachine.java
+++ b/core/java/com/android/internal/util/StateMachine.java
@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
+import java.util.Iterator;
import java.util.HashMap;
import java.util.Vector;
@@ -1864,6 +1865,20 @@
}
/**
+ * Removes a message from the deferred messages queue.
+ */
+ protected final void removeDeferredMessages(int what) {
+ SmHandler smh = mSmHandler;
+ if (smh == null) return;
+
+ Iterator<Message> iterator = smh.mDeferredMessages.iterator();
+ while (iterator.hasNext()) {
+ Message msg = iterator.next();
+ if (msg.what == what) iterator.remove();
+ }
+ }
+
+ /**
* Validate that the message was sent by
* {@link StateMachine#quit} or {@link StateMachine#quitNow}.
* */
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index 0579ce7..073a2ad 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -456,7 +456,7 @@
// well, we tried...
}
- if (userHandle == UserHandle.USER_OWNER) {
+ if (userHandle == UserHandle.USER_SYSTEM) {
// Set the encryption password to default.
updateEncryptionPassword(StorageManager.CRYPT_TYPE_DEFAULT, null);
}
@@ -516,7 +516,7 @@
DevicePolicyManager dpm = getDevicePolicyManager();
// Update the device encryption password.
- if (userId == UserHandle.USER_OWNER
+ if (userId == UserHandle.USER_SYSTEM
&& LockPatternUtils.isDeviceEncryptionEnabled()) {
if (!shouldEncryptWithCredentials(true)) {
clearEncryptionPassword();
@@ -538,7 +538,7 @@
}
private void updateCryptoUserInfo(int userId) {
- if (userId != UserHandle.USER_OWNER) {
+ if (userId != UserHandle.USER_SYSTEM) {
return;
}
@@ -714,7 +714,7 @@
int computedQuality = computePasswordQuality(password);
// Update the device encryption password.
- if (userHandle == UserHandle.USER_OWNER
+ if (userHandle == UserHandle.USER_SYSTEM
&& LockPatternUtils.isDeviceEncryptionEnabled()) {
if (!shouldEncryptWithCredentials(true)) {
clearEncryptionPassword();
@@ -1008,7 +1008,7 @@
setBoolean(Settings.Secure.LOCK_PATTERN_VISIBLE, enabled, userId);
// Update for crypto if owner
- if (userId != UserHandle.USER_OWNER) {
+ if (userId != UserHandle.USER_SYSTEM) {
return;
}
@@ -1031,7 +1031,7 @@
*/
public void setVisiblePasswordEnabled(boolean enabled, int userId) {
// Update for crypto if owner
- if (userId != UserHandle.USER_OWNER) {
+ if (userId != UserHandle.USER_SYSTEM) {
return;
}
@@ -1210,7 +1210,7 @@
}
public void setCredentialRequiredToDecrypt(boolean required) {
- if (ActivityManager.getCurrentUser() != UserHandle.USER_OWNER) {
+ if (ActivityManager.getCurrentUser() != UserHandle.USER_SYSTEM) {
Log.w(TAG, "Only device owner may call setCredentialRequiredForDecrypt()");
return;
}
diff --git a/core/java/com/android/internal/widget/NonClientDecorView.java b/core/java/com/android/internal/widget/NonClientDecorView.java
index 372d934..491b323 100644
--- a/core/java/com/android/internal/widget/NonClientDecorView.java
+++ b/core/java/com/android/internal/widget/NonClientDecorView.java
@@ -128,6 +128,8 @@
// When there is no decor we should not react to anything.
return false;
}
+ // Ensure that the activity is active.
+ activateActivity();
// A drag action is started if we aren't dragging already and the starting event is
// either a left mouse button or any other input device.
if (!mDragging &&
@@ -346,4 +348,18 @@
}
}
}
+
+ /**
+ * Activates the activity - means setting the focus and moving it to the top of the stack.
+ */
+ private void activateActivity() {
+ Window.WindowControllerCallback callback = mOwner.getWindowControllerCallback();
+ if (callback != null) {
+ try {
+ callback.activateActivity();
+ } catch (RemoteException ex) {
+ Log.e(TAG, "Failed to activate the activity.");
+ }
+ }
+ }
}
diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp
index e10a644..8b69bbd 100644
--- a/core/jni/android_hardware_camera2_DngCreator.cpp
+++ b/core/jni/android_hardware_camera2_DngCreator.cpp
@@ -755,48 +755,31 @@
// ----------------------------------------------------------------------------
/**
- * Given a buffer crop rectangle relative to the pixel array size, and the pre-correction active
- * array crop rectangle for the camera characteristics, set the default crop rectangle in the
- * TiffWriter relative to the buffer crop rectangle origin.
+ * Calculate the default crop relative to the "active area" of the image sensor (this active area
+ * will always be the pre-correction active area rectangle), and set this.
*/
static status_t calculateAndSetCrop(JNIEnv* env, const CameraMetadata& characteristics,
- uint32_t bufWidth, uint32_t bufHeight, sp<TiffWriter> writer) {
+ sp<TiffWriter> writer) {
camera_metadata_ro_entry entry =
characteristics.find(ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE);
- uint32_t xmin = static_cast<uint32_t>(entry.data.i32[0]);
- uint32_t ymin = static_cast<uint32_t>(entry.data.i32[1]);
uint32_t width = static_cast<uint32_t>(entry.data.i32[2]);
uint32_t height = static_cast<uint32_t>(entry.data.i32[3]);
const uint32_t margin = 8; // Default margin recommended by Adobe for interpolation.
- // Crop based on pre-correction array for pixel array
- uint32_t aLeft = xmin;
- uint32_t aTop = ymin;
- uint32_t aRight = xmin + width;
- uint32_t aBottom = ymin + height;
-
- // 8 pixel border crop for pixel array dimens
- uint32_t bLeft = margin;
- uint32_t bTop = margin;
- uint32_t bRight = bufWidth - margin;
- uint32_t bBottom = bufHeight - margin;
-
- // Set the crop to be the intersection of the two rectangles
- uint32_t defaultCropOrigin[] = {std::max(aLeft, bLeft), std::max(aTop, bTop)};
- uint32_t defaultCropSize[] = {std::min(aRight, bRight) - defaultCropOrigin[0],
- std::min(aBottom, bBottom) - defaultCropOrigin[1]};
-
- // If using buffers with pre-correction array dimens, switch to 8 pixel border crop
- // relative to the pixel array dimens
- if (bufWidth == width && bufHeight == height) {
- defaultCropOrigin[0] = xmin + margin;
- defaultCropOrigin[1] = ymin + margin;
- defaultCropSize[0] = width - margin;
- defaultCropSize[1] = height - margin;
+ if (width < margin * 2 || height < margin * 2) {
+ ALOGE("%s: Cannot calculate default crop for image, pre-correction active area is too"
+ "small: h=%" PRIu32 ", w=%" PRIu32, __FUNCTION__, height, width);
+ jniThrowException(env, "java/lang/IllegalStateException",
+ "Pre-correction active area is too small.");
+ return BAD_VALUE;
}
+ uint32_t defaultCropOrigin[] = {margin, margin};
+ uint32_t defaultCropSize[] = {width - defaultCropOrigin[0] - margin,
+ height - defaultCropOrigin[1] - margin};
+
BAIL_IF_INVALID_R(writer->addEntry(TAG_DEFAULTCROPORIGIN, 2, defaultCropOrigin,
TIFF_IFD_0), env, TAG_DEFAULTCROPORIGIN, writer);
BAIL_IF_INVALID_R(writer->addEntry(TAG_DEFAULTCROPSIZE, 2, defaultCropSize,
@@ -1565,17 +1548,24 @@
{
// Set dimensions
- if (calculateAndSetCrop(env, characteristics, imageWidth, imageHeight, writer) != OK) {
+ if (calculateAndSetCrop(env, characteristics, writer) != OK) {
return nullptr;
}
camera_metadata_entry entry =
characteristics.find(ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE);
- BAIL_IF_EMPTY_RET_NULL_SP(entry, env, TAG_DEFAULTCROPSIZE, writer);
+ BAIL_IF_EMPTY_RET_NULL_SP(entry, env, TAG_ACTIVEAREA, writer);
uint32_t xmin = static_cast<uint32_t>(entry.data.i32[0]);
uint32_t ymin = static_cast<uint32_t>(entry.data.i32[1]);
uint32_t width = static_cast<uint32_t>(entry.data.i32[2]);
uint32_t height = static_cast<uint32_t>(entry.data.i32[3]);
+ // If we only have a buffer containing the pre-correction rectangle, ignore the offset
+ // relative to the pixel array.
+ if (imageWidth == width && imageHeight == height) {
+ xmin = 0;
+ ymin = 0;
+ }
+
uint32_t activeArea[] = {ymin, xmin, ymin + height, xmin + width};
BAIL_IF_INVALID_RET_NULL_SP(writer->addEntry(TAG_ACTIVEAREA, 4, activeArea, TIFF_IFD_0),
env, TAG_ACTIVEAREA, writer);
diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp
index 47132f4..6c3676b 100644
--- a/core/jni/android_view_ThreadedRenderer.cpp
+++ b/core/jni/android_view_ThreadedRenderer.cpp
@@ -418,6 +418,12 @@
proxy->notifyFramePending();
}
+static void android_view_ThreadedRenderer_serializeDisplayListTree(JNIEnv* env, jobject clazz,
+ jlong proxyPtr) {
+ RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);
+ proxy->serializeDisplayListTree();
+}
+
static void android_view_ThreadedRenderer_dumpProfileInfo(JNIEnv* env, jobject clazz,
jlong proxyPtr, jobject javaFileDescriptor, jint dumpFlags) {
RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);
@@ -483,6 +489,7 @@
{ "nFence", "(J)V", (void*) android_view_ThreadedRenderer_fence },
{ "nStopDrawing", "(J)V", (void*) android_view_ThreadedRenderer_stopDrawing },
{ "nNotifyFramePending", "(J)V", (void*) android_view_ThreadedRenderer_notifyFramePending },
+ { "nSerializeDisplayListTree", "(J)V", (void*) android_view_ThreadedRenderer_serializeDisplayListTree },
{ "nDumpProfileInfo", "(JLjava/io/FileDescriptor;I)V", (void*) android_view_ThreadedRenderer_dumpProfileInfo },
{ "nDumpProfileData", "([BLjava/io/FileDescriptor;)V", (void*) android_view_ThreadedRenderer_dumpProfileData },
{ "setupShadersDiskCache", "(Ljava/lang/String;)V",
diff --git a/core/res/res/layout/non_client_decor_dark.xml b/core/res/res/layout/non_client_decor_dark.xml
index d1e2974..112f4b7 100644
--- a/core/res/res/layout/non_client_decor_dark.xml
+++ b/core/res/res/layout/non_client_decor_dark.xml
@@ -26,7 +26,9 @@
android:layout_width="match_parent"
android:layout_gravity="end"
android:layout_height="wrap_content"
- android:background="@drawable/non_client_decor_title" >
+ android:background="@drawable/non_client_decor_title"
+ android:focusable="false"
+ android:descendantFocusability="blocksDescendants" >
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -40,7 +42,7 @@
android:layout_gravity="center_vertical|end"
android:contentDescription="@string/maximize_button_text"
android:background="@drawable/decor_maximize_button_dark" />
- <Button
+ <Button
android:id="@+id/close_window"
android:layout_width="32dp"
android:layout_height="32dp"
diff --git a/core/res/res/layout/non_client_decor_light.xml b/core/res/res/layout/non_client_decor_light.xml
index f7c3fcd..5dd79c7 100644
--- a/core/res/res/layout/non_client_decor_light.xml
+++ b/core/res/res/layout/non_client_decor_light.xml
@@ -26,7 +26,9 @@
android:layout_width="match_parent"
android:layout_gravity="end"
android:layout_height="wrap_content"
- android:background="@drawable/non_client_decor_title" >
+ android:background="@drawable/non_client_decor_title"
+ android:focusable="false"
+ android:descendantFocusability="blocksDescendants" >
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -40,7 +42,7 @@
android:layout_gravity="center_vertical|end"
android:contentDescription="@string/maximize_button_text"
android:background="@drawable/decor_maximize_button_light" />
- <Button
+ <Button
android:id="@+id/close_window"
android:layout_width="32dp"
android:layout_height="32dp"
diff --git a/core/res/res/values-af-watch/strings.xml b/core/res/res/values-af-watch/strings.xml
index 9dc98a1..ee43129 100644
--- a/core/res/res/values-af-watch/strings.xml
+++ b/core/res/res/values-af-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Program <xliff:g id="NUMBER_0">%1$d</xliff:g> van <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensors"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"verkry toegang tot jou kontakte"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"verkry toegang tot hierdie horlosie se ligging"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"verkry toegang tot jou kalender"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"stuur en bekyk SMS-boodskappe"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"verkry toegang tot foto\'s, media en lêers op jou horlosie"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"neem oudio op"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"neem foto\'s en neem video op"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"maak en bestuur foonoproepe"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"verkry toegang tot sensordata oor jou lewenstekens"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"wees die statusbalk"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"verkry toegang tot liggaamsensors (soos hartklopmonitors)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"verkry toegang tot presiese ligging (GPS- en netwerkgegrond)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"verkry toegang tot benaderde ligging (netwerkgegrond)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"stuur bevele na die SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"verkry volle netwerktoegang"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"bestuur profiel- en toesteleienaars"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"verander WiMAX-status"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"ontvang Android Straal-oordragstatus"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"roeteer media-uitvoer"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"lees installeersessies"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"versoek installeerpakkette"</string>
</resources>
diff --git a/core/res/res/values-am-watch/strings.xml b/core/res/res/values-am-watch/strings.xml
index ebe6ae0..ee6ed57 100644
--- a/core/res/res/values-am-watch/strings.xml
+++ b/core/res/res/values-am-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g> መተግበሪያ ከ<xliff:g id="NUMBER_1">%2$d</xliff:g>።"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"አነፍናፊዎች"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"የእርስዎ እውቂያዎች ላይ ይድረሱባቸው"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"የዚህን ሰዓት መገኛ አካባቢ ይድረሱባቸው"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"የእርስዎን ቀን መቁጠሪያ ይድረሱበት"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"የኤስኤምኤስ መልዕክቶችን ይላኩና ይመልከቱ"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"በእርስዎ ሰዓት ላይ ፎቶዎችን፣ ሚዲያ እና ፋይሎችን ይድረሱባቸው"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ኦዲዮ ይቅዱ"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ስዕሎች ያንሱ እና ቪዲዮ ይቅረጹ"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"የስልክ ጥሪዎች ያድርጉ እና ያስተዳድሩ"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"ስለአስፈላጊ ምልክቶችዎ ያሉ የዳሳሽ ውሂብ ይድረሱ"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"የሁነታ አሞሌ ይሁን"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"የሰውነት ዳሳሾችን ይድረሱባቸው (እንደ የልብ ምት መከታተያዎች)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"ትክክለኛ አካባቢ ይድረሱበት (በጂ ፒ ኤስ እና አውታረ መረብ ላይ የተመሠረተ)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"ግምታዊ አካባቢን ይድረሱበት (በአውታረ መረብ ላይ የተመሰረተ)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"ወደ ሲሙ ትዕዛዞችን ላክ"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ሙሉ የአውታረ መረብ መዳረሻ"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"የመገለጫ እና የመሣሪያ ባለቤቶችን ያስተዳድሩ"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"የWiMAX ሁኔታ ይለውጡ"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"የAndroid Beam ሽግግር ሁኔታን ይቀበሉ"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"የሚዲያ ውፅአት መንገድ"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"የመጫን ክፍለ ጊዜዎችን አንብብ"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"የጭነት ጥቅሎችን ጠይቅ"</string>
</resources>
diff --git a/core/res/res/values-ar-watch/strings.xml b/core/res/res/values-ar-watch/strings.xml
index 374b665..af6a164 100644
--- a/core/res/res/values-ar-watch/strings.xml
+++ b/core/res/res/values-ar-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"التطبيق <xliff:g id="NUMBER_0">%1$d</xliff:g> من <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"أجهزة الاستشعار"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"الوصول إلى جهات الاتصال التابعة لك"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"الوصول إلى موقع هذه الساعة"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"الوصول إلى تقويمك"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"إرسال رسائل قصيرة SMS وعرضها"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"الوصول إلى الصور والوسائط والملفات على ساعتك"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"تسجيل الصوت"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"التقاط صور وتسجيل فيديو"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"إجراء مكالمات هاتفية وإدارتها"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"الوصول إلى بيانات المستشعر حول علاماتك الحيوية"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"العمل كشريط للحالة"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"الوصول إلى أجهزة استشعار الجسم (مثل شاشات معدل ضربات القلب)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"الوصول إلى الموقع الدقيق (استنادًا إلى نظام تحديد المواقع العالمي \"GPS\" والشبكة)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"الوصول إلى الموقع التقريبي (استنادًا إلى الشبكة)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"إرسال أوامر إلى شريحة SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"حق الوصول بالكامل إلى الشبكة"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"إدارة المالكين لكل من الملف الشخصي والجهاز"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"تغيير حالة WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"تلقي حالة نقل شعاع Android"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"توجيه إخراج الوسائط"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"قراءة جلسات التثبيت"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"طلب حزم التثبيت"</string>
</resources>
diff --git a/core/res/res/values-az-rAZ-watch/strings.xml b/core/res/res/values-az-rAZ-watch/strings.xml
index cdc6a3d..5a84880 100644
--- a/core/res/res/values-az-rAZ-watch/strings.xml
+++ b/core/res/res/values-az-rAZ-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Tətbiq <xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensorlar"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"kontaktlarınıza daxil olun"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"bu saatın məkanına giriş"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"təqvimə daxil olun"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"göndərin və SMS mesajlarına baxın"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"Saatınızda foto, media və fayllara daxil olun"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"səsi qeydə alın"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"şəkil çəkin və video yazın"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"telefon zəngləri edin və onları idarə edin"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"Həyati əlamətlər haqqında sensor dataya daxil olun"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"status paneli edin"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"bədən sensorlarına (ürək döyüntüsü monitorları kimi) giriş"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"dəqiq məkana (GPS və şəbəkə əsasında) giriş"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"təxmini məkana (şəbəkə əsaslı) giriş"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"əmrləri SIM\'ə göndərin"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"tam şəbəkə girişi var"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"profil və cihaz sahiblərini idarə edin"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX vəziyyətini dəyişin"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam transfer statusunu əldə edin"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"media çıxışını yönləndirin"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"quraşdırma sessiyalarını oxuyun"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"paketləri quraşdırma sorğusu"</string>
</resources>
diff --git a/core/res/res/values-bg-watch/strings.xml b/core/res/res/values-bg-watch/strings.xml
index a31f8d8..5eb2a02 100644
--- a/core/res/res/values-bg-watch/strings.xml
+++ b/core/res/res/values-bg-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Прилож. <xliff:g id="NUMBER_0">%1$d</xliff:g> от <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Сензори"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"достъп до контактите ви"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"достъп до местоположението на този часовник"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"достъп до календара ви"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"изпращане и преглед на SMS съобщения"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"достъп до снимките, мултимедията и файловете на часовника ви"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"записване на звук"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"правене на снимки и записване на видеоклипове"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"извършване и управление на телефонни обаждания"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"достъп до сензорните данни за жизнените ви показатели"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"изпълняване на ролята на лента на състоянието"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"достъп до сензорите за тяло (например пулсомери)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"достъп до точното местоположение (въз основа на GPS и мрежата)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"достъп до приблизителното местоположение (въз основа на мрежата)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"изпращане на команди до SIM картата"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"пълен достъп до мрежата"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"управление на собствениците на потребителските профили и устройствата"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"промяна на състоянието на WiMAX мрежата"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"получаване на състоянието на прехвърлянията чрез Android Лъч"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"маршрутизиране на извеждането на мултимедия"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"четене на сесии за инсталиране"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"заявка на пакети за инсталиране"</string>
</resources>
diff --git a/core/res/res/values-bn-rBD-watch/strings.xml b/core/res/res/values-bn-rBD-watch/strings.xml
index 4ce6091..4ef2d6ea 100644
--- a/core/res/res/values-bn-rBD-watch/strings.xml
+++ b/core/res/res/values-bn-rBD-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g>টির মধ্যে <xliff:g id="NUMBER_0">%1$d</xliff:g>টি অ্যাপ্লিকেশান"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"সেন্সরগুলি"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"আপনার পরিচিতিগুলিতে অ্যাক্সেস করুন"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"এই ঘড়ির অবস্থানে অ্যাক্সেস করুন"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"আপনার ক্যালেন্ডারে অ্যাক্সেস করুন"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS বার্তাগুলি পাঠান এবং দেখুন"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"আপনার দেখা ফটো, মিডিয়া এবং ফাইলগুলিতে অ্যাক্সেস করুন"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"অডিও রেকর্ড করুন"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ছবি তুলুন এবং ভিডিও রেকর্ড করুন"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ফোন কলগুলি করুন এবং পরিচালনা করুন"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"আপনার গুরুত্বপূর্ণ লক্ষণ এবং শারীরিক ক্রিয়াকলাপের সম্পর্কে তথ্য অ্যাক্সেস করুন"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"স্থিতি দন্ডে থাকুন"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"শরীরের সেন্সর (হার্ট রেট মনিটারের মত) অ্যাক্সেস করুন"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"সুনির্দিষ্ট অবস্থান (GPS এবং নেটওয়ার্ক-ভিত্তিক) অ্যাক্সেস করুন"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"আনুমানিক অবস্থান (নেটওয়ার্ক-ভিত্তিক) অ্যাক্সেস করুন"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM এ আদেশগুলি পাঠান"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"সম্পূর্ণ নেটওয়ার্ক অ্যাক্সেস রয়েছে"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"প্রোফাইল এবং ডিভাইস মালিকদের পরিচালনা করুন"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX এর স্থিতি পরিবর্তন করুন"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android বীম স্থানান্তর স্থিতি গ্রহণ করুন"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"মিডিয়া আউটপুট রুট করুন"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ইনস্টল সেশন পড়ুন"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"প্যাকেজগুলি ইনস্টল করার অনুরোধ"</string>
</resources>
diff --git a/core/res/res/values-ca-watch/strings.xml b/core/res/res/values-ca-watch/strings.xml
index 8f626e5..b01ca63 100644
--- a/core/res/res/values-ca-watch/strings.xml
+++ b/core/res/res/values-ca-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplicació <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensors"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"accedir als contactes"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"accedir a la ubicació del rellotge"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"accedir al calendari"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"enviar i llegir missatges SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"accedir a les fotos, el contingut multimèdia i els fitxers del rellotge"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"enregistrar àudio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"fer fotos i enregistrar vídeos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"fer i gestionar trucades telefòniques"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"accedir a les dades del sensor sobre els signes vitals"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ser la barra d\'estat"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"accedir als sensors corporals (com ara monitors de freqüència cardíaca)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"accedir a la ubicació precisa (basada en el GPS i la xarxa)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"accedir a la ubicació aproximada (basada en la xarxa)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"enviar ordres a la SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"tenir accés complet a la xarxa"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"gestionar els propietaris del perfil i del dispositiu"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"canviar l\'estat de WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"rebre l\'estat de la transferència d\'Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"indicar la ruta de sortida del contingut multimèdia"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"llegir les sessions d\'instal·lació"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"sol·licitar els paquets d\'instal·lació"</string>
</resources>
diff --git a/core/res/res/values-cs-watch/strings.xml b/core/res/res/values-cs-watch/strings.xml
index 34f8864..229e1eb 100644
--- a/core/res/res/values-cs-watch/strings.xml
+++ b/core/res/res/values-cs-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplikace <xliff:g id="NUMBER_0">%1$d</xliff:g> z <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Senzory"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"přístup ke kontaktům"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"přístup k poloze těchto hodinek"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"přístup ke kalendáři"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"odesílání a zobrazení zpráv SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"přístup k fotkám, médiím a souborům v hodinkách"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"nahrávání zvuku"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"pořizování fotografií a nahrávání videa"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"uskutečňování a správa telefonních hovorů"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"přístup k údajům senzorů vašich životních funkcí"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"vydávání se za stavový řádek"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"přístup k tělesným senzorům (jako jsou snímače tepu)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"přístup k přesné poloze (pomocí GPS a sítě)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"přístup k přibližné poloze (pomocí sítě)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"odesílání příkazů do SIM karty"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"úplný přístup k síti"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"správa vlastníků profilu a zařízení"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"změna stavu připojení WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"příjem stavu přenosů Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"směrování výstupu médií"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"čtení instalačních relací"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"žádost o instalaci balíčků"</string>
</resources>
diff --git a/core/res/res/values-da-watch/strings.xml b/core/res/res/values-da-watch/strings.xml
index efc4cf2..094a50f 100644
--- a/core/res/res/values-da-watch/strings.xml
+++ b/core/res/res/values-da-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> af <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensorer"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"få adgang til dine kontaktpersoner"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"få adgang til dette urs placering"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"få adgang til din kalender"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"sende og se sms-beskeder"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"få adgang til billeder, medier og filer på dit ur"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"optage lyd"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"tage billeder og optage video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"foretage og administrere telefonopkald"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"få adgang til sensordata om dine livstegn"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"være statusbjælken"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"få adgang til kropssensorer (f.eks. pulsmålere)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"få adgang til nøjagtig placering (baseret på GPS og netværk)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"få adgang til omtrentlig placering (netværksbaseret)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"sende kommandoer til SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"få fuld netværksadgang"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"administrere profil- og enhedsejere"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"skifte WiMAX-tilstand"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"modtage status for Android Beam-overførsler"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"videreføre medieoutput"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"læse installationssessioner"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"anmode om installation af pakker"</string>
</resources>
diff --git a/core/res/res/values-de-watch/strings.xml b/core/res/res/values-de-watch/strings.xml
index 99b3336..6f5941b 100644
--- a/core/res/res/values-de-watch/strings.xml
+++ b/core/res/res/values-de-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> von <xliff:g id="NUMBER_1">%2$d</xliff:g>"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensoren"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"auf Kontakte zugreifen"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"auf den Standort dieser Smartwatch zugreifen"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"auf den Kalender zugreifen"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS senden und abrufen"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"auf Fotos, Medien und Dateien auf Ihrer Smartwatch zugreifen"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"Audio aufnehmen"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"Bilder und Videos aufnehmen"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"Telefonanrufe tätigen und verwalten"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"auf Sensordaten zu Ihren Vitaldaten zugreifen"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"Statusleiste darstellen"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"auf Körpersensoren wie beispielsweise Herzfrequenzmesser zugreifen"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"auf genauen Standort zugreifen (GPS- und netzwerkbasiert)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"auf den ungefähren Standort zugreifen (netzwerkbasiert)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"Befehle an die SIM senden"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"auf alle Netzwerke zugreifen"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"Profilinhaber und Geräteeigentümer verwalten"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX-Status ändern"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Status von Android Beam-Übertragungen erhalten"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"Medienausgabe umleiten"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"Installationssitzungen lesen"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"Installation von Paketen anfordern"</string>
</resources>
diff --git a/core/res/res/values-el-watch/strings.xml b/core/res/res/values-el-watch/strings.xml
index c159d6f..8081013 100644
--- a/core/res/res/values-el-watch/strings.xml
+++ b/core/res/res/values-el-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Εφαρμογή <xliff:g id="NUMBER_0">%1$d</xliff:g> από <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Αισθητήρες"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"πρόσβαση στις επαφές σας"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"πρόσβαση στην τοποθεσία αυτού του ρολογιού"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"πρόσβαση στο ημερολόγιό σας"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"αποστολή και προβολή μηνυμάτων SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"πρόσβαση στις φωτογραφίες, τα πολυμέσα και τα αρχεία στο ρολόι σας"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"εγγραφή ήχου"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"λήψη φωτογραφιών και εγγραφή βίντεο"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"πραγματοποίηση και διαχείριση τηλεφωνικών κλήσεων"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"πρόσβαση στα δεδομένα αισθητήρα σχετικά με τις ζωτικές ενδείξεις σας"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ορισμός ως γραμμής κατάστασης"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"πρόσβαση στους αισθητήρες λειτουργιών (π.χ. παρακολούθηση καρδιακού παλμού)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"πρόσβαση στην ακριβή τοποθεσία (με βάση το GPS και το δίκτυο)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"πρόσβαση στην τοποθεσία κατά προσέγγιση (με βάση το δίκτυο)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"στέλνει εντολές στην κάρτα SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"πλήρης πρόσβαση στο δίκτυο"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"διαχείριση προφίλ και κατόχων συσκευής"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"αλλαγή κατάστασης WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"λήψη κατάστασης μεταφοράς Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"δρομολόγηση εξόδου μέσων"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ανάγνωση περιόδων σύνδεσης εγκατάστασης"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"αίτημα εγκατάστασης πακέτων."</string>
</resources>
diff --git a/core/res/res/values-en-rAU-watch/strings.xml b/core/res/res/values-en-rAU-watch/strings.xml
index 6102d4e4..30357ce 100644
--- a/core/res/res/values-en-rAU-watch/strings.xml
+++ b/core/res/res/values-en-rAU-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensors"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"access your contacts"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"access this watch\'s location"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"access your calendar"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"send and view SMS messages"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"access photos, media and files on your watch"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"record audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"take pictures and record videos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"make and manage phone calls"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"access sensor data about your vital signs"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"be the status bar"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"access body sensors (like heart rate monitors)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"access precise location (GPS and network-based)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"access approximate location (network-based)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"send commands to the SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"have full network access"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"manage profile and device owners"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"change WiMAX state"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"receive Android Beam transfer status"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"route media output"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"read install sessions"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"request install packages"</string>
</resources>
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml
index 28d8eb4..ea33448 100644
--- a/core/res/res/values-en-rAU/strings.xml
+++ b/core/res/res/values-en-rAU/strings.xml
@@ -223,7 +223,7 @@
<string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
<string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
- <string name="android_system_label" msgid="6577375335728551336">"Android System"</string>
+ <string name="android_system_label" msgid="6577375335728551336">"Android system"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
<string name="managed_profile_label" msgid="6260850669674791528">"Work"</string>
<string name="permgrouplab_contacts" msgid="3657758145679177612">"Contacts"</string>
diff --git a/core/res/res/values-en-rGB-watch/strings.xml b/core/res/res/values-en-rGB-watch/strings.xml
index 6102d4e4..30357ce 100644
--- a/core/res/res/values-en-rGB-watch/strings.xml
+++ b/core/res/res/values-en-rGB-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensors"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"access your contacts"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"access this watch\'s location"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"access your calendar"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"send and view SMS messages"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"access photos, media and files on your watch"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"record audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"take pictures and record videos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"make and manage phone calls"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"access sensor data about your vital signs"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"be the status bar"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"access body sensors (like heart rate monitors)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"access precise location (GPS and network-based)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"access approximate location (network-based)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"send commands to the SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"have full network access"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"manage profile and device owners"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"change WiMAX state"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"receive Android Beam transfer status"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"route media output"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"read install sessions"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"request install packages"</string>
</resources>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 28d8eb4..ea33448 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -223,7 +223,7 @@
<string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
<string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
- <string name="android_system_label" msgid="6577375335728551336">"Android System"</string>
+ <string name="android_system_label" msgid="6577375335728551336">"Android system"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
<string name="managed_profile_label" msgid="6260850669674791528">"Work"</string>
<string name="permgrouplab_contacts" msgid="3657758145679177612">"Contacts"</string>
diff --git a/core/res/res/values-en-rIN-watch/strings.xml b/core/res/res/values-en-rIN-watch/strings.xml
index 6102d4e4..30357ce 100644
--- a/core/res/res/values-en-rIN-watch/strings.xml
+++ b/core/res/res/values-en-rIN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensors"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"access your contacts"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"access this watch\'s location"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"access your calendar"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"send and view SMS messages"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"access photos, media and files on your watch"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"record audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"take pictures and record videos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"make and manage phone calls"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"access sensor data about your vital signs"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"be the status bar"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"access body sensors (like heart rate monitors)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"access precise location (GPS and network-based)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"access approximate location (network-based)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"send commands to the SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"have full network access"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"manage profile and device owners"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"change WiMAX state"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"receive Android Beam transfer status"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"route media output"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"read install sessions"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"request install packages"</string>
</resources>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index 28d8eb4..ea33448 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -223,7 +223,7 @@
<string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
<string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
- <string name="android_system_label" msgid="6577375335728551336">"Android System"</string>
+ <string name="android_system_label" msgid="6577375335728551336">"Android system"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
<string name="managed_profile_label" msgid="6260850669674791528">"Work"</string>
<string name="permgrouplab_contacts" msgid="3657758145679177612">"Contacts"</string>
diff --git a/core/res/res/values-es-rUS-watch/strings.xml b/core/res/res/values-es-rUS-watch/strings.xml
index 76664ef..703cb32 100644
--- a/core/res/res/values-es-rUS-watch/strings.xml
+++ b/core/res/res/values-es-rUS-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensores"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"acceder a los contactos"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"acceder a la ubicación de este reloj"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"acceder al calendario"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"enviar y ver mensajes SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"acceder a las fotos, el contenido multimedia y los archivos del reloj"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"grabar audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"tomar fotografías y grabar videos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"realizar y administrar llamadas telefónicas"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"acceder a los datos del sensor acerca de tus signos vitales"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"aparecer en la barra de estado"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"acceder a los sensores corporales (como los monitores de frecuencia cardíaca)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"acceder a la ubicación precisa (según el GPS y la red)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"acceder a la ubicación aproximada (según la red)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"enviar comandos a la tarjeta SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"permitir acceso completo a la red"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"administrar perfiles de propietarios y propietario del dispositivo"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"cambiar estado de WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"recibir estado de transferencias de Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"dirigir salida de medios"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"leer sesiones de instalación"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"solicitar la instalación de paquetes"</string>
</resources>
diff --git a/core/res/res/values-es-watch/strings.xml b/core/res/res/values-es-watch/strings.xml
index 002bfce..7eedf0c 100644
--- a/core/res/res/values-es-watch/strings.xml
+++ b/core/res/res/values-es-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensores"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"acceder a tus contactos"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"acceder a la ubicación de este reloj"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"acceder a tu calendario"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"enviar y ver mensajes SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"acceder a fotos, contenido multimedia y archivos en el reloj"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"grabar audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"hacer fotos y grabar vídeos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"hacer y administrar llamadas de teléfono"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"acceder a datos del sensor sobre tus constantes vitales"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"aparecer en la barra de estado"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"acceder a sensores corporales (como monitores de frecuencia cardíaca)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"acceder a tu ubicación precisa (basada en red y GPS)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"acceder a tu ubicación aproximada (basada en red)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"enviar comandos a la tarjeta SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"tener acceso completo a la red"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"administrar propietarios del perfil y del dispositivo"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"cambiar estado de WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"recibir estado de transferencias de Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"dirigir salida de medio"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"consultar sesiones de instalación"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"solicitar instalación de paquetes"</string>
</resources>
diff --git a/core/res/res/values-et-rEE-watch/strings.xml b/core/res/res/values-et-rEE-watch/strings.xml
index a1d29a8..c554e38 100644
--- a/core/res/res/values-et-rEE-watch/strings.xml
+++ b/core/res/res/values-et-rEE-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Rakendus <xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Andurid"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"juurdepääs kontaktidele"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"juurdepääs selle kella asukohale"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"juurdepääs kalendrile"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS-sõnumite saatmine ja vaatamine"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"juurdepääs teie kellas olevatele fotodele, meediale ja failidele"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"heli salvestamine"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"pildistamine ja video salvestamine"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"helistamine ja telefonikõnede haldamine"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"juurdepääs anduri andmetele teie eluliste näitajate kohta"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"olekuribana kuvamine"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"juurdepääs kehaanduritele (nt pulsilugeja)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"juurdepääs täpsele asukohale (GPS-i ja võrgupõhine)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"juurdepääs ligikaudsele asukohale (võrgupõhine)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM-kaardile käskluste saatmine"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"täielik juurdepääs võrgule"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"profiilide ja seadmeomanike haldamine"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX-i oleku muutmine"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beami ülekande oleku vastuvõtmine"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"meediaväljundi marsruutimine"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"installiseansside lugemine"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"installipakettide taotlemine"</string>
</resources>
diff --git a/core/res/res/values-eu-rES-watch/strings.xml b/core/res/res/values-eu-rES-watch/strings.xml
index aa67602..011105e 100644
--- a/core/res/res/values-eu-rES-watch/strings.xml
+++ b/core/res/res/values-eu-rES-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g> aplikaz."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sentsoreak"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"Atzitu kontaktuak"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"Atzitu erlojuaren kokapena"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"Atzitu egutegia"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"Bidali eta ikusi SMS mezuak"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"Atzitu erlojuko argazkiak, multimedia-elementuak eta fitxategiak"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"Grabatu audioa"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"Atera argazkiak eta grabatu bideoak"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"Egin eta kudeatu telefono-deiak"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"Atzitu bizi-konstanteei buruzko sentsore-datuak"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"Bihurtu egoera-barra"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"Atzitu gorputzaren sentsoreak (adibidez, bihotz-erritmoaren monitoreak)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"Atzitu kokapen zehatza (GPS sisteman eta sarean oinarrituta)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"Atzitu gutxi gorabeherako kokapena (sarean oinarrituta)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"Bidali aginduak SIM txartelera"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"Izan sarerako sarbide osoa"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"Kudeatu profilen eta gailuen jabeak"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"Aldatu WiMAX egoera"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Jaso Android Beam transferentzien egoera"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"Bideratu multimedia-irteera"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"Irakurri instalazio-saioak"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"Eskatu instalazio-paketeak"</string>
</resources>
diff --git a/core/res/res/values-fa-watch/strings.xml b/core/res/res/values-fa-watch/strings.xml
index 243ccad..5fe8359 100644
--- a/core/res/res/values-fa-watch/strings.xml
+++ b/core/res/res/values-fa-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"برنامه <xliff:g id="NUMBER_0">%1$d</xliff:g> از <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"حسگرها"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"دسترسی به مخاطبین شما"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"دسترسی به مکان این ساعت"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"دسترسی به تقویم شما"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"ارسال و مشاهده پیامکها"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"دسترسی به عکس، رسانه و فایلهای روی ساعتتان"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ضبط صدا"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"عکس گرفتن و فیلمبرداری"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"برقراری و مدیریت تماسهای تلفنی"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"دسترسی به دادههای حسگر در رابطه با علائم حیاتی شما"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"نوار وضعیت باشد"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"دسترسی به حسگرهای بدن (مانند مانیتورهای ضربان قلب)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"دسترسی به مکان دقیق (مبتنی بر GPS و شبکه)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"دسترسی به مکان تقریبی (مبتنی بر شبکه)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"ارسال فرمانها به سیم کارت"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"داشتن دسترسی کامل به شبکه"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"مدیریت نمایه و مالکان دستگاه"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"تغییر وضعیت WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"دریافت وضعیت انتقال پرتوی Android"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"تعیین مسیر خروجی رسانه"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"خواندن جلسات نصب"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"درخواست نصب بستهبندی"</string>
</resources>
diff --git a/core/res/res/values-fi-watch/strings.xml b/core/res/res/values-fi-watch/strings.xml
index abe5ebb..662e0ab 100644
--- a/core/res/res/values-fi-watch/strings.xml
+++ b/core/res/res/values-fi-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Sovellus <xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Anturit"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"käyttää yhteystietoja"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"käyttää tämän kellon sijaintia"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"käyttää kalenteria"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"lähettää ja tarkastella tekstiviestejä"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"käyttää kellosi kuvia, mediaa ja tiedostoja"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"tallentaa ääntä"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ottaa kuvia ja videoita"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"soittaa ja hallinnoida puheluita"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"käyttää anturitietoja elintoiminnoistasi"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"sijaita tilapalkissa"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"käyttää kehon antureita (kuten sykemittareita)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"käyttää tarkkaa sijaintia (GPS- ja verkkopohjainen)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"käyttää likimääräistä sijaintia (verkkopohjainen)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"lähettää komentoja SIM-kortille"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"saada täydet verkon käyttöoikeudet"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"hallinnoida laitteen ja profiilien omistajia"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"vaihtaa WiMAX-verkon tilaa"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"vastaanottaa Android Beam -siirron tilatietoja"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"reitittää mediaa"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"lukea asennusistuntoja"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"pyytää pakettien asennusta"</string>
</resources>
diff --git a/core/res/res/values-fr-rCA-watch/strings.xml b/core/res/res/values-fr-rCA-watch/strings.xml
index 197b18a..8f2e683 100644
--- a/core/res/res/values-fr-rCA-watch/strings.xml
+++ b/core/res/res/values-fr-rCA-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Appli <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Capteurs"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"accéder à vos contacts"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"accéder à la position de cette montre"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"accéder à votre agenda"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"envoyer et afficher des messages texte"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"accéder à des photos, à des contenus multimédias et à des fichiers sur votre montre"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"enregistrer des fichiers audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"prendre des photos et filmer des vidéos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"faire et gérer des appels téléphoniques"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"accéder aux données des capteurs sur vos signes vitaux"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"faire office de barre d\'état"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"accéder aux capteurs corporels (comme les moniteurs de fréquence cardiaque)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"accéder à votre position précise (GPS et réseau)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"accéder à votre position approximative (réseau)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"envoyer des commandes à la carte SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"bénéficier d\'un accès complet au réseau"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"gérer les propriétaires des profils et de l\'appareil"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"modifier l\'état du WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"recevoir des données sur l\'état du transfert Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"diriger la sortie multimédia"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"accéder aux sessions d\'installation"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"demander l\'installation de paquets"</string>
</resources>
diff --git a/core/res/res/values-fr-watch/strings.xml b/core/res/res/values-fr-watch/strings.xml
index b853188..21bf8a6 100644
--- a/core/res/res/values-fr-watch/strings.xml
+++ b/core/res/res/values-fr-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Appli <xliff:g id="NUMBER_0">%1$d</xliff:g> sur <xliff:g id="NUMBER_1">%2$d</xliff:g>"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Capteurs"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"accéder à vos contacts"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"accéder à la position de cette montre"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"accéder à votre agenda"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"envoyer et consulter des SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"accéder à des photos, à des contenus multimédias et à des fichiers sur votre montres"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"enregistrer des fichiers audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"prendre des photos et enregistrer des vidéos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"effectuer et gérer des appels téléphoniques"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"accéder aux données des capteurs relatives à vos signes vitaux"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"remplacer la barre d\'état"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"accéder aux capteurs corporels (tels que les cardiofréquencemètres)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"accéder à votre position précise (GPS et réseau)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"accéder à votre position approximative (selon le réseau)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"envoyer des commandes à la carte SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"bénéficier d\'un accès complet au réseau"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"gérer les propriétaires des profils et de l\'appareil"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"modifier l\'état du WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"recevoir des informations sur l\'état du transfert Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"diriger la sortie multimédia"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"accéder aux sessions d\'installation"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"demander l\'installation de packages"</string>
</resources>
diff --git a/core/res/res/values-gl-rES-watch/strings.xml b/core/res/res/values-gl-rES-watch/strings.xml
index 002bfce..95d6400 100644
--- a/core/res/res/values-gl-rES-watch/strings.xml
+++ b/core/res/res/values-gl-rES-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensores"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"acceder aos contactos"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"acceder á localización deste reloxo"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"acceder ao calendario"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"envíar e consultar mensaxes de SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"acceder ás fotos, ao contido multimedia e aos ficheiros do teu reloxo"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"gravar audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"tirar fotos e gravar vídeos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"facer e xestionar chamadas telefónicas"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"acceder aos datos do sensor sobre as túas constantes vitais"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"actuar como a barra de estado"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"acceder a sensores do corpo (como monitores de ritmo cardíaco)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"acceder á localización precisa (baseada no GPS e na rede)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"acceder á localización aproximada (baseada na rede)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"enviar comandos á SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ter acceso completo á rede"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"xestionar propietarios do perfil e do dispositivo"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"cambiar estado de WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"recibir o estado das transferencias de Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"dirixir saída multimedia"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ler sesións de instalación"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"solicitar instalación de paquetes"</string>
</resources>
diff --git a/core/res/res/values-gu-rIN-watch/strings.xml b/core/res/res/values-gu-rIN-watch/strings.xml
index f607966..af1b068 100644
--- a/core/res/res/values-gu-rIN-watch/strings.xml
+++ b/core/res/res/values-gu-rIN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g> માંથી <xliff:g id="NUMBER_0">%1$d</xliff:g> એપ્લિકેશન."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"સેન્સર્સ"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"તમારા સંપર્કોને ઍક્સેસ કરો"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"આ ઘડિયાળના સ્થાનને ઍક્સેસ કરો"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"તમારા કેલેન્ડરને ઍક્સેસ કરો"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS સંદેશા મોકલો અને જુઓ"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"તમારી ઘડિયાળ પર ફોટા, મીડિયા અને ફાઇલો ઍક્સેસ કરો"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ઑડિઓ રેકોર્ડ કરો"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ચિત્રો લો અને વિડિઓ રેકોર્ડ કરો"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ફોન કૉલ્સ કરો તથા સંચાલિત કરો"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"તમારા મહત્વપૂર્ણ ચિહ્નો વિશે સેન્સર ડેટા ઍક્સેસ કરો"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"સ્થિતિ બાર થાઓ"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"બૉડી સેન્સર્સ ઍક્સેસ કરો (જેમ કે હાર્ટ રેટ મૉનિટર્સ)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"નિશ્ચિત સ્થાન ઍક્સેસ કરો (GPS અને નેટવર્ક-આધારિત)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"અંદાજિત સ્થાન (નેટવર્ક-આધારિત)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM ને આદેશો મોકલો"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"પૂર્ણ નેટવર્ક ઍક્સેસ મેળવો"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"પ્રોફાઇલ અને ઉપકરણ માલિકોને સંચાલિત કરો"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX સ્થિતિ બદલો"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android બીમ ટ્રાન્સફર સ્થિતિ પ્રાપ્ત કરો"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"મીડિયા આઉટપુટ રૂટ કરો"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ઇન્સ્ટોલ સત્રો વાંચો"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"પૅકેજેસ ઇન્સ્ટોલ કરવાની વિનંતી કરો"</string>
</resources>
diff --git a/core/res/res/values-hi-watch/strings.xml b/core/res/res/values-hi-watch/strings.xml
index ead4d60..afed795 100644
--- a/core/res/res/values-hi-watch/strings.xml
+++ b/core/res/res/values-hi-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g> में से <xliff:g id="NUMBER_0">%1$d</xliff:g> ऐप."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"संवेदक"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"अपने संपर्कों को ऐक्सेस करें"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"इस घड़ी के स्थान को ऐक्सेस करें"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"अपने कैलेंडर को ऐक्सेस करें"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS संदेश भेजें और देखें"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"अपनी घड़ी पर फ़ोटो, मीडिया और फ़ाइलें ऐक्सेस करें"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ऑडियो रिकॉर्ड करें"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"चित्र लें और वीडियो रिकॉर्ड करें"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"फ़ोन कॉल करें और प्रबंधित करें"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"अपने महत्वपूर्ण संकेतों के बारे में सेंसर डेटा को ऐक्सेस करें"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"स्थिति बार होने दें"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"शरीर संवेदक ऐक्सेस करें (जैसे हृदय गति मॉनीटर)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"सटीक स्थान ऐक्सेस करें (GPS और नेटवर्क-आधारित)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"अनुमानित स्थान ऐक्सेस करें (नेटवर्क-आधारित)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM पर आदेश भेजें"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"पूर्ण नेटवर्क ऐक्सेस पाएं"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"प्रोफ़ाइल और डिवाइस स्वामियों को प्रबंधित करें"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX स्थिति बदलें"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam ट्रांसफर स्थिति प्राप्त करें"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"मीडिया आउटपुट को रूट करें"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"इंस्टॉल सत्रों को पढ़ें"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"पैकेज इंस्टॉल करने का अनुरोध करें"</string>
</resources>
diff --git a/core/res/res/values-hr-watch/strings.xml b/core/res/res/values-hr-watch/strings.xml
index 7e65f07..dda3cb2 100644
--- a/core/res/res/values-hr-watch/strings.xml
+++ b/core/res/res/values-hr-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplikacija <xliff:g id="NUMBER_0">%1$d</xliff:g> od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Senzori"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"pristupati vašim kontaktima"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"pristupati lokaciji ovog sata"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"pristupati kalendaru"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"slati i pregledavati SMS poruke"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"pristupati fotografijama, medijima i datotekama na vašem satu"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"snimati zvuk"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"snimati fotografije i videozapise"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"uspostavljati telefonske pozive i upravljati njima"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"pristupati podacima senzora o vašim vitalnim znakovima"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"biti traka statusa"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"pristupati biometrijskim senzorima (kao što su monitori otkucaja srca)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"pristupati preciznoj lokaciji (na temelju GPS-a i mreža)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"pristupati približnoj lokaciji (na temelju mreža)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"slati naredbe SIM-u"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"imati puni mrežni pristup"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"upravljati vlasnicima profila i uređaja"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"promijeniti stanje WiMAX-a"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"primati status prijenosa Android Beama"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"usmjeravati medijski izlaz"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"čitati sesije instaliranja"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"zahtijevati instaliranje paketa"</string>
</resources>
diff --git a/core/res/res/values-hu-watch/strings.xml b/core/res/res/values-hu-watch/strings.xml
index aa72468..7c45326 100644
--- a/core/res/res/values-hu-watch/strings.xml
+++ b/core/res/res/values-hu-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>. alkalmazás"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Érzékelők"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"hozzáférés a névjegyekhez"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"hozzáférés ennek az órának a helyadataihoz"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"hozzáférés a naptárhoz"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS-ek küldése és megtekintése"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"hozzáférés az órán lévő fotókhoz, médiatartalmakhoz és fájlokhoz"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"hanganyag rögzítése"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"fotók és videók készítése"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"telefonhívások kezdeményezése és kezelése"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"hozzáférés az érzékelők által mért, életjelekkel kapcsolatos adatokhoz"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"az állapotsor szerepének átvétele"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"hozzáférés a testérzékelőkhöz (például pulzusmérők)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"hozzáférés a pontos (GPS- és hálózatalapú) helyadatokhoz"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"hozzáférés a hozzávetőleges (hálózatalapú) helyadatokhoz"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"parancsok küldése a SIM kártyára"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"teljes hálózati hozzáférés"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"profil és eszköztulajdonosok kezelése"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX-állapot módosítása"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"android Beam-átviteli állapot fogadása"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"médiafájlok kimenetének irányítása"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"telepítési munkamenetek olvasása"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"telepítőcsomagok kérése"</string>
</resources>
diff --git a/core/res/res/values-hy-rAM-watch/strings.xml b/core/res/res/values-hy-rAM-watch/strings.xml
index 28617cb..9bff6ad 100644
--- a/core/res/res/values-hy-rAM-watch/strings.xml
+++ b/core/res/res/values-hy-rAM-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Հավելված <xliff:g id="NUMBER_0">%1$d</xliff:g>՝ <xliff:g id="NUMBER_1">%2$d</xliff:g>-ից:"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Սենսորներ"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"օգտագործել ձեր կոնտակտները"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"օգտագործել այս ժամացույցի տեղադրությունը"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"օգտագործել ձեր օրացույցը"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"ուղարկել և դիտել SMS հաղորդագրությունները"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"օգտագործել լուսանկարները, մեդիա ֆայլերը և ձեր ժամացույցում պահվող այլ ֆայլերը"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ձայնագրել"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"լուսանկարել և տեսագրել"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"կատարել հեռախոսազանգեր և կառավարել դրանք"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"օգտագործել ձեր հիմնական ֆիզիոլոգիական ցուցանիշների վերաբերյալ սենսորի տվյալները"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"լինել կարգավիճակի գոտի"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"օգտագործել մարմնի սենսորները (օրինակ` սրտի կծկումների հաճախականության չափիչ)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"օգտագործել ճշգրիտ տեղադրությունը (GPS և ցանցային)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"օգտագործել մոտավոր տեղադրությունը (ցանցային)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"ուղարկել հրամաններ SIM քարտին"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ունենալ ամբողջական ցանցային մուտք"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"կառավարել պրոֆիլները և սարքի սեփականատերերին"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"փոխել WiMAX-ի կարգավիճակը"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"ստանալ Android Beam-ով փոխանցման կարգավիճակը"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"երթուղել մեդիա արտածումը"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"կարդալ տեղադրման աշխատաշրջանները"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"պահանջել տեղադրման փաթեթներ"</string>
</resources>
diff --git a/core/res/res/values-in-watch/strings.xml b/core/res/res/values-in-watch/strings.xml
index b0b22e7..ef88a11 100644
--- a/core/res/res/values-in-watch/strings.xml
+++ b/core/res/res/values-in-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplikasi <xliff:g id="NUMBER_0">%1$d</xliff:g> dari <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensor"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"akses kontak"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"akses lokasi jam tangan ini"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"akses kalender"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"kirim dan lihat pesan SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"akses foto, media, dan file di jam tangan"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"rekam audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ambil gambar dan rekam video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"lakukan dan kelola panggilan telepon"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"akses data sensor tentang tanda-tanda vital"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"jadikan bilah status"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"akses sensor tubuh (misalnya, monitor detak jantung)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"akses lokasi akurat (berbasis jaringan dan GPS)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"akses perkiraan lokasi (berbasis jaringan)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"kirimkan perintah ke SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"dapatkan akses jaringan penuh"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"kelola pemilik profil dan perangkat"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"ubah status WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"terima status transfer Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"tentukan rute keluaran media"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"baca sesi pemasangan"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"minta pasang paket"</string>
</resources>
diff --git a/core/res/res/values-is-rIS-watch/strings.xml b/core/res/res/values-is-rIS-watch/strings.xml
index ab82c1c..d512b6e 100644
--- a/core/res/res/values-is-rIS-watch/strings.xml
+++ b/core/res/res/values-is-rIS-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Forrit <xliff:g id="NUMBER_0">%1$d</xliff:g> af <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Skynjarar"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"fá aðgang að tengiliðunum þínum"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"fá aðgang að staðsetningu þessa úrs"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"fá aðgang að dagatalinu þínu"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"senda og skoða SMS-skilaboð"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"fá aðgang að myndum, efni og skrám í úrinu þínu"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"taka upp hljóð"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"taka myndir og myndskeið"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"hringja og stjórna símtölum"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"fá aðgang að skynjaragögnum yfir lífsmörk þín"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"vera stöðustikan"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"fá aðgang að líkamsskynjurum (s.s. hjartsláttarmælum)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"fá aðgang að nákvæmri staðsetningu (frá GPS og símkerfi)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"fá aðgang að áætlaðri staðsetningu (frá símkerfi)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"senda skipanir til SIM-kortsins"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"hafa fullan netaðgang"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"stjórna eigendum sniða og tækja"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"breyta stöðu WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"fá flutningsstöðu Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"beina margmiðlunarúttaki"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"lesa uppsetningarlotur"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"fara fram á uppsetningu pakka"</string>
</resources>
diff --git a/core/res/res/values-it-watch/strings.xml b/core/res/res/values-it-watch/strings.xml
index 111c2a2..c348e48 100644
--- a/core/res/res/values-it-watch/strings.xml
+++ b/core/res/res/values-it-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> di <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensori"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"accedere ai contatti"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"accedere alla posizione dell\'orologio"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"accedere al calendario"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"inviare e visualizzare SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"accedere a foto, contenuti multimediali e file sull\'orologio"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"registrare audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"scattare foto e registrare video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"fare e gestire telefonate"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"accedere ai dati dei sensori relativi ai tuoi parametri vitali"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"avere la funzione di barra di stato"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"accedere ai sensori (come il cardiofrequenzimetro)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"accedere alla posizione esatta (basata su GPS e rete)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"accedere alla posizione approssimativa (basata sulla rete)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"inviare comandi alla SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"avere accesso completo alla rete"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"gestire proprietari di dispositivi e profili"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"modificare lo stato WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"ricevere lo stato dei trasferimenti Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"indirizzare l\'output dei contenuti multimediali"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"leggere sessioni di installazione"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"richiedere pacchetti di installazione"</string>
</resources>
diff --git a/core/res/res/values-iw-watch/strings.xml b/core/res/res/values-iw-watch/strings.xml
index d0b4943..1e4bad4 100644
--- a/core/res/res/values-iw-watch/strings.xml
+++ b/core/res/res/values-iw-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"אפליקציה <xliff:g id="NUMBER_0">%1$d</xliff:g> מתוך <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"חיישנים"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"גישה אל אנשי הקשר"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"גישה אל מיקום השעון הזה"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"גישה אל היומן"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"שליחה והצגה של הודעות SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"גישה אל תמונות, מדיה וקבצים בשעון שלך"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"הקלטת אודיו"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"צילום תמונות והקלטת סרטונים"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"התקשרות וניהול של שיחות טלפון"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"גישה אל נתוני חיישנים של הסימנים החיוניים שלך"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"להיות שורת מצב"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"גישה אל חיישני גוף (כמו מוניטורים עבור קצב לב)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"גישה אל מיקום מדויק (מבוסס GPS ורשת)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"גישה אל מיקום משוער (מבוסס רשת)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"שלח פקודות אל ה-SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"קבלת גישת רשת מלאה"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"ניהול בעלים של פרופיל ומכשיר"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"שנה את מצב WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"קבלת סטטוס העברה של Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"ניתוב פלט מדיה"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"קריאת פעילות התקנה"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"בקשה להתקנת חבילות"</string>
</resources>
diff --git a/core/res/res/values-ja-watch/strings.xml b/core/res/res/values-ja-watch/strings.xml
index ec1257ef..3248041 100644
--- a/core/res/res/values-ja-watch/strings.xml
+++ b/core/res/res/values-ja-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"アプリ<xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"センサー"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"連絡先へのアクセス"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"この時計の位置情報へのアクセス"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"カレンダーへのアクセス"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMSメッセージの送信と表示"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"時計上の写真、メディア、ファイルへのアクセス"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"録音"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"写真の撮影と動画の記録"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"通話の発信と管理"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"バイタルサインに関するセンサーデータへのアクセス"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ステータスバーへの表示"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"ボディーセンサー（心拍数モニターなど）へのアクセス"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"正確な位置情報（GPSとネットワーク基地局）へのアクセス"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"おおよその位置情報（ネットワーク基地局）へのアクセス"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIMへのコマンド送信"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ネットワークへのフルアクセス"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"プロフィールの所有者と端末の所有者の管理"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX状態の変更"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Androidビーム転送のステータスの受信"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"メディア出力のルーティング"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"インストールセッションの読み取り"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"インストールパッケージのリクエスト"</string>
</resources>
diff --git a/core/res/res/values-ka-rGE-watch/strings.xml b/core/res/res/values-ka-rGE-watch/strings.xml
index 5aa9aaf..9e2ca1f 100644
--- a/core/res/res/values-ka-rGE-watch/strings.xml
+++ b/core/res/res/values-ka-rGE-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"აპი <xliff:g id="NUMBER_0">%1$d</xliff:g>, სულ <xliff:g id="NUMBER_1">%2$d</xliff:g>-დან."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"სენსორები"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"თქვენს კონტაქტებზე წვდომა"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"ამ ნახვის მდებარეობაზე წვდომა"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"თქვენს კალენდარზე წვდომა"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS შეტყობინებების გაგზავნა და ნახვა"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"თქვენს სანახავ ფოტოებზე, მედიაზე და ფაილებზე წვდომა"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"აუდიოს ჩაწერა"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ფოტოებისა და ვიდეოების გადაღება"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"სატელეფონო ზარების გაშვება და მართვა"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"თქვენი სასიცოცხლო ნიშნების შესახებ სენეორის მონაცემებზე წვდომა"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"სტატუსის ზოლის ჩანაცვლება"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"სხეულის სენსორებზე (როგორიცაა გულისცემის სიხშირე) წვდომა"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"ზუსტ მდებარეობაზე წვდომა (GPS-ის და ქსელის მიხედვით)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"მიახლოებით მდებარეობაზე წვდომა (ქსელის მიხედვით)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"ბრძანებების SIM-ზე გაგზავნა"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"მთელ ქსელზე წვდომის მიღება"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"პროფილისა და მოწყობილობის მფლობელების მართვა"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX-ის მდგომარეობის შეცვლა"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android სხივით გადაცემის სტატუსის მიღება"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"მედიის მონაცემების მარშრუტიზაცია"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ინსტალაციის სესიების წაკითხვა"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"პაკეტების ინსტალაციის მოთხოვნა"</string>
</resources>
diff --git a/core/res/res/values-kk-rKZ-watch/strings.xml b/core/res/res/values-kk-rKZ-watch/strings.xml
index e913230..8c41688 100644
--- a/core/res/res/values-kk-rKZ-watch/strings.xml
+++ b/core/res/res/values-kk-rKZ-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g> бағдарлама."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Сенсорлар"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"контактілерге қатынасу"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"осы сағаттың орнына қатынасу"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"күнтізбеге қатынасу"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS хабарларын жіберу және көру"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"сағаттағы фотосуреттерге, медиафайлдарға және файлдарға қатынасу"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"аудио жазу"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"суреттер түсіру және бейне жазу"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"қоңырау шалу және телефон қоңырауларын басқару"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"ағза күйінің көрсеткіштері туралы сенсор деректеріне қатынасу"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"күй жолағы болу"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"дене датчиктеріне (мысалы, жүрек соғу жиілігінің мониторларына) қатынасу"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"дәл орынға қатынасу (GPS және желіге негізделген)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"шамамен алған орынға қатынасу (желі негізінде)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM картасына пәрмендер жіберу"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"желіге толық қатынасы бар"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"профиль және құрылғы иелерін басқару"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX күйін өзгерту"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam тасымалдау күйін алу"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"медиа шығысын бағыттау"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"орнату сеанстарын оқу"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"орнату бумаларын сұрау"</string>
</resources>
diff --git a/core/res/res/values-km-rKH-watch/strings.xml b/core/res/res/values-km-rKH-watch/strings.xml
index 01731f3..5c1bf8a 100644
--- a/core/res/res/values-km-rKH-watch/strings.xml
+++ b/core/res/res/values-km-rKH-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"កម្មវិធី <xliff:g id="NUMBER_0">%1$d</xliff:g> នៃ <xliff:g id="NUMBER_1">%2$d</xliff:g>។"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"ឧបករណ៍ចាប់សញ្ញា"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"ចូលដំណើរការទំនាក់ទំនងរបស់អ្នក"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"ចូលដំណើរការទីតាំងនាឡិកាដៃនេះ"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"ចូលដំណើរការប្រិតិទិនរបស់អ្នក"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"ផ្ញើ និងមើលសារ SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"ចូលដំណើរការរូបថត មេឌៀ និងឯកសារនៅលើនាឡិកាដៃរបស់អ្នក។"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ថតសំឡេង"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ថតរូប និងថតវីដេអូ"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ហៅទូរស័ព្ទ និងគ្រប់គ្រងការហៅទូរស័ព្ទ"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"ចូលដំណើរការទិន្នន័យឧបករណ៍ចាប់សញ្ញាអំពីស្ថានភាពសុខភាពរបស់អ្នក"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ធ្វើជារបារស្ថានភាព"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"ចូលដំណើរការឧបករណ៍ចាប់សញ្ញារាងកាយ (ដូចជាម៉ាស៊ីនវាស់ចង្វាក់បេះដូង)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"ចូលដំណើរការទីតាំងច្បាស់លាស់ (ផ្អែកលើបណ្តាញ និង GPS)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"ចូលដំណើរការទីតាំងប្រហាក់ប្រហែល (ផ្អែកលើបណ្តាញ)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"ផ្ញើពាក្យបញ្ជាទៅស៊ីមកាត"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"មានការចូលដំណើរការបណ្ដាញពេញលេញ"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"គ្រប់គ្រងម្ចាស់ឧបករណ៍ និងប្រវត្តិរូប"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"ប្ដូរស្ថានភាព WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"ទទួលបានស្ថានភាពផ្ទេរ Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"នាំផ្លូវលទ្ធផលមេឌៀ"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"អានវេនដំឡើង"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"ស្នើសុំកញ្ចប់ដំឡើង"</string>
</resources>
diff --git a/core/res/res/values-kn-rIN-watch/strings.xml b/core/res/res/values-kn-rIN-watch/strings.xml
index ea010b3..def2130 100644
--- a/core/res/res/values-kn-rIN-watch/strings.xml
+++ b/core/res/res/values-kn-rIN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="NUMBER_0">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"ಸೆನ್ಸರ್ಗಳು"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಪ್ರವೇಶಿಸಿ"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"ಈ ಗಡಿಯಾರದ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿ"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"ನಿಮ್ಮ ಕ್ಯಾಲೆಂಡರ್ ಪ್ರವೇಶಿಸಿ"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಿ ಮತ್ತು ವೀಕ್ಷಿಸಿ"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"ನಿಮ್ಮ ಗಡಿಯಾರದಲ್ಲಿನ ಫೋಟೋಗಳು, ಮಾಧ್ಯಮ ಮತ್ತು ಫೈಲ್ಗಳನ್ನು ಪ್ರವೇಶಿಸಿ"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ಆಡಿಯೊ ರೆಕಾರ್ಡ್ ಮಾಡಿ"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ಚಿತ್ರಗಳನ್ನು ತೆಗೆಯಿರಿ ಹಾಗೂ ವೀಡಿಯೊ ರೆಕಾರ್ಡ್ ಮಾಡಿ"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ಫೋನ್ ಕರೆಗಳನ್ನು ಮಾಡಿ ಹಾಗೂ ನಿರ್ವಹಿಸಿ"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"ನಿಮ್ಮ ಮುಖ್ಯ ಲಕ್ಷಣಗಳ ಕುರಿತು ಸೆನ್ಸರ್ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಿ"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ಸ್ಥಿತಿ ಪಟ್ಟಿಯಾಗಿರಲು"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"ದೇಹ ಸೆನ್ಸರ್ಗಳನ್ನು ಪ್ರವೇಶಿಸಿ (ಹೃದಯದ ಬಡಿತ ಮಾನಿಟರ್ಗಳಂತಹ)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"ನಿಖರ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿ (GPS ಮತ್ತು ನೆಟ್ವರ್ಕ್-ಆಧಾರಿತ)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿ (ನೆಟ್ವರ್ಕ್-ಆಧಾರಿತ)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"ಸಿಮ್ಗೆ ಆಜ್ಞೆಗಳನ್ನು ಕಳುಹಿಸಿ"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ಪೂರ್ಣ ನೆಟ್ವರ್ಕ್ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿರಿ"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಾಧನ ಮಾಲೀಕರನ್ನು ನಿರ್ವಹಿಸಿ"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX ಸ್ಥಿತಿಯನ್ನು ಬದಲಿಸಿ"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android ಬೀಮ್ ವರ್ಗಾವಣೆ ಸ್ಥಿತಿ ಸ್ವೀಕರಿಸಿ"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"ಮಾಧ್ಯಮ ಔಟ್ಪುಟ್ ಅನ್ನು ರೂಟ್ ಮಾಡಿ"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ಸ್ಥಾಪನೆ ಸೆಷನ್ಗಳನ್ನು ಓದಿ"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"ಸ್ಥಾಪನೆ ಪ್ಯಾಕೇಜ್ಗಳನ್ನು ವಿನಂತಿಸಿ"</string>
</resources>
diff --git a/core/res/res/values-ko-watch/strings.xml b/core/res/res/values-ko-watch/strings.xml
index 985f401..8602c7e 100644
--- a/core/res/res/values-ko-watch/strings.xml
+++ b/core/res/res/values-ko-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"앱 <xliff:g id="NUMBER_1">%2$d</xliff:g>개 중 <xliff:g id="NUMBER_0">%1$d</xliff:g>개"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"센서"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"주소록에 액세스"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"이 시계 위치에 액세스"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"캘린더에 액세스"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS 메시지 보내기 및 보기"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"시계의 사진, 미디어, 파일에 액세스"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"오디오 녹음"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"사진 찍기 및 동영상 녹화"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"전화 걸기 및 관리"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"생체 신호에 관한 센서 데이터에 액세스"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"상태 표시줄에 위치"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"신체 센서(예: 심박수 모니터)에 액세스"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"정확한 위치(GPS 및 네트워크 기반)에 액세스"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"대략적인 위치(네트워크 기반)에 액세스"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM에 명령어 보내기"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"전체 네트워크 액세스 권한 보유"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"프로필 및 기기 소유자 관리"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX 상태 변경"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam 전송 상태 수신"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"미디어 출력 연결"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"설치 세션 읽기"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"패키지 설치 요청"</string>
</resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index 1844214..f5a6fa4 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -431,7 +431,7 @@
<string name="fingerprint_error_canceled" msgid="4402024612660774395">"지문 인식 작업이 취소되었습니다."</string>
<string name="fingerprint_error_lockout" msgid="5536934748136933450">"시도 횟수가 너무 많습니다. 나중에 다시 시도하세요."</string>
<string name="fingerprint_error_unable_to_process" msgid="6107816084103552441">"다시 시도해 보세요."</string>
- <string name="fingerprint_name_template" msgid="5870957565512716938">"<xliff:g id="FINGERID">%d</xliff:g>번째 손가락"</string>
+ <string name="fingerprint_name_template" msgid="5870957565512716938">"손가락 <xliff:g id="FINGERID">%d</xliff:g>"</string>
<string-array name="fingerprint_error_vendor">
</string-array>
<string name="fingerprint_icon_content_description" msgid="2340202869968465936">"지문 아이콘"</string>
diff --git a/core/res/res/values-ky-rKG-watch/strings.xml b/core/res/res/values-ky-rKG-watch/strings.xml
index 3c708961..2fb9047 100644
--- a/core/res/res/values-ky-rKG-watch/strings.xml
+++ b/core/res/res/values-ky-rKG-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g> ичинен <xliff:g id="NUMBER_0">%1$d</xliff:g> колднм."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Сенсорлор"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"байланыштарыңызга уруксат"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"бул сааттын жайгашкан жерине уруксат"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"жылнаамаңызды пайдалануу"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS билдирүүлөрдү жөнөтүү жана көрсөтүү"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"саатыңыздагы сүрөттөр, медиа жана файлдарга уруксат"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"аудио жаздыруу"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"сүрөт тартуу жана видео жаздыруу"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"телефон чалуу жана аларды башкаруу"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"организмдин абалына көз салган сенсордун дайындарына мүмкүнчүлүк алуу"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"абал тилкесинин милдетин аткаруу"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"дене-бой сенсорлоруна (жүрөктүн кагышын өлчөгүчтөр сыяктуу) уруксат"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"так аныкталган жайгашкан жерге (GPS жана тармактын негизинде) уруксат"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"болжолдуу жайгашкан жерге (тармактын негизинде) уруксат"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM-картага буйруктарды жөнөтүү"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"тармакка толук мүмкүнчүлүк алуу"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"профилди жана түзмөк ээлерин башкаруу"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX абалын өзгөртүү"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam өткөрүү абалын кабыл алуу"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"медиа чыгарылышын багыттоо"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"орнотуу сеанстарын окуу"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"топтомдорду орнотууга уруксат суроо"</string>
</resources>
diff --git a/core/res/res/values-lo-rLA-watch/strings.xml b/core/res/res/values-lo-rLA-watch/strings.xml
index d7e97fb..db2f7e4 100644
--- a/core/res/res/values-lo-rLA-watch/strings.xml
+++ b/core/res/res/values-lo-rLA-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"ແອັບ <xliff:g id="NUMBER_0">%1$d</xliff:g> ໃນ <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"ເຊັນເຊີ"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"ເຂົ້າຫາລາຍຊື່ຂອງທ່ານ"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"ເຂົ້າຫາທີ່ຕັ້ງຂອງໂມງນີ້"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"ເຂົ້າຫາປະຕິທິນຂອງທ່ານ"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"ສົ່ງ ແລະ ເບິ່ງຂໍ້ຄວາມ SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"ເຂົ້າເຖິງຮູບຖ່າຍ, ສື່ ແລະ ໄຟລ໌ຢູ່ເທິງໂມງຂອງທ່ານ"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ບັນທຶກສຽງ"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ຖ່າຍຮູບ ແລະ ບັນທຶກວິດີໂອ"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ໂທ ແລະ ຈັດການການໂທລະສັບ"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"ເຂົ້າຫາຂໍ້ມູນເຊັນເຊີກ່ຽວກັບສັນຍານຊີບຂອງທ່ານ"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ເປັນແຖບສະຖານະ"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"ເຂົ້າຫາເຊັນເຊີກວດຮ່າງກາຍ (ເຊັ່ນ: ຈໍຕິດຕາມອັດຕາການເຕັ້ນຂອງຫົວໃຈ)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"ເຂົ້າຫາທີ່ຕັ້ງທີ່ແນ່ນອນ (ອີງໃສ່ GPS ແລະ ເຄືອຂ່າຍ)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"ເຂົ້າຫາທີ່ຕັ້ງໂດຍປະມານ (ອີງໃສ່ເຄືອຂ່າຍ)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"ສົ່ງຄຳສັ່ງຫາ SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ມີການເຂົ້າເຖິງເຄືອຂ່າຍເຕັມຮູບແບບ"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"ຈັດການເຈົ້າຂອງໂປຣໄຟລ໌ ແລະ ອຸປະກອນ"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"ປ່ຽນສະຖານະ WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"ຮັບສະຖານະການໂອນຂໍ້ມູນ Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"ກຳນົດຊ່ອງທາງອອກຂອງສື່"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ອ່ານເຊສຊັນການຕິດຕັ້ງ"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"ຂໍຕິດຕັ້ງແພັກເກດ"</string>
</resources>
diff --git a/core/res/res/values-lt-watch/strings.xml b/core/res/res/values-lt-watch/strings.xml
index bf32040..ce154e70 100644
--- a/core/res/res/values-lt-watch/strings.xml
+++ b/core/res/res/values-lt-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g> programa iš <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Jutikliai"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"pasiekti kontaktus"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"pasiekti šio laikrodžio vietą"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"pasiekti kalendorių"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"siųsti ir peržiūrėti SMS pranešimus"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"pasiekti laikrodžio nuotraukas, mediją ir failus"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"įrašyti garsą"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"fotografuoti ir filmuoti"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"skambinti ir tvarkyti telefonų skambučius"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"pasiekti jutiklių duomenis apie gyvybinius ženklus"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"būti būsenos juosta"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"pasiekti kūno jutiklius (pvz., pulso dažnio stebėjimo įrenginius)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"pasiekti tikslią vietą (nustatytą atsižvelgiant į GPS ir tinklą)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"pasiekti apytikslę vietą (nustatytą atsižvelgiant į tinklą)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"siųsti komandas į SIM kortelę"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"turėti visateisę tinklo prieigą"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"tvarkyti profilio ir įrenginio savininkus"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"keisti „WiMAX“ būseną"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"gauti „Android“ perdavimo funkcijos perkėlimo būseną"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"nukreipti medijos išvestį"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"skaityti diegimo sesijas"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"pateikti užklausą dėl diegimo paketų"</string>
</resources>
diff --git a/core/res/res/values-lv-watch/strings.xml b/core/res/res/values-lv-watch/strings.xml
index 3a7fd95..c44677f 100644
--- a/core/res/res/values-lv-watch/strings.xml
+++ b/core/res/res/values-lv-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g>. lietotne no <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensori"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"Piekļūt jūsu kontaktpersonu datiem"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"Piekļūt šī pulksteņa atrašanās vietas datiem"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"Piekļūt jūsu kalendāram"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"Sūtīt un skatīt īsziņas"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"Piekļūt fotoattēliem, multivides saturam un failiem pulkstenī"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"Ierakstīt audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"Uzņemt attēlus un ierakstīt videoklipus"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"Veikt un pārvaldīt tālruņa zvanus"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"Piekļūt sensoru datiem par jūsu veselības rādījumiem"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"Būt par statusa joslu"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"Piekļūt ķermeņa sensoriem (piemēram, sirdsdarbības monitoriem)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"Noteikt precīzu atrašanās vietu (izmantojot GPS un tīklu)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"Noteikt aptuveno atrašanās vietu (izmantojot tīklu)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"Sūtīt komandas SIM kartei"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"Pilnīga piekļuve tīklam"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"Pārvaldīt profilus un ierīces īpašniekus"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"Mainīt WiMAX statusu"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Saņemt Android Beam pārsūtīšanas statusu"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"Maršrutēt multivides datu izeju"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"Lasīt instalēšanas sesijas"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"Pieprasīt pakotņu instalēšanu"</string>
</resources>
diff --git a/core/res/res/values-mk-rMK-watch/strings.xml b/core/res/res/values-mk-rMK-watch/strings.xml
index 5e67a61..9d7c5bf 100644
--- a/core/res/res/values-mk-rMK-watch/strings.xml
+++ b/core/res/res/values-mk-rMK-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Апликац. <xliff:g id="NUMBER_0">%1$d</xliff:g> од <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Сензори"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"пристапи до контактите"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"пристапи до локацијата на часовникот"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"пристапи до календарот"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"испраќај и прикажувај СМС-пораки"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"пристапи до фотографиите, медиумите и датотеките на часовникот"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"снимај аудио"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"фотографирај и снимај видео"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"повикувај и управувај со телефонски повици"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"пристапи до податоците од сензорите за виталните знаци"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"биди статусната лента"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"пристапи до телесните сензори (како монитори за ритам на срце)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"пристапи до прецизната локација (ГПС и врз база на мрежа)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"пристапи до приближната локација (врз база на мрежа)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"испраќај наредби до СИМ-картичката"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"добиј целосен пристап до мрежата"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"управувај со сопствениците на профил и уред"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"промени ја состојбата на WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"добиј статус на пренос на Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"насочи излез за медиуми"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"читај сесии на инсталирање"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"барај пакети за инсталирање"</string>
</resources>
diff --git a/core/res/res/values-ml-rIN-watch/strings.xml b/core/res/res/values-ml-rIN-watch/strings.xml
index c10769e..02fe66c 100644
--- a/core/res/res/values-ml-rIN-watch/strings.xml
+++ b/core/res/res/values-ml-rIN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g> അപ്ലിക്കേഷൻ."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"സെൻസറുകൾ"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ ആക്സസ് ചെയ്യുക"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"ഈ വാച്ചിന്റെ ലൊക്കേഷൻ ആക്സസ് ചെയ്യുക"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"നിങ്ങളുടെ കലണ്ടർ ആക്സസ് ചെയ്യുക"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS സന്ദേശങ്ങൾ അയയ്ക്കുകയും കാണുകയും ചെയ്യുക"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"നിങ്ങളുടെ വാച്ചിൽ ഫോട്ടോകളും മീഡിയയും ഫയലുകളും ആക്സസ് ചെയ്യുക"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ഓഡിയോ റെക്കോർഡ് ചെയ്യുക"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ചിത്രങ്ങൾ എടുക്കുക, വീഡിയോ റെക്കോർഡ് ചെയ്യുക"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ഫോൺ വിളിക്കുകയും നിയന്ത്രിക്കുകയും ചെയ്യുക"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"നിങ്ങളുടെ ജീവാധാര ലക്ഷണങ്ങളെ കുറിച്ചുള്ള സെൻസർ വിവരങ്ങൾ ആക്സസ് ചെയ്യുക"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"സ്റ്റാറ്റസ് ബാർ ആയിരിക്കുക"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"ശരീര സെൻസറുകൾ (ഹൃദയമിടിപ്പ് നിരക്ക് മോണിറ്ററുകൾ പോലെ) ആക്സസ് ചെയ്യുക"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"കൃത്യമായ ലൊക്കേഷൻ (GPS - നെറ്റ്വർക്ക് അധിഷ്ഠിതം) ആക്സസ് ചെയ്യുക"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"ഏകദേശ ലൊക്കേഷൻ (നെറ്റ്വർക്ക് അധിഷ്ഠിതം) ആക്സസ് ചെയ്യുക"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM കമാൻഡുകൾ അയയ്ക്കുക"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"പൂർണ്ണ നെറ്റ്വർക്ക് ആക്സസ് ഉണ്ടായിരിക്കുക"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"പ്രൊഫൈൽ, ഉപകരണ ഉടമകളെ മാനേജുചെയ്യുക"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX നില മാറ്റുക"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android ബീം കൈമാറൽ നില സ്വീകരിക്കുക"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"മീഡിയ ഔട്ട്പുട്ട് റൂട്ടുചെയ്യുക"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ഇൻസ്റ്റാൾ സെഷനുകൾ റീഡുചെയ്യുക"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"പാക്കേജുകൾ ഇൻസ്റ്റാൾ ചെയ്യാൻ അഭ്യർത്ഥിക്കുക"</string>
</resources>
diff --git a/core/res/res/values-mn-rMN-watch/strings.xml b/core/res/res/values-mn-rMN-watch/strings.xml
index 7b2e21b..6387aed 100644
--- a/core/res/res/values-mn-rMN-watch/strings.xml
+++ b/core/res/res/values-mn-rMN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g>-ны <xliff:g id="NUMBER_1">%2$d</xliff:g> апп."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Мэдрэгч"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"харилцагчийн хаягт хандах"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"энэ цагийн байршилд хандах"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"Хуанлид хандах"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS мессежийг илгээх, харах"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"Цагныхаа зураг, медиа, файлд хандах"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"дуу хураах"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"зураг авах, бичлэг хийх"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"залгах, дуудлагыг зохион байгуулах"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"таны биеийн байдлын талаарх мэдрэгч бүхий өгөгдөлд хандах"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"статус мөр байхыг зөвшөөрөх"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"бие мэдрэгчид (зүрхний түвшин шалгагч г.м) хандах"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"тодорхой байршилд (GPS, сүлжээнд суурилсан) хандах"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"ойролцоох байршилд (сүлжээнд суурилсан) хандах"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM карт руу комманд илгээх"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"сүлжээнд бүрэн нэвтрэх"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"Профайл, төхөөрөмж эзэмшигчийг зохион байгуулах"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX статусыг солих"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam дамжуулалтын статусыг хүлээн авах"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"Медиа хадгалах байршлыг тодорхойлох"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"Суулгах үеийг унших"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"Багц суулгахыг хүсэх"</string>
</resources>
diff --git a/core/res/res/values-mr-rIN-watch/strings.xml b/core/res/res/values-mr-rIN-watch/strings.xml
index 11af412..0a60aad 100644
--- a/core/res/res/values-mr-rIN-watch/strings.xml
+++ b/core/res/res/values-mr-rIN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g> पैकी <xliff:g id="NUMBER_0">%1$d</xliff:g> अॅप"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"सेन्सर"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"आपल्या संपर्कांमध्ये प्रवेश करा"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"या घड्याळाच्या स्थानामध्ये प्रवेश करा"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"आपल्या कॅलेंडरमध्ये प्रवेश करा"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS संदेश पाठवा आणि पहा"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"आपल्या घड्याळावरील फोटो, मीडिया आणि फायलींमध्ये प्रवेश करा"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ऑडिओ रेकॉर्ड करा"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"चित्रे घ्या आणि व्हिडिओ रेकॉर्ड करा"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"फोन कॉल करा आणि व्यवस्थापित करा"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"आपल्या महत्त्वाच्या मापनांविषयी सेन्सर डेटामध्ये प्रवेश करा"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"स्टेटस बार होऊ द्या"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"शरीर सेन्सरमध्ये (हृदय गती मॉनिटरसारखे) प्रवेश करा"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"अचूक स्थानामध्ये (GPS आणि नेटवर्क-आधारित) प्रवेश करा"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"अंदाजे स्थानामध्ये (नेटवर्क-आधारित) प्रवेश करा"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"सिमला आदेश पाठवा"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"पूर्ण नेटवर्क प्रवेश आहे"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"प्रोफाईल आणि डिव्हाइस मालक व्यवस्थापित करा"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX स्थिती बदला"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android बीम स्थानांतरण स्थिती प्राप्त करा"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"मीडिया आउटपुट मार्गस्थ करा"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"स्थापना सत्र वाचा"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"पॅकेज स्थापित करण्यासाठी विनंती करा"</string>
</resources>
diff --git a/core/res/res/values-ms-rMY-watch/strings.xml b/core/res/res/values-ms-rMY-watch/strings.xml
index d8245ed..c3f68b8 100644
--- a/core/res/res/values-ms-rMY-watch/strings.xml
+++ b/core/res/res/values-ms-rMY-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Apl <xliff:g id="NUMBER_0">%1$d</xliff:g> daripada <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Penderia"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"akses kenalan anda"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"akses lokasi jam tangan ini"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"akses kalendar anda"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"hantar dan lihat mesej SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"akses foto, media dan fail pada jam tangan anda"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"rakam audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ambil gambar dan rakam video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"buat dan urus panggilan telefon"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"akses data penderia tentang tanda vital anda"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"jadi bar status"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"akses penderia badan (seperti pemantau kadar denyut jantung)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"akses lokasi tepat (GPS dan berdasarkan rangkaian)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"akses lokasi anggaran (berdasarkan rangkaian)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"hantar perintah ke SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"mempunyai akses rangkaian penuh"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"urus pemilik profil dan peranti"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"tukar keadaan WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"terima status pemindahan Pancaran Android"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"halakan output media"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"baca sesi pemasangan"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"minta pakej pemasangan"</string>
</resources>
diff --git a/core/res/res/values-my-rMM-watch/strings.xml b/core/res/res/values-my-rMM-watch/strings.xml
index 34bd033..c4d738a 100644
--- a/core/res/res/values-my-rMM-watch/strings.xml
+++ b/core/res/res/values-my-rMM-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g>၏ <xliff:g id="NUMBER_0">%1$d</xliff:g> အသေးစားဆော့ဝဲ"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"အာရုံခံကိရိယာများ"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"သင့် အဆက်အသွယ်များကို ယူသုံးရန်"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"ဒီနာရီရဲ့ တည်နေရာကို ရယူရန်"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"သင့် ပြက္ခဒိန်ကို ယူသုံးရန်"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS စာတိုများကို ပို့ရန် နှင့် ကြည့်ရန်"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"သင့်နာရီထဲက ဓာတ်ပုံများ၊ မီဒီယာ၊ နှင့် ဖိုင်များကို ရယူသုံးရန်"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"အသံ ဖမ်းရန်"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ဓာတ်ပုံ ရိုက်ရန် နှင့် ဗွီဒီယို မှတ်တမ်းတင်ရန်"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ဖုန်းခေါ်ဆိုမှုများ ပြုလုပ်ရန် နှင့် စီမံရန်"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"သင်ရဲ့ အဓိက အသက်ရှင်မှုဆိုင်ရာ အာရုံခံကိရိယာ ဒေတာကို ရယူသုံးစွဲရန်"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"အခြေအနေပြ ဘားဖြစ်ပါစေ"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"ခန္ဓာကိုယ် အာရုံကိရိယာများကို (နှလုံးခုန်နှုန်း မော်နီတာလို)ကို ရယူသုံးရန်"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"တိကျတဲ့ တည်နေရာ (GPS နှင့် ကွန်ရက် အခြေခံ)ကို ရယူသုံးရန်"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"အနီးစပ်ဆုံး တည်နေရာ (ကွန်ရက် အခြေခံ)ကို ရယူသုံးရန်"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM ထံသို့ ညွှန်ကြားချက်များကို ပို့တယ်"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ကွန်ရက်ကို အပြည့်အဝ ရယူသုံးနိုင်"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"ပရိုဖိုင် နှင့် ကိရိယာ ပိုင်ရှင်များကို စီမံပါ"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX အခြေအနေကို ပြောင်းရန်"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android ရဲ့ အလင်းတန်းထိုး လွှဲပြောင်းမှု အခြေအနေကို ရယူရန်"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"မီဒီယာ ထွက်ပေါက်ကို လမ်းဖေါ်ပြပေးပါ"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"တပ်ဆင်ရေး လုပ်ကိုင်မှုကို ဖတ်ရန်"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"တပ်ဆင်ရေး အထုပ်များကို တောင်းဆိုပါ"</string>
</resources>
diff --git a/core/res/res/values-nb-watch/strings.xml b/core/res/res/values-nb-watch/strings.xml
index aba8abb..249026c 100644
--- a/core/res/res/values-nb-watch/strings.xml
+++ b/core/res/res/values-nb-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> av <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensorer"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"se kontaktene dine"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"få tilgang til posisjonen til denne klokken"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"åpne kalenderen din"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"sende og lese SMS-meldinger"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"få tilgang til bilder, media og filer på klokken din"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"spille inn lyd"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ta bilder og ta opp video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ringe og administrere anrop"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"få tilgang til sensordata om de vitale tegnene dine"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"vise appen i statusfeltet"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"få tilgang til kroppssensorer (for eksempel pulsmålere)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"få tilgang til nøyaktig posisjon (GPS- og nettverksbasert)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"få tilgang til omtrentlig posisjon (nettverksbasert)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"sende kommandoer til SIM-kortet"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"få full nettverkstilgang"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"administrere profiler og enhetseiere"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"endre WiMAX-statusen"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"motta overføringsstatus for Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"videresende medieutdata"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"lese installeringsøkter"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"be om installasjon av pakker"</string>
</resources>
diff --git a/core/res/res/values-ne-rNP-watch/strings.xml b/core/res/res/values-ne-rNP-watch/strings.xml
index fe331bd..a38de99 100644
--- a/core/res/res/values-ne-rNP-watch/strings.xml
+++ b/core/res/res/values-ne-rNP-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g> को <xliff:g id="NUMBER_0">%1$d</xliff:g> अनुप्रयोग।"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"सेन्सरहरू"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"आफ्नो सम्पर्कको पहुँच गर्नुहोस्"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"यो घडीको स्थान पहुँच गर्नुहोस्"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"आफ्नो पात्रोमा पहुँच गर्नुहोस्"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS सन्देशहरू पठाउनुहोस् र हेर्नुहोस्"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"आफ्नो समयमा फोटो, मिडिया, र फाइलहरू हेर्नुहोस्"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"अडियो रेकर्ड गर्नुहोस्"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"तस्बिरहरू खिच्नुहोस् र भिडियो रेकर्ड गर्नुहोस्"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"फोन कलहरू गर्नुहोस् र व्यवस्थापन गर्नुहोस्"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"आफ्नो महत्त्वपूर्ण संकेत बारेको सेन्सर डेटा पहुँच गर्नुहोस्"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"वस्तुस्थिति पट्टी हुन"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"शरीरका सेन्सरहरू पहुँच गर्नुहोस् (जस्तै हृदय धड्कन निगरानी)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"सटीक स्थान पहुँच गर्नुहोस् (GPS र नेटवर्क आधारित)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"अनुमानित स्थान पहुँच गर्नुहोस् (नेटवर्क आधारित)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"यस SIM मा आदेशहरू पठाउनहोस्"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"पूर्ण नेटवर्क पहुँच प्राप्त"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"प्रोफाइल र यन्त्र मालिकहरूको व्यवस्थापन गर्नुहोस्"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX अवस्था परिवर्तन गर्नुहोस्"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam स्थानान्तरण अवस्था प्राप्त गर्नुहोस्"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"मिडिया परिणाम दिशानिर्देश गर्नुहोस्"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"स्थापना सत्रहरू पढ्नुहोस्"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"स्थापना प्याकेजहरू अनुरोध गर्नुहोस्"</string>
</resources>
diff --git a/core/res/res/values-nl-watch/strings.xml b/core/res/res/values-nl-watch/strings.xml
index bed8a11..590d146 100644
--- a/core/res/res/values-nl-watch/strings.xml
+++ b/core/res/res/values-nl-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> van <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensoren"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"toegang tot uw contacten"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"toegang tot de locatie van dit horloge"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"toegang tot uw agenda"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"sms\'jes verzenden en bekijken"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"toegang tot foto\'s, media en bestanden op uw horloge"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"audio opnemen"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"foto\'s maken en video opnemen"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"bellen en telefoontjes beheren"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"toegang tot sensorgegevens over uw vitale functies"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"de statusbalk zijn"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"toegang tot lichaamssensoren (zoals hartslagmeters)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"toegang tot precieze locatie (GPS- en netwerkgebaseerd)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"toegang tot geschatte locatie (netwerkgebaseerd)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"opdrachten verzenden naar de simkaart"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"volledige netwerktoegang"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"profiel- en apparaateigenaren beheren"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX-status wijzigen"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam-overdrachtsstatus ontvangen"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"media-uitvoer aansturen"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"installatiesessies lezen"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"installatiepakketten aanvragen"</string>
</resources>
diff --git a/core/res/res/values-pa-rIN-watch/strings.xml b/core/res/res/values-pa-rIN-watch/strings.xml
index addaa6b..e5cb9e1 100644
--- a/core/res/res/values-pa-rIN-watch/strings.xml
+++ b/core/res/res/values-pa-rIN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"ਐਪ <xliff:g id="NUMBER_1">%2$d</xliff:g> ਦਾ <xliff:g id="NUMBER_0">%1$d</xliff:g>"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"ਸੰੰਵੇਦਕ"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਤੱਕ ਪਹੁੰਚ ਪ"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"ਇਸ ਘੜੀ ਦੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਤੱਕ ਪਹੁੰਚ"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"ਤੁਹਾਡੇ ਕੈਲੰਡਰ ਤੱਕ ਪਹੁੰਚ"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS ਸੁਨੇਹੇ ਭੇਜੋ ਅਤੇ ਦਿਖਾਓ"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"ਤੁਹਾਡੀ ਘੜੀ ਤੇ ਮੌਜੂਦ ਫੋਟੋਆਂ, ਮੀਡੀਆ ਅਤੇ ਫਾਈਲਾਂ ਤੱਕ ਪਹੁੰਚ"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ਤਸਵੀਰਾਂ ਖਿੱਚੋ ਅਤੇ ਵੀਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ਫ਼ੋਨ ਕਾਲਾਂ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਪ੍ਰਬੰਧਿਤ ਕਰੋ"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"ਆਪਣੇ ਮਹੱਤਵਪੂਰਣ ਲੱਛਣਾਂ ਬਾਰੇ ਸੰਵੇਦਕ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ਸਥਿਤੀ ਬਾਰ ਹੋਵੋ"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"ਸਰੀਰ ਸੰਵੇਦਕਾਂ ਤੱਕ ਪਹੁੰਚ (ਜਿਵੇਂ ਦਿਲ ਦੀ ਧੜਕਣ ਦੇ ਨਿਰੀਖਕ)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"ਨਿਯਤ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਤੱਕ ਪਹੁੰਚ (GPS ਅਤੇ ਨੈਟਵਰਕ-ਆਧਾਰਿਤ)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"ਅਨੁਮਾਨਿਤ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਤੱਕ ਪਹੁੰਚ (ਨੈਟਵਰਕ-ਆਧਾਰਿਤ)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM ਨੂੰ ਕਮਾਂਡਾਂ ਭੇਜੋ"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ਪੂਰੀ ਨੈਟਵਰਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"ਪ੍ਰੋਫ਼ਾਈਲ ਅਤੇ ਡਿਵਾਈਸ ਦੇ ਮਾਲਕਾਂ ਨੂੰ ਪ੍ਰਬੰਧਿਤ ਕਰੋ"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX ਸਥਿਤੀ ਬਦਲੋ"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam ਟ੍ਰਾਂਸਫਰ ਸਥਿਤੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"ਰੂਟ ਮੀਡੀਆ ਆਊਟਪੁਟ"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ਇੰਸਟੌਲ ਸੈਸ਼ਨ ਪੜ੍ਹੋ"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"ਪੈਕੇਜ ਇੰਸਟੌਲ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕਰੋ"</string>
</resources>
diff --git a/core/res/res/values-pl-watch/strings.xml b/core/res/res/values-pl-watch/strings.xml
index f266d0a..ff9f7ea 100644
--- a/core/res/res/values-pl-watch/strings.xml
+++ b/core/res/res/values-pl-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplikacja <xliff:g id="NUMBER_0">%1$d</xliff:g> z <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Czujniki"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"dostęp do kontaktów"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"dostęp do lokalizacji tego zegarka"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"dostęp do kalendarza"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"wysyłanie i wyświetlanie SMS-ów"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"dostęp do zdjęć, multimediów i plików na Twoim zegarku"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"nagrywanie dźwięku"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"robienie zdjęć i nagrywanie filmów"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"nawiązywanie połączeń telefonicznych i zarządzanie nimi"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"dostęp do danych czujnika podstawowych funkcji życiowych"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"działanie jako pasek stanu"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"dostęp do czujników ciała (np. monitorujących tętno)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"dostęp do dokładnej lokalizacji (na podstawie GPS-u i sieci)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"dostęp do przybliżonej lokalizacji (na podstawie sieci)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"wysyłanie poleceń do karty SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"pełny dostęp do sieci"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"zarządzanie właścicielami profilu i urządzenia"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"zmiana stanu WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"uzyskiwanie informacji o stanie transmisji Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"kierowanie wyjścia multimediów"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"odczytywanie sesji instalacji"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"żądanie instalacji pakietów"</string>
</resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index 1086601..82d1c02 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -421,10 +421,10 @@
<string name="permlab_useFingerprint" msgid="3150478619915124905">"używanie czytnika linii papilarnych"</string>
<string name="permdesc_useFingerprint" msgid="9165097460730684114">"Zezwala aplikacji na używanie czytnika linii papilarnych na potrzeby autoryzacji"</string>
<string name="fingerprint_acquired_partial" msgid="735082772341716043">"Odcisk palca został odczytany tylko częściowo. Spróbuj ponownie."</string>
- <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Nie udało się przetworzyć linii papilarnych. Spróbuj ponownie."</string>
+ <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Nie udało się przetworzyć odcisku palca. Spróbuj ponownie."</string>
<string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Czytnik linii papilarnych jest zabrudzony. Wyczyść go i spróbuj ponownie."</string>
- <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"Palec został uniesiony zbyt szybko. Spróbuj ponownie."</string>
- <string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"Palec został przesunięty zbyt wolno. Spróbuj ponownie."</string>
+ <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"Palec został podniesiony zbyt wcześnie. Spróbuj jeszcze raz."</string>
+ <string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"Palec został obrócony zbyt wolno. Spróbuj ponownie."</string>
<string-array name="fingerprint_acquired_vendor">
</string-array>
<string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"Czytnik linii papilarnych nie jest dostępny."</string>
@@ -433,7 +433,7 @@
<string name="fingerprint_error_canceled" msgid="4402024612660774395">"Odczyt odcisku palca został anulowany."</string>
<string name="fingerprint_error_lockout" msgid="5536934748136933450">"Zbyt wiele prób. Spróbuj ponownie później."</string>
<string name="fingerprint_error_unable_to_process" msgid="6107816084103552441">"Spróbuj ponownie."</string>
- <string name="fingerprint_name_template" msgid="5870957565512716938">"Palec <xliff:g id="FINGERID">%d</xliff:g>"</string>
+ <string name="fingerprint_name_template" msgid="5870957565512716938">"Odcisk palca <xliff:g id="FINGERID">%d</xliff:g>"</string>
<string-array name="fingerprint_error_vendor">
</string-array>
<string name="fingerprint_icon_content_description" msgid="2340202869968465936">"Ikona odcisku palca"</string>
diff --git a/core/res/res/values-pt-rBR-watch/strings.xml b/core/res/res/values-pt-rBR-watch/strings.xml
index 0eb0da3..a5e4a11 100644
--- a/core/res/res/values-pt-rBR-watch/strings.xml
+++ b/core/res/res/values-pt-rBR-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensores"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"acessar seus contatos"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"acessar a localização deste relógio"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"acessar sua agenda"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"enviar e ver mensagens SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"acessar fotos, mídia e arquivos do seu relógio"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"grave áudio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"tire fotos e grave vídeos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"fazer e gerenciar chamadas telefônicas"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"acessar dados do sensor sobre seus sinais vitais"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ser a barra de status"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"acessar os sensores corporais (como monitores de frequência cardíaca)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"acessar a localização precisa (GPS e com base na rede)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"acessar a localização aproximada (com base na rede)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"enviar comandos para o SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ter acesso total à rede"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"gerenciar proprietários de perfis e de dispositivos"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"alterar estado do WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"receber status de transferência do Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"rotear saída de mídia"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ler sessões de instalação"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"solicitar pacotes de instalação"</string>
</resources>
diff --git a/core/res/res/values-pt-rPT-watch/strings.xml b/core/res/res/values-pt-rPT-watch/strings.xml
index 1654fc3..0dd354a 100644
--- a/core/res/res/values-pt-rPT-watch/strings.xml
+++ b/core/res/res/values-pt-rPT-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplicação <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensores"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"aceder aos contactos"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"aceder à localização deste relógio"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"aceder ao calendário"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"enviar e ver mensagens SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"aceder a fotos, a multimédia e a ficheiros no relógio"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"gravar áudio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"tirar fotos e gravar vídeos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"fazer e gerir chamadas"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"aceder a dados do sensor acerca dos seus sinais vitais"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ser apresentada na barra de estado"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"aceder aos sensores corporais (como monitores do ritmo cardíaco)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"aceder à localização exata (baseada no GPS e na rede)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"aceder à localização aproximada (baseada na rede)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"enviar comandos para o SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ter acesso total à rede"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"gerir proprietários de perfis e de dispositivos"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"alterar estado do WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"receber estado de transferências do Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"encaminhar saída de som multimédia"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ler sessões de instalação"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"solicitar a instalação de pacotes"</string>
</resources>
diff --git a/core/res/res/values-pt-watch/strings.xml b/core/res/res/values-pt-watch/strings.xml
index 0eb0da3..a5e4a11 100644
--- a/core/res/res/values-pt-watch/strings.xml
+++ b/core/res/res/values-pt-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensores"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"acessar seus contatos"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"acessar a localização deste relógio"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"acessar sua agenda"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"enviar e ver mensagens SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"acessar fotos, mídia e arquivos do seu relógio"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"grave áudio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"tire fotos e grave vídeos"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"fazer e gerenciar chamadas telefônicas"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"acessar dados do sensor sobre seus sinais vitais"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"ser a barra de status"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"acessar os sensores corporais (como monitores de frequência cardíaca)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"acessar a localização precisa (GPS e com base na rede)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"acessar a localização aproximada (com base na rede)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"enviar comandos para o SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"ter acesso total à rede"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"gerenciar proprietários de perfis e de dispositivos"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"alterar estado do WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"receber status de transferência do Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"rotear saída de mídia"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ler sessões de instalação"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"solicitar pacotes de instalação"</string>
</resources>
diff --git a/core/res/res/values-ro-watch/strings.xml b/core/res/res/values-ro-watch/strings.xml
index dc3c906..e3cba00 100644
--- a/core/res/res/values-ro-watch/strings.xml
+++ b/core/res/res/values-ro-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplic. <xliff:g id="NUMBER_0">%1$d</xliff:g> din <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Senzori"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"accesează persoanele de contact"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"accesează locația acestui ceas"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"accesează calendarul"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"trimite și vede mesajele SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"accesează fotografiile, conținutul media și fișierele de pe ceas"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"înregistrează conținut audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"fotografiază și înregistrează videoclipuri"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"inițiază și gestionează apeluri telefonice"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"accesează datele înregistrate de senzori despre semnele vitale"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"este bara de stare"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"accesează senzorii corporali (cum ar fi monitoarele cardiace)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"accesează locația exactă (bazată pe GPS și pe rețea)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"accesează locația aproximativă (bazată pe rețea)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"trimite comenzi către SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"are acces deplin la rețea"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"gestionează profilul și proprietarii dispozitivului"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"schimbă starea WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"primește starea transferului prin Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"direcționează rezultatele media"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"citește sesiunile de instalare"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"solicită pachete de instalare"</string>
</resources>
diff --git a/core/res/res/values-ru-watch/strings.xml b/core/res/res/values-ru-watch/strings.xml
index cd536c5..5dd5630 100644
--- a/core/res/res/values-ru-watch/strings.xml
+++ b/core/res/res/values-ru-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Приложение <xliff:g id="NUMBER_0">%1$d</xliff:g> из <xliff:g id="NUMBER_1">%2$d</xliff:g>"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Датчики"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"доступ к контактам"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"доступ к местоположению часов"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"доступ к календарю"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"отправка и просмотр SMS-сообщений"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"доступ к фото, медиа и файлам на часах"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"запись аудио"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"фото- и видеосъемка"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"осуществление телефонных звонков и управление ими"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"доступ к данным датчиков о состоянии организма"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"замена строки состояния"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"доступ к датчикам (например, пульсометру)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"доступ к точному местоположению (на основе GPS и данных сети)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"доступ к примерному местоположению (на основе данных сети)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"отправка команд SIM-карте"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"неограниченный доступ к Интернету"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"управление профилями и владельцами"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"изменение статуса WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"получение статуса передачи Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"перенаправление мультимедийных данных"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"чтение данных о сеансах установки"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"разрешение на установку пакетов"</string>
</resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 821342a..f1deb22 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -1038,7 +1038,7 @@
<string name="usb_ptp_notification_title" msgid="1347328437083192112">"Передача фото через USB"</string>
<string name="usb_midi_notification_title" msgid="4850904915889144654">"MIDI через USB"</string>
<string name="usb_accessory_notification_title" msgid="7848236974087653666">"USB-устройство подключено"</string>
- <string name="usb_notification_message" msgid="7347368030849048437">"Ещё варианты"</string>
+ <string name="usb_notification_message" msgid="7347368030849048437">"Нажмите, чтобы настроить."</string>
<string name="adb_active_notification_title" msgid="6729044778949189918">"Отладка по USB разрешена"</string>
<string name="adb_active_notification_message" msgid="1016654627626476142">"Нажмите, чтобы отключить отладку по USB."</string>
<string name="select_input_method" msgid="8547250819326693584">"Выбор раскладки"</string>
diff --git a/core/res/res/values-si-rLK-watch/strings.xml b/core/res/res/values-si-rLK-watch/strings.xml
index 4adfbb5..aad82a0 100644
--- a/core/res/res/values-si-rLK-watch/strings.xml
+++ b/core/res/res/values-si-rLK-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g> හි <xliff:g id="NUMBER_1">%2$d</xliff:g> යෙදුම."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"සංවේදක"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"ඔබේ සම්බන්ධතාවලට පිවිසීම"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"මෙම ඔරලෝසුවෙහි ස්ථානයට පිවිසීම"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"ඔබේ දින දර්ශනයට පිවිසීම"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS පණිවිඩ යැවීම සහ බැලීම"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"ඔබේ ඔරලෝසුවේ ඇති ඡායාරූප, මාධ්ය සහ ගොනුවලට පිවිසීම"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ශ්රව්ය පටිගත කිරීම"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"පින්තූර ගැනීම සහ වීඩියෝ පටිගත කිරීම"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"දුරකථන ඇමතුම් සිදු කිරීම සහ කළමනාකරණය කිරීම"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"ඔබේ ජෛව ලක්ෂණ පිළිබඳ සංවේදක දත්ත වෙත පිවිසීම"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"තත්ත්ව තීරුව බවට පත්වීම"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"දේහ සංවේදකවලට (හෘද ස්පන්දන වේග මොනිටර වැනි) පිවිසීම"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"නිවැරදි ස්ථානයට (GPS සහ ජාලය පදනම් කරගත්) පිවිසීම"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"ආසන්නතම ස්ථානයට (ජාලය-පාදක වූ) පිවිසීම"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM වෙත විධාන යැවීම"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"සම්පූර්ණ ජාල ප්රවේශය තබා ගැනීම"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"පැතිකඩ සහ උපාංග හිමිකරුවන් කළමනාකරණය කිරීම"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX තත්ත්වය වෙනස් කිරීම"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android කදම්බ හුවමාරු තත්ත්වය ලබා ගැනීම"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"මාධ්ය ප්රතිදානය මාර්ගගත කිරීම"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ස්ථාපන සැසි කියවීම"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"ස්ථාපන පැකේජ ඉල්ලීම"</string>
</resources>
diff --git a/core/res/res/values-sk-watch/strings.xml b/core/res/res/values-sk-watch/strings.xml
index 24bed89..765b390 100644
--- a/core/res/res/values-sk-watch/strings.xml
+++ b/core/res/res/values-sk-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplikácia <xliff:g id="NUMBER_0">%1$d</xliff:g> z <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Senzory"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"prístup ku kontaktom"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"prístup k polohe týchto hodiniek"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"prístup ku kalendáru"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"posielanie a zobrazovanie správ SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"prístup k fotkám, médiám a súborom v hodinkách"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"zaznamenávanie zvuku"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"fotenie a zaznamenávanie videí"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"telefonovanie a správa hovorov"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"prístup k údajom senzorov o životných funkciách"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"vydávanie sa za stavový riadok"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"prístup k telesným senzorom (ako sú snímače tepu)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"prístup k presnej polohe (pomocou GPS a siete)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"prístup k približnej polohe (pomocou siete)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"posielanie príkazov do SIM karty"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"úplný prístup k sieti"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"správa vlastníkov profilov a zariadení"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"zmena stavu pripojenia WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"príjem stavu prenosov Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"smerovanie výstupu médií"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"čítanie inštalačných relácií"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"odosielanie žiadostí o inštaláciu balíčkov"</string>
</resources>
diff --git a/core/res/res/values-sl-watch/strings.xml b/core/res/res/values-sl-watch/strings.xml
index 5bc0ea5..f138326 100644
--- a/core/res/res/values-sl-watch/strings.xml
+++ b/core/res/res/values-sl-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g>. aplikac. od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Tipala"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"dostop do stikov"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"dostop do lokacije te ure"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"dostop do koledarja"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"pošiljanje in ogled sporočil SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"dostop do fotografij, predstavnosti in datotek v uri"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"snemanje zvoka"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"fotografiranje in snemanje videoposnetkov"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"opravljanje in upravljanje telefonskih klicev"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"dostop do podatkov tipala o vaših vitalnih znakih"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"postane vrstica stanja"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"dostop do tipal telesnih funkcij (npr. merilnikov srčnega utripa)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"dostop do natančne lokacije (na podlagi podatkov GPS in omrežja)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"dostop do približne lokacije (na podlagi podatkov omrežja)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"pošiljanje ukazov na kartico SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"poln dostop do omrežja"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"upravljanje lastnikov profilov in lastnika naprave"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"sprememba stanja omrežja WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"prejemanje stanja prenosov s funkcijo Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"preusmeritev predstavnosti"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"branje sej namestitev"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"zahtevanje paketov za namestitev"</string>
</resources>
diff --git a/core/res/res/values-sq-rAL-watch/strings.xml b/core/res/res/values-sq-rAL-watch/strings.xml
index 1b0bdaf..7e36a32 100644
--- a/core/res/res/values-sq-rAL-watch/strings.xml
+++ b/core/res/res/values-sq-rAL-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Aplikacioni <xliff:g id="NUMBER_0">%1$d</xliff:g> nga <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensorët"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"qasu te kontaktet e tua"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"qasu te vendndodhja e kësaj ore"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"qasu te kalendari yt"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"dërgo dhe shiko mesazhet SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"qasu te fotografitë, përmbajtjet audio-vizuale dhe skedarët në orën tënde të dorës"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"regjistro audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"bëj fotografi dhe regjistro video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"kryej dhe menaxho telefonata"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"qasu tek të dhënat e sensorëve rreth shenjave të tua jetësore"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"të bëhet shiriti i statusit"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"qasu te sensorët e trupit (si monitorimet e rrahjeve të zemrës)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"qasu te vendndodhja e përpiktë (në bazë të GPS-së dhe rrjetit)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"qasu te vendndodhja e përafërt (bazuar në rrjet)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"dërgo komanda te karta SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"qasu plotësisht në rrjet"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"menaxho zotëruesit e profilit dhe të pajisjes"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"ndrysho gjendjen WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"merr statusin e transferimit përmes \"Dërgimit me rreze të Android\""</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"kalo daljet e përmbajtjes audio-vizuale"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"lexo sesionet e instalimit"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"kërko paketat e instalimit"</string>
</resources>
diff --git a/core/res/res/values-sr-watch/strings.xml b/core/res/res/values-sr-watch/strings.xml
index ae70ab1..afeae38 100644
--- a/core/res/res/values-sr-watch/strings.xml
+++ b/core/res/res/values-sr-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Апликација <xliff:g id="NUMBER_0">%1$d</xliff:g> од <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Сензори"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"приступ контактима"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"приступ локацији овог сата"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"приступ календару"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"слање и преглед SMS порука"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"приступ сликама, медијским и другим датотекама на сату"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"снимање аудио снимака"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"снимање слика и видео снимака"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"упућивање телефонских позива и управљање њима"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"приступ подацима сензора о виталним функцијама"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"функционисање као статусне траке"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"приступ сензорима на телу (попут монитора за праћење пулса)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"приступ прецизној локацији (утврђена преко мреже и GPS-а)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"приступ приближној локацији (утврђена преко мреже)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"слање команди на SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"има пун мрежни приступ"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"управљање власницима профила и уређаја"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"мењање WiMAX статуса"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"пријем статуса пребацивања помоћу Android пребацивања"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"усмеравање излаза медија"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"читање сесија инсталирања"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"захтевање пакета за инсталирање"</string>
</resources>
diff --git a/core/res/res/values-sv-watch/strings.xml b/core/res/res/values-sv-watch/strings.xml
index aba8abb..439b464 100644
--- a/core/res/res/values-sv-watch/strings.xml
+++ b/core/res/res/values-sv-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> av <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensorer"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"få tillgång till dina kontakter"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"få tillgång till klockans plats"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"få tillgång till din kalender"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"skicka och visa sms"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"få åtkomst till foton, media och filer på klockan"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"spela in ljud"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ta bilder och spela in video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ringa och hantera telefonsamtal"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"få åtkomst till sensordata om dina vitalparametrar"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"visas i statusfältet"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"få åtkomst till kroppssensorer (till exempel pulsmätare)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"få åtkomst till din exakta position (GPS- och nätverksbaserad)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"få åtkomst till din ungefärliga position (nätverksbaserad)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"skicka kommandon till SIM-kortet"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"få fullständig nätverksåtkomst"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"hantera profil- och enhetsägare"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"ändra WiMAX-status"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"ta emot status för Android Beam-överföring"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"dirigera medieuppspelning"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"läsa installationssessioner"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"begära installationspaket"</string>
</resources>
diff --git a/core/res/res/values-sw-watch/strings.xml b/core/res/res/values-sw-watch/strings.xml
index 929022f..3cad827 100644
--- a/core/res/res/values-sw-watch/strings.xml
+++ b/core/res/res/values-sw-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Programu ya <xliff:g id="NUMBER_0">%1$d</xliff:g> kati ya <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Vihisi"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"fikia anwani zako"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"tambua mahali saa hii ilipo"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"fikia kalenda yako"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"tuma na uangalie ujumbe wa SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"fikia picha, maudhui na faili kwenye saa yako"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"rekodi sauti"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"piga picha na urekodi video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"piga na udhibiti simu"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"fikia data ya kihisi kuhusu alama zako muhimu"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"kuwa sehemu ya arifa"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"fikia vihisi vya mwili (kama vifuatiliaji vya mapigo ya moyo)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"fikia mahali halisi (inategemea mtandao na GPS)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"fikia mahali karibu na hapo (inategemea mtandao)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"tuma amri kwenye SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"pata ufikiaji kamili wa mtandao"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"simamia wamiliki wa wasifu na vifaa"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"badilisha hali ya WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"pokea hali ya uhamisho wa Boriti ya Android"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"tuma njia ya kutoa maudhui"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"soma vipindi vya kusakinisha"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"omba ruhusa ya kusakinisha vifurushi"</string>
</resources>
diff --git a/core/res/res/values-ta-rIN-watch/strings.xml b/core/res/res/values-ta-rIN-watch/strings.xml
index 23accbc..63e072f 100644
--- a/core/res/res/values-ta-rIN-watch/strings.xml
+++ b/core/res/res/values-ta-rIN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"பயன்பாடு: <xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"உணர்விகள்"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"தொடர்புகளை அணுகும்"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"இந்த வாட்சின் இருப்பிடத்தை அணுகும்"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"கேலெண்டரை அணுகும்"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS செய்திகளை அனுப்பும் மற்றும் பார்க்கும்"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"உங்கள் வாட்சில் உள்ள படங்கள், மீடியா மற்றும் கோப்புகளை அணுகும்"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ஆடியோவைப் பதிவுசெய்யும்"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"படங்களை எடுக்கும், வீடியோவைப் பதிவுசெய்யும்"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"மொபைல் அழைப்புகளைச் செய்யும், பெறும்"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"உங்கள் உடலியக்கக் குறிகள் பற்றிய உணர்வித் தரவை அணுகும்"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"நிலைப் பட்டியில் இருக்கும்"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"உடல் உணர்விகளை (இதயத் துடிப்பு மானிட்டர்கள் போன்றவை) அணுகும்"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"துல்லியமான இருப்பிடத்தை அணுகும் (GPS மற்றும் நெட்வொர்க் அடிப்படையில்)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"தோராயமான இருப்பிடத்தை அணுகும் (நெட்வொர்க் அடிப்படையில்)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"கட்டளைகளை சிம்மிற்கு அனுப்பும்"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"முழுமையான நெட்வொர்க் அணுகலைக் கொண்டிருக்கும்"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"சுயவிவரத்தையும் சாதன உரிமையாளர்களையும் நிர்வகிக்கும்"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX நிலையை மாற்றும்"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android பீம் பரிமாற்ற நிலையைப் பெறும்"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"மீடியா அவுட்புட்டை ரூட் செய்யும்"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"நிறுவல் அமர்வுகளைப் படிக்கும்"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"நிறுவல் தொகுப்புகளைக் கோரும்"</string>
</resources>
diff --git a/core/res/res/values-te-rIN-watch/strings.xml b/core/res/res/values-te-rIN-watch/strings.xml
index 0843471..f642807 100644
--- a/core/res/res/values-te-rIN-watch/strings.xml
+++ b/core/res/res/values-te-rIN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g>లో <xliff:g id="NUMBER_0">%1$d</xliff:g>వ అనువర్తనం."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"సెన్సార్లు"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"మీ పరిచయాలను ప్రాప్యత చేస్తుంది"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"ఈ గడియారం స్థానాన్ని ప్రాప్యత చేస్తుంది"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"మీ క్యాలెండర్ను ప్రాప్యత చేస్తుంది"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS సందేశాలను పంపుతుంది మరియు చూస్తుంది"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"మీ గడియారంలోని ఫోటోలు, మీడియా మరియు ఫైల్లను ప్రాప్యత చేస్తుంది"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ఆడియోను రికార్డ్ చేస్తుంది"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"చిత్రాలను తీస్తుంది మరియు వీడియోను రికార్డ్ చేస్తుంది"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"ఫోన్ కాల్లు చేస్తుంది మరియు నిర్వహిస్తుంది"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"మీ అత్యంత కీలకమైన గుర్తుల గురించి సెన్సార్ డేటాని ప్రాప్యత చేస్తుంది"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"స్థితి పట్టీగా ఉంటుంది"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"శరీర సెన్సార్లను (హృదయ స్పందన రేటు మానిటర్ల వంటివి) ప్రాప్యత చేస్తుంది"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"ఖచ్చితమైన స్థానాన్ని (GPS మరియు నెట్వర్క్-ఆధారితం) ప్రాప్యత చేస్తుంది"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"సమీప స్థానాన్ని (నెట్వర్క్-ఆధారితం) ప్రాప్యత చేస్తుంది"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIMకి ఆదేశాలు పంపుతుంది"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"పూర్తి నెట్వర్క్ ప్రాప్యతను కలిగి ఉంటుంది"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"ప్రొఫైల్ మరియు పరికరం యజమానులను నిర్వహిస్తుంది"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX స్థితిని మారుస్తుంది"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam బదిలీ స్థితిని స్వీకరిస్తుంది"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"మీడియా అవుట్పుట్ మార్గం నిర్దేశిస్తుంది"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"ఇన్స్టాల్ సెషన్లను చదువుతుంది"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"ఇన్స్టాల్ ప్యాకేజీలను అభ్యర్థిస్తుంది"</string>
</resources>
diff --git a/core/res/res/values-th-watch/strings.xml b/core/res/res/values-th-watch/strings.xml
index 9cc21b0..98f938d 100644
--- a/core/res/res/values-th-watch/strings.xml
+++ b/core/res/res/values-th-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"แอป <xliff:g id="NUMBER_0">%1$d</xliff:g> จาก <xliff:g id="NUMBER_1">%2$d</xliff:g> แอป"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"เซ็นเซอร์"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"เข้าถึงรายชื่อติดต่อ"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"เข้าถึงตำแหน่งของนาฬิกานี้"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"เข้าถึงปฏิทิน"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"ส่งและดูข้อความ SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"เข้าถึงรูปภาพ สื่อ และไฟล์ในนาฬิกา"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"บันทึกเสียง"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"ถ่ายภาพและบันทึกวิดีโอ"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"โทรและจัดการการโทร"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"เข้าถึงข้อมูลเซ็นเซอร์เกี่ยวกับสัญญาณชีพของคุณ"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"เป็นแถบสถานะ"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"เข้าถึงเซ็นเซอร์สำหรับร่างกาย (เช่น เครื่องติดตามดูอัตราการเต้นของหัวใจ)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"เข้าถึงตำแหน่งที่แม่นยำ (อิงจาก GPS และเครือข่าย)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"เข้าถึงตำแหน่งโดยประมาณ (อิงจากเครือข่าย)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"ส่งคำสั่งไปยังซิม"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"มีสิทธิ์เข้าถึงเครือข่ายเต็มรูปแบบ"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"จัดการเจ้าของโปรไฟล์และอุปกรณ์"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"เปลี่ยนสถานะของ WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"รับสถานะการโอน Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"กำหนดเส้นทางเอาต์พุตของสื่อ"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"อ่านเซสชันการติดตั้ง"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"ขอติดตั้งแพ็กเกจ"</string>
</resources>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index 9804f99..b2df636 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -1026,7 +1026,7 @@
<string name="usb_accessory_notification_title" msgid="7848236974087653666">"เชื่อมต่อกับอุปกรณ์เสริม USB แล้ว"</string>
<string name="usb_notification_message" msgid="7347368030849048437">"แตะเพื่อดูตัวเลือกเพิ่มเติม"</string>
<string name="adb_active_notification_title" msgid="6729044778949189918">"เชื่อมต่อการแก้ไขข้อบกพร่อง USB แล้ว"</string>
- <string name="adb_active_notification_message" msgid="1016654627626476142">"แตะเพื่อปิดใช้งานการแก้ไขข้อบกพร่องของ USB"</string>
+ <string name="adb_active_notification_message" msgid="1016654627626476142">"แตะเพื่อปิดใช้งานการแก้ไขข้อบกพร่อง USB"</string>
<string name="select_input_method" msgid="8547250819326693584">"เปลี่ยนแป้นพิมพ์"</string>
<string name="configure_input_methods" msgid="4769971288371946846">"เลือกแป้นพิมพ์"</string>
<string name="show_ime" msgid="9157568568695230830">"แสดงวิธีการป้อนข้อมูล"</string>
diff --git a/core/res/res/values-tl-watch/strings.xml b/core/res/res/values-tl-watch/strings.xml
index 3fba2dc..c38891e 100644
--- a/core/res/res/values-tl-watch/strings.xml
+++ b/core/res/res/values-tl-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> ng <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Mga Sensor"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"i-access ang iyong mga contact"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"i-access ang lokasyon ng relong ito"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"i-access ang iyong kalendaryo"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"magpadala at tumingin ng mga mensaheng SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"i-access ang mga larawan, media at mga file sa iyong relo"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"mag-record ng audio"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"kumuha ng mga larawan at mag-record ng video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"tumawag sa telepono at mamahala ng mga tawag sa telepono"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"i-access ang data ng sensor tungkol sa iyong mahahalagang senyales"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"maging status bar"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"i-access ang mga sensor sa katawan (tulad ng mga monitor ng bilis ng tibok ng puso)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"i-access ang tumpak na lokasyon (batay sa GPS at network)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"i-access ang tinatantyang lokasyon (batay sa network)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"magpadala ng mga command sa SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"magkaroon ng ganap na access sa network"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"pamahalaan ang mga may-ari ng profile at device"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"baguhin ang status ng WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"tanggapin ang status ng paglilipat ng Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"iruta ang output ng media"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"basahin ang mga session ng pag-install"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"humiling ng mga package sa pag-install"</string>
</resources>
diff --git a/core/res/res/values-tr-watch/strings.xml b/core/res/res/values-tr-watch/strings.xml
index b34ad74..4dbf664 100644
--- a/core/res/res/values-tr-watch/strings.xml
+++ b/core/res/res/values-tr-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Uygulama <xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensörler"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"kişilerinize erişme"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"bu saatin konum bilgilerine erişme"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"takviminize erişme"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS iletileri gönderme ve görüntüleme"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"saatinizdeki fotoğraflara, medyaya ve dosyalara erişme"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ses kaydetme"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"fotoğraf çekme ve video kaydetme"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"telefon aramaları yapma ve çağrıları yönetme"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"hayati belirtilerinizle ilgili sensör verilerine erişme"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"durum çubuğunda olma"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"vücut sensörlerine erişme (nabız takip cihazları gibi)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"konumunuza hassas olarak erişme (GPS ve ağ tabanlı)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"konumunuza yaklaşık olarak erişme (ağ tabanlı)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM karta komut gönderme"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"tam ağ erişimine sahip olma"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"profili ve cihaz sahiplerini yönetme"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX durumunu değiştirme"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam aktarım durumunu alma"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"medya çıkışını yönlendirme"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"yükleme oturumlarını okuma"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"paketleri yükleme isteğinde bulunma"</string>
</resources>
diff --git a/core/res/res/values-uk-watch/strings.xml b/core/res/res/values-uk-watch/strings.xml
index 4141b08..63ddea9 100644
--- a/core/res/res/values-uk-watch/strings.xml
+++ b/core/res/res/values-uk-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Додаток <xliff:g id="NUMBER_0">%1$d</xliff:g> з <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Датчики"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"отримувати доступ до контактів"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"отримувати геодані з годинника"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"отримувати доступ до календаря"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"надсилати та переглядати SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"отримувати доступ до фотографій, медіа-вмісту й інших файлів на годиннику"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"записувати аудіо"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"фотографувати та записувати відео"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"телефонувати та керувати дзвінками"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"отримувати життєві показники з датчиків"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"відображатися як рядок стану"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"отримувати дані з датчиків на тілі (наприклад, з пульсометра)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"отримувати дані про точне місцезнаходження (на основі GPS і мережі)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"отримувати дані про приблизне місцезнаходження (на основі мережі)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"надсилати команди на SIM-карту"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"отримувати повний доступ до мережі"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"керувати власниками профілів і пристроїв"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"змінювати стан WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"отримувати інформацію про стан функції Передавання даних Android"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"вибирати маршрути виводу медіа-вмісту"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"отримувати дані про сеанси встановлення"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"надсилати запити на пакети встановлення"</string>
</resources>
diff --git a/core/res/res/values-ur-rPK-watch/strings.xml b/core/res/res/values-ur-rPK-watch/strings.xml
index f90af0b..8ba8042 100644
--- a/core/res/res/values-ur-rPK-watch/strings.xml
+++ b/core/res/res/values-ur-rPK-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"ایپ <xliff:g id="NUMBER_0">%1$d</xliff:g> از <xliff:g id="NUMBER_1">%2$d</xliff:g>۔"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"سینسرز"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"اپنے رابطوں تک رسائی حاصل کریں"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"اس گھڑی کے مقام تک رسائی حاصل کریں"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"اپنے کیلنڈر تک رسائی حاصل کریں"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS پیغامات بھیجیں اور دیکھیں"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"اپنی گھڑی پر تصاویر، میڈیا اور فائلوں تک رسائی حاصل کریں"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"آڈیو ریکارڈ کریں"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"تصاویر لیں اور ویڈیو ریکارڈ کریں"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"فون کالز کریں اور ان کا نظم کریں"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"اپنی علامات حیات کے متعلق سنسر ڈیٹا تک رسائی حاصل کریں"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"بطور اسٹیٹس بار کام لیں"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"باڈی سینسرز تک رسائی حاصل کریں (جیسے دل کی دھڑکن کے مانیٹرز)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"قطعی مقام تک رسائی حاصل کریں (GPS اور نیٹ ورک پر مبنی)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"تخمینی مقام تک رسائی حاصل کریں (نیٹ ورک پر مبنی)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM کو ہدایات بھیجیں"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"پورے نیٹ ورک تک رسائی حاصل کریں"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"پروفائل اور آلہ کے مالکان کا نظم کریں"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX کی حیثیت تبدیل کریں"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam منتقلی کی صورت حال موصول کریں"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"میڈیا آؤٹ پٹ کی سمت طے کریں"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"انسٹال سیشنز پڑھیں"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"پیکجز انسٹال کرنے کی درخواست کریں"</string>
</resources>
diff --git a/core/res/res/values-uz-rUZ-watch/strings.xml b/core/res/res/values-uz-rUZ-watch/strings.xml
index 42fe54a..0fe54a1 100644
--- a/core/res/res/values-uz-rUZ-watch/strings.xml
+++ b/core/res/res/values-uz-rUZ-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_1">%2$d</xliff:g>dan <xliff:g id="NUMBER_0">%1$d</xliff:g> ilova."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensorlar"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"kontaktlarga kirishga ruxsat berish"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"mazkur soatning joylashgan joyini ko‘rishga ruxsat berish"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"taqvim ma’lumotlariga kirish"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"SMS xabarlarni yuborish va ko‘rish"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"Soatingizdagi rasmlar, media va fayllarga kirish"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ovoz yozib olish"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"rasmga tushirish va videoga olish"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"telefon qo‘ng‘iroqlarini amalga oshirish va boshqarish"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"asosiy belgilaringiz haqidagi sezgich ma’lumotlaridan foydalanishga ruxsat"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"holat qatorida ko‘rinishi"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"tana sezgichlari (m-n, yurak urishi sensori) ma’lumotlaridan foydalanishga ruxsat"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"aniq joylashuv (GPS va tarmoqqa asoslanib) ma’lumotlaridan foydalanishga ruxsat"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"taxminiy joylashuv (tarmoq asosida) ma’lumotlaridan foydalanishga ruxsat"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"SIM kartaga buyruqlar yuborish"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"to‘liq tarmoqdan foydalanish ruxsatiga ega"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"profil va qurilma egalarini boshqarish"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"WiMAX holatini o‘zgartirish"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"Android Beam o‘tkazmasi holati haqidagi ma’lumotlarni olish"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"media chiqishni yo‘naltirish"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"o‘rnatish seansi ma’lumotlarini o‘qish"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"paketlarni o‘rnatish so‘rovini yuborish"</string>
</resources>
diff --git a/core/res/res/values-vi-watch/strings.xml b/core/res/res/values-vi-watch/strings.xml
index 634d890..8bfd3df 100644
--- a/core/res/res/values-vi-watch/strings.xml
+++ b/core/res/res/values-vi-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Ứng dụng <xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Cảm biến"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"truy cập danh bạ của bạn"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"truy cập vị trí của đồng hồ này"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"truy cập lịch của bạn"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"gửi và xem tin nhắn SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"truy cập ảnh, phương tiện và tệp trên đồng hồ của bạn"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"ghi âm"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"chụp ảnh và quay video"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"thực hiện và quản lý cuộc gọi điện thoại"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"truy cập dữ liệu cảm biến về dấu hiệu sinh tồn của bạn"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"trở thành thanh trạng thái"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"truy cập cảm biến cơ thể (như máy đo nhịp tim)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"truy cập vị trí chính xác (dựa vào mạng và GPS)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"truy cập vị trí gần đúng (dựa vào mạng)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"gửi lệnh đến SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"có quyền truy cập mạng đầy đủ"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"quản lý chủ sở hữu thiết bị và hồ sơ"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"thay đổi trạng thái WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"nhận trạng thái chuyển của Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"định tuyến thiết bị ra phương tiện"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"đọc phiên cài đặt"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"yêu cầu gói cài đặt"</string>
</resources>
diff --git a/core/res/res/values-zh-rCN-watch/strings.xml b/core/res/res/values-zh-rCN-watch/strings.xml
index 8864701..f336907 100644
--- a/core/res/res/values-zh-rCN-watch/strings.xml
+++ b/core/res/res/values-zh-rCN-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"应用：<xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g>。"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"传感器"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"使用您的通讯录"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"访问此手表的位置信息"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"访问您的日历"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"发送和查看短信"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"访问您手表中的照片、媒体和文件"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"录制音频"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"拍摄照片和录制视频"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"拨打电话和管理通话"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"访问与您的生命体征相关的传感器数据"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"用作状态栏"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"访问身体传感器（如心率监测器）"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"访问确切位置信息（以 GPS 和网络为依据）"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"访问大致位置信息（以网络为依据）"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"向 SIM 卡发送命令"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"拥有完全的网络访问权限"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"管理个人资料和设备所有者"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"更改 WiMAX 状态"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"接收 Android Beam 的传输状态"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"更改媒体输出线路"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"读取安装会话"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"请求安装文件包"</string>
</resources>
diff --git a/core/res/res/values-zh-rHK-watch/strings.xml b/core/res/res/values-zh-rHK-watch/strings.xml
index 356e853..b5ecb08 100644
--- a/core/res/res/values-zh-rHK-watch/strings.xml
+++ b/core/res/res/values-zh-rHK-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"應用程式 (<xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>)"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"感應器"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"存取您的通訊錄"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"存取此手錶的位置"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"存取您的日曆"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"傳送和查看短訊"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"存取手錶上的相片、媒體和檔案"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"錄製語音"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"拍攝和錄製影片"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"撥打電話及管理通話"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"存取與您生命體徵相關的感應器資料"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"成為狀態列"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"存取身體感應器 (例如心跳監測器)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"存取精確位置 (根據 GPS 和網絡)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"存取約略位置 (根據網絡)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"發送指令至 SIM 卡"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"擁有全面網絡存取權"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"管理個人檔案和裝置擁有者"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"變更 WiMAX 狀態"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"接收 Android Beam 的傳送狀態"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"轉送媒體輸出"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"讀取安裝工作階段"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"要求安裝套件"</string>
</resources>
diff --git a/core/res/res/values-zh-rTW-watch/strings.xml b/core/res/res/values-zh-rTW-watch/strings.xml
index 20ef6ba..79fb99d 100644
--- a/core/res/res/values-zh-rTW-watch/strings.xml
+++ b/core/res/res/values-zh-rTW-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"應用程式 <xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>。"</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"感應器"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"存取您的聯絡人"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"存取這個手錶的位置資訊"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"存取您的日曆"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"傳送及查看簡訊"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"存取手錶上的相片、媒體和檔案"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"錄音"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"拍照及錄製影片"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"撥打電話及管理通話"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"存取生命徵象相關感應器資料"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"用作狀態列"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"存取人體感測器 (例如心跳速率監測器)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"存取精確位置 (以 GPS 和網路為依據)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"存取概略位置 (以網路為依據)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"傳送指令到 SIM 卡"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"擁有完整的網路存取權"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"管理個人資料和裝置擁有者"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"變更 WiMAX 狀態"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"接收 Android Beam 的傳輸狀態"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"轉送媒體輸出"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"讀取安裝工作階段"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"索取安裝套件"</string>
</resources>
diff --git a/core/res/res/values-zu-watch/strings.xml b/core/res/res/values-zu-watch/strings.xml
index 22b8af7..e9121b9 100644
--- a/core/res/res/values-zu-watch/strings.xml
+++ b/core/res/res/values-zu-watch/strings.xml
@@ -21,48 +21,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="android_upgrading_apk" msgid="1090732262010398759">"Uhlelo lokusebenza olungu-<xliff:g id="NUMBER_0">%1$d</xliff:g> kokungu-<xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <!-- no translation found for permgrouplab_sensors (202675452368612754) -->
- <skip />
- <!-- no translation found for permgrouplab_contactswear (2340286500790908344) -->
- <skip />
- <!-- no translation found for permgrouplab_locationwear (6275317222482780209) -->
- <skip />
- <!-- no translation found for permgrouplab_calendarwear (441900844045065081) -->
- <skip />
- <!-- no translation found for permgrouplab_smswear (6849506550342974220) -->
- <skip />
- <!-- no translation found for permgrouplab_storagewear (1003807594193602313) -->
- <skip />
- <!-- no translation found for permgrouplab_microphonewear (1047561180980891136) -->
- <skip />
- <!-- no translation found for permgrouplab_camerawear (4543951283103407017) -->
- <skip />
- <!-- no translation found for permgrouplab_phonewear (134365036753766126) -->
- <skip />
- <!-- no translation found for permgrouplab_sensorswear (1429324744329327663) -->
- <skip />
- <!-- no translation found for permlab_statusBarServicewear (2469402818964691034) -->
- <skip />
- <!-- no translation found for permlab_bodySensorswear (7857941041202791873) -->
- <skip />
- <!-- no translation found for permlab_accessFineLocationwear (5584423486924377563) -->
- <skip />
- <!-- no translation found for permlab_accessCoarseLocationwear (5880746016230166090) -->
- <skip />
- <!-- no translation found for permlab_sim_communicationwear (1899198085342781874) -->
- <skip />
- <!-- no translation found for permlab_createNetworkSocketswear (6467042386273822913) -->
- <skip />
- <!-- no translation found for permlab_manageProfileAndDeviceOwnerswear (7313340516937821847) -->
- <skip />
- <!-- no translation found for permlab_changeWimaxStatewear (3828470843939853744) -->
- <skip />
- <!-- no translation found for permlab_handoverStatuswear (4835786819716499249) -->
- <skip />
- <!-- no translation found for permlab_route_media_outputwear (8737024341474587192) -->
- <skip />
- <!-- no translation found for permlab_readInstallSessionswear (9059478058685861989) -->
- <skip />
- <!-- no translation found for permlab_requestInstallPackageswear (4982025836783539503) -->
- <skip />
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Izinzwa"</string>
+ <string name="permgrouplab_contactswear" msgid="2340286500790908344">"finyelela koxhumana nabo"</string>
+ <string name="permgrouplab_locationwear" msgid="6275317222482780209">"finyelela indawo yaleli washi"</string>
+ <string name="permgrouplab_calendarwear" msgid="441900844045065081">"finyelela kukhalenda yakho"</string>
+ <string name="permgrouplab_smswear" msgid="6849506550342974220">"thumela uphinde ubuke imilayezo ye-SMS"</string>
+ <string name="permgrouplab_storagewear" msgid="1003807594193602313">"finyelela izithombe, imidiya, namafayela kuwashi lakho"</string>
+ <string name="permgrouplab_microphonewear" msgid="1047561180980891136">"rekhoda ividiyo"</string>
+ <string name="permgrouplab_camerawear" msgid="4543951283103407017">"thatha izithombe uphinde urekhode ividiyo"</string>
+ <string name="permgrouplab_phonewear" msgid="134365036753766126">"yenza uphinde uphathe amakholi wefoni"</string>
+ <string name="permgrouplab_sensorswear" msgid="1429324744329327663">"finyelela idatha yenzwa mayelana nezimpawu zakho ezibalulekile"</string>
+ <string name="permlab_statusBarServicewear" msgid="2469402818964691034">"yiba yibha yesimo"</string>
+ <string name="permlab_bodySensorswear" msgid="7857941041202791873">"finyelela kuzinzwa zomzimba (ezifana neziqaphi zokulinganisela inhliziyo)"</string>
+ <string name="permlab_accessFineLocationwear" msgid="5584423486924377563">"finyelela indawo enembile (i-GPS nesuselwa kunethiwekhi)"</string>
+ <string name="permlab_accessCoarseLocationwear" msgid="5880746016230166090">"finyelela kundawo elinganiselwe (esuselwa kunethiwekhi)"</string>
+ <string name="permlab_sim_communicationwear" msgid="1899198085342781874">"thumela imilayezo ku-SIM"</string>
+ <string name="permlab_createNetworkSocketswear" msgid="6467042386273822913">"iba nokufinyelela okugcwele kwenethiwekhi"</string>
+ <string name="permlab_manageProfileAndDeviceOwnerswear" msgid="7313340516937821847">"phatha iphrofayela nabanikazi bedivayisi"</string>
+ <string name="permlab_changeWimaxStatewear" msgid="3828470843939853744">"shintsha isimo se-WiMAX"</string>
+ <string name="permlab_handoverStatuswear" msgid="4835786819716499249">"thola isimo sokudlulisa se-Android Beam"</string>
+ <string name="permlab_route_media_outputwear" msgid="8737024341474587192">"yenza umzila ukukhipha kwemidiya"</string>
+ <string name="permlab_readInstallSessionswear" msgid="9059478058685861989">"funda izikhathi zokufaka"</string>
+ <string name="permlab_requestInstallPackageswear" msgid="4982025836783539503">"cela amaphakheji wokufaka"</string>
</resources>
diff --git a/core/tests/coretests/src/android/animation/ValueAnimatorTests.java b/core/tests/coretests/src/android/animation/ValueAnimatorTests.java
index 03ae9dc..6d20503 100644
--- a/core/tests/coretests/src/android/animation/ValueAnimatorTests.java
+++ b/core/tests/coretests/src/android/animation/ValueAnimatorTests.java
@@ -15,13 +15,21 @@
*/
package android.animation;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
import android.os.SystemClock;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
+import android.view.Choreographer;
+import android.view.animation.LinearInterpolator;
+
+import java.util.ArrayList;
import static android.test.MoreAsserts.assertNotEqual;
public class ValueAnimatorTests extends ActivityInstrumentationTestCase2<BasicAnimatorActivity> {
+ private static final long WAIT_TIME_OUT = 5000;
private ValueAnimator a1;
private ValueAnimator a2;
@@ -34,6 +42,9 @@
private final static int A2_START_VALUE = 100;
private final static int A2_END_VALUE = 200;
+ private final static long DEFAULT_FRAME_INTERVAL = 5; //ms
+ private final static long COMMIT_DELAY = 3; //ms
+
public ValueAnimatorTests() {
super(BasicAnimatorActivity.class);
}
@@ -47,9 +58,9 @@
@Override
public void tearDown() throws Exception {
- super.tearDown();
a1 = null;
a2 = null;
+ super.tearDown();
}
@SmallTest
@@ -387,6 +398,63 @@
}
@SmallTest
+ public void testEnd() throws Throwable {
+ final MyListener l1 = new MyListener();
+ final MyListener l2 = new MyListener();
+ a1.addListener(l1);
+ a2.addListener(l2);
+ a1.addListener(new MyListener() {
+ @Override
+ public void onAnimationEnd(Animator anim) {
+ anim.cancel();
+ }
+ });
+ a2.addListener(new MyListener() {
+ @Override
+ public void onAnimationCancel(Animator anim) {
+ anim.end();
+ }
+ });
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ assertFalse(l1.cancelCalled);
+ assertFalse(l1.endCalled);
+ assertFalse(l2.cancelCalled);
+ assertFalse(l2.endCalled);
+ a1.start();
+ a2.start();
+ }
+ });
+ Thread.sleep(POLL_INTERVAL);
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ a1.end();
+ a2.cancel();
+ }
+ });
+ Thread.sleep(POLL_INTERVAL);
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // Calling cancel from onAnimationEnd will be ignored.
+ assertFalse(l1.cancelCalled);
+ assertTrue(l1.endCalled);
+ assertTrue(l2.cancelCalled);
+ assertTrue(l2.endCalled);
+
+ float value1 = (Float) a1.getAnimatedValue();
+ int value2 = (Integer) a2.getAnimatedValue();
+ assertEquals(A1_END_VALUE, value1);
+ assertEquals(A2_END_VALUE, value2);
+ }
+ });
+
+ }
+
+ @SmallTest
public void testEndValue() throws Throwable {
final MyListener l1 = new MyListener();
a1.addListener(l1);
@@ -435,10 +503,265 @@
});
}
+ @SmallTest
+ public void testUpdateListener() throws InterruptedException {
+
+ final MyFrameCallbackProvider provider = new MyFrameCallbackProvider();
+ long sleep = 0;
+ while (provider.mHandler == null) {
+ Thread.sleep(POLL_INTERVAL);
+ sleep += POLL_INTERVAL;
+ if (sleep > WAIT_TIME_OUT) {
+ break;
+ }
+ }
+ // Either the looper has started, or timed out
+ assertNotNull(provider.mHandler);
+
+ final MyListener listener = new MyListener();
+ final MyUpdateListener l1 = new MyUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ long currentTime = SystemClock.uptimeMillis();
+ long frameDelay = provider.getFrameDelay();
+ if (lastUpdateTime > 0) {
+ // Error tolerance here is one frame.
+ assertTrue((currentTime - lastUpdateTime) < frameDelay * 2);
+ } else {
+ // First frame:
+ assertTrue(listener.startCalled);
+ assertTrue(listener.startTime > 0);
+ assertTrue(currentTime - listener.startTime < frameDelay * 2);
+ }
+ super.onAnimationUpdate(animation);
+ }
+ };
+ a1.addUpdateListener(l1);
+ a1.addListener(listener);
+ a1.setStartDelay(100);
+
+ provider.mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ AnimationHandler.getInstance().setProvider(provider);
+ a1.start();
+ }
+ });
+ Thread.sleep(POLL_INTERVAL);
+ assertTrue(a1.isStarted());
+ Thread.sleep(a1.getTotalDuration() + TOLERANCE);
+ // Finished by now.
+ assertFalse(a1.isStarted());
+ assertTrue(listener.endTime > 0);
+
+ // Check the time difference between last frame and end time.
+ assertTrue(listener.endTime >= l1.lastUpdateTime);
+ assertTrue(listener.endTime - l1.lastUpdateTime < 2 * provider.getFrameDelay());
+ }
+
+
+ @SmallTest
+ public void testConcurrentModification() throws Throwable {
+ // Attempt to modify list of animations as the list is being iterated
+ final ValueAnimator a0 = ValueAnimator.ofInt(100, 200).setDuration(500);
+ final ValueAnimator a3 = ValueAnimator.ofFloat(0, 1).setDuration(500);
+ final ValueAnimator a4 = ValueAnimator.ofInt(200, 300).setDuration(500);
+ final MyListener listener = new MyListener() {
+ @Override
+ public void onAnimationEnd(Animator anim) {
+ super.onAnimationEnd(anim);
+ // AnimationHandler should be iterating the list at the moment, end/cancel all
+ // the other animations. No ConcurrentModificationException should happen.
+ a0.cancel();
+ a1.end();
+ a3.end();
+ a4.cancel();
+ }
+ };
+ a2.addListener(listener);
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ a0.start();
+ a1.start();
+ a2.start();
+ a3.start();
+ a4.start();
+ }
+ });
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ assertTrue(a0.isStarted());
+ assertTrue(a1.isStarted());
+ assertTrue(a2.isStarted());
+ assertTrue(a3.isStarted());
+ assertTrue(a4.isStarted());
+ }
+ });
+ Thread.sleep(POLL_INTERVAL);
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // End the animator that should be in the middle of the list.
+ a2.end();
+ }
+ });
+ Thread.sleep(POLL_INTERVAL);
+ assertTrue(listener.endCalled);
+ assertFalse(a0.isStarted());
+ assertFalse(a1.isStarted());
+ assertFalse(a2.isStarted());
+ assertFalse(a3.isStarted());
+ assertFalse(a4.isStarted());
+ }
+
+ @SmallTest
+ public void testASeek() throws Throwable {
+ final MyListener l1 = new MyListener();
+ final MyListener l2 = new MyListener();
+ final MyUpdateListener updateListener1 = new MyUpdateListener();
+ final MyUpdateListener updateListener2 = new MyUpdateListener();
+ final float a1StartFraction = 0.2f;
+ final float a2StartFraction = 0.3f;
+
+ // Extend duration so we have plenty of latitude to manipulate the animations when they
+ // are running.
+ a1.setDuration(1000);
+ a2.setDuration(1000);
+ a1.addListener(l1);
+ a2.addListener(l2);
+ a1.addUpdateListener(updateListener1);
+ a2.addUpdateListener(updateListener2);
+ TimeInterpolator interpolator = new LinearInterpolator();
+ a1.setInterpolator(interpolator);
+ a2.setInterpolator(interpolator);
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ assertFalse(a1.isStarted());
+ assertFalse(a1.isRunning());
+ assertFalse(a2.isStarted());
+ assertFalse(a2.isRunning());
+
+ // Test isRunning() and isStarted() before and after seek
+ a1.setCurrentFraction(a1StartFraction);
+ a2.setCurrentFraction(a2StartFraction);
+
+ assertFalse(a1.isStarted());
+ assertFalse(a1.isRunning());
+ assertFalse(a2.isStarted());
+ assertFalse(a2.isRunning());
+ }
+ });
+ Thread.sleep(POLL_INTERVAL);
+
+ // Start animation and seek during the animation.
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ assertFalse(a1.isStarted());
+ assertFalse(a1.isRunning());
+ assertFalse(a2.isStarted());
+ assertFalse(a2.isRunning());
+ assertEquals(a1StartFraction, a1.getAnimatedFraction());
+ assertEquals(a2StartFraction, a2.getAnimatedFraction());
+
+ a1.start();
+ a2.start();
+ }
+ });
+
+ Thread.sleep(POLL_INTERVAL);
+ final float halfwayFraction = 0.5f;
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ assertTrue(l1.startCalled);
+ assertTrue(l2.startCalled);
+ assertFalse(l1.endCalled);
+ assertFalse(l2.endCalled);
+
+ // Check whether the animations start from the seeking fraction
+ assertTrue(updateListener1.startFraction >= a1StartFraction);
+ assertTrue(updateListener2.startFraction >= a2StartFraction);
+
+ assertTrue(a1.isStarted());
+ assertTrue(a1.isRunning());
+ assertTrue(a2.isStarted());
+ assertTrue(a2.isRunning());
+
+ a1.setCurrentFraction(halfwayFraction);
+ a2.setCurrentFraction(halfwayFraction);
+ }
+ });
+
+ Thread.sleep(POLL_INTERVAL);
+
+ // Check that seeking during running doesn't change animation's internal state
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ assertTrue(l1.startCalled);
+ assertTrue(l2.startCalled);
+ assertFalse(l1.endCalled);
+ assertFalse(l2.endCalled);
+
+ assertTrue(a1.isStarted());
+ assertTrue(a1.isRunning());
+ assertTrue(a2.isStarted());
+ assertTrue(a2.isRunning());
+ }
+ });
+
+ // Wait until the animators finish successfully.
+ long wait = Math.max(a1.getTotalDuration(), a2.getTotalDuration());
+ Thread.sleep(wait);
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // Verify that the animators have finished.
+ assertTrue(l1.endCalled);
+ assertTrue(l2.endCalled);
+
+ assertFalse(a1.isStarted());
+ assertFalse(a2.isStarted());
+ assertFalse(a1.isRunning());
+ assertFalse(a2.isRunning());
+ }
+ });
+
+ // Re-start animator a1 after it ends normally, and check that seek value from last run
+ // does not affect the new run.
+ updateListener1.reset();
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ a1.start();
+ }
+ });
+
+ Thread.sleep(POLL_INTERVAL);
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ assertTrue(updateListener1.wasRunning);
+ assertTrue(updateListener1.startFraction >= 0);
+ assertTrue(updateListener1.startFraction < halfwayFraction);
+ a1.end();
+ }
+ });
+
+ }
+
class MyUpdateListener implements ValueAnimator.AnimatorUpdateListener {
boolean wasRunning = false;
long firstRunningFrameTime = -1;
long lastUpdateTime = -1;
+ float startFraction = 0;
@Override
public void onAnimationUpdate(ValueAnimator animation) {
@@ -446,24 +769,36 @@
if (animation.isRunning() && !wasRunning) {
// Delay has passed
firstRunningFrameTime = lastUpdateTime;
+ startFraction = animation.getAnimatedFraction();
wasRunning = animation.isRunning();
}
}
+
+ void reset() {
+ wasRunning = false;
+ firstRunningFrameTime = -1;
+ lastUpdateTime = -1;
+ startFraction = 0;
+ }
}
class MyListener implements Animator.AnimatorListener {
boolean startCalled = false;
boolean cancelCalled = false;
boolean endCalled = false;
+ long startTime = -1;
+ long endTime = -1;
@Override
public void onAnimationStart(Animator animation) {
startCalled = true;
+ startTime = SystemClock.uptimeMillis();
}
@Override
public void onAnimationEnd(Animator animation) {
endCalled = true;
+ endTime = SystemClock.uptimeMillis();
}
@Override
@@ -491,4 +826,72 @@
resumeCalled = true;
}
}
+
+ class MyFrameCallbackProvider implements AnimationHandler.AnimationFrameCallbackProvider {
+
+ Handler mHandler = null;
+ private final static int MSG_FRAME = 0;
+ private long mFrameDelay = DEFAULT_FRAME_INTERVAL;
+ private ArrayList<Choreographer.FrameCallback> mFrameCallbacks = new ArrayList<>();
+
+ final LooperThread mThread = new LooperThread();
+
+ public MyFrameCallbackProvider() {
+ mThread.start();
+ }
+
+ @Override
+ public void postFrameCallback(Choreographer.FrameCallback callback) {
+ mHandler.sendEmptyMessageDelayed(MSG_FRAME, mFrameDelay);
+ if (!mFrameCallbacks.contains(callback)) {
+ mFrameCallbacks.add(callback);
+ }
+ }
+
+ @Override
+ public void postCommitCallback(Runnable runnable) {
+ // Run the runnable after a commit delay
+ mHandler.postDelayed(runnable, COMMIT_DELAY);
+ }
+
+ @Override
+ public long getFrameTime() {
+ return SystemClock.uptimeMillis();
+ }
+
+ @Override
+ public long getFrameDelay() {
+ return mFrameDelay;
+ }
+
+ @Override
+ public void setFrameDelay(long delay) {
+ mFrameDelay = delay;
+ if (mFrameCallbacks.size() != 0) {
+ mHandler.removeMessages(MSG_FRAME);
+ mHandler.sendEmptyMessageDelayed(MSG_FRAME, mFrameDelay);
+ }
+ }
+
+ class LooperThread extends Thread {
+ public void run() {
+ Looper.prepare();
+ mHandler = new Handler() {
+ public void handleMessage(Message msg) {
+ // Handle message here.
+ switch (msg.what) {
+ case MSG_FRAME:
+ for (int i = 0; i < mFrameCallbacks.size(); i++) {
+ mFrameCallbacks.get(i).doFrame(SystemClock.uptimeMillis());
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ };
+ Looper.loop();
+ }
+ }
+ }
}
diff --git a/docs/html-intl/intl/es/index.jd b/docs/html-intl/intl/es/index.jd
index e23c99f..4065439 100644
--- a/docs/html-intl/intl/es/index.jd
+++ b/docs/html-intl/intl/es/index.jd
@@ -10,19 +10,16 @@
<section class="dac-hero-carousel">
<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
-<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
+<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">
<a href="/preview/index.html">
- <div class="wrap" style="max-width:1100px;">
+ <div class="wrap" style="max-width:1100px;margin-top:0">
<div class="cols dac-hero-content">
- <div class="col-10of16 col-push-6of16 dac-hero-figure">
- <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"
- srcset="{@docRoot}images/home/devices-hero_620px.png 1x,
- {@docRoot}images/home/devices-hero_620px_2x.png 2x">
+ <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">
</div>
- <div class="col-6of16 col-pull-10of16">
+ <div class="col-8of16 col-pull-7of16">
<div class="dac-hero-tag"></div>
- <h1 class="dac-hero-title">Android M Developer Preview</h1>
+ <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
<p class="dac-hero-description">Prepárese para la próxima versión de
Android. Pruebe sus aplicaciones en Nexus 5, 6, 9 y Player. </p>
@@ -31,7 +28,7 @@
¡Empiece hoy mismo!</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</a>
</div>
</div>
diff --git a/docs/html-intl/intl/es/preview/download.jd b/docs/html-intl/intl/es/preview/download.jd
index d71d8fd..d77242c 100644
--- a/docs/html-intl/intl/es/preview/download.jd
+++ b/docs/html-intl/intl/es/preview/download.jd
@@ -164,14 +164,16 @@
<div id="qv">
<h2>Contenido del documento</h2>
<ol>
- <li><a href="#sdk">SDK de la versión preliminar</a></li>
+ <li><a href="#sdk">Android 6.0 SDK</a></li>
<li><a href="#docs">Documentación para desarrolladores</a></li>
<li><a href="#images">Imágenes del sistema de hardware</a></li>
</ol>
<h2>Legacy downloads</h2>
<ol>
- <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview 1</a></li>
+ <li><a href="{@docRoot}preview/download_mp2.html">Developer Preview 2</a></li>
+
</ol>
</div>
</div>
@@ -184,7 +186,7 @@
</p>
-<h2 id="sdk">SDK de la versión preliminar</h2>
+<h2 id="sdk">Android 6.0 SDK</h2>
<p>
El SDK de la versión preliminar se encuentra disponible para descargarlo a través del <a href="{@docRoot}tools/help/sdk-manager.html">Administrador de SDK de Android</a>. Para obtener más información sobre cómo descargar y configurar el SDK de la versión preliminar, consulte la sección <a href="{@docRoot}preview/setup-sdk.html#downloadSdk">Configurar el SDK de la versión preliminar</a>.
@@ -204,11 +206,11 @@
<th scope="col">Download / Checksums</th>
</tr>
<tr id="docs-dl">
- <td>Android M Preview 2<br>Developer Docs</td>
+ <td>Android M Preview 3<br>Developer Docs</td>
<td><a href="#top" onclick="onDownload(this)"
- >m-preview-2-developer-docs.zip</a><br>
- MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
- SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ >m-preview-3-developer-docs.zip</a><br>
+ MD5: d99b14b0c06d31c8dfecb25072654ca3<br>
+ SHA-1: 9cefeeda07676130da606a1796e1c00fffc667c1
</td>
</tr>
</table>
@@ -241,34 +243,34 @@
<tr id="hammerhead">
<td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
<td><a href="#top" onclick="onDownload(this)"
- >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
- MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
- SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ >hammerhead-MPA44I-preview-2ebbc049.tgz</a><br>
+ MD5: 91a924fb0c9f8e716e3b4c9954fd0dbb<br>
+ SHA-1: 2ebbc049b68c4da8baeee3e42bb94d7a965ba4a3
</td>
</tr>
<tr id="shamu">
<td>Nexus 6 <br>"shamu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >shamu-MPZ79M-preview-e1024040.tgz</a><br>
- MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
- SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ >shamu-MPA44I-preview-62b9c486.tgz</a><br>
+ MD5: ac6e58da86125073d9c395257fd42664<br>
+ SHA-1: 62b9c486fd7a5020e228d53ca5acd5c1857e48ff
</td>
</tr>
<tr id="volantis">
<td>Nexus 9 <br>"volantis"</td>
<td><a href="#top" onclick="onDownload(this)"
- >volantis-MPZ79M-preview-9f305342.tgz</a><br>
- MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
- SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ >volantis-MPA44I-preview-5c30a6e2.tgz</a><br>
+ MD5: 7f83768757913d3fea945a661020d185<br>
+ SHA-1: 5c30a6e2acd11a81f4105b12d23ff654f534f699
</td>
</tr>
<tr id="fugu">
<td>Nexus Player <br>"fugu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
- MD5: e8d081137a20b66df595ee69523314b5<br>
- SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ >fugu-MPA44I-preview-2860040a.tgz</a><br>
+ MD5: 438da8d37da9e341a69cfb16a4001ac5<br>
+ SHA-1: 2860040a326582f1ff5f702bf9a1ef002717fc98
</td>
</tr>
diff --git a/docs/html-intl/intl/es/preview/download_mp2.jd b/docs/html-intl/intl/es/preview/download_mp2.jd
new file mode 100644
index 0000000..d71d8fd
--- /dev/null
+++ b/docs/html-intl/intl/es/preview/download_mp2.jd
@@ -0,0 +1,360 @@
+page.title=Descargas
+page.image=images/cards/card-download_16-9_2x.png
+
+@jd:body
+
+<div style="position:relative; min-height:600px">
+
+ <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
+
+ <p class="sdk-terms-intro">Antes de descargar e instalar los componentes del SDK de la versión preliminar de Android, debe aceptar los términos y las condiciones que se describen a continuación.
+</p>
+
+ <h2 class="norule">Términos y condiciones</h2>
+
+ <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
+Este es el Contrato de licencia de la versión preliminar del SDK de Android (el “Contrato de licencia”). 1.
+
+ Introducción 1.1 Se le otorga la licencia de la versión preliminar del SDK de Android (denominada “Versión preliminar” en este Contrato de licencia y que incluye específicamente los archivos de sistema de Android, las API agrupadas y los archivos de biblioteca de la Versión preliminar, si se encuentran disponibles), sujeto a los términos del Contrato de licencia.
+
+ El Contrato de licencia establece una relación legal vinculante entre usted y Google en relación con el uso que usted realice de la Versión preliminar. 1.2 “Android” hace referencia al conjunto de soluciones Android para dispositivos, según se encuentre disponible en el Proyecto de código abierto de Android (Android Open Source Project), que se encuentra en la siguiente URL: http://source.android.com/, y según se actualiza periódicamente. 1.3 “Google” hace referencia a Google Inc., una corporación de Delaware, con sede principal en 1600 Amphitheatre Parkway, Mountain View, CA 94043, Estados Unidos. 2.
+
+
+
+
+
+ Aceptación del Contrato de licencia 2.1 Para poder utilizar la Versión preliminar, primero debe aceptar el Contrato de licencia.
+
+ Si no acepta el Contrato de licencia, no podrá utilizar la Versión preliminar. 2.2 Al hacer clic para aceptar o utilizar la Versión preliminar, por medio del presente, usted acepta los términos del Contrato de licencia. 2.3 Usted no puede utilizar la Versión preliminar ni aceptar el Contrato de licencia si tiene prohibido recibir la Versión preliminar en virtud de las leyes de los Estados Unidos o de otros países, lo que incluye el país donde es residente o desde el que utilizará la Versión preliminar. 2.4 Si usted utilizará la Versión preliminar de forma interna, dentro de su compañía u organización, usted acepta quedar sujeto al Contrato de licencia en representación de su empleador u otra entidad, y expresa y garantiza que tiene plena autoridad legal para vincular a su empleador o a dicha entidad al Contrato de licencia.
+
+
+
+
+
+ Si no posee la autoridad exigida, no podrá aceptar el Contrato de licencia ni usar la Versión preliminar en representación de su empleador u otra entidad. 3.
+
+ Licencia de la Versión preliminar de Google 3.1 Sujeto a los términos del Contrato de licencia, Google le otorga una licencia libre de regalías, no asignable, no exclusiva, no transferible a terceros, limitada y revocable para utilizar la Versión preliminar, de forma personal o interna dentro de su compañía u organización, únicamente para desarrollar aplicaciones para ejecutar en la plataforma de Android. 3.2 Usted acepta que Google u otros terceros poseen todos los derechos legales, títulos e intereses en relación con la Versión preliminar, incluidos los Derechos de propiedad intelectual que existan en la Versión preliminar.
+
+
+
+ Los “Derechos de propiedad intelectual” hacen referencia a todos y cada uno de los derechos en virtud de las leyes de patentes, derechos de autor, secreto comercial y marca comercial, y todos los demás derechos de propiedad. Google se reserva todos los derechos que no se le otorguen expresamente. 3.3 No podrá utilizar la Versión preliminar para ningún otro propósito que no esté expresamente permitido en el Contrato de licencia.
+
+ Excepto en la medida que lo exijan las licencias correspondientes de terceros, no podrá: (a) copiar (excepto con fines de copia de seguridad), modificar, adaptar, redistribuir, descompilar, utilizar técnicas de ingeniería inversa, desarmar ni crear trabajos derivados de la Versión preliminar ni de ninguna de sus partes; ni (b) cargar ninguna parte de la Versión preliminar en un teléfono móvil ni en ningún otro dispositivo de hardware (a excepción de una computadora personal), ni podrá combinar ninguna parte de la Versión preliminar con otro software, ni distribuir algún software o dispositivo que incorpore alguna parte de la Versión preliminar. 3.4 Usted acepta que no tomará medidas que pudieran provocar la fragmentación de Android, incluidas, entre otras, la distribución y la participación en la creación o la promoción de un kit de desarrollo de software derivado de la Versión preliminar. 3.5 El uso, la reproducción y la distribución de los componentes de la Versión preliminar con licencia de software de código abierto están regidos exclusivamente por los términos de la licencia de ese software de código abierto y no de este Contrato de licencia.
+
+
+
+ Usted acepta mantener la licencia en buenas condiciones con respecto a dichas licencias de software de código abierto en virtud de todos los derechos otorgados y acepta abstenerse de realizar alguna acción que pueda poner fin, suspender o violar dichos derechos. 3.6 Usted acepta que la forma y la naturaleza de la Versión preliminar que proporciona Google pueden cambiar sin brindarle aviso previo y que las versiones futuras de la Versión preliminar pueden ser incompatibles con las aplicaciones desarrolladas en versiones anteriores de la Versión preliminar.
+
+ Usted acepta que Google puede (de forma permanente o temporal) dejar de proporcionarles la Versión preliminar (o cualquiera de las características incluidas en ella) a usted o a los usuarios, generalmente, a criterio exclusivo de Google, sin brindarle aviso previo. 3.7 Ninguna declaración de este Contrato de licencia le otorga el derecho de utilizar alguno de los nombres comerciales, las marcas comerciales, las marcas de servicio, los logotipos, los nombres de dominio ni otras características distintivas de marca de Google. 3.8 Usted acepta que no eliminará, ocultará ni alterará ninguno de los avisos de derechos de propiedad (lo que incluye los avisos de marca comercial y derechos de autor) que pudieran estar anexados o incluidos en la Versión preliminar. 4.
+
+
+
+
+
+ Uso que usted realiza de la Versión preliminar 4.1 Google acepta que ninguna declaración del Contrato de licencia le concede a Google derecho, título o interés alguno de su parte (o de parte de sus licenciantes), en virtud del Contrato de licencia, con respecto a las aplicaciones de software que usted desarrolle mediante el uso de la Versión preliminar, lo que incluye los derechos de propiedad intelectual que conlleven esas aplicaciones. 4.2 Usted acepta utilizar la Versión preliminar y escribir aplicaciones únicamente conforme a lo que permite (a) este Contrato de licencia y (b) las leyes, regulaciones, o prácticas y pautas generalmente aceptadas pertinentes en las jurisdicciones relevantes (lo que incluye las leyes sobre la exportación de datos o software hacia los Estados Unidos u otros países relevantes y desde ellos). 4.3 Usted acepta que si utiliza la Versión preliminar para desarrollar aplicaciones, protegerá la privacidad y los derechos legales de los usuarios.
+
+
+
+
+
+ Si los usuarios le proporcionan sus nombres de usuario, contraseñas u otra información de inicio de sesión o información personal, debe comunicarles a los usuarios que la información se encontrará disponible para su aplicación, y debe proporcionarles a dichos usuarios un aviso de privacidad con protección y validez legal. Si su aplicación almacena información personal o confidencial proporcionada por los usuarios, lo debe hacer de forma segura. Si los usuarios le proporcionan información sobre la cuenta de Google, su aplicación solo puede usar esa información para acceder a la cuenta de Google del usuario siempre que este le haya otorgado permiso para hacerlo y con los fines para los que se lo haya otorgado. 4.4 Usted acepta que no participará en ninguna actividad con la Versión preliminar (lo que incluye el desarrollo o la distribución de una aplicación) que interfiera, interrumpa, dañe o acceda sin autorización a servidores, redes u otras propiedades o servicios de Google o de algún tercero. 4.5 Usted acepta que es el único responsable (y que Google no asume responsabilidades hacia usted ni terceros) de los datos, el contenido o los recursos que usted cree, transmita o muestre a través de Android o las aplicaciones para Android, y de las consecuencias de sus acciones (lo que incluye la pérdida o el daño que Google pudiera sufrir) al hacerlo. 4.6 Usted acepta que es el único responsable (y que Google no asume responsabilidades hacia usted ni terceros) de cualquier incumplimiento de sus obligaciones en virtud de este Contrato de licencia, los contratos aplicables de terceros o los términos del servicio, o cualquier ley o regulación pertinentes, y de las consecuencias (lo que incluye las pérdidas o los daños que pudieran sufrir Google o algún tercero) de dichos incumplimientos. 4.7 La Versión preliminar se encuentra en desarrollo, y sus pruebas y comentarios son una parte importante del proceso de desarrollo.
+
+
+
+
+
+
+
+ Al utilizar la Versión preliminar, usted reconoce que la implementación de algunas características aún se encuentra en desarrollo y que no debe confiar en que la Versión preliminar contará con todas las funcionalidades de una versión estable. Usted acepta no distribuir públicamente ni enviar ninguna aplicación que utilice esta Versión preliminar, ya que esta Versión preliminar ya no se admitirá tras el lanzamiento del SDK oficial de Android. 5.
+
+ Sus credenciales de desarrollador 5.1 Usted acepta que es responsable de mantener la confidencialidad de toda credencial de desarrollador que Google pudiera otorgarle o que usted pudiera escoger, y que será el único responsable de todas las aplicaciones que se desarrollen con sus credenciales de desarrollador. 6.
+
+
+
+ Privacidad e información 6.1 A fin de poder innovar y mejorar de forma continua la Versión preliminar, Google podría recopilar ciertas estadísticas de uso del software, lo que incluye, entre otras características, un identificador único, la dirección IP asociada, el número de versión del software e información sobre las herramientas o los servicios de la Versión preliminar que se estén utilizando y la manera en que se estén utilizando.
+
+ Antes de que se recopile esta información, la Versión preliminar se lo notificará y le solicitará su permiso. Si no otorga su permiso, no se recopilará la información. 6.2 Los datos recopilados se analizan en el agregado para mejorar la Versión preliminar y se conservan de acuerdo con la política de privacidad de Google que se encuentra en el sitio http://www.google.com/policies/privacy/. 7.
+
+
+
+ Aplicaciones de terceros 7.1 Si utiliza la Versión preliminar para ejecutar aplicaciones desarrolladas por un tercero o que accedan a datos, contenido o recursos proporcionados por un tercero, usted acepta que Google no es responsable de esas aplicaciones, datos, contenido ni recursos.
+
+ Usted comprende que todos los datos, contenidos o recursos a los que podría acceder a través de esas aplicaciones de terceros son exclusiva responsabilidad de la persona que los origina y que Google no es responsable de las pérdidas ni los daños que usted pudiera experimentar como consecuencia del uso o acceso de cualquiera de esas aplicaciones, datos, contenido o recursos de terceros. 7.2 Usted debe saber que los datos, el contenido y los recursos que se le presentan a través de esa aplicación de un tercero pueden estar protegidos por derechos de propiedad intelectual que les pertenecen a sus proveedores (o a otras personas o compañías en representación de estos).
+
+ No puede modificar, alquilar, arrendar, prestar, vender, distribuir ni crear obras derivadas basadas en esos datos, contenidos o recursos (en su totalidad o en parte), a menos que los propietarios pertinentes le hayan otorgado permiso específicamente para hacerlo. 7.3 Usted acepta que el uso que haga de las aplicaciones, los datos, el contenido o los recursos de ese tercero puede estar sujeto a términos independientes entre usted y el tercero correspondiente. 8.
+
+
+
+ Uso de las API de Google 8.1 API de Google 8.1.1 Si utiliza alguna API para recuperar datos de Google, usted acepta que los datos pueden estar protegidos por derechos de propiedad intelectual que le pertenecen a Google o a las partes que proporcionan esos datos (o a otras personas o empresas en representación de estos).
+
+
+
+ El uso que realice de cualquiera de esas API puede estar sujeto a términos de servicio adicionales. No puede modificar, alquilar, arrendar, prestar, vender, distribuir ni crear obras derivadas basadas en esos datos (en su totalidad o en parte), a menos que los términos de servicio correspondientes lo permitan. 8.1.2 Si utiliza alguna API para recuperar datos de un usuario de Google, usted acepta y acuerda que solo podrá recuperar datos con el consentimiento explícito del usuario y solo con los fines limitados para los que el usuario le haya otorgado permiso para hacerlo. 9.
+
+
+
+ Finalización del Contrato de licencia 9.1 Este Contrato de licencia tendrá vigencia hasta que lo revoquen usted o Google, como se indica a continuación. 9.2 Si desea rescindir el Contrato de licencia, puede hacerlo al interrumpir el uso que realiza de la Versión preliminar y de las credenciales de desarrollador pertinentes. 9.3 Google puede, en cualquier momento, rescindir el Contrato de licencia, con causa o sin ella, después de notificárselo a usted. 9.4 El Contrato de licencia finalizará automáticamente, sin previo aviso ni acción alguna, tras la primera de las siguientes situaciones: (A) cuando Google deje de proporcionar la Versión preliminar o ciertas partes de esta a los usuarios en el país donde usted reside o desde el que utiliza el servicio; y (B) cuando Google emita una versión final del SDK de Android. 9.5 Si el Contrato de licencia se rescinde, se revocará la licencia que usted recibió en virtud de dicho contrato; usted deberá suspender inmediatamente todo uso de la Versión preliminar y las disposiciones de los párrafos 10, 11, 12 y 14 seguirán vigentes indefinidamente. 10.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ EXENCIONES DE RESPONSABILIDAD 10.1 USTED COMPRENDE Y ACEPTA EXPRESAMENTE QUE EL USO QUE REALICE DE LA VERSIÓN PRELIMINAR ES BAJO SU PROPIO RIESGO Y QUE LA VERSIÓN PRELIMINAR SE PROPORCIONA “EN LAS CONDICIONES EN LAS QUE SE ENCUENTRA” Y “SUJETA A DISPONIBILIDAD” SIN GARANTÍAS DE NINGÚN TIPO POR PARTE DE GOOGLE. 10.2 EL USO QUE USTED REALICE DE LA VERSIÓN PRELIMINAR Y DE TODO MATERIAL DESCARGADO U OBTENIDO DE ALGUNA OTRA MANERA MEDIANTE EL USO DE LA VERSIÓN PRELIMINAR ES A SU ENTERO RIESGO Y DISCRECIÓN, Y USTED ES EL ÚNICO RESPONSABLE DE CUALQUIER DAÑO QUE PUDIERA SUFRIR SU SISTEMA INFORMÁTICO U OTRO DISPOSITIVO, O DE LA PÉRDIDA DE DATOS COMO CONSECUENCIA DE DICHO USO.
+
+
+
+ SIN PERJUICIO DE LO MENCIONADO ANTERIORMENTE, USTED COMPRENDE QUE LA VERSIÓN PRELIMINAR NO ES UNA VERSIÓN ESTABLE, Y PUEDE CONTENER ERRORES, DEFECTOS Y VULNERABILIDADES DE SEGURIDAD QUE PUEDEN PROVOCAR DAÑOS SIGNIFICATIVOS, LO QUE INCLUYE LA PÉRDIDA COMPLETA E IRRECUPERABLE DEL USO DE SU SISTEMA INFORMÁTICO U OTRO DISPOSITIVO. 10.3 GOOGLE TAMBIÉN RECHAZA TODAS LAS GARANTÍAS Y CONDICIONES DE CUALQUIER TIPO, EXPRESAS O IMPLÍCITAS, INCLUIDAS, ENTRE OTRAS, LAS GARANTÍAS Y CONDICIONES DE COMERCIABILIDAD, IDONEIDAD PARA UN FIN DETERMINADO Y NO VIOLACIÓN. 11.
+
+
+
+ LIMITACIÓN DE RESPONSABILIDADES 11.1 USTED COMPRENDE Y ACEPTA EXPRESAMENTE QUE GOOGLE, SUS SUBSIDIARIAS Y FILIALES, Y SUS LICENCIANTES NO SERÁN RESPONSABLES ANTE USTED, EN VIRTUD DE NINGUNA TEORÍA DE RESPONSABILIDAD, POR NINGÚN DAÑO DIRECTO, INDIRECTO, INCIDENTAL, ESPECIAL, RESULTANTE NI PUNITIVO EN EL QUE PODRÍA HABER INCURRIDO, LO QUE INCLUYE LA PÉRDIDA DE DATOS, YA SEA QUE SE LE HAYA NOTIFICADO O NO A GOOGLE O A SUS REPRESENTANTES, O SOBRE CUYA POSIBILIDAD ESTOS DEBERÍAN HABER SABIDO. 12.
+
+
+
+ Indemnización 12.1 Hasta el grado máximo que permita la ley, usted acepta defender, indemnizar y eximir de responsabilidades a Google, sus filiales y sus respectivos directores, funcionarios, empleados y agentes, de todo tipo de reclamo, acción legal y proceso judicial, así como de las pérdidas, responsabilidades, daños, costos y gastos (incluidos los honorarios razonables de abogados) que surjan o se acumulen (a) del uso que usted realiza de la Versión preliminar, (b) de cualquier aplicación que desarrolle en la Versión preliminar que infrinja algún derecho de propiedad intelectual de cualquier persona, o que difame a cualquier persona o viole sus derechos de publicidad o privacidad, y (c) del incumplimiento por su parte del Contrato de licencia. 13.
+
+
+
+ Cambios en el Contrato de licencia 13.1 Google puede realizar cambios en el Contrato de licencia a medida que distribuye nuevas versiones de la Versión preliminar.
+
+ Cuando se realicen esos cambios, Google emitirá una nueva versión del Contrato de licencia, que estará disponible en el sitio web donde se ponga a la venta la Versión preliminar. 14.
+
+ Términos legales generales 14.1 El Contrato de licencia constituye el contrato legal integral entre usted y Google, y rige el uso que usted realice de la Versión preliminar (a excepción de los servicios que Google pueda proporcionarle en virtud de un contrato por escrito independiente), y reemplaza totalmente cualquier contrato anterior entre usted y Google en relación con la Versión preliminar. 14.2 Usted acepta que, si Google no ejerce ni impone un derecho o recurso legal especificados en el Contrato de licencia (o sobre el que Google tenga beneficios conforme a cualquier ley aplicable), esto no se considerará una renuncia formal a los derechos por parte de Google y Google aún seguirá recibiendo los beneficios de esos derechos o recursos legales. 14.3 Si algún tribunal judicial con jurisdicción para decidir sobre este asunto determina que alguna de las disposiciones de este Contrato de licencia no es válida, se eliminará esa disposición del Contrato de licencia sin que eso afecte la validez del resto del contrato.
+
+
+
+
+
+ Las disposiciones restantes del Contrato de licencia continuarán siendo válidas y aplicables. 14.4 Usted reconoce y acepta que cada miembro del grupo de compañías de las que Google es la compañía central serán terceros beneficiarios del Contrato de licencia, y que esas otras empresas tendrán el derecho de imponer directamente cualquier disposición y ampararse en las disposiciones de este Contrato de licencia que les confieran un beneficio (o que confieran derechos a su favor).
+
+ Además de esto, ninguna otra persona o compañía serán terceros beneficiarios del Contrato de licencia. 14.5 RESTRICCIONES DE EXPORTACIÓN.
+
+ LA VERSIÓN PRELIMINAR ESTÁ SUJETA A LAS LEYES Y REGULACIONES DE EXPORTACIÓN DE LOS ESTADOS UNIDOS. DEBE CUMPLIR CON TODAS LAS LEYES Y REGULACIONES DE EXPORTACIÓN NACIONALES E INTERNACIONALES QUE SE APLIQUEN A LA VERSIÓN PRELIMINAR. ESTAS LEYES INCLUYEN RESTRICCIONES EN RELACIÓN CON LOS DESTINOS, USUARIOS FINALES Y USO FINAL. 14.6 Usted no puede asignar ni transferir el Contrato de licencia sin la aprobación previa por escrito de Google y todo intento de asignación sin dicha aprobación no tendrá validez.
+
+ No podrá delegar sus responsabilidades u obligaciones otorgados en virtud del Contrato de licencia sin la aprobación previa por escrito de Google. 14.7 El Contrato de licencia y su relación con Google conforme al Contrato de licencia se regirán por las leyes del estado de California, independientemente de los principios de conflictos entre leyes.
+
+ Usted y Google aceptan presentarse ante la jurisdicción exclusiva de los tribunales del condado de Santa Clara, California, para resolver cualquier asunto legal que pudiera surgir del Contrato de licencia. Sin perjuicio de esto, usted acepta que Google aún podrá aplicar reparaciones conforme a mandato judicial (o a un tipo equivalente de desagravio legal) en cualquier jurisdicción.
+ </div><!-- sdk terms -->
+
+
+
+ <div id="sdk-terms-form">
+ <p>
+ <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
+ <label id="agreeLabel" for="agree">He leído y acepto los términos y las condiciones anteriores.</label>
+ </p>
+ <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+ </div>
+
+
+ </div><!-- end TOS -->
+
+
+ <div id="landing">
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>Contenido del documento</h2>
+ <ol>
+ <li><a href="#sdk">SDK de la versión preliminar</a></li>
+ <li><a href="#docs">Documentación para desarrolladores</a></li>
+ <li><a href="#images">Imágenes del sistema de hardware</a></li>
+ </ol>
+
+ <h2>Legacy downloads</h2>
+ <ol>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ </ol>
+ </div>
+</div>
+
+
+<p>
+ El SDK de la versión preliminar de Android M incluye herramientas de desarrollo, archivos de sistema de Android y archivos de biblioteca que lo ayudarán a probar su aplicación y las nuevas API que se incluirán en la próxima versión de la plataforma.
+ En este documento, se describe la manera de obtener los componentes que se pueden descargar de la versión preliminar para probar su aplicación.
+
+</p>
+
+
+<h2 id="sdk">SDK de la versión preliminar</h2>
+
+<p>
+ El SDK de la versión preliminar se encuentra disponible para descargarlo a través del <a href="{@docRoot}tools/help/sdk-manager.html">Administrador de SDK de Android</a>. Para obtener más información sobre cómo descargar y configurar el SDK de la versión preliminar, consulte la sección <a href="{@docRoot}preview/setup-sdk.html#downloadSdk">Configurar el SDK de la versión preliminar</a>.
+
+</p>
+
+
+<h2 id="docs">Documentación para desarrolladores</h2>
+
+<p>
+ El paquete de descarga de documentación para desarrolladores brinda información detallada de referencia sobre las API y un informe de diferencias de las API para la versión preliminar.
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Description</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="docs-dl">
+ <td>Android M Preview 2<br>Developer Docs</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >m-preview-2-developer-docs.zip</a><br>
+ MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
+ SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ </td>
+ </tr>
+</table>
+
+
+<h2 id="images">Imágenes del sistema de hardware</h2>
+
+<p>
+ Estas imágenes del sistema le permiten instalar una versión preliminar de la plataforma en un dispositivo físico para realizar pruebas.
+ Al configurar un dispositivo con una de estas imágenes, puede instalar y probar su aplicación para ver cómo funciona en la próxima versión de la plataforma.
+ El proceso de instalación de una imagen del sistema en un dispositivo <em>elimina todos los datos del dispositivo</em>, por lo que debe hacer una copia de seguridad de los datos antes de instalar una imagen del sistema.
+
+
+</p>
+
+<p class="warning">
+ <b>Advertencia:</b> Las siguientes imágenes del sistema de Android son versiones preliminares y están sujetas a cambios. El uso que haga de estas imágenes del sistema se rige por el Contrato de licencia de la versión preliminar del SDK de Android.
+ Las imágenes del sistema de la versión preliminar de Android no son versiones estables y pueden contener errores y defectos que pueden generar daños en sus sistemas informáticos, dispositivos y datos.
+
+ Las imágenes del sistema de la versión preliminar de Android no se someten a las mismas pruebas que el OS de fábrica y podrían hacer que el teléfono, y las aplicaciones y los servicios instalados dejen de funcionar.
+
+
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Device</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="hammerhead">
+ <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
+ MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
+ SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ </td>
+ </tr>
+ <tr id="shamu">
+ <td>Nexus 6 <br>"shamu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >shamu-MPZ79M-preview-e1024040.tgz</a><br>
+ MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
+ SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ </td>
+ </tr>
+ <tr id="volantis">
+ <td>Nexus 9 <br>"volantis"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >volantis-MPZ79M-preview-9f305342.tgz</a><br>
+ MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
+ SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ </td>
+ </tr>
+
+ <tr id="fugu">
+ <td>Nexus Player <br>"fugu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
+ MD5: e8d081137a20b66df595ee69523314b5<br>
+ SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ </td>
+ </tr>
+
+</table>
+
+<h3 id="install-image">Instalar una imagen en un dispositivo</h3>
+
+<p>
+ Si desea utilizar una imagen del dispositivo para realizar pruebas, debe instalarla en un dispositivo compatible. Siga las instrucciones que se ofrecen a continuación para instalar una imagen del sistema:
+
+</p>
+
+<ol>
+ <li>Descargue y descomprima uno de los paquetes de imágenes del sistema que se enumeran aquí.</li>
+ <li>Realice una copia de seguridad de los datos del dispositivo que desee conservar.</li>
+ <li>Siga las instrucciones que se describen en el sitio <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
+ para actualizar la imagen en su dispositivo.
+</li>
+</ol>
+
+<p class="note">
+ <strong>Nota:</strong> Cuando haya actualizado un dispositivo de desarrollo con la imagen del sistema de la versión preliminar, se actualizará automáticamente con la próxima versión preliminar a través de actualizaciones OTA.
+
+</p>
+
+<h3 id="revertDevice">Restablecer las especificaciones de fábrica en un dispositivo</h3>
+
+<p>
+ Si desea desinstalar la versión preliminar y restablecer las especificaciones de fábrica en un dispositivo, visite el sitio <a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a> y descargue la imagen con la que desea actualizar su dispositivo.
+
+ Siga las instrucciones que se describen en esa página para actualizar la imagen en su dispositivo.
+
+</p>
+
+ </div><!-- landing -->
+
+</div><!-- relative wrapper -->
+
+
+
+<script>
+ var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
+ function onDownload(link) {
+
+ $("#downloadForRealz").html("Download " + $(link).text());
+ $("#downloadForRealz").attr('href', urlRoot + $(link).text());
+
+ $("#tos").fadeIn('fast');
+ $("#landing").fadeOut('fast');
+
+ return true;
+ }
+
+
+ function onAgreeChecked() {
+ /* verify that the TOS is agreed */
+ if ($("input#agree").is(":checked")) {
+ /* reveal the download button */
+ $("a#downloadForRealz").removeClass('disabled');
+ } else {
+ $("a#downloadForRealz").addClass('disabled');
+ }
+ }
+
+ function onDownloadForRealz(link) {
+ if ($("input#agree").is(':checked')) {
+ /*
+ $("#tos").fadeOut('fast');
+ $("#landing").fadeIn('fast');
+ */
+
+ ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
+
+ /*
+ location.hash = "";
+ */
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ $(window).hashchange( function(){
+ if (location.hash == "") {
+ location.reload();
+ }
+ });
+
+</script>
diff --git a/docs/html-intl/intl/es/preview/index.jd b/docs/html-intl/intl/es/preview/index.jd
index aae8e4c..547b5b0 100644
--- a/docs/html-intl/intl/es/preview/index.jd
+++ b/docs/html-intl/intl/es/preview/index.jd
@@ -30,7 +30,7 @@
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
diff --git a/docs/html-intl/intl/ja/index.jd b/docs/html-intl/intl/ja/index.jd
index 3084b24..a11136d 100644
--- a/docs/html-intl/intl/ja/index.jd
+++ b/docs/html-intl/intl/ja/index.jd
@@ -10,19 +10,16 @@
<section class="dac-hero-carousel">
<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
-<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
+<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">
<a href="/preview/index.html">
- <div class="wrap" style="max-width:1100px;">
+ <div class="wrap" style="max-width:1100px;margin-top:0">
<div class="cols dac-hero-content">
- <div class="col-10of16 col-push-6of16 dac-hero-figure">
- <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"
- srcset="{@docRoot}images/home/devices-hero_620px.png 1x,
- {@docRoot}images/home/devices-hero_620px_2x.png 2x">
+ <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">
</div>
- <div class="col-6of16 col-pull-10of16">
+ <div class="col-8of16 col-pull-7of16">
<div class="dac-hero-tag"></div>
- <h1 class="dac-hero-title">Android M Developer Preview</h1>
+ <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
<p class="dac-hero-description">次期バージョンの Android に向けて準備しましょう。
Nexus 5、6、9、Nexus Player でアプリをテストします。 </p>
@@ -32,7 +29,7 @@
</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
diff --git a/docs/html-intl/intl/ja/preview/download.jd b/docs/html-intl/intl/ja/preview/download.jd
index 67b1bc4..7f6f499 100644
--- a/docs/html-intl/intl/ja/preview/download.jd
+++ b/docs/html-intl/intl/ja/preview/download.jd
@@ -164,14 +164,15 @@
<div id="qv">
<h2>本書の内容</h2>
<ol>
- <li><a href="#sdk">Preview SDK</a></li>
+ <li><a href="#sdk">Android 6.0 SDK</a></li>
<li><a href="#docs">デベロッパー ドキュメント</a></li>
<li><a href="#images">ハードウェアのシステム イメージ</a></li>
</ol>
<h2>Legacy downloads</h2>
<ol>
- <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview 1</a></li>
+ <li><a href="{@docRoot}preview/download_mp2.html">Developer Preview 2</a></li>
</ol>
</div>
</div>
@@ -184,7 +185,7 @@
</p>
-<h2 id="sdk">Preview SDK</h2>
+<h2 id="sdk">Android 6.0 SDK</h2>
<p>
Preview SDK <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK マネージャー</a>経由でダウンロードできます。Preview SDK のダウンロードと設定の詳細については、<a href="{@docRoot}preview/setup-sdk.html#downloadSdk">Set Up the Preview SDK</a> をご覧ください。
@@ -204,11 +205,11 @@
<th scope="col">Download / Checksums</th>
</tr>
<tr id="docs-dl">
- <td>Android M Preview 2<br>Developer Docs</td>
+ <td>Android M Preview 3<br>Developer Docs</td>
<td><a href="#top" onclick="onDownload(this)"
- >m-preview-2-developer-docs.zip</a><br>
- MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
- SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ >m-preview-3-developer-docs.zip</a><br>
+ MD5: d99b14b0c06d31c8dfecb25072654ca3<br>
+ SHA-1: 9cefeeda07676130da606a1796e1c00fffc667c1
</td>
</tr>
</table>
@@ -240,34 +241,34 @@
<tr id="hammerhead">
<td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
<td><a href="#top" onclick="onDownload(this)"
- >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
- MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
- SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ >hammerhead-MPA44I-preview-2ebbc049.tgz</a><br>
+ MD5: 91a924fb0c9f8e716e3b4c9954fd0dbb<br>
+ SHA-1: 2ebbc049b68c4da8baeee3e42bb94d7a965ba4a3
</td>
</tr>
<tr id="shamu">
<td>Nexus 6 <br>"shamu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >shamu-MPZ79M-preview-e1024040.tgz</a><br>
- MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
- SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ >shamu-MPA44I-preview-62b9c486.tgz</a><br>
+ MD5: ac6e58da86125073d9c395257fd42664<br>
+ SHA-1: 62b9c486fd7a5020e228d53ca5acd5c1857e48ff
</td>
</tr>
<tr id="volantis">
<td>Nexus 9 <br>"volantis"</td>
<td><a href="#top" onclick="onDownload(this)"
- >volantis-MPZ79M-preview-9f305342.tgz</a><br>
- MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
- SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ >volantis-MPA44I-preview-5c30a6e2.tgz</a><br>
+ MD5: 7f83768757913d3fea945a661020d185<br>
+ SHA-1: 5c30a6e2acd11a81f4105b12d23ff654f534f699
</td>
</tr>
<tr id="fugu">
<td>Nexus Player <br>"fugu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
- MD5: e8d081137a20b66df595ee69523314b5<br>
- SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ >fugu-MPA44I-preview-2860040a.tgz</a><br>
+ MD5: 438da8d37da9e341a69cfb16a4001ac5<br>
+ SHA-1: 2860040a326582f1ff5f702bf9a1ef002717fc98
</td>
</tr>
diff --git a/docs/html-intl/intl/ja/preview/download_mp2.jd b/docs/html-intl/intl/ja/preview/download_mp2.jd
new file mode 100644
index 0000000..67b1bc4
--- /dev/null
+++ b/docs/html-intl/intl/ja/preview/download_mp2.jd
@@ -0,0 +1,359 @@
+page.title=ダウンロード
+page.image=images/cards/card-download_16-9_2x.png
+
+@jd:body
+
+<div style="position:relative; min-height:600px">
+
+ <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
+
+ <p class="sdk-terms-intro">Android Preview SDK のコンポーネントをダウンロード、インストールする前に、次の利用規約に同意する必要があります。
+</p>
+
+ <h2 class="norule">利用規約</h2>
+
+ <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
+以下は、Android SDK Preview の使用許諾契約です（以下「本契約」）。
+
+1.はじめに
+
+1.1 Android SDK Preview（以下、本契約で「Preview」という。具体的には利用可能な場合には Android システム ファイル、パッケージ型 API、Preview ライブラリ ファイルを含む）は、本契約の規定に従ってライセンス許可されます。本契約では、デベロッパーの Preview の使用に関して、デベロッパーと Google の間で法的拘束力のある契約を結びます。
+
+1.2 「Android」とは、Android オープン ソース プロジェクト（http://source.android.com/ にて随時更新）にて利用可能な、端末向けの Android ソフトウェア スタックを意味します。
+
+1.3 「Google」とは、1600 Amphitheatre Parkway, Mountain View, CA 94043, United States に主たる事業所を有するデラウェア州法人である Google Inc. を意味します。
+
+2.本契約の同意
+
+2.1 Preview を使用するには、まず本契約に同意する必要があります。本契約に同意しない場合は Preview を使用できません。
+
+2.2 同意するかまたは Preview を使用するためにクリックすると、本契約に同意したことになります。
+
+2.3 米国またはその他の国（デベロッパーが居住している国かまたはデベロッパーが Preview を使用する国を含む）の法律により Preview の使用を禁止されている人である場合、Preview を使用することも、使用許諾契約に同意することもできません。
+
+2.4 雇用主またはその他の事業体を代表または代理して本契約に拘束されることに同意し Preview を企業または組織の内部で使用する場合、担当者の雇用主またはその他の事業体を本契約に法的に拘束する完全な法的権限を有していることを表明および保証するものとします。担当者が必要な権限を有していない場合は、担当者の雇用主またはその他の事業体を代表または代理して、本契約に同意することも、Preview を使用することもできません。
+
+3.Google Preview ライセンス
+
+3.1 本契約の規定に従い、Google は Android プラットフォーム上で実行するアプリケーションの開発に Preview を個人的にもしくは企業または組織の内部で使用するための、ロイヤリティ フリーな、譲渡不可で、非排他的な、サブライセンス不可の、限定された、取り消し可能なライセンスを付与するものとします。
+
+3.2 Preview に関するすべての法的権利、所有権、利益（Preview に含まれる知的財産権を含む）は Google またはサードパーティが所有するものとします。「知的財産権」とは、特許法、著作権法、営業秘密法、商標法、不当競争防止法に基づいて発生するすべての権利、およびその他のすべての所有権を意味します。デベロッパーに明示的に付与されていない権利は、すべて Google が所有します。
+
+3.3 本契約で明示的に許可されている目的以外においては、Preview を使用できません。当該のサードパーティのライセンスで必要とされる場合を除き、デベロッパーは、（a） Preview または Preview の一部をコピー（バックアップ目的を除く）、修正、改造、再配布、逆コンパイル、リバース エンジニアリング、逆アセンブルまたは派生物の作成、または（b）モバイル ハンドセットまたは個人用 PC 以外のハードウェア端末への Preview の読み込み、Preview と他のソフトウェアとの結合、または Preview の一部を組み込んだソフトウェアや端末の配布はできません。
+
+3.4 デベロッパーは、Android の断片化につながるような行為をしないことに同意します。これには、Preview から派生したソフトウェア開発キットの配布、作成への参加、宣伝を含みます（ただし必ずしもこれらには限定されません）。
+
+3.5 オープンソース ソフトウェア ライセンス下でライセンス付与された Preview のコンポーネントの使用、複製、配布は、本契約ではなく、そのオープンソース ソフトウェアのライセンスに準拠するものとします。デベロッパーは、許諾されるすべての権利下で、そのようなオープンソース ソフトウェア ライセンスに対して、優良ライセンシーのままでいることに同意し、そのような権利を終了、停止、または違反する可能性のあるいかなる行為も差し控えることに同意するものとします。
+
+3.6 デベロッパーは、Google が提供する Preview の形式および性質は事前の通知なしに変更される場合があり、今後リリースされる Preview のバージョンでは、以前のバージョンの Preview で開発されたアプリケーションとの互換性がない可能性があることに同意します。デベロッパーは、Google が事前の通知なく、Google の単独の裁量でデベロッパーまたはユーザーへの Preview（または Preview 内の一部の機能）の提供を（恒久的または一時的に）停止する場合があることに同意します。
+
+3.7 本契約のいかなる部分も、Google のいかなる商標名、商標、サービスマーク、ロゴ、ドメイン名、またはその他のブランド識別表示を使用する権利もデベロッパーに付与するものではありません。
+
+3.8 デベロッパーは、Preview に添付または収録されているすべての知的財産権に関する通知（著作権および商標の通知を含む）の削除、隠ぺい、改ざんを行わないことに同意します。
+
+4.デベロッパーによる Preview の使用
+
+4.1 Google は、本契約に基づき Preview を使用してデベロッパーが開発したソフトウェア アプリケーションに関して、デベロッパー（またはデベロッパーのライセンサー）からいかなる権利、所有権、または利益（当該アプリケーションに含まれる知的財産権を含む）も取得するものではないことに同意します。
+
+4.2 デベロッパーは、Preview を（a）本契約、および（b）該当する司法管轄区における適用される法律、規則、または一般に認められた慣行またはガイドライン（米国またはその他の該当国におけるデータまたはソフトウェアの輸出入に関する法律を含む）で認められている目的にのみ使用することに同意します。
+
+4.3 Preview を使用してアプリケーションを開発する場合、デベロッパーはユーザーのプライバシーおよび法的権利を保護することに同意します。ユーザーからデベロッパーにユーザー名、パスワード、またはその他のログイン情報または個人情報が提供される場合、デベロッパーは、情報がデベロッパーのアプリケーションに提供されることをユーザーに認識させ、当該ユーザーについてプライバシーに関する法的に十分な通知および保護を行わなければなりません。デベロッパーのアプリケーションに個人情報または秘密情報が保存される場合、この保存は保護された方法で行われなければなりません。ユーザーからデベロッパーのアプリケーションに Google アカウントの情報が提供された場合、デベロッパーのアプリケーションでは、ユーザーが許可したタイミングで、かつユーザーが許可した限定された目的にのみ、当該情報を使用してユーザーの Google アカウントにアクセスすることが認められるものとします。
+
+4.4 デベロッパーは、Preview に関して、第三者（Google、およびあらゆる携帯電話会社を含むが、これらに限定されない）のサーバー、ネットワーク、またはその他の財産またはサービスへの妨害、中断、損害、または許可されていない態様でのアクセスとなる行為（そのような行為に該当する対象製品の開発または販売 / 配布を含む）に関与しないことに同意します。
+
+4.5 デベロッパーは、デベロッパーが Android および Android のアプリケーションを介して作成、送信、表示するデータ、コンテンツ、リソース、および自身の行為の結果（Google に発生する可能性のあるあらゆる損失および損害を含む）について、自身が単独で責任を負うこと（および Google がこれについてデベロッパーまたはいかなる第三者に対しても一切責任を負わないこと）に同意します。
+
+4.6 デベロッパーは、本契約、適用される第三者の契約もしくは利用規約、または適用される法律もしくは規則に基づく自身の義務に違反したこと、および当該違反の結果（Google または第三者に発生したあらゆる損失および損害を含む）について、自身が単独で責任を負うこと（および Google がこれについてデベロッパーまたはいかなる第三者に対しても一切責任を負わないこと）に同意します。
+
+4.7 Preview は開発中であり、デベロッパーによるテスティングやフィードバックは開発プロセスの重要な一部となります。デベロッパーは、Preview の使用により、一部の機能の実装が開発中であると認識し、Preview が安定したリリースの完全な機能性を持つことに依存すべきでないことを認識するものとします。本 Preview は、公式の Android SDK のリリース後はサポート対象でなくなるため、デベロッパーは、Preview を使用するいかなるアプリケーションも公然と配布または引き渡さないことに同意するものとします。
+
+5.デベロッパーの資格情報
+
+5.1 デベロッパーは、Google が発行した、またはデベロッパー自身で選択した、自身のデベロッパー用資格情報の秘密を保持する責任を負うこと、および自身のデベロッパー用資格情報のもとで開発されたすべてのアプリケーションについて単独で責任を負うことに同意します。
+
+6.プライバシーおよび情報
+
+6.1 Google は、Preview の継続的な技術革新と改良のために、ソフトウェアから特定の使用状況統計情報（一意識別子、関連する IP アドレス、ソフトウェアのバージョン番号、Preview のどのツール/サービスがどのように使用されているかに関する情報を含むが、これらに限定されない）を収集できます。この情報が収集される前に、Preview に通知が表示され、デベロッパーの同意が求められます。デベロッパーが同意しない場合は、情報は収集されません。
+
+6.2 収集されるデータは、Preview の改良のために集約された形で精査され、Google のプライバシー ポリシー（http://www.google.com/policies/privacy/）に従って管理されます。
+
+7.第三者のアプリケーション
+
+7.1 デベロッパーが、Preview を使用して第三者が開発したアプリケーションを実行する、あるいは第三者から提供されたデータ、コンテンツ、リソースにアクセスする場合、デベロッパーは、Google がそれらのアプリケーション、データ、コンテンツ、リソースについて責任を負わないことに同意します。デベロッパーは、そのような第三者のアプリケーションを介してアクセスするすべてのデータ、コンテンツ、リソースについては、それらを生成した者が単独で責任を負うものであり、Google はそれらの第三者のアプリケーション、データ、コンテンツ、またはリソースの使用もしくはアクセスによって生じたあらゆる損失および損害について一切責任を負わないことを理解します。
+
+7.2 デベロッパーは、そのような第三者のアプリケーションを介して表示されるデータ、コンテンツ、リソースは、提供者（あるいは代理の第三者または事業体）が所有する知的財産権で保護されている場合があることを認識するものとします。デベロッパーは、当該所有者からの明確な許可がない限り、それらのデータ、コンテンツ、リソース（全体または一部）の変更、貸与、賃貸、担保、配布または派生物の作成を行うことはできません。
+
+7.3 デベロッパーは、そのような第三者のアプリケーション、データ、コンテンツまたはリソースの使用が、デベロッパーと当該第三者間の別の規約に従うものであることを認識するものとします。
+
+8.Google API の使用
+
+8.1 Google API
+
+8.1.1 API を使用して Google からデータを取得する場合、デベロッパーは、そのデータは、Google またはデータを提供する事業体（あるいは代理の第三者または事業体）が所有する知的財産権で保護されている場合があることを認識するものとします。そのような API の使用は追加の利用規約に従うものとします。デベロッパーは、当該の利用規約による許可がない限り、そのデータ（全体または一部）の変更、貸与、賃貸、担保、配布または派生物の作成を行うことはできません。
+
+8.1.2 デベロッパーは、API を使用して Google からユーザーのデータを取得する場合、ユーザーが明示的に同意した場合のみ、およびユーザーが許可したタイミングとその目的にのみ、データを取得できることを理解し、同意します。
+
+9.本契約の終了
+
+9.1 本契約は、下記の規定に従ってデベロッパーまたは Google のいずれかによって解約されるまで、継続して適用されるものとします。
+
+9.2 デベロッパーが本契約の解約を希望する場合は、Preview および関連するデベロッパー資格情報の使用を停止することで、契約を終了するものとします。
+
+9.3 Google は、理由の有無にかかわらず、書面で通知することでいつでもデベロッパーとの本契約を解約することができます。
+
+9.4 本契約は事前の通知またはその他の措置なく、次のうち早い方に自動的に終了します。
+（A）Google が、デベロッパーが居住している国またはデベロッパーがサービスを使用する国での Preview または Preview の一部の配布を停止したとき。
+（B）Google が Android SDK の最終バージョンをリリースしたとき。
+
+9.5 本契約が終了すると、本契約で付与されていたライセンスは終了し、デベロッパーは速やかに Preview のすべての使用を停止するものとし、第 10 条、第 11 条、第 12 条、第 14 条の規定は無期限に効力を有するものとします。
+
+10.免責事項
+
+10.1 デベロッパーは、デベロッパーによる Preview の使用はデベロッパー自身の責任において行うものであること、および Preview は「現状有姿」かつ「提供可能な限りにおいて」、Google からのいかなる種類の保証もなく提供されるものであることを明示的に理解し、これに同意します。
+
+10.2 デベロッパーによる Preview および Preview の使用を通じてダウンロードまたはその他の方法で取得されたマテリアルの使用は、デベロッパー自身の裁量および責任において行うものであり、当該使用の結果として生じるデベロッパーのコンピュータ システムもしくはその他の端末への損害またはデータの喪失についての責任はデベロッパーが単独で負います。前述を制限することなく、Preview は安定したリリースではなく、コンピュータやその他の端末の利用の完全な回復不可能な損失を含む、重大な損害を引き起こす可能性のあるエラー、欠陥、およびセキュリティ上の脆弱性が含まれている可能性があることを理解します。
+
+10.3 Google はまた、商品性、特定目的への適合性、および権利侵害がないことの黙示的な保証および条件を含む（ただしこれらに限定されない）、明示的か黙示的かを問わずあらゆる種類のすべての保証および条件を明示的に否定します。
+
+11.責任の制限
+
+11.1 デベロッパーは、Google、その子会社および関連会社、ならびにそのライセンサーが、デベロッパーに発生した直接損害、間接損害、偶発的損害、特別損害、結果的損害、または懲罰的損害（データの喪失を含む）について、Google またはその代表者が当該損失が発生する可能性について告知されていたかどうか、または知っていたはずであるかどうかにかかわらず、いかなる責任法理のもとでもデベロッパーに対して責任を負わないことを明示的に理解し、これに同意します。
+
+12.補償
+
+12.1 法律で認められる最大限の範囲内において、デベロッパーは、（a）デベロッパーが Preview を使用したこと、および（b）デベロッパーが Preview で開発したアプリケーションが他者のいかなる知的財産権を侵害していること、または他者の名誉を毀損している、もしくは他者のパブリシティ権もしくはプライバシー権を侵害していること、および（c）デベロッパーが本契約に違反したことから発生したあらゆる申し立て、普通法上の訴訟、衡平法上の訴訟、または法的手続き、ならびにあらゆる損失、責任、損害、費用、および経費（合理的な弁護士報酬を含む）について、Google、その関連会社、ならびに当該各社の取締役、役員、従業員、代理人を防御し、補償し、免責することに同意します。
+
+13.契約の変更
+
+13.1 Google は、Preview の新しいバージョンを配布することにより、いつでも本契約を変更することができます。変更が生じた場合、Google は、Preview の提供ウェブサイト上に使用許諾契約の改訂版を公開します。
+
+14.法的一般条項
+
+14.1 本契約は、デベロッパーと Google の間の法的な合意のすべてを表し、デベロッパーによる Preview の使用（別の契約下で Google が提供するサービスを除く）に適用され、Preview に関するデベロッパーと Google の間のあらゆる事前の合意に完全に取って代わるものです。
+
+14.2 デベロッパーは、Google が本契約に定める（または適用される法律のもとで Google が享受できる）法的な権利または救済措置を行使または執行しなかった場合でも、Google の権利が正式に放棄されたとはみなされないこと、および Google が以後も引き続き当該権利および救済措置を行使または執行できることに同意します。
+
+14.3 本件について判断を下す管轄権を有する司法裁判所によって、本契約のいずれかの条項が無効と判断された場合、当該条項は、本契約の残りの部分に影響を与えることなく本契約から削除されるものとします。本契約の残りの条項は、以後も引き続き有効かつ執行可能であるものとします。
+
+14.4 デベロッパーは、Google が親会社となっている各グループ企業が、本契約の第三受益者となること、および当該企業が、当該企業に利益（または受益権）を付与する本契約の条項を直接執行する、また当該条項に依拠する権利を有することを了承し、これに同意します。上記以外のいかなる人または法人も、本契約の第三受益者とはならないものとします。
+
+14.5 輸出規制。Preview は、米国輸出管理法令の対象です。デベロッパーは、Preview に適用されるすべての国内および国際の輸出管理法令に従わなければなりません。これらの法律には、仕向け地、ユーザー、および最終用途に関する制限が含まれます。
+
+14.6 デベロッパーは、Google から事前に書面で承認を得ずに、本契約を譲渡または移転することはできません。また、そのような承認を得ずに計画された譲渡はすべて無効になります。デベロッパーは、Google から事前に書面で承認を得ずに、本契約に基づく自身の責任または義務を他者に委任してはなりません。
+
+14.7 本契約あるいは本契約に基づくデベロッパーと Google の関係から発生または関連するすべての申し立ては、米国カリフォルニア州の抵触法を除いて、カリフォルニア州法に準拠するものとします。デベロッパーおよび Google は、本契約あるいは本契約に基づくデベロッパーと Google の関係から発生または関連する法的事項の解決について、米国カリフォルニア州サンタクララ郡に所在の連邦裁判所または州立裁判所が専属管轄権を有することに合意します。上記にかかわらず、デベロッパーは、Google が任意の司法管轄区において差し止め命令による救済（または同等の緊急法的救済）を求める申し立てを行うことが認められることに同意します。
+ </div><!-- sdk terms -->
+
+
+
+ <div id="sdk-terms-form">
+ <p>
+ <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
+ <label id="agreeLabel" for="agree">上記の利用規約を読み、同意します。</label>
+ </p>
+ <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+ </div>
+
+
+ </div><!-- end TOS -->
+
+
+ <div id="landing">
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>本書の内容</h2>
+ <ol>
+ <li><a href="#sdk">Preview SDK</a></li>
+ <li><a href="#docs">デベロッパー ドキュメント</a></li>
+ <li><a href="#images">ハードウェアのシステム イメージ</a></li>
+ </ol>
+
+ <h2>Legacy downloads</h2>
+ <ol>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ </ol>
+ </div>
+</div>
+
+
+<p>
+ Android M Preview SDK には、アプリとプラットフォームの次期リリースで提供される新しい API とのテストに役立つ開発ツール、Android システム ファイル、ライブラリ ファイルが含まれています。
+このドキュメントでは、アプリのテスト用にダウンロードできる Preview のコンポーネントを入手する方法について説明します。
+
+</p>
+
+
+<h2 id="sdk">Preview SDK</h2>
+
+<p>
+ Preview SDK <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK マネージャー</a>経由でダウンロードできます。Preview SDK のダウンロードと設定の詳細については、<a href="{@docRoot}preview/setup-sdk.html#downloadSdk">Set Up the Preview SDK</a> をご覧ください。
+
+</p>
+
+
+<h2 id="docs">デベロッパー ドキュメント</h2>
+
+<p>
+ デベロッパー ドキュメントのダウンロード パッケージでは、詳細な Preview の API リファレンス情報や API の比較レポートが提供されます。
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Description</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="docs-dl">
+ <td>Android M Preview 2<br>Developer Docs</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >m-preview-2-developer-docs.zip</a><br>
+ MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
+ SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ </td>
+ </tr>
+</table>
+
+<h2 id="images">ハードウェアのシステム イメージ</h2>
+
+<p>
+ これらのシステム イメージでは、テスト用に物理端末にプラットフォームのプレビュー バージョンをインストールできます。
+端末にこれらのイメージを 1 つ以上設定すると、アプリをインストールして、プラットフォームの次期バージョンでアプリがどのように動作するかをテストできます。
+端末にシステム イメージをインストールするプロセスでは、<em>端末からすべてのデータが削除</em>されるため、システム イメージのインストール前にデータをバックアップする必要があります。
+
+
+</p>
+
+<p class="warning">
+ <b>警告:</b> 次の Android システム イメージはプレビュー版であり、今後変更される可能性があります。デベロッパーによるシステム イメージの使用は、Android SDK Preview 使用許諾契約に準拠するものとします。
+Android Preview システム イメージは安定したリリースではなく、お使いのコンピュータ システム、端末、データに影響を与える可能性のあるエラーや欠陥が含まれている場合があります。
+
+プレビュー版の Android システム イメージは工場出荷版の OS と同等のテストを受けておらず、お使いの電話やインストールされているサービス、アンインストールの動作停止を引き起こす場合があります。
+
+
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Device</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="hammerhead">
+ <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
+ MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
+ SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ </td>
+ </tr>
+ <tr id="shamu">
+ <td>Nexus 6 <br>"shamu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >shamu-MPZ79M-preview-e1024040.tgz</a><br>
+ MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
+ SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ </td>
+ </tr>
+ <tr id="volantis">
+ <td>Nexus 9 <br>"volantis"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >volantis-MPZ79M-preview-9f305342.tgz</a><br>
+ MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
+ SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ </td>
+ </tr>
+
+ <tr id="fugu">
+ <td>Nexus Player <br>"fugu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
+ MD5: e8d081137a20b66df595ee69523314b5<br>
+ SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ </td>
+ </tr>
+
+</table>
+
+<h3 id="install-image">端末にイメージをインストールする</h3>
+
+<p>
+ テスト用に端末イメージを使用するには、互換性のある端末にインストールする必要があります。次の手順に従って、システム イメージをインストールします。
+
+</p>
+
+<ol>
+ <li>この一覧の中からいずれかのシステム イメージ パッケージをダウンロードして、解凍します。</li>
+ <li>保持するデータを端末からバックアップします。</li>
+ <li>
+<a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
+ の手順に従って端末にイメージをフラッシュします。</li>
+</ol>
+
+<p class="note">
+ <strong>注:</strong> 開発用端末に Preview のシステム イメージをフラッシュすると、OTA アップデートを通じて次のプレビュー リリースに自動的にアップグレードされます。
+
+</p>
+
+<h3 id="revertDevice">端末を工場出荷時の仕様に戻す</h3>
+
+<p>
+ Preview をアンインストールして、工場出荷時の仕様に戻すには、
+<a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a> にアクセス
+して、端末にフラッシュするイメージをダウンロードします。同じページの手順に従って端末にイメージをフラッシュします。
+
+</p>
+
+ </div><!-- landing -->
+
+</div><!-- relative wrapper -->
+
+
+
+<script>
+ var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
+ function onDownload(link) {
+
+ $("#downloadForRealz").html("Download " + $(link).text());
+ $("#downloadForRealz").attr('href', urlRoot + $(link).text());
+
+ $("#tos").fadeIn('fast');
+ $("#landing").fadeOut('fast');
+
+ return true;
+ }
+
+
+ function onAgreeChecked() {
+ /* verify that the TOS is agreed */
+ if ($("input#agree").is(":checked")) {
+ /* reveal the download button */
+ $("a#downloadForRealz").removeClass('disabled');
+ } else {
+ $("a#downloadForRealz").addClass('disabled');
+ }
+ }
+
+ function onDownloadForRealz(link) {
+ if ($("input#agree").is(':checked')) {
+ /*
+ $("#tos").fadeOut('fast');
+ $("#landing").fadeIn('fast');
+ */
+
+ ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
+
+ /*
+ location.hash = "";
+ */
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ $(window).hashchange( function(){
+ if (location.hash == "") {
+ location.reload();
+ }
+ });
+
+</script>
diff --git a/docs/html-intl/intl/ja/preview/index.jd b/docs/html-intl/intl/ja/preview/index.jd
index e44a42a..2e84aa3 100644
--- a/docs/html-intl/intl/ja/preview/index.jd
+++ b/docs/html-intl/intl/ja/preview/index.jd
@@ -30,7 +30,7 @@
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
<div class="dac-section dac-small">
diff --git a/docs/html-intl/intl/ko/index.jd b/docs/html-intl/intl/ko/index.jd
index 34c14ec..d95d698 100644
--- a/docs/html-intl/intl/ko/index.jd
+++ b/docs/html-intl/intl/ko/index.jd
@@ -10,19 +10,16 @@
<section class="dac-hero-carousel">
<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
-<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
+<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">
<a href="/preview/index.html">
- <div class="wrap" style="max-width:1100px;">
+ <div class="wrap" style="max-width:1100px;margin-top:0">
<div class="cols dac-hero-content">
- <div class="col-10of16 col-push-6of16 dac-hero-figure">
- <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"
- srcset="{@docRoot}images/home/devices-hero_620px.png 1x,
- {@docRoot}images/home/devices-hero_620px_2x.png 2x">
+ <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">
</div>
- <div class="col-6of16 col-pull-10of16">
+ <div class="col-8of16 col-pull-7of16">
<div class="dac-hero-tag"></div>
- <h1 class="dac-hero-title">Android M Developer Preview</h1>
+ <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
<p class="dac-hero-description">Android의 다음 버전을 만나볼 준비가
되셨습니까? 여러분의 앱을 Nexus 5, 6, 9 및 Player에서 테스트해보십시오. </p>
@@ -32,7 +29,7 @@
</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
</div>
diff --git a/docs/html-intl/intl/ko/preview/download.jd b/docs/html-intl/intl/ko/preview/download.jd
index ff9dd7e..d92453a 100644
--- a/docs/html-intl/intl/ko/preview/download.jd
+++ b/docs/html-intl/intl/ko/preview/download.jd
@@ -164,14 +164,15 @@
<div id="qv">
<h2>이 문서의 내용</h2>
<ol>
- <li><a href="#sdk">미리 보기 SDK</a></li>
+ <li><a href="#sdk">Android 6.0 SDK</a></li>
<li><a href="#docs">개발자 관련 문서</a></li>
<li><a href="#images">하드웨어 시스템 이미지</a></li>
</ol>
<h2>Legacy downloads</h2>
<ol>
- <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview 1</a></li>
+ <li><a href="{@docRoot}preview/download_mp2.html">Developer Preview 2</a></li>
</ol>
</div>
</div>
@@ -184,7 +185,7 @@
</p>
-<h2 id="sdk">미리 보기 SDK</h2>
+<h2 id="sdk">Android 6.0 SDK</h2>
<p>
미리 보기 SDK는 <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a>를 통해 다운로드할 수 있습니다. 미리 보기 SDK를 다운로드하고 구성하는 데 관한 자세한 정보는 <a href="{@docRoot}preview/setup-sdk.html#downloadSdk">미리 보기 SDK 설정하기</a>를 참조하십시오.
@@ -204,11 +205,11 @@
<th scope="col">Download / Checksums</th>
</tr>
<tr id="docs-dl">
- <td>Android M Preview 2<br>Developer Docs</td>
+ <td>Android M Preview 3<br>Developer Docs</td>
<td><a href="#top" onclick="onDownload(this)"
- >m-preview-2-developer-docs.zip</a><br>
- MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
- SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ >m-preview-3-developer-docs.zip</a><br>
+ MD5: d99b14b0c06d31c8dfecb25072654ca3<br>
+ SHA-1: 9cefeeda07676130da606a1796e1c00fffc667c1
</td>
</tr>
</table>
@@ -241,34 +242,34 @@
<tr id="hammerhead">
<td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
<td><a href="#top" onclick="onDownload(this)"
- >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
- MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
- SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ >hammerhead-MPA44I-preview-2ebbc049.tgz</a><br>
+ MD5: 91a924fb0c9f8e716e3b4c9954fd0dbb<br>
+ SHA-1: 2ebbc049b68c4da8baeee3e42bb94d7a965ba4a3
</td>
</tr>
<tr id="shamu">
<td>Nexus 6 <br>"shamu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >shamu-MPZ79M-preview-e1024040.tgz</a><br>
- MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
- SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ >shamu-MPA44I-preview-62b9c486.tgz</a><br>
+ MD5: ac6e58da86125073d9c395257fd42664<br>
+ SHA-1: 62b9c486fd7a5020e228d53ca5acd5c1857e48ff
</td>
</tr>
<tr id="volantis">
<td>Nexus 9 <br>"volantis"</td>
<td><a href="#top" onclick="onDownload(this)"
- >volantis-MPZ79M-preview-9f305342.tgz</a><br>
- MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
- SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ >volantis-MPA44I-preview-5c30a6e2.tgz</a><br>
+ MD5: 7f83768757913d3fea945a661020d185<br>
+ SHA-1: 5c30a6e2acd11a81f4105b12d23ff654f534f699
</td>
</tr>
<tr id="fugu">
<td>Nexus Player <br>"fugu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
- MD5: e8d081137a20b66df595ee69523314b5<br>
- SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ >fugu-MPA44I-preview-2860040a.tgz</a><br>
+ MD5: 438da8d37da9e341a69cfb16a4001ac5<br>
+ SHA-1: 2860040a326582f1ff5f702bf9a1ef002717fc98
</td>
</tr>
diff --git a/docs/html-intl/intl/ko/preview/download_mp2.jd b/docs/html-intl/intl/ko/preview/download_mp2.jd
new file mode 100644
index 0000000..ff9dd7e
--- /dev/null
+++ b/docs/html-intl/intl/ko/preview/download_mp2.jd
@@ -0,0 +1,360 @@
+page.title=다운로드
+page.image=images/cards/card-download_16-9_2x.png
+
+@jd:body
+
+<div style="position:relative; min-height:600px">
+
+ <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
+
+ <p class="sdk-terms-intro">Android 미리 보기 SDK의 구성 요소를 다운로드하고 설치하기 전에 우선 다음과 같은 사용 약관에 동의해야 합니다.
+</p>
+
+ <h2 class="norule">사용 약관</h2>
+
+ <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
+이것은 Android SDK 미리 보기 라이선스 계약서입니다(이하 "라이선스 계약").
+
+1. 개요
+
+1.1 Android SDK 미리 보기(본 라이선스 계약에서는 "미리 보기"라고 칭하며, 구체적으로 Android 시스템 파일, 패키지 API 및 미리 보기 라이브러리 파일이 이용 가능한 경우 및 이용 가능하게 전환된 경우 이를 포함한 것을 가리킴)는 본 라이선스 계약 조건에 따라 계약자에게 사용을 허여합니다. 본 라이선스 계약은 미리 보기 사용과 관련하여 계약자와 Google 간에 법적 구속력이 있는 계약을 체결합니다.
+
+1.2 "Android"는 기기를 위한 Android 소프트웨어 스택을 의미합니다. 이는 http://source.android.com/ URL에 위치하며 수시로 업데이트되는 Android 오픈 소스 프로젝트에서 제공됩니다.
+
+1.3 "Google"은 미국 1600 Amphitheatre Parkway, Mountain View, CA 94043에 본사를 두고 있는 델라웨어주 법인인 Google Inc.를 의미합니다.
+
+2. 라이선스 계약에 동의
+
+2.1 이 미리 보기를 사용하려면, 먼저 라이선스 계약에 동의해야 합니다. 이 라이선스 계약에 동의하지 않고 미리 보기를 사용해서는 안 됩니다.
+
+2.2 수락을 클릭하고/거나 미리 보기를 사용하면 본 라이선스 계약 조건에 동의하는 것으로 간주됩니다.
+
+2.3 미국법 또는 현재 거주 중이거나 미리 보기를 사용하는 국가를 포함하여 다른 국가의 법에 따라 미리 보기를 받는 것이 금지된 경우, 미리 보기를 사용할 수 없으며 본 라이선스 계약을 수락할 수 없습니다.
+
+2.4 회사 또는 단체 내에서 내부적으로 미리 보기를 사용하며 고용주 또는 기타 단체를 대신하여 본 라이선스 계약 준수에 동의하는 경우, 계약자의 고용주나 그 단체에 본 라이선스 계약에 대한 구속력을 부여할 수 있는 모든 법적 권한을 계약자가 갖고 있음을 진술하고 보증합니다. 구속력을 부여할 수 있는 법적 권한이 없을 경우, 고용주 또는 기타 단체를 대신하여 본 라이선스 계약에 동의하거나 미리 보기를 사용할 수 없습니다.
+
+3. Google이 허하는 미리 보기 라이선스
+
+3.1 본 라이선스 계약의 조건에 따라 Google은 계약자에게 로열티 없고 양도 불가능하며 비독점적이고 2차 인가를 불허하며, 한정되고 무효화할 수 있는 미리 보기 사용 권한을 허용하여 회사 또는 조직 내에서 개인적 또는 내부적으로 사용할 수 있도록 합니다. 이는 Android 플랫폼에서 실행되는 애플리케이션을 개발할 목적으로만 사용해야 합니다.
+
+3.2 계약자는 SDK에 존재하는 지적 재산권을 포함한 SDK에 대한 모든 법적인 권리, 소유권 및 이익이 Google 또는 제3자에게 있음에 동의합니다 "지적 재산권"은 모든 특허법, 저작권법, 영업비밀법, 상표법상 존재하는 모든 권리 및 기타 모든 재산권을 의미합니다. Google은 계약자에게 명시적으로 부여하지 않은 모든 권리를 보유합니다.
+
+3.3 본 라이선스 계약에 명시적으로 허용된 용도 외에는 미리 보기를 사용할 수 없습니다. 해당 제3자 라이선스 요건이 허용하는 범위를 제외하고 계약자는 미리 보기의 일부분을 (a) 복사(백업 목적 제외), 수정, 개작, 재배포, 역컴파일, 리버스 엔지니어링, 분해하거나 이를 통해 파생물을 생성하거나 (b) 개인 컴퓨터를 제외한 모바일 단말기 또는 기타 모든 하드웨어 기기에 미리 보기의 일부를 로드하거나, 미리 보기의 일부를 다른 소프트웨어와 결합하거나 미리 보기의 일부가 통합된 일체의 소프트웨어나 기기를 배포해서는 안 됩니다.
+
+3.4 계약자는 미리 보기에서 파생된 소프트웨어 개발 키트의 배포, 이러한 키트 생성에 참여 또는 홍보를 포함하되 이에 국한되지 않고, Android의 단편화를 야기하는 어떠한 행동도 취하지 않을 것임에 동의합니다.
+
+3.5 오픈 소스 소프트웨어 라이선스에 의거한 미리 보기 구성요소의 사용, 재생산, 배포에는 본 라이선스 계약이 아닌, 해당 오픈 소스 소프트웨어 라이선스의 조건이 적용됩니다. 계약자는 허용된 모든 권한 하에서 그러한 오픈 소스 소프트웨어 라이선스에 관해 충실한 피허가자로서의 자세를 견지할 것이며 그러한 권한을 종료, 일시 중단 또는 침해하는 행위를 삼갈 것을 동의합니다.
+
+3.6 계약자는 Google이 제공하는 SDK의 형태 및 특성이 사전 통지 없이 변경될 수 있음에 동의하며, 이전 버전의 미리 보기에서 개발된 애플리케이션이 이후 버전의 SDK와 호환되지 않을 수 있음에 동의합니다. 계약자는 계약자 또는 사용자에게 사전 통지 없이 SDK(또는 SDK에 포함된 기능) 제공을(영구적 또는 일시적으로) 중단할 수 있는 권한이 Google에게 있음에 동의합니다.
+
+3.7 본 라이선스 계약은 계약자에게 Google의 상표명, 상표, 서비스 표시, 로고, 도메인 이름, 기타 독특한 브랜드 특징에 대한 사용 권한을 부여하지 않습니다.
+
+3.8 계약자는 SDK에 부착되어 있거나 포함되어 있는 모든 소유권 고지 사항(저작권 및 상표 고지 사항 포함)을 제거, 변경 또는 불분명하게 만들지 않을 것에 동의합니다.
+
+4. 계약자의 미리 보기 사용
+
+4.1 Google은 본 라이선스 계약의 어떤 조항도 계약자(또는 계약자의 사용 허가자)가 미리 보기를 사용하여 개발한 소프트웨어 애플리케이션에 대한 권리, 소유권 또는 이익, 그리고 해당 애플리케이션에 존재하는 모든 지적 재산권을 부여하지 않는다는 점에 동의합니다.
+
+4.2 계약자는 (a) 본 라이선스 계약 그리고 (b) 모든 준거법, 규정 또는 관련 관할권 내에서 일반적으로 수용되는 관행 또는 지침(미국 또는 기타 관련 국가로/에서의 데이터 또는 소프트웨어 수출과 관련된 모든 법률 포함)에서 허용하는 용도에 한하여 미리 보기를 사용하고 애플리케이션을 작성하는 것에 동의합니다.
+
+4.3 계약자는 일반 대중 사용자를 대상으로 미리 보기를 사용하여 애플리케이션을 개발하는 경우, 해당 사용자의 프라이버시 및 법적 권리를 보호하는 것에 동의합니다. 사용자가 계약자에게 사용자 이름, 비밀번호 또는 기타 로그인 정보나 개인 정보를 제공하는 경우, 계약자는 제공된 정보가 자신의 애플리케이션에 제공된다는 사실을 사용자에게 알려야 하며, 반드시 법적으로 적절한 개인정보 보호정책 고지 및 보호를 해당 사용자에게 제공해야 합니다. 애플리케이션에서 사용자가 제공한 개인정보나 민감한 정보를 저장하는 경우, 이를 안전하게 처리해야 합니다. 사용자들이 애플리케이션에 Google 계정 정보를 제공하는 경우, 애플리케이션은 해당 사용자의 Google 계정에 액세스하는 목적으로만, 그리고 각 사용자가 허용한 범위 내의 한정된 목적으로만 이러한 정보를 사용해야 합니다.
+
+4.4 계약자는 Google 또는 기타 모든 타사의 서버, 네트워크 또는 기타 모든 재산 또는 서비스를 허가 없이 방해, 교란, 손상 또는 액세스하는 애플리케이션의 개발 또는 배포를 포함한 하등의 행위에 미리 보기를 이용하지 않을 것임을 동의합니다.
+
+4.5 계약자는 자신이 Android 및/또는 Android용 애플리케이션을 통해 생성, 전송 또는 표시하는 모든 데이터, 콘텐츠 또는 리소스 그리고 그로 인한 결과(Google이 입을 수 있는 모든 피해나 손실 포함)에 대해 전적으로 책임이 있다는 것(그리고 Google은 계약자 또는 모든 제3자에 대한 책임이 없다는 것)에 동의합니다.
+
+4.6 계약자는 본 라이선스 계약, 모든 해당 제3자 계약 또는 서비스 약관, 또는 모든 준거법 또는 규정에 의거한 계약자 의무 위반, 그리고 그로 인한 결과(Google 또는 제3자가 입을 수 있는 모든 피해나 손실 포함)에 전적으로 책임이 있다는 것(그리고 Google은 계약자 또는 모든 제3자에 대한 책임이 없다는 것)에 동의합니다.
+
+4.7 이 미리 보기는 현재 개발 단계에 있으며, 계약자의 테스트와 피드백은 그러한 개발 과정에 중요한 부분을 차지합니다. 미리 보기를 사용함으로써 계약자는 일부 기능의 구현은 아직 개발 중인 상태이며 미리 보기가 안정된 릴리스처럼 완벽하게 기능할 것이라 믿고 사용해서는 안 된다는 점을 인지하는 것으로 간주합니다. 계약자는 이 미리 보기를 사용한 애플리케이션을 공개적으로 배포 또는 배송하지 않기로 동의합니다. 이 미리 보기는 공식 Android SDK가 출시된 이후에는 더 이상 지원되지 않기 때문입니다.
+
+5. 계약자의 개발자 자격 증명
+
+5.1 계약자는 Google이 발급했거나 자신이 선택한 모든 개발자 자격 증명에 대한 기밀성을 유지할 책임이 있으며 계약자의 개발자 자격 증명 하에 개발된 모든 애플리케이션에 대한 전적인 책임이 있음에 동의합니다.
+
+6. 개인정보 보호정책 및 정보
+
+6.1 미리 보기를 지속적으로 혁신하고 개선하기 위해, Google은 고유 식별자, 관련 IP 주소, 소프트웨어 버전 번호, 미리 보기에서 사용 중인 도구 및/또는 서비스와 도구의 사용법에 대한 정보를 포함하되 이에 국한되지 않고 소프트웨어에서 특정 사용량 통계 정보를 수집할 수 있습니다. 그러한 정보를 수집하기 전에 미리 보기는 계약자에게 이를 통지하고 동의를 구할 것입니다. 계약자가 동의하지 않을 경우 정보를 수집하지 않습니다.
+
+6.2 수집된 데이터는 모두 취합된 형태로 미리 보기 개선을 위해 검토되며, Google의 개인정보 보호정책에 따라 유지 관리됩니다. 이 정보는 http://www.google.com/policies/privacy/를 참조하십시오.
+
+7. 제3자 애플리케이션
+
+7.1 제3자가 개발한 애플리케이션을 실행하거나 제3자가 제공한 데이터, 콘텐츠 또는 리소스에 액세스하기 위해 미리 보기를 사용하는 경우, 계약자는 Google이 그러한 애플리케이션, 데이터, 콘텐츠 또는 리소스에 대한 책임이 없음에 동의합니다. 계약자는 그러한 제3자 애플리케이션을 통해 자신이 액세스한 모든 데이터, 콘텐츠 또는 리소스에 대한 책임은 그것을 만든 사람에게 있음에 동의합니다. 또한 계약자가 그러한 모든 제3자 애플리케이션, 데이터, 콘텐츠 또는 리소스를 사용하거나 액세스함으로써 비롯된 모든 피해나 손실에 대한 책임이 Google에게 없음에 동의합니다.
+
+7.2 그러한 제3자 애플리케이션을 통해 계약자에게 제공된 데이터, 콘텐츠 그리고 리소스는 그것을 제공한 제공자(또는 제공자를 대신하는 기타 개인 또는 기업)가 소유한 지적 재산권에 의해 보호될 수 있음을 유의해야 합니다. 그러한 데이터, 콘텐츠 또는 리소스(전부 또는 일부)를 수정, 임대, 리스, 대여, 판매, 배포하거나 이를 기반으로 파생물을 생성해서는 안 됩니다. 단, 관련 소유자로부터 그러한 작업을 수행해도 좋다는 허락을 받은 경우에는 예외입니다.
+
+7.3 계약자는 그러한 제3자 애플리케이션, 데이터, 콘텐츠 또는 리소스의 사용은 계약자와 관련 제3자 간에 체결하는 별도의 계약 조건의 적용을 받는다는 것을 인정합니다.
+
+8. Google API 사용
+
+8.1 Google Data API
+
+8.1.1 Google에서 데이터를 검색하기 위해 API를 사용하는 경우, 그러한 데이터가 Google 또는 데이터를 제공하는 당사자(또는 당사자를 대신하는 기타 개인 또는 기업)가 소유한 지적 재산권에 의해 보호될 수 있음을 인정합니다. 그러한 API를 사용하는 경우, 추가적인 서비스 약관의 적용을 받을 수 있습니다. 관련 서비스 약관에 허용되지 않은 한, 그러한 데이터(전부 또는 일부)를 변경, 임대, 리스, 대여, 판매, 배포하거나 이를 기반으로 파생물을 생성해서는 안 됩니다.
+
+8.1.2 Google에서 사용자 데이터를 검색하기 위해 API를 사용하는 경우, 계약자는 사용자로부터 명시적인 동의를 얻은 경우에 한하여, 그리고 해당 사용자가 허용한 범위 내의 한정된 목적으로만 데이터를 검색해야 합니다.
+
+9. 라이선스 계약 종료
+
+9.1 본 라이선스 계약은 계약자 또는 Google에 의해 아래와 같은 조건 하에 종료될 때까지 계속 적용됩니다.
+
+9.2 계약자가 라이선스 계약을 종료하고자 하는 경우, 미리 보기 및 관련 개발자 자격 증명 일체의 사용을 중단하는 것으로 그러한 의사를 피력할 수 있습니다.
+
+9.3 Google은 언제든 이유 여하를 불문하고 계약자에게 통고하여 라이선스 계약을 종료할 수 있습니다.
+
+9.4 본 라이선스 계약은 통보 또는 여타의 행위 없이도 자동으로 종료됩니다. 이에 해당되려면 다음과 같은 조건이 수반되어야 합니다.
+(A) Google이 계약자가 거주하는 국가 또는 계약자가 서비스를 사용하는 지역에서 미리 보기 또는 미리 보기의 특정 부분 제공을 중지하는 경우 및
+(B) Google이 Android SDK의 최종 릴리스 버전을 발행하는 경우.
+
+9.5 본 라이선스 계약이 종료되면 라이선스 계약으로 계약자에게 허용한 라이선스가 취소되며, 이에 따라 계약자는 미리 보기 사용을 즉시 모두 중단해야 하고 제 10, 11, 12 및 14절의 조항이 기한 없이 유지됩니다.
+
+10. 면책 조항
+
+10.1 계약자는 미리 보기 이용에 대한 위험 부담이 전적으로 본인에게 있으며, Google이 일체의 보증 없이 미리 보기를 "있는 그대로" 그리고 "이용 가능한" 상태로 제공한다는 것을 분명히 이해하고 동의합니다.
+
+10.2 미리 보기 이용 및 이용 과정에서 다운로드하거나 얻게 되는 모든 자료를 사용하는 것은 본인의 재량에 따르며 이에 대한 위험 부담이 전적으로 본인에게 있으며, 그러한 사용으로 인해 발생하는 컴퓨터 시스템 또는 다른 기기의 손상 또는 데이터 손실에 대한 책임은 전적으로 본인에게 있습니다. 전술한 조항을 제한하지 않는 범위 내에서 계약자는 미리 보기가 안정된 릴리스가 아니며 오류, 결함 및 보안 취약성이 포함되어 있을 수 있어 그 결과로 중대한 손상을 유발할 수 있다는 점을 이해하는 것으로 간주합니다. 여기에는 계약자의 컴퓨터 시스템 또는 기타 기기의 완전하고 돌이킬 수 없는 손실도 포함됩니다.
+
+10.3 더 나아가, Google은 상품성, 특정 목적에 대한 적합성 및 비침해의 묵시적 보증 등을 포함하되 이에 국한되지 않고 명시적이든 묵시적이든 모든 종류의 보증 및 조건을 명시적으로 부인합니다.
+
+11. 책임 한계
+
+11.1 계약자는 계약자에게 발생할 수 있는 직접, 간접, 부수적, 특별, 결과적 또는 징벌적 손해에 대해 그 어떤 책임 이론에 근거해서도 Google, 해당 자회사, 계열사 및 사용 허가자가 어떠한 책임도 지지 아니함을 분명히 이해하고 동의합니다. 이러한 손해에는 Google 또는 해당 대리자가 이러한 손실 발생 가능성에 대해 통지를 받았거나 이러한 사항을 인식했는지에 상관없이 모든 데이터 손실이 포함됩니다.
+
+12. 면책
+
+12.1 법률에 의해 허용되는 최대한의 범위 안에서 계약자는 (a) 미리 보기 사용, (b) 계약자가 미리 보기에서 개발한 일체의 애플리케이션에서 초래된 모든 사람의 저작권, 상표, 영업비밀, 트레이드 드레스, 특허 또는 기타 지적 재산권의 침해, 또는 어떤 사람의 명예를 훼손하거나 초상권 또는 개인정보 보호정책을 침해함 또는 (C)계약자 본인이 본 라이선스 계약을 위반함으로써 발생하거나 생기는 모든 청구, 조치, 소송 또는 절차, 그리고 모든 손실, 책임, 손해, 경비(합리적인 변호사 비용 포함)로부터 Google을 옹호하고, 면책시키고, Google이 손해를 입지 않도록 하는 데 동의합니다.
+
+13. 라이선스 계약 변경
+
+13.1 미리 보기의 새로운 버전을 배포할 때, Google은 본 라이선스 계약의 내용을 변경할 수 있습니다. 그러한 변경이 이뤄진 경우, Google은 미리 보기가 제공되는 웹사이트에 새로운 라이선스 계약 버전을 게재할 것입니다.
+
+14. 일반 법적 조건
+
+14.1 본 라이선스 계약은 계약자와 Google 간의 모든 법적 계약을 구성하며, 계약자의 미리 보기 사용을 규제하고(별도의 서면 계약을 통해 Google이 계약자에게 제공하는 모든 서비스는 제외), 미리 보기와 관련하여 이전에 계약자와 Google이 맺은 모든 계약을 완전히 대체합니다.
+
+14.2 계약자는 Google이 라이선스 계약에 포함된(또는 관련 법률에 의해 Google이 향유하는) 법적 권리 또는 구제수단을 행사하거나 집행하지 않더라도, Google이 권리를 공식적으로 포기한 것으로 간주하지 않으며, Google이 계속해서 그러한 권리 또는 구제수단을 이용할 수 있음에 동의합니다.
+
+14.3 본 라이선스 계약의 조항이 무효라고 이 사안에 관한 판결을 할 수 있는 관할권을 가진 법원이 판결할 경우, 그 조항은 라이선스 계약의 나머지 조항에 영향을 미치지 않는 형태로 라이선스 계약에서 제거됩니다. 본 라이선스 계약의 나머지 조항은 여전히 유효하며 집행 가능합니다.
+
+14.4 계약자는 Google이 모회사가 되는 회사 그룹에 속한 각 회사가 본 라이선스 계약의 제3수익자이며, 그러한 다른 회사들이 그들에게 이익(또는 유리한 권리)을 부여하는 본 라이선스 계약의 모든 조항을 직접 행사하고 적용할 수 있는 권리를 가진다는 데 동의합니다. 그 외에는 다른 어떤 개인이나 회사도 본 라이선스 계약의 제3수익자가 될 수 없습니다.
+
+14.5 수출 규제. 미리 보기는 미국의 수출법과 규정의 적용을 받습니다. 계약자는 미리 보기에 적용되는 모든 국내 및 국제 수출법과 규정을 준수해야 합니다. 그러한 법에는 수출 대상국, 최종 사용자 및 최종 용도에 대한 제한이 포함됩니다.
+
+14.6 계약자 또는 Google은 상대 당사자의 사전 서면 승인 없이 본 라이선스 계약에서 부여된 권리를 제3자에게 양도하거나 이전할 수 없으며, 그러한 승인 없이 이루어진 양도 시도는 모두 무효입니다. 계약자는 Google의 사전 승인 없이 본 라이선스 계약 상의 책임 또는 의무를 위임할 수 없습니다.
+
+14.7 본 라이선스 계약, 그리고 본 라이선스 계약 상의 계약자와 Google의 관계는 법률 조항 간의 충돌과는 무관하게 캘리포니아주법에 의한 규제를 받습니다. 계약자와 Google은 본 라이선스 계약으로부터 발생하는 모든 법적 문제 해결을 캘리포니아주 산타 클라라(Santa Clara) 카운티 내에 소재한 전속 관할 법원에 의뢰하는 것에 동의합니다. 위 규정에도 불구하고, 계약자는 Google이 여전히 모든 관할권에서 강제 구제책(또는 동등한 유형의 긴급 법적 구제)을 신청할 수 있음에 동의합니다.
+ </div><!-- sdk terms -->
+
+
+
+ <div id="sdk-terms-form">
+ <p>
+ <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
+ <label id="agreeLabel" for="agree">본인은 상기 사용 약관을 읽었으며 이에 동의합니다.</label>
+ </p>
+ <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+ </div>
+
+
+ </div><!-- end TOS -->
+
+
+ <div id="landing">
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>이 문서의 내용</h2>
+ <ol>
+ <li><a href="#sdk">미리 보기 SDK</a></li>
+ <li><a href="#docs">개발자 관련 문서</a></li>
+ <li><a href="#images">하드웨어 시스템 이미지</a></li>
+ </ol>
+
+ <h2>Legacy downloads</h2>
+ <ol>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ </ol>
+ </div>
+</div>
+
+
+<p>
+ Android M 미리 보기 SDK에는 개발 도구, Android 시스템 파일 및 라이브러리 파일이 포함되어 있어 앱을 테스트하고 플랫폼의 다음 릴리스에 도입되는 새 API를 테스트하는 데 유용합니다.
+ 이 문서에서는 미리 보기의 다운로드할 수 있는 구성 요소를 가져와 앱을 테스트하는 방법에 대해 설명합니다.
+
+</p>
+
+
+<h2 id="sdk">미리 보기 SDK</h2>
+
+<p>
+ 미리 보기 SDK는 <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a>를 통해 다운로드할 수 있습니다. 미리 보기 SDK를 다운로드하고 구성하는 데 관한 자세한 정보는 <a href="{@docRoot}preview/setup-sdk.html#downloadSdk">미리 보기 SDK 설정하기</a>를 참조하십시오.
+
+</p>
+
+
+<h2 id="docs">개발자 관련 문서</h2>
+
+<p>
+ 개발자 관련 문서 다운로드 패키지에서는 자세한 API 참조 정보와 미리 보기에 대한 API 차이점 보고서를 제공합니다.
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Description</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="docs-dl">
+ <td>Android M Preview 2<br>Developer Docs</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >m-preview-2-developer-docs.zip</a><br>
+ MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
+ SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ </td>
+ </tr>
+</table>
+
+
+<h2 id="images">하드웨어 시스템 이미지</h2>
+
+<p>
+ 이러한 시스템 이미지를 사용하면 물리적인 기기에서 플랫폼의 미리 보기 버전을 설치하여 테스트할 수 있게 해줍니다.
+ 이러한 이미지 중 한 가지로 기기를 구성하면, 앱을 설치하고 테스트하여 앱이 플랫폼의 다음 버전에서 어떤 성능을 보일지 확인할 수 있습니다.
+ 기기에 시스템 이미지를 설치하는 과정은<em>기기에서 모든 데이터를 제거하므로</em>, 시스템 이미지를 설치하기에 앞서 데이터를 백업하는 것이 좋습니다.
+
+
+</p>
+
+<p class="warning">
+ <b>경고:</b> 다음 Android 시스템 이미지는 미리 보기이며 사정에 따라 변동될 수 있습니다. 이러한 시스템 이미지를 사용할 때에는 Android SDK 미리 보기 라이선스 계약을 따라야 합니다.
+ Android 미리 보기 시스템 이미지는 안정된 릴리스가 아니며, 오류나 결함이 들어있을 수 있고 이 때문에 컴퓨터 시스템, 기기 및 데이터에 손상을 초래할 수 있습니다.
+
+ 미리 보기 Android 시스템 이미지는 공장 OS와 같은 테스트를 거치며 전화기 및 설치된 서비스와 애플리케이션의 작동이 중단되는 결과를 낳을 수 있습니다.
+
+
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Device</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="hammerhead">
+ <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
+ MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
+ SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ </td>
+ </tr>
+ <tr id="shamu">
+ <td>Nexus 6 <br>"shamu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >shamu-MPZ79M-preview-e1024040.tgz</a><br>
+ MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
+ SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ </td>
+ </tr>
+ <tr id="volantis">
+ <td>Nexus 9 <br>"volantis"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >volantis-MPZ79M-preview-9f305342.tgz</a><br>
+ MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
+ SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ </td>
+ </tr>
+
+ <tr id="fugu">
+ <td>Nexus Player <br>"fugu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
+ MD5: e8d081137a20b66df595ee69523314b5<br>
+ SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ </td>
+ </tr>
+
+</table>
+
+<h3 id="install-image">기기에 이미지 설치</h3>
+
+<p>
+ 기기 이미지를 테스트용으로 사용하려면, 이를 호환되는 기기에 설치해야만 합니다. 시스템 이미지를 설치하려면 아래의 지침을 따르십시오.
+
+</p>
+
+<ol>
+ <li>여기 목록에 나열된 시스템 이미지 중 하나를 다운로드하여 압축을 해제합니다.</li>
+ <li>기기에서 보존하고자 하는 데이터를 모두 백업합니다.</li>
+ <li>이미지를 기기에 플래시하려면 <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>에 있는 지침을 따릅니다.
+
+</li>
+</ol>
+
+<p class="note">
+ <strong>참고:</strong> 일단 개발 기기에 미리 보기 시스템 이미지를 플래시하고 나면 이것은 OTA(over-the-air) 업데이트를 통해 다음 미리 보기 릴리스에 맞춰 자동으로 업그레이드됩니다.
+
+</p>
+
+<h3 id="revertDevice">기기를 공장 사양으로 되돌리기</h3>
+
+<p>
+ 미리 보기의 설치를 제거하고 기기를 공장 사양으로 되돌리고자 하는 경우, <a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a>를 방문하여 기기에 플래시하고자 하는 이미지를 다운로드하십시오.
+
+ 해당 페이지에 있는 지침을 따라 기기에 이미지를 플래시하면 됩니다.
+
+</p>
+
+ </div><!-- landing -->
+
+</div><!-- relative wrapper -->
+
+
+
+<script>
+ var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
+ function onDownload(link) {
+
+ $("#downloadForRealz").html("Download " + $(link).text());
+ $("#downloadForRealz").attr('href', urlRoot + $(link).text());
+
+ $("#tos").fadeIn('fast');
+ $("#landing").fadeOut('fast');
+
+ return true;
+ }
+
+
+ function onAgreeChecked() {
+ /* verify that the TOS is agreed */
+ if ($("input#agree").is(":checked")) {
+ /* reveal the download button */
+ $("a#downloadForRealz").removeClass('disabled');
+ } else {
+ $("a#downloadForRealz").addClass('disabled');
+ }
+ }
+
+ function onDownloadForRealz(link) {
+ if ($("input#agree").is(':checked')) {
+ /*
+ $("#tos").fadeOut('fast');
+ $("#landing").fadeIn('fast');
+ */
+
+ ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
+
+ /*
+ location.hash = "";
+ */
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ $(window).hashchange( function(){
+ if (location.hash == "") {
+ location.reload();
+ }
+ });
+
+</script>
diff --git a/docs/html-intl/intl/ko/preview/index.jd b/docs/html-intl/intl/ko/preview/index.jd
index 9d0e040..badb9f6 100644
--- a/docs/html-intl/intl/ko/preview/index.jd
+++ b/docs/html-intl/intl/ko/preview/index.jd
@@ -29,7 +29,7 @@
</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
<div class="dac-section dac-small">
diff --git a/docs/html-intl/intl/pt-br/index.jd b/docs/html-intl/intl/pt-br/index.jd
index 24dd2fe..4d0a39e 100644
--- a/docs/html-intl/intl/pt-br/index.jd
+++ b/docs/html-intl/intl/pt-br/index.jd
@@ -10,19 +10,16 @@
<section class="dac-hero-carousel">
<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
-<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
+<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">
<a href="/preview/index.html">
- <div class="wrap" style="max-width:1100px;">
+ <div class="wrap" style="max-width:1100px;margin-top:0">
<div class="cols dac-hero-content">
- <div class="col-10of16 col-push-6of16 dac-hero-figure">
- <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"
- srcset="{@docRoot}images/home/devices-hero_620px.png 1x,
- {@docRoot}images/home/devices-hero_620px_2x.png 2x">
+ <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">
</div>
- <div class="col-6of16 col-pull-10of16">
+ <div class="col-8of16 col-pull-7of16">
<div class="dac-hero-tag"></div>
- <h1 class="dac-hero-title">Android M Developer Preview</h1>
+ <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
<p class="dac-hero-description">Prepare-se para a próxima versão do
Android. Teste os aplicativos no Nexus 5, 6, 9 e Player. </p>
@@ -31,7 +28,7 @@
Comece!</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
</div>
diff --git a/docs/html-intl/intl/pt-br/preview/download.jd b/docs/html-intl/intl/pt-br/preview/download.jd
index 12ef194..80685f9 100644
--- a/docs/html-intl/intl/pt-br/preview/download.jd
+++ b/docs/html-intl/intl/pt-br/preview/download.jd
@@ -164,14 +164,15 @@
<div id="qv">
<h2>Neste documento</h2>
<ol>
- <li><a href="#sdk">Preview SDK</a></li>
+ <li><a href="#sdk">Android 6.0 SDK</a></li>
<li><a href="#docs">Documentação do desenvolvedor</a></li>
<li><a href="#images">Imagens do sistema de hardware</a></li>
</ol>
<h2>Legacy downloads</h2>
<ol>
- <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview 1</a></li>
+ <li><a href="{@docRoot}preview/download_mp2.html">Developer Preview 2</a></li>
</ol>
</div>
</div>
@@ -184,7 +185,7 @@
</p>
-<h2 id="sdk">Preview SDK</h2>
+<h2 id="sdk">Android 6.0 SDK</h2>
<p>
O Preview SDK está disponível para download no <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a>. Para obter mais informações
@@ -204,11 +205,11 @@
<th scope="col">Download / Checksums</th>
</tr>
<tr id="docs-dl">
- <td>Android M Preview 2<br>Developer Docs</td>
+ <td>Android M Preview 3<br>Developer Docs</td>
<td><a href="#top" onclick="onDownload(this)"
- >m-preview-2-developer-docs.zip</a><br>
- MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
- SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ >m-preview-3-developer-docs.zip</a><br>
+ MD5: d99b14b0c06d31c8dfecb25072654ca3<br>
+ SHA-1: 9cefeeda07676130da606a1796e1c00fffc667c1
</td>
</tr>
</table>
@@ -241,34 +242,34 @@
<tr id="hammerhead">
<td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
<td><a href="#top" onclick="onDownload(this)"
- >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
- MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
- SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ >hammerhead-MPA44I-preview-2ebbc049.tgz</a><br>
+ MD5: 91a924fb0c9f8e716e3b4c9954fd0dbb<br>
+ SHA-1: 2ebbc049b68c4da8baeee3e42bb94d7a965ba4a3
</td>
</tr>
<tr id="shamu">
<td>Nexus 6 <br>"shamu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >shamu-MPZ79M-preview-e1024040.tgz</a><br>
- MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
- SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ >shamu-MPA44I-preview-62b9c486.tgz</a><br>
+ MD5: ac6e58da86125073d9c395257fd42664<br>
+ SHA-1: 62b9c486fd7a5020e228d53ca5acd5c1857e48ff
</td>
</tr>
<tr id="volantis">
<td>Nexus 9 <br>"volantis"</td>
<td><a href="#top" onclick="onDownload(this)"
- >volantis-MPZ79M-preview-9f305342.tgz</a><br>
- MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
- SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ >volantis-MPA44I-preview-5c30a6e2.tgz</a><br>
+ MD5: 7f83768757913d3fea945a661020d185<br>
+ SHA-1: 5c30a6e2acd11a81f4105b12d23ff654f534f699
</td>
</tr>
<tr id="fugu">
<td>Nexus Player <br>"fugu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
- MD5: e8d081137a20b66df595ee69523314b5<br>
- SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ >fugu-MPA44I-preview-2860040a.tgz</a><br>
+ MD5: 438da8d37da9e341a69cfb16a4001ac5<br>
+ SHA-1: 2860040a326582f1ff5f702bf9a1ef002717fc98
</td>
</tr>
diff --git a/docs/html-intl/intl/pt-br/preview/download_mp2.jd b/docs/html-intl/intl/pt-br/preview/download_mp2.jd
new file mode 100644
index 0000000..12ef194
--- /dev/null
+++ b/docs/html-intl/intl/pt-br/preview/download_mp2.jd
@@ -0,0 +1,360 @@
+page.title=Downloads
+page.image=images/cards/card-download_16-9_2x.png
+
+@jd:body
+
+<div style="position:relative; min-height:600px">
+
+ <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
+
+ <p class="sdk-terms-intro">Antes de fazer o download ou instalar componentes do Android Preview
+ SDK, você deve concordar com os seguintes termos e condições.</p>
+
+ <h2 class="norule">Termos e condições</h2>
+
+ <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
+Este é o contrato de licença do Android SDK Preview (o “Contrato de Licença”).
+
+1. Introdução
+
+1.1 O Android SDK Preview (que este Contrato de licença chama de "Preview", incluindo especificamente os arquivos de sistema do Android, APIs integradas e arquivos da biblioteca Preview, se e quando estiverem disponíveis) é licenciado por meio da concordância com os termos deste contrato. O Contrato de licença forma um vínculo contratual legal entre o contratante e a Google em relação ao uso do Preview.
+
+1.2 "Android" se refere à pilha de software do Android para dispositivos, conforme disponibilizado no Projeto de código aberto do Android, localizado no URL a seguir: http://source.android.com/, atualizado periodicamente.
+
+1.3 "Google" refere-se à Google Inc, uma corporação de Delaware, com sede em 1600 Amphitheatre Parkway, Mountain View, CA 94043, Estados Unidos.
+
+2. Aceitação do Contrato de Licença
+
+2.1 A fim de usar o Preview, é necessário concordar com este Contrato de licença. O uso do Preview é proibido àqueles que não concordam com este Contrato de licença.
+
+2.2 Ao clicar em aceitar e/ou usar o Preview, você concorda com os termos do Contrato de licença
+
+2.3 É proibido o uso do Preview e a aceitação deste contrato pelo indivíduo que tenha impedimento legal sobre o recebimento do Preview sob as leis dos Estados Unidos ou de outros países, incluindo o país de residência ou no qual usa o Preview.
+
+2.4 Se for usar o Preview internamente na empresa ou organização, você deverá concordar com o vínculo com este contrato em nome do empregador ou de outra entidade e declarar e garantir que tem total autoridade legal para tanto. Se você não tem a autoridade necessária, não deve concordar com este contrato nem usar o Preview em nome do empregador ou de outra entidade.
+
+3. Licença do Preview da Google
+
+3.1 Sujeito aos termos do Contrato de licença, a Google confere uma licença limitada, revogável, livre de taxas, intransmissível, não sub-licenciável e não exclusiva para o uso apenas do Preview, pessoal ou internamente dentro da sua empresa ou organização, para fins de desenvolvimento de aplicativos executados na plataforma do Android.
+
+3.2 Você concorda que a Google ou terceiros detêm todos os direitos legais, títulos e interesses relativos ao Preview, incluindo quaisquer direitos de propriedade intelectual que subsistam no Preview. "Direitos de propriedade intelectual" se referem a todo e qualquer direito sob as leis de patentes, de direitos autorais, de segredo comercial, de marca registrada e todos os outros direitos de propriedade. A Google reserva todos os direitos não conferidos expressamente a você.
+
+3.3 O uso do Preview não é autorizado para qualquer finalidade não expressamente permitida por este Contrato de licença. Salvo na extensão exigida por licenças aplicáveis de terceiros, é proibido: (a) copiar (exceto para fins de cópia de segurança), modificar, adaptar, redistribuir, descompilar, fazer engenharia reversa, desmontar ou criar trabalhos derivados do Preview ou qualquer parte dele; ou (b) carregar qualquer parte do Preview em um aparelho celular ou outro dispositivo de hardware, exceto em computador pessoal, combinar qualquer parte do Preview com outros softwares ou distribuir qualquer software ou dispositivo que contenha uma parte do Preview.
+
+3.4 Você concorda que não tomará quaisquer medidas que possam causar ou resultar em fragmentação do Android, incluindo, sem limitar-se, a distribuição e a participação na criação ou na promoção, sob quaisquer formas, de um conjunto de desenvolvimento de software derivado do Preview.
+
+3.5 O uso, a reprodução e a distribuição de componentes do Preview licenciado sob licença de software de código aberto são regidos exclusivamente pelos termos daquela licença de software de código aberto, e não por este Contrato de licença. Você concorda em manter uma licença em bom estado para as licenças de software de código aberto sob todos os direitos concedidos e deter quaisquer ações que possam limitar, suspender ou romper tais direitos.
+
+3.6 Você concorda que a forma e a natureza do SDK que a Google fornece podem mudar sem aviso prévio e que as versões futuras do SDK podem ser incompatíveis com aplicativos desenvolvidos em versões anteriores do SDK. Você concorda que a Google pode cessar (permanente ou temporariamente) o fornecimento do Preview (ou quaisquer recursos dentro dele) a você ou a usuários em geral sob critério exclusivo da Google, sem aviso prévio.
+
+3.7 Nada neste Contrato de licença confere o direito de uso de quaisquer nomes comerciais, marcas comerciais, marcas de serviço, logomarcas, nomes de domínios e outros recursos de marcas especiais da Google.
+
+3.8 Você concorda que não removerá, ocultará nem alterará quaisquer observações de direitos de propriedade (incluindo observações de direitos autorais e de marcas registradas) que possam estar afixadas ou contidas no Preview.
+
+4. Uso do Preview por você
+
+4.1 A Google compreende que nada no Contrato de licença dá a ela direito, título nem interesse no usuário (ou em seus licenciadores), sob o presente Contrato de licença, no que tange ao desenvolvimento de aplicativos de software através do uso do Preview, incluindo quaisquer direitos de propriedade intelectual que subsistam nos referidos aplicativos.
+
+4.2 Você concorda em usar o Preview e desenvolver aplicativos somente para as finalidades permitidas por (a) este Contrato de licença e (b) quaisquer leis, normas, diretrizes geralmente aceitas ou orientações aplicáveis nas jurisdições relevantes (incluindo quaisquer leis acerca da exportação e da importação de dados ou softwares nos Estados Unidos ou em outros países relevantes).
+
+4.3 Você concorda que, se usar o Preview para o desenvolvimento de aplicativos, deverá proteger a privacidade e os direitos legais destes usuários. Se nomes de usuário, senhas ou outras informações de acesso ou informações pessoais forem fornecidos ao aplicativo, deve-se informá-los de que tais dados estarão disponíveis para o aplicativo, além de fornecer observações de privacidade e proteção legalmente adequadas a esses usuários. Se o aplicativo armazenar informações pessoais ou confidenciais fornecidas pelos usuários, deve fazê-lo com segurança. Se o usuário fornecer informações da conta do Google, o aplicativo poderá usar essas informações exclusivamente para acessar a conta da Google do usuário quando houver autorização para fazê-lo e para os fins limitados pela autorização.
+
+4.4 Você concorda que não se envolverá em qualquer atividade com o Preview, incluindo o desenvolvimento e a distribuição de um aplicativo que interfira, perturbe, danifique ou acesse, de modo não autorizado, servidores, redes ou outras propriedades ou serviços da Google ou qualquer outro terceiro.
+
+4.5 Você concorda que é exclusivamente responsável por (e que a Google não tem qualquer responsabilidade com você ou terceiro) quaisquer dados, conteúdo ou recursos que criar, transmitir ou exibir por meio do Android e/ou de aplicativos do Android e pelas consequências que suas ações (incluindo perda ou dano que a Google possa sofrer) podem gerar.
+
+4.6 Você concorda que é exclusivamente responsável por (e que a Google não tem qualquer responsabilidade com você ou terceiro) qualquer violação das obrigações exigidas neste Contrato de licença, qualquer contrato ou termos de serviço aplicáveis a terceiros, qualquer lei ou norma aplicável e pelas consequências (incluindo a perda ou dano que a Google ou qualquer terceiro possa sofrer) de quaisquer violações.
+
+4.7 O Preview está em desenvolvimento e o seu teste e feedback são uma parte importante deste processo. Ao usar o Preview, você está ciente de que a implementação de alguns recursos ainda estão em desenvolvimento e que não se deve confiar que o Preview tem a funcionalidade completa de uma versão estável. Você concorda em não distribuir nem enviar publicamente quaisquer aplicativos usando este Preview, pois ele não será mais suportado após o lançamento oficial do Android SDK.
+
+5. Suas credenciais de desenvolvedor
+
+5.1 Você é responsável pela manutenção da confidencialidade de quaisquer credenciais de desenvolvedor que possam ser emitidas pela Google ou escolhidas por você e será o único responsável por todos os aplicativos que forem desenvolvidos sob suas credenciais de desenvolvedor.
+
+6. Privacidade e informações
+
+6.1 A fim de inovar e aprimorar continuamente o Preview, a Google pode coletar certas estatísticas de uso do software, incluindo, sem limitar-se, um identificador exclusivo, endereço IP associado, número de versão do software e informações sobre quais ferramentas e/ou serviços no Preview estão sendo usados e como estão sendo usados. Antes de coletar quaisquer dessas informações, o Preview o notificará e buscará seu consentimento. Se você recusar, as informações não serão coletadas.
+
+6.2 Os dados coletados são examinados coletivamente para aprimorar o Preview e são mantidos em conformidade com a Política de privacidade da Google acessível em http://www.google.com/policies/privacy/.
+
+7. Aplicativos de terceiros
+
+7.1 Ao usar o Preview para executar aplicativos desenvolvidos por terceiros ou que acessam dados, conteúdo ou recursos fornecidos por terceiros, você concorda que a Google não é responsável por tais aplicativos, dados, conteúdo ou recursos. Você compreende que quaisquer dados, conteúdo ou recursos passíveis de aceitação por meio de tais aplicativos de terceiros imputam responsabilidade exclusiva ao indivíduo que os originou. A Google não é responsável por qualquer perda ou dano que possa ocorrer como resultado do uso ou acesso de quaisquer aplicativos, dados, conteúdo ou recursos de terceiros.
+
+7.2 Você deve estar ciente de que os dados, conteúdo e recursos apresentados a você por aplicativos de terceiros podem ser protegidos pelos direitos de propriedade intelectual de posse dos fornecedores (ou de outras pessoas ou empresas em seus nomes). Não é permitido modificar, alugar, arrendar, emprestar, vender, distribuir nem criar trabalhos derivados com base nestes dados, conteúdo ou recursos (na totalidade ou em parte), salvo se houver permissão explícita especificada pelos respectivos detentores de direitos.
+
+7.3 Você reconhece que o uso de tais aplicativos, dados, conteúdo ou recursos de terceiros pode estar sujeito a termos adicionais entre você e o terceiro em questão.
+
+8. Uso de APIs da Google
+
+8.1 APIs da Google
+
+8.1.1 Ao usar qualquer API para recuperar dados da Google, você reconhece que eles podem ser protegidos por direitos de propriedade intelectual de posse da Google ou dos terceiros que fornecem os dados (ou de pessoas ou empresas em nomes deles). O uso de tal API pode estar sujeito a termos de serviço adicionais. Não é permitido modificar, alugar, arrendar, emprestar, vender, distribuir nem criar trabalhos derivados baseados nesses dados (na totalidade ou em parte), salvo se permitido pelos termos de serviço pertinentes.
+
+8.1.2 Se você usar qualquer API para recuperar dados de um usuário a partir da Google, reconhece e concorda que deve recuperar dados somente com consentimento explícito do usuário e somente quando, e para os fins limitados aos quais, o usuário conceder permissão para fazê-lo.
+
+9. Rescisão do Contrato de licença
+
+9.1 O Contrato de licença continuará a se aplicar até que ocorra uma rescisão sua ou da Google, como definido abaixo.
+
+9.2 Caso queira rescindir o Contrato de licença, você pode fazer isto cessando o uso do Preview e de qualquer credencial de desenvolvedor relevante.
+
+9.3 A Google pode, a qualquer momento, rescindir o Contrato de licença, com ou sem causa, com uma notificação.
+
+9.4 O Contrato de licença será encerrado automaticamente sem aviso ou outras ações na ocorrência de:
+(A) a Google interromper o fornecimento do Preview ou de determinadas partes do Preview aos usuários no país em que você reside ou de onde o serviço é usado; e
+(B) a Google emitir uma versão de lançamento final do Android SDK.
+
+9.5 Quando o Contrato de licença é rescindido, a licença concedida a você no Contrato de licença é finalizada, todo o uso do Preview será interrompido e as provisões dos parágrafos 10, 11, 12 e 14 deverão permanecer indefinidamente.
+
+10. EXCLUSÕES
+
+10.1 VOCÊ COMPREENDE E CONCORDA EXPRESSAMENTE QUE O RISCO DO USO DO PREVIEW É EXCLUSIVAMENTE SEU E QUE O PREVIEW É FORNECIDO NA FORMA EM QUE SE ENCONTRA E COMO DISPONIBILIZADO, SEM GARANTIA DE QUALQUER TIPO DA GOOGLE.
+
+10.2 O USO DO PREVIEW E DE QUALQUER MATERIAL BAIXADO OU OBTIDO DE OUTRO MODO PELO USO DO PREVIEW ESTÁ A SEU CRITÉRIO E RISCO E VOCÊ É O ÚNICO RESPONSÁVEL POR QUALQUER DANO AO SEU SISTEMA OPERACIONAL OU OUTRO DISPOSITIVO OU PELA PERDA DE DADOS QUE RESULTEM DE TAL USO. SEM LIMITAR OS PRECEDENTES, VOCÊ ENTENDE QUE O PREVIEW NÃO É UMA VERSÃO ESTÁVEL E QUE PODE CONTER ERROS, DEFEITOS E VULNERABILIDADES DE SEGURANÇA QUE PODEM RESULTAR EM DANOS SIGNIFICANTES, INCLUINDO A PERDA IRRECUPERÁVEL OU COMPLETA DO USO DO SISTEMA DO COMPUTADOR OU DE OUTROS DISPOSITIVOS.
+
+10.3 A GOOGLE EXCLUI EXPRESSAMENTE TODAS AS GARANTIAS E CONDIÇOES DE QUALQUER TIPO, EXPRESSAS OU IMPLÍCITAS, INCLUINDO, MAS NÃO LIMITADO A, GARANTIAS E CONDIÇÕES DE COMERCIALIZAÇÃO IMPLÍCITAS, ADEQUAÇÃO A UMA FINALIDADE PARTICULAR E A NÃO VIOLAÇÃO.
+
+11. LIMITAÇÃO DE RESPONSABILIDADE
+
+11.1 VOCÊ COMPREENDE E CONCORDA EXPRESSAMENTE QUE A GOOGLE, SUAS SUBSIDIÁRIAS, AFILIADAS E SEUS LICENCIADORES NÃO SERÃO RESPONSABILIZADOS POR VOCÊ SOB QUALQUER TEORIA DE RESPONSABILIDADE POR QUAISQUER DANOS, SEJAM ELES DIRETOS, INDIRETOS, INCIDENTAIS, ESPECIAIS, CONSEQUENCIAIS OU DE EXEMPLO QUE POSSAM INCORRER, INCLUINDO QUALQUER PERDA DE DADOS, INDEPENDENTE DE AVISO À GOOGLE OU A SEUS REPRESENTANTES OU DA NECESSIDADE DE AVISO SOBRE A POSSIBILIDADE DA INCORRÊNCIA DE TAIS PERDAS.
+
+12. Indenização
+
+12.1 Ao limite máximo permitido por lei, você concorda em defender, indenizar e isentar a Google, suas afiliadas e respectivos conselheiros, diretores, empregados e agentes com relação a todas e quaisquer reivindicações, ações, processos ou procedimentos, bem como todas e quaisquer perdas, responsabilidades, danos, custos e despesas (incluindo honorários advocatícios) decorrentes ou provenientes de: (a) seu uso do Preview, (b) qualquer aplicativo desenvolvido no Preview que infrinja direitos de propriedade intelectual de qualquer pessoa, difame qualquer pessoa ou viole seus direitos de publicidade ou privacidade e (c) qualquer não cumprimento deste Contrato de licença.
+
+13. Mudanças no Contrato de licença
+
+13.1 A Google pode realizar mudanças no Contrato de licença à medida que distribui novas versões do Preview. Quando essas mudanças forem realizadas, a Google fará uma nova versão do Contrato de licença disponível no site em que o Preview estiver disponível.
+
+14. Termos legais gerais
+
+14.1 Esse Contrato de licença constitui o contrato legal integral entre você e a Google e rege o uso do Preview (excluindo quaisquer serviços que a Google possa fornecer a você sob um contrato escrito em separado), e substitui inteiramente quaisquer contratos anteriores entre você e a Google em relação ao Preview.
+
+14.2 Você concorda que, se a Google não exercer nem impetrar qualquer direito ou recurso legal que esteja contido no Contrato de licença (ou que a Google detenha direitos nos termos de qualquer lei aplicável), não se considerará esse fato como uma renúncia formal aos direitos da Google e esses direitos ou recursos continuarão disponíveis à Google.
+
+14.3 Se qualquer tribunal de justiça que tiver a competência para decidir sobre esse tema determinar que qualquer cláusula do Contrato de licença é inválida, tal cláusula será removida do contrato sem afetar as cláusulas restantes ou sua vigência. As cláusulas restantes do Contrato de licença continuarão válidas e obrigatórias.
+
+14.4 Você reconhece e concorda que cada membro do grupo de empresas das quais a Google é a empresa controladora deve ser beneficiário terceiro do Contrato de licença e que essas outras empresas terão o poder de aplicar diretamente, e apoiar-se em, qualquer cláusula do Contrato de licença que confira um direito (ou direitos em favor) deles. Além disso, nenhuma outra pessoa nem empresa deve ser beneficiário terceiro do Contrato de licença.
+
+14.5 RESTRIÇÕES DE EXPORTAÇÃO. O PREVIEW ESTÁ SUJEITO ÀS LEIS E NORMAS DE EXPORTAÇÃO DOS ESTADOS UNIDOS. VOCÊ DEVE CUMPRIR TODAS AS LEIS E NORMAS DOMÉSTICAS E INTERNACIONAIS QUE SE APLICAREM AO PREVIEW. ESSAS LEIS INCLUEM RESTRIÇÕES SOBRE DESTINOS, USUÁRIOS FINAIS E USO FINAL.
+
+14.6 O Contrato de licença não pode ser atribuído nem transferido por você sem a aprovação prévia por escrito da Google. Qualquer tentativa de atribuição sem a aprovação será inválida. Você não deve delegar as próprias responsabilidades ou obrigações nos termos do Contrato de licença sem aprovação prévia por escrito da Google.
+
+14.7 O Contrato de licença e sua relação com a Google nos termos do contrato serão regidos pelas leis do estado da Califórnia sem considerar conflitos de disposições legais. Você e a Google concordam em se submeter à competência exclusiva dos tribunais localizados na comarca de Santa Clara, Califórnia, para dirimir quaisquer questões legais decorrentes do Contrato de licença. Não obstante a isso, você concorda que a Google continua habilitada a impetrar medidas cautelares (ou mecanismo legal urgente equivalente) em qualquer jurisdição.
+ </div><!-- sdk terms -->
+
+
+
+ <div id="sdk-terms-form">
+ <p>
+ <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
+ <label id="agreeLabel" for="agree">Li e concordo com todos os termos e condições expressos acima</label>
+ </p>
+ <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+ </div>
+
+
+ </div><!-- end TOS -->
+
+
+ <div id="landing">
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>Neste documento</h2>
+ <ol>
+ <li><a href="#sdk">Preview SDK</a></li>
+ <li><a href="#docs">Documentação do desenvolvedor</a></li>
+ <li><a href="#images">Imagens do sistema de hardware</a></li>
+ </ol>
+
+ <h2>Legacy downloads</h2>
+ <ol>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ </ol>
+ </div>
+</div>
+
+
+<p>
+ O Android M Preview SDK inclui ferramentas de desenvolvimento, arquivos de sistema do Android e arquivos da biblioteca
+ para ajudar você a testar o aplicativo e novas APIs da próxima versão da plataforma. Este documento
+ descreve como adquirir os componentes disponíveis para download da prévia para o teste do aplicativo.
+</p>
+
+
+<h2 id="sdk">Preview SDK</h2>
+
+<p>
+ O Preview SDK está disponível para download no <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a>. Para obter mais informações
+ sobre o download e a configuração do Preview SDK, consulte <a href="{@docRoot}preview/setup-sdk.html#downloadSdk">Configuração do Preview SDK</a>.
+</p>
+
+
+<h2 id="docs">Documentação do desenvolvedor</h2>
+
+<p>
+ O pacote de download da documentação do desenvolvedor fornece informações de referência de API detalhadas e um relatório de diferença de API para a prévia.
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Description</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="docs-dl">
+ <td>Android M Preview 2<br>Developer Docs</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >m-preview-2-developer-docs.zip</a><br>
+ MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
+ SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ </td>
+ </tr>
+</table>
+
+
+<h2 id="images">Imagens do sistema de hardware</h2>
+
+<p>
+ Essas imagens do sistema permitem que você instale uma versão de prévia da plataforma em um dispositivo físico
+para fins de teste. Ao configurar um dispositivo com uma dessas imagens, é possível instalar e testar o aplicativo
+ para verificar o seu desempenho na próxima versão da plataforma. O processo de instalação de uma imagem do sistema
+ em um dispositivo <em>remove todos os dados do dispositivo</em>. Portanto, deve-se realizar um backup dos dados
+ antes de instalar uma imagem do sistema.
+</p>
+
+<p class="warning">
+ <b>Aviso:</b> as seguintes imagens do sistema Android são prévias e estão sujeitas a alterações. O uso
+ dessas imagens do sistema são governadas pelo Contrato de licença do Android SDK Preview. As imagens do sistema do Android Preview
+ não são versões estáveis e podem conter erros e defeitos que podem resultar
+ em danos aos sistemas do computador, aos dispositivos e aos dados. As imagens do sistema Android Preview
+ não estão sujeitas ao mesmo teste do sistema operacional de fábrica e podem fazer com que o telefone e aplicativos e os serviços
+ instalados parem de funcionar.
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Device</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="hammerhead">
+ <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
+ MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
+ SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ </td>
+ </tr>
+ <tr id="shamu">
+ <td>Nexus 6 <br>"shamu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >shamu-MPZ79M-preview-e1024040.tgz</a><br>
+ MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
+ SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ </td>
+ </tr>
+ <tr id="volantis">
+ <td>Nexus 9 <br>"volantis"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >volantis-MPZ79M-preview-9f305342.tgz</a><br>
+ MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
+ SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ </td>
+ </tr>
+
+ <tr id="fugu">
+ <td>Nexus Player <br>"fugu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
+ MD5: e8d081137a20b66df595ee69523314b5<br>
+ SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ </td>
+ </tr>
+
+</table>
+
+<h3 id="install-image">Instalar uma imagem no dispositivo</h3>
+
+<p>
+ Para usar uma imagem de dispositivo para testes, deve-se instalá-lo em um dispositivo compatível. Siga
+ as instruções abaixo para instalar uma imagem de sistema.
+</p>
+
+<ol>
+ <li>Faça o download e descompacte um dos pacotes de imagem do sistema listados aqui.</li>
+ <li>Faça um backup dos dados do dispositivo que deseja preservar.</li>
+ <li>Siga as instruções em
+ <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
+ para programar em flash a imagem no dispositivo.</li>
+</ol>
+
+<p class="note">
+ <strong>Observação:</strong> ao programar em flash a imagem do sistema de prévia no dispositivo de desenvolvimento,
+ ele é atualizado automaticamente com o próximo lançamento da prévia por meio de atualizações over-the-air (OTA).
+</p>
+
+<h3 id="revertDevice">Reverter um dispositivo para as especificações de fábrica</h3>
+
+<p>
+ Caso queira desinstalar a prévia e reverter o dispositivo para as especificações de fábrica, acesse
+ <a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a> e
+ faça o download da imagem que deseja programar em flash no dispositivo. Siga as instruções nesta página
+ para programar em flash a imagem no dispositivo.
+</p>
+
+ </div><!-- landing -->
+
+</div><!-- relative wrapper -->
+
+
+
+<script>
+ var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
+ function onDownload(link) {
+
+ $("#downloadForRealz").html("Download " + $(link).text());
+ $("#downloadForRealz").attr('href', urlRoot + $(link).text());
+
+ $("#tos").fadeIn('fast');
+ $("#landing").fadeOut('fast');
+
+ return true;
+ }
+
+
+ function onAgreeChecked() {
+ /* verify that the TOS is agreed */
+ if ($("input#agree").is(":checked")) {
+ /* reveal the download button */
+ $("a#downloadForRealz").removeClass('disabled');
+ } else {
+ $("a#downloadForRealz").addClass('disabled');
+ }
+ }
+
+ function onDownloadForRealz(link) {
+ if ($("input#agree").is(':checked')) {
+ /*
+ $("#tos").fadeOut('fast');
+ $("#landing").fadeIn('fast');
+ */
+
+ ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
+
+ /*
+ location.hash = "";
+ */
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ $(window).hashchange( function(){
+ if (location.hash == "") {
+ location.reload();
+ }
+ });
+
+</script>
diff --git a/docs/html-intl/intl/pt-br/preview/index.jd b/docs/html-intl/intl/pt-br/preview/index.jd
index 172b211..6936718 100644
--- a/docs/html-intl/intl/pt-br/preview/index.jd
+++ b/docs/html-intl/intl/pt-br/preview/index.jd
@@ -29,7 +29,7 @@
</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
<div class="dac-section dac-small">
diff --git a/docs/html-intl/intl/ru/index.jd b/docs/html-intl/intl/ru/index.jd
index 3fe65ea..3da0b9e 100644
--- a/docs/html-intl/intl/ru/index.jd
+++ b/docs/html-intl/intl/ru/index.jd
@@ -10,19 +10,16 @@
<section class="dac-hero-carousel">
<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
-<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
+<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">
<a href="/preview/index.html">
- <div class="wrap" style="max-width:1100px;">
+ <div class="wrap" style="max-width:1100px;margin-top:0">
<div class="cols dac-hero-content">
- <div class="col-10of16 col-push-6of16 dac-hero-figure">
- <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"
- srcset="{@docRoot}images/home/devices-hero_620px.png 1x,
- {@docRoot}images/home/devices-hero_620px_2x.png 2x">
+ <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">
</div>
- <div class="col-6of16 col-pull-10of16">
+ <div class="col-8of16 col-pull-7of16">
<div class="dac-hero-tag"></div>
- <h1 class="dac-hero-title">Android M Developer Preview</h1>
+ <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
<p class="dac-hero-description">Подготовьтесь к выходу следующей версии
платформы Android. Протестируйте ваши приложения на устройствах Nexus
5, 6, 9 и Player. </p>
@@ -33,7 +30,7 @@
</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
</div>
diff --git a/docs/html-intl/intl/ru/preview/download.jd b/docs/html-intl/intl/ru/preview/download.jd
index 13872d1..9afc62b 100644
--- a/docs/html-intl/intl/ru/preview/download.jd
+++ b/docs/html-intl/intl/ru/preview/download.jd
@@ -164,13 +164,14 @@
<div id="qv">
<h2>Содержание документа</h2>
<ol>
- <li><a href="#sdk">SDK Preview</a></li>
+ <li><a href="#sdk">Android 6.0 SDK</a></li>
<li><a href="#docs">Документация для разработчиков</a></li>
<li><a href="#images">Системные образы оборудования</a></li>
</ol>
<h2>Legacy downloads</h2>
<ol>
- <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview 1</a></li>
+ <li><a href="{@docRoot}preview/download_mp2.html">Developer Preview 2</a></li>
</ol>
</div>
</div>
@@ -183,7 +184,7 @@
</p>
-<h2 id="sdk">SDK Preview</h2>
+<h2 id="sdk">Android 6.0 SDK</h2>
<p>
Загрузить SDK Preview можно с помощью <a href="{@docRoot}tools/help/sdk-manager.html">менеджера SDK Android</a>. Дополнительные сведения
@@ -203,11 +204,11 @@
<th scope="col">Download / Checksums</th>
</tr>
<tr id="docs-dl">
- <td>Android M Preview 2<br>Developer Docs</td>
+ <td>Android M Preview 3<br>Developer Docs</td>
<td><a href="#top" onclick="onDownload(this)"
- >m-preview-2-developer-docs.zip</a><br>
- MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
- SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ >m-preview-3-developer-docs.zip</a><br>
+ MD5: d99b14b0c06d31c8dfecb25072654ca3<br>
+ SHA-1: 9cefeeda07676130da606a1796e1c00fffc667c1
</td>
</tr>
</table>
@@ -240,34 +241,34 @@
<tr id="hammerhead">
<td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
<td><a href="#top" onclick="onDownload(this)"
- >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
- MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
- SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ >hammerhead-MPA44I-preview-2ebbc049.tgz</a><br>
+ MD5: 91a924fb0c9f8e716e3b4c9954fd0dbb<br>
+ SHA-1: 2ebbc049b68c4da8baeee3e42bb94d7a965ba4a3
</td>
</tr>
<tr id="shamu">
<td>Nexus 6 <br>"shamu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >shamu-MPZ79M-preview-e1024040.tgz</a><br>
- MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
- SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ >shamu-MPA44I-preview-62b9c486.tgz</a><br>
+ MD5: ac6e58da86125073d9c395257fd42664<br>
+ SHA-1: 62b9c486fd7a5020e228d53ca5acd5c1857e48ff
</td>
</tr>
<tr id="volantis">
<td>Nexus 9 <br>"volantis"</td>
<td><a href="#top" onclick="onDownload(this)"
- >volantis-MPZ79M-preview-9f305342.tgz</a><br>
- MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
- SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ >volantis-MPA44I-preview-5c30a6e2.tgz</a><br>
+ MD5: 7f83768757913d3fea945a661020d185<br>
+ SHA-1: 5c30a6e2acd11a81f4105b12d23ff654f534f699
</td>
</tr>
<tr id="fugu">
<td>Nexus Player <br>"fugu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
- MD5: e8d081137a20b66df595ee69523314b5<br>
- SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ >fugu-MPA44I-preview-2860040a.tgz</a><br>
+ MD5: 438da8d37da9e341a69cfb16a4001ac5<br>
+ SHA-1: 2860040a326582f1ff5f702bf9a1ef002717fc98
</td>
</tr>
diff --git a/docs/html-intl/intl/ru/preview/download_mp2.jd b/docs/html-intl/intl/ru/preview/download_mp2.jd
new file mode 100644
index 0000000..13872d1
--- /dev/null
+++ b/docs/html-intl/intl/ru/preview/download_mp2.jd
@@ -0,0 +1,359 @@
+page.title=Загрузки
+page.image=images/cards/card-download_16-9_2x.png
+
+@jd:body
+
+<div style="position:relative; min-height:600px">
+
+ <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
+
+ <p class="sdk-terms-intro">Прежде чем приступить к загрузке и установке компонентов пакета SDK Android Preview,
+примите следующие положения и условия.</p>
+
+ <h2 class="norule">Положения и условия</h2>
+
+ <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
+Это лицензионное соглашение для пакета SDK Android Preview (далее «Лицензионное соглашение»).
+
+1. Введение
+
+1.1. Лицензия на пакет SDK Android Preview (далее по тексту настоящего Лицензионного соглашения – «Preview», который включает системные файлы Android, пакеты API-интерфейсов и файлы библиотеки Preview, если такие доступны) передается в соответствии с положениями настоящего Лицензионного соглашения. Настоящее Лицензионное соглашение является юридически обязывающим договором между компанией Google и любым лицом, использующим Preview.
+
+1.2. В настоящем Лицензионном соглашении термин «Android» означает набор программного обеспечения Android для устройств, предлагаемый к использованию в рамках проекта Android Open Source Project, который доступен на веб-сайте http://source.android.com/ (сведения, размещенные на этом сайте, могут периодически обновляться).
+
+1.3. Под термином «Google» понимается корпорация Google Inc., главный офис которой находится по адресу 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States (США).
+
+2. Принятие лицензионного соглашения
+
+2.1. Использование Preview возможно только после принятия условий настоящего Лицензионного соглашения. Запрещается использовать Preview, если вы не согласны с указанными в настоящем документе условиями и положениями.
+
+2.2. Нажатие кнопки принятия условий и/или использование Preview означает, что вы согласны с положениями настоящего Лицензионного соглашения.
+
+2.3. Вы не вправе использовать Preview и принимать условия данного Лицензионного соглашения, если по законам США или иных стран, включая страну вашего проживания или использования Preview, запрещается передавать Preview в ваш адрес.
+
+2.4. Если вы используете Preview в рамках своей компании или организации, вы соглашаетесь взять на себя обязательства по соблюдению настоящего Лицензионного соглашения от имени своего работодателя или другого юридического лица, и вы тем самым подтверждаете и гарантируете, что обладаете полными юридическими полномочиями связать вашего работодателя или иное подобное юридическое лицо обязательствами по настоящему Лицензионному соглашению. Если вы не обладаете необходимыми полномочиями, вы не вправе принимать указанные в настоящем документе условия и положения или использовать Preview от имени вашего работодателя или другого юридического лица.
+
+3. Лицензия на Preview от Google
+
+3.1. В соответствии с условиями настоящего Лицензионного соглашения Google предоставляет вам ограниченную, бесплатную и неэксклюзивную лицензию без права передачи и подлежащую отмене, на использование Preview, лично или в рамках своей компании или организации, исключительно в целях разработки приложений для платформы Android.
+
+3.2. Вы соглашаетесь с тем, что Google или третьим сторонам принадлежат все юридические и имущественные права, а также правовой интерес в отношении Preview, в том числе любые права на объекты интеллектуальной собственности, которые имеются в Preview. Термин «Права на интеллектуальную собственность» означает все возможные права в рамках патентного права, авторского права, закона о коммерческой тайне, закона о товарных знаках, а также иные возможные имущественные права. Google оставляет за собой все права, не предоставленные вам в явном виде.
+
+3.3. Вам запрещается использовать Preview в любых целях, которые однозначно не определены в настоящем Лицензионном соглашении. За исключением случаев, предусмотренных применимыми сторонними лицензиями, вам запрещается: (a) копировать (кроме случаев резервного копирования), изменять, адаптировать, повторно распространять, декомпилировать, осуществлять инженерный анализ, деассемблировать или создавать производные элементы Preview или иной его части; а также (b) загружать любую часть Preview в мобильные телефоны или иные устройства, помимо персонального компьютера, объединять любые части Preview с другим программным обеспечением, распространять любое программное обеспечение или устройства, содержащие части Preview.
+
+3.4. Вы соглашаетесь с тем, что не будете предпринимать никаких действий, которые прямо или косвенно могут привести к фрагментированию платформы Android, включая помимо прочего распространение набора средств разработки программного обеспечения, полученного из Preview, участие в создании таких средств и содействие их продвижению в любой форме.
+
+3.5. Использование, воспроизведение и распространение компонентов Preview, на которые распространяется лицензия на программное обеспечение с открытым исходным кодом, регулируются исключительно положениями и условиями такой лицензии на программное обеспечение с открытым исходным кодом, а не настоящим Лицензионным соглашением. Вы соглашаетесь обеспечивать хорошую репутацию получателя лицензии в отношении таких лицензии на программное обеспечение с открытым исходным кодом в рамках всех предоставленных ему прав, а также не допускать каких-либо действий, которые могут привести к аннулированию, приостановлению или нарушению таких прав
+
+3.6. Вы соглашаетесь с тем, что форма и содержание Preview , предоставляемого Google, могут быть изменены без предварительного уведомления, а также с тем, что будущие версии Preview могут оказаться несовместимыми с приложениями, разработанными в предыдущих версиях Preview. Вы соглашаетесь с тем, что Google вправе по собственному усмотрению и без предварительного уведомления прекратить (временно или навсегда) предоставление Preview (или любых функций в составе Preview) вам или пользователям.
+
+3.7. Ни одна из частей настоящего Лицензионного соглашения не предусматривает предоставления вам права использовать любые торговые наименования, товарные знаки, знаки обслуживания, логотипы, имена доменов или иные отличительные фирменные знаки, принадлежащие Google.
+
+3.8. Вы соглашаетесь с тем, что обязуетесь не удалять, не скрывать или не изменять любые уведомления об имущественных правах (включая уведомления об авторских правах и товарных знаках), которые могут сопровождать Preview или содержаться в нем.
+
+4. Использование Preview
+
+4.1. Компания Google выражает согласие с тем, что ни по какому положению настоящего Лицензионного соглашения не получает от вас (или ваших лицензиаров) каких-либо юридических и имущественных прав, а также правового интереса в отношении любых программных приложений, разработанных вами с помощью Preview, включая любые права на объекты интеллектуальной собственности, которые имеются в таких приложениях.
+
+4.2. Вы соглашаетесь использовать Preview и создавать приложения исключительно в целях, предусмотренных (a) настоящим Лицензионным соглашением и (b) любым применимым законом, нормативным актом или общепринятыми правилами или рекомендациями в соответствующей юрисдикции (включая любые законы, касающиеся экспорта данных или программного обеспечения из США или иных соответствующих стран, а также импорта в них).
+
+4.3. Вы соглашаетесь с тем, что при использовании Preview для разработки приложений вы обязуетесь обеспечивать конфиденциальность и защищать юридические права пользователей. В случае, если пользователи предоставляют вам свои имена, пароли или иные данные для входа либо свои персональные данные, вы обязуетесь уведомить пользователей о том, что такая информация будет присутствовать в вашем приложении, и вы также обязуетесь предоставить пользователям юридически соответствующие уведомление о конфиденциальности и средства правовой защиты. Если в вашем приложении хранится личная или конфиденциальная информация, предоставленная пользователями, вы обязуетесь обеспечить ее надлежащую защиту. Если пользователь предоставляет вам сведения о своей учетной записи Google, то ваше приложение может использовать такую информацию для доступа к учетной записи Google пользователя только при условии, что пользователь предоставил вам разрешение на это, и только в тех целях, которые обозначил пользователь.
+
+4.4. Вы соглашаетесь с тем, что обязуетесь не использовать Preview для любого рода деятельности, в том числе для разработки или распространения приложений, в целях нарушения работы и повреждения серверов, сетей или иной собственности или служб Google или любой третьей стороны.
+
+4.5. Вы соглашаетесь с тем, что несете единоличную ответственность (и признаете, что компания Google не несет ответственности ни перед вами, ни перед любой третьей стороной) за любые данные, содержимое или ресурсы, которые вы создаете, передаете или демонстрируете посредством Android и/или приложений для Android, а также за любые последствия ваших действий, связанных с этим (в том числе за любые убытки и любой ущерб, которые могут быть причинены Google).
+
+4.6. Вы соглашаетесь с тем, что несете единоличную ответственность (и признаете, что компания Google не несет ответственности ни перед вами, ни перед любой третьей стороной) за любое несоблюдение обязательств по настоящему Лицензионному соглашению, обязательств по любому применимому договору с третьей стороной или предусмотренных Условиями и положениями, за нарушение любых применимых законов или нормативных актов, а также за любые последствия ваших действий, связанных с таким нарушением (в том числе за любые убытки и любой ущерб, которые могут быть причинены Google).
+
+4.7 Preview находится на стадии разработки, поэтому ваши отзывы и результаты тестирования являются важной частью процесса разработки. Используя Preview, вы признаете, что реализация некоторых функций по-прежнему находится на этапе разработки и вам не следует рассчитывать на полную функциональность стабильной версии. Вы соглашаетесь не распространять или предоставлять любые приложения, использующие Preview, поскольку поддержка Preview будет прекращена после выпуска официальной версии пакета SDK Android.
+
+5. Ваши учетные данные разработчика
+
+5.1. Вы соглашаетесь с тем, что несете ответственность за обеспечение конфиденциальности любых учетных данных разработчика, которые компания Google может вам предоставить или которые вы можете самостоятельно выбрать, а также с тем, что вы несете единоличную ответственность за все приложения, разработанные с использованием ваших учетных данных разработчика.
+
+6. Конфиденциальность и личная информация
+
+6.1. В целях постоянного совершенствования и улучшения Preview компания Google вправе собирать определенные статистические данные об использовании программного обеспечения, включая уникальный идентификатор, связанный IP-адрес, номер версии программного обеспечения, а также сведения об используемых в Preview инструментах и/или службах и способах их применения. Перед тем как любые из таких данных будут отправлены в Google, в Preview отобразится соответствующее уведомление с просьбой дать свое согласие. В случае вашего отказа предоставить такие сведения соответствующие данные собираться не будут.
+
+6.2. Собранные данные изучаются в обобщенном виде с целью улучшения Preview и хранятся в соответствии с Политикой конфиденциальности Google, которая опубликована на веб-сайте по адресу http://www.google.com/policies/privacy/.
+
+7. Сторонние приложения
+
+7.1. Если вы используете Preview для запуска приложений, разработанных третьими сторонами или получающих доступ к данным, содержимому или ресурсам, предоставляемым третьей стороной, вы соглашаетесь с тем, что Google не несет ответственности за такие приложения, данные, содержимое или ресурсы. Вы осознаете, что единоличную ответственность за все данные, содержимое или ресурсы, доступ к которым вы можете получить посредством таких приложений третьих сторон, несет лицо, предоставившее их, а также то, что Google не несет ответственности за любые убытки или любой ущерб, которые могут возникнуть в результате использования вами любых таких сторонних приложений, данных, содержимого или ресурсов и в результате обращения к ним.
+
+7.2. Вы должны быть осведомлены о том, что данные, содержимое и ресурсы, предоставляемые вам посредством таких сторонних приложений, могут быть защищены правами на объекты интеллектуальной собственности, принадлежащие предоставляющим их лицам (или иным лицам либо компаниям от их имени). Вам запрещается изменять, сдавать в аренду, передавать, продавать, распространять такие данные, содержимое или ресурсы (полностью или частично), а также создавать на их основе производные элементы, если у вас нет на это разрешения от соответствующих владельцев.
+
+7.3. Вы осознаете, что использование вами таких сторонних приложений, данных или ресурсов может регулироваться отдельными условиями, заключенными между вами и соответствующей третьей стороной.
+
+8. Использование API-интерфейсов Google
+
+8.1. API-интерфейсы для получения данных Google.
+
+8.1.1. В случае использования вами любых API для получения данных из Google вы осознаете, что такие данные могут быть защищены правами на объекты интеллектуальной собственности, принадлежащие Google или предоставляющим их сторонам (или иным лицам либо компаниям от их имени). Использование вами подобных API может регулироваться дополнительными Условиями использования. Вам запрещается изменять, сдавать в аренду, передавать, продавать, распространять такие данные (полностью или частично), а также создавать на их основе производные элементы, если это не разрешено соответствующими Условиями использования.
+
+8.1.2. Если вы используете какие-либо API-интерфейсы для получения данных пользователя из Google, вы осознаете и соглашаетесь с тем, что вы обязуетесь получать такие данные исключительно с прямого согласия пользователя и только в тех целях, которые обозначил пользователь.
+
+9. Прекращение действия Лицензионного соглашения
+
+9.1 Настоящее Лицензионное соглашение остается в силе до тех пор, пока его действие не будет прекращено вами или Google, как указано ниже.
+
+9.2. Если вы желаете прекратить действие настоящего Лицензионного соглашения, вы вправе сделать это, прекратив использование Preview и любых соответствующих учетных данных разработчика.
+
+9.3. Google вправе в любое время прекратить действие настоящего Лицензионного соглашения, отправив предварительное уведомление или без него.
+
+9.4 Действие настоящего Лицензионного соглашения автоматически прекращается без предварительного уведомления или выполнения иных действий сразу после любого из следующих событий:
+(A) компания Google прекращает предоставление Preview или определенных частей Preview пользователям на территории страны, в которой вы проживаете или используете услуги компании;
+(B) компания Google выпускает окончательную версию SDK Android.
+
+9.5 В случае прекращения действия настоящего Лицензионного соглашения прекращается действие лицензии, предоставленной в рамках Лицензионного соглашения, и вам следует незамедлительно прекратить любое использование Preview, тогда как положения, изложенные в разделах 10, 11, 12 и 14 продолжают действовать бессрочно.
+
+10. ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ
+
+10.1. ВЫ ЧЕТКО ОСОЗНАЕТЕ И БЕЗОГОВОРОЧНО СОГЛАШАЕТЕСЬ С ТЕМ, ЧТО ВЫ ИСПОЛЬЗУЕТЕ PREVIEW ИСКЛЮЧИТЕЛЬНО НА СВОЙ СТРАХ И РИСК И ЧТО PREVIEW ПРЕДОСТАВЛЯЕТСЯ ВАМ НА УСЛОВИЯХ «КАК ЕСТЬ» И «КАК ДОСТУПНО» БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ СО СТОРОНЫ КОМПАНИИ GOOGLE.
+
+10.2 ИСПОЛЬЗОВАНИЕ ВАМИ PREVIEW И ЗАГРУЗКА ЛЮБЫХ МАТЕРИАЛОВ И ИХ ПОЛУЧЕНИЕ ИНЫМ СПОСОБОМ С ПОМОЩЬЮ PREVIEW ВЫПОЛНЯЕТСЯ ПО ВАШЕМУ СОБСТВЕННОМУ УСМОТРЕНИЮ НА СВОЙ СТРАХ И РИСК. ВСЯ ОТВЕТСТВЕННОСТЬ ЗА ЛЮБОЙ УЩЕРБ, ПРИЧИНЕННЫЙ ВАШЕЙ ВЫЧИСЛИТЕЛЬНОЙ СИСТЕМЕ ИЛИ ДРУГОМУ ОБОРУДОВАНИЮ, А ТАКЖЕ ЗА ПОТЕРЮ ДАННЫХ, ВЫЗВАННУЮ ПОДОБНЫМ ИСПОЛЬЗОВАНИЕМ, ВОЗЛАГАЕТСЯ НА ВАС. НЕ ОГРАНИЧИВАЯ ВЫШЕСКАЗАННОЕ, ВЫ ПОНИМАЕТЕ, ЧТО PREVIEW НЕ ЯВЛЯЕТСЯ СТАБИЛЬНЫМ ВЫПУСКОМ И МОЖЕТ СОДЕРЖАТЬ ОШИБКИ, ДЕФЕКТЫ И УЯЗВИМОСТИ В СИСТЕМЕ БЕЗОПАСНОСТИ, КОТОРЫЕ МОГУТ ПРИВЕСТИ К СЕРЬЕЗНЫМ ПОВРЕЖДЕНИЯМ, ВКЛЮЧАЯ ПОЛНУЮ И БЕЗВОЗВРАТНУЮ ПОТЕРЮ РАБОТОСПОСОБНОСТИ ВАШЕГО КОМПЬЮТЕРА ИЛИ ИНОГО УСТРОЙСТВА.
+
+10.3. КОМПАНИЯ GOOGLE БЕЗОГОВОРОЧНО ОТКАЗЫВАЕТСЯ ОТ ЯВНЫХ И НЕЯВНЫХ ГАРАНТИЙ И УСЛОВИЙ ЛЮБОГО РОДА, ВКЛЮЧАЯ ПОМИМО ПРОЧЕГО НЕЯВНЫЕ ГАРАНТИИ И УСЛОВИЯ ТОВАРНОГО СОСТОЯНИЯ, ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННОЙ ЦЕЛИ И ОТСУТСТВИЯ НАРУШЕНИЙ ПРАВ СОБСТВЕННОСТИ.
+
+11. ОГРАНИЧЕНИЕ ОТВЕТСТВЕННОСТИ
+
+11.1. ВЫ ЧЕТКО ОСОЗНАЕТЕ И БЕЗОГОВОРОЧНО СОГЛАШАЕТЕСЬ С ТЕМ, ЧТО КОМПАНИЯ GOOGLE, ЕЕ ДОЧЕРНИЕ И АФФИЛИРОВАННЫЕ КОМПАНИИ И ЛИЦЕНЗИАРЫ НЕ НЕСУТ ПЕРЕД ВАМИ ОТВЕТСТВЕННОСТИ, НЕЗАВИСИМО ОТ ЕЕ ПРИЧИНЫ И ВИДА, ЗА КАКИЕ-ЛИБО ПРЯМЫЕ, КОСВЕННЫЕ, СЛУЧАЙНЫЕ, СПЕЦИАЛЬНЫЕ, ОПОСРЕДОВАННЫЕ И ШТРАФНЫЕ УБЫТКИ, ПОНЕСЕННЫЕ ВАМИ, ВКЛЮЧАЯ ПОТЕРЮ ДАННЫХ, ВНЕ ЗАВИСИМОСТИ ОТ ТОГО, БЫЛА ЛИ КОМПАНИЯ GOOGLE ИЛИ ЕЕ ПРЕДСТАВИТЕЛИ ИЗВЕЩЕНЫ О ВОЗМОЖНОСТИ ТАКОГО УЩЕРБА.
+
+12 Освобождение от ответственности
+
+12.1. В максимально допустимой законом степени вы соглашаетесь защищать, освобождать от ответственности и возможных претензий компанию Google, ее аффилированные компании и их соответствующих руководителей, служащих, сотрудников и агентов от всех возможных правовых требований, действий, судебных исков или разбирательств, а также от всех возможных убытков, обязательств, ущерба, издержек и расходов (включая обоснованные вознаграждения для адвокатов), возникающих в связи (a) с использованием вами Preview, (b) любыми приложениями, разрабатываемыми вами с помощью Preview и нарушающими любые права на объекты интеллектуальной собственности любого лица, а также порочащие любое лицо либо нарушающие права таких лиц на публичность и конфиденциальность, а также (c) в связи с любым несоблюдением вами положений настоящего Лицензионного соглашения.
+
+13. Изменения в Лицензионном соглашении
+
+13.1. Компания Google вправе вносить изменения в настоящее Лицензионное соглашение по мере выхода новых версий Preview. При внесении изменений Google создает новую версию Лицензионного соглашения и размещает ее на веб-сайте, на котором размещен Preview.
+
+14. Общие правовые условия
+
+14.1. Настоящее Лицензионное соглашение составляет полный текст юридического соглашения между вами и компанией Google, регулирует использование вами Preview (за исключением услуг, которые Google предоставляет на основании отдельного письменного соглашения) и полностью заменяет собой все предыдущие соглашения между вами и компанией Google в отношении Preview.
+
+14.2. Вы соглашаетесь с тем, что отсутствие каких-либо действий или судебных исков со стороны Google, направленных на соблюдение каких-либо правовых норм или исполнение средств правовой защиты, установленных настоящим Лицензионным соглашением (или которыми Google обладает в соответствии с каким-либо действующим законом), не означает отказ компании Google от своих прав и не препятствует компании Google использовать эти права или средства защиты.
+
+14.3. Если какой-либо судебный орган, уполномоченный рассматривать этот вопрос, признает недействительность какого-либо положения данного Лицензионного соглашения, то соответствующее положение будет исключено из Лицензионного соглашения с сохранением действия всех остальных его положений. Остальные положения Лицензионного соглашения по-прежнему будут действовать, и их соблюдение может обеспечиваться в судебном порядке.
+
+14.4. Вы признаете и соглашаетесь с тем, что все участники группы компаний, среди которых Google является материнской компанией, являются сторонними бенефициарами Лицензионного соглашения и что эти компании имеют право пользоваться привилегиями (или правами), предоставляемыми по настоящему Лицензионному соглашению, и напрямую требовать их соблюдения в судебном порядке. Все остальные физические и юридические лица не являются сторонними бенефициарами Лицензионного соглашения.
+
+14.5. ОГРАНИЧЕНИЯ НА ЭКСПОРТ. ИСПОЛЬЗОВАНИЕ PREVIEW РЕГУЛИРУЕТСЯ ЗАКОНАМИ И НОРМАТИВНЫМИ АКТАМИ США, КАСАЮЩИМИСЯ ЭКСПОРТА. ВЫ ОБЯЗУЕТЕСЬ СОБЛЮДАТЬ ВСЕ НАЦИОНАЛЬНЫЕ И МЕЖДУНАРОДНЫЕ ЗАКОНЫ ОБ ЭКСПОРТЕ, ПРИМЕНИМЫЕ К PREVIEW. ДАННЫЕ ЗАКОНЫ НАЛАГАЮТ ОГРАНИЧЕНИЯ НА РЕГИОНЫ, КРУГ ЛИЦ И СПОСОБ КОНЕЧНОГО ИСПОЛЬЗОВАНИЯ.
+
+14.6. Вы не вправе переуступать либо передавать права, предоставляемые по настоящему Лицензионному соглашению, без предварительного письменного согласия Google; любые попытки переуступки без такого согласия считаются недействительными. Вы обязуетесь не делегировать свои полномочия или обязательства по настоящему Лицензионному соглашению без предварительного письменного согласия Google.
+
+14.7. Лицензионное соглашение, а также взаимоотношения между вами и компанией Google в рамках настоящего Лицензионного соглашения регулируются законодательством штата Калифорния за исключением его норм коллизионного права. Вы и компания Google признаете, что урегулирование любых правовых вопросов, связанных с данным Лицензионным соглашением, относится исключительно к юрисдикции судов округа Санта-Клара, штат Калифорния. Несмотря на это, вы соглашаетесь с тем, что компания Google по-прежнему имеет право обращаться за наложением судебного запрета (или за получением аналогичного вида неотложной судебной защиты) в суды любой юрисдикции.
+ </div><!-- sdk terms -->
+
+
+
+ <div id="sdk-terms-form">
+ <p>
+ <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
+ <label id="agreeLabel" for="agree">Я прочитал(а) и принимаю изложенные выше положения и условия</label>
+ </p>
+ <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+ </div>
+
+
+ </div><!-- end TOS -->
+
+
+ <div id="landing">
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>Содержание документа</h2>
+ <ol>
+ <li><a href="#sdk">SDK Preview</a></li>
+ <li><a href="#docs">Документация для разработчиков</a></li>
+ <li><a href="#images">Системные образы оборудования</a></li>
+ </ol>
+ <h2>Legacy downloads</h2>
+ <ol>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ </ol>
+ </div>
+</div>
+
+
+<p>
+ В состав SDK Android M Preview входят инструменты для разработки, системные файлы Android и файлы библиотеки, призванные
+помочь вам в тестировании ваших приложений и новых API-интерфейсов, которые будут реализованы в предстоящем выпуске платформы. В этом документе
+рассказывается, как загрузить необходимые компоненты Preview для тестирования ваших приложений.
+</p>
+
+
+<h2 id="sdk">SDK Preview</h2>
+
+<p>
+ Загрузить SDK Preview можно с помощью <a href="{@docRoot}tools/help/sdk-manager.html">менеджера SDK Android</a>. Дополнительные сведения
+о загрузке и настройке SDK Preview представлены в статье <a href="{@docRoot}preview/setup-sdk.html#downloadSdk">Настройка SDK Preview</a>.
+</p>
+
+
+<h2 id="docs">Документация для разработчиков</h2>
+
+<p>
+ В пакете документации для разработчиков, который доступен для загрузки, представлены подробные сведения об API-интерфейсах, а также о различиях между API-интерфейсами для Preview.
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Description</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="docs-dl">
+ <td>Android M Preview 2<br>Developer Docs</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >m-preview-2-developer-docs.zip</a><br>
+ MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
+ SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ </td>
+ </tr>
+</table>
+
+
+<h2 id="images">Системные образы оборудования</h2>
+
+<p>
+ С помощью этих системных образов можно установить предварительную версию платформы на физическое устройство для
+тестирования. Используя один из этих образов для настройки устройства, вы можете установить и протестировать ваше приложение, чтобы узнать, как оно будет работать в будущей версии
+платформы. В процессе установки системного образа
+<em>на устройстве удаляются все данные</em>, поэтому перед установкой образа обязательно сделайте резервное копирование данных.
+
+</p>
+
+<p class="warning">
+ <b>Предупреждение.</b> Перечисленные ниже системные образы Android являются предварительными и могут быть изменены. Использование вами
+этих образов регулируется Лицензионным соглашением на использование пакета SDK Android Preview. Системные образы предварительной версии Android
+не являются стабильными и могут содержать ошибки и дефекты,
+способные повредить ваши компьютеры, устройства и данные. Системные образы предварительной версии Android не проходят такое же тестирование,
+как заводская ОС. Поэтому в результате использования этих образов ваш телефон и установленные на нем приложения
+и службы могут перестать работать.
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Device</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="hammerhead">
+ <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
+ MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
+ SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ </td>
+ </tr>
+ <tr id="shamu">
+ <td>Nexus 6 <br>"shamu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >shamu-MPZ79M-preview-e1024040.tgz</a><br>
+ MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
+ SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ </td>
+ </tr>
+ <tr id="volantis">
+ <td>Nexus 9 <br>"volantis"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >volantis-MPZ79M-preview-9f305342.tgz</a><br>
+ MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
+ SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ </td>
+ </tr>
+
+ <tr id="fugu">
+ <td>Nexus Player <br>"fugu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
+ MD5: e8d081137a20b66df595ee69523314b5<br>
+ SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ </td>
+ </tr>
+
+</table>
+
+<h3 id="install-image">Установка образа на устройство</h3>
+
+<p>
+ Чтобы воспользоваться образом устройства для тестирования, установите его на совместимое устройство. Следуйте
+инструкциям по установке системного образа.
+</p>
+
+<ol>
+ <li>Загрузите и распакуйте один из указанных выше пакетов с системным образом.</li>
+ <li>Создайте резервные копии данных, которые хотите сохранить.</li>
+ <li>Следуйте инструкциям, приведенным на сайте
+<a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>,
+чтобы прошить ваше устройство с использованием выбранного образа.</li>
+</ol>
+
+<p class="note">
+ <strong>Примечание.</strong> После прошивки устройства для разработки с использованием системного образа с предварительной версией платформы
+она будет автоматически обновлена до следующего выпуска Preview по беспроводной сети.
+</p>
+
+<h3 id="revertDevice">Сброс параметров устройства до заводских настроек</h3>
+
+<p>
+ Чтобы удалить Preview и восстановить заводские настройки устройства, перейдите на сайт
+<a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a>
+и загрузите образ, который требуется использовать для прошивки. Следуйте инструкциям, приведенным на странице,
+чтобы прошить ваше устройство с использованием выбранного образа.
+</p>
+
+ </div><!-- landing -->
+
+</div><!-- relative wrapper -->
+
+
+
+<script>
+ var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
+ function onDownload(link) {
+
+ $("#downloadForRealz").html("Download " + $(link).text());
+ $("#downloadForRealz").attr('href', urlRoot + $(link).text());
+
+ $("#tos").fadeIn('fast');
+ $("#landing").fadeOut('fast');
+
+ return true;
+ }
+
+
+ function onAgreeChecked() {
+ /* verify that the TOS is agreed */
+ if ($("input#agree").is(":checked")) {
+ /* reveal the download button */
+ $("a#downloadForRealz").removeClass('disabled');
+ } else {
+ $("a#downloadForRealz").addClass('disabled');
+ }
+ }
+
+ function onDownloadForRealz(link) {
+ if ($("input#agree").is(':checked')) {
+ /*
+ $("#tos").fadeOut('fast');
+ $("#landing").fadeIn('fast');
+ */
+
+ ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
+
+ /*
+ location.hash = "";
+ */
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ $(window).hashchange( function(){
+ if (location.hash == "") {
+ location.reload();
+ }
+ });
+
+</script>
diff --git a/docs/html-intl/intl/ru/preview/index.jd b/docs/html-intl/intl/ru/preview/index.jd
index 138a5a6..18174a9 100644
--- a/docs/html-intl/intl/ru/preview/index.jd
+++ b/docs/html-intl/intl/ru/preview/index.jd
@@ -29,7 +29,7 @@
</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
<div class="dac-section dac-small">
diff --git a/docs/html-intl/intl/zh-cn/index.jd b/docs/html-intl/intl/zh-cn/index.jd
index bbd7fbe..cdd81cd 100644
--- a/docs/html-intl/intl/zh-cn/index.jd
+++ b/docs/html-intl/intl/zh-cn/index.jd
@@ -10,19 +10,16 @@
<section class="dac-hero-carousel">
<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
-<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
+<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">
<a href="/preview/index.html">
- <div class="wrap" style="max-width:1100px;">
+ <div class="wrap" style="max-width:1100px;margin-top:0">
<div class="cols dac-hero-content">
- <div class="col-10of16 col-push-6of16 dac-hero-figure">
- <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"
- srcset="{@docRoot}images/home/devices-hero_620px.png 1x,
- {@docRoot}images/home/devices-hero_620px_2x.png 2x">
+ <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">
</div>
- <div class="col-6of16 col-pull-10of16">
+ <div class="col-8of16 col-pull-7of16">
<div class="dac-hero-tag"></div>
- <h1 class="dac-hero-title">Android M Developer Preview</h1>
+ <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
<p class="dac-hero-description">准备迎接 Android 的下一版本。在 Nexus 5、
6、9 和 Player 中测试应用。 </p>
@@ -31,7 +28,7 @@
开始！</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</a>
</div>
</div>
diff --git a/docs/html-intl/intl/zh-cn/preview/download.jd b/docs/html-intl/intl/zh-cn/preview/download.jd
index ba5249a..c7ba9df 100644
--- a/docs/html-intl/intl/zh-cn/preview/download.jd
+++ b/docs/html-intl/intl/zh-cn/preview/download.jd
@@ -164,13 +164,14 @@
<div id="qv">
<h2>本文内容</h2>
<ol>
- <li><a href="#sdk">预览版 SDK</a></li>
+ <li><a href="#sdk">Android 6.0 SDK</a></li>
<li><a href="#docs">开发者文档</a></li>
<li><a href="#images">硬件系统映像</a></li>
</ol>
<h2>Legacy downloads</h2>
<ol>
- <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview 1</a></li>
+ <li><a href="{@docRoot}preview/download_mp2.html">Developer Preview 2</a></li>
</ol>
</div>
</div>
@@ -183,7 +184,7 @@
</p>
-<h2 id="sdk">预览版 SDK</h2>
+<h2 id="sdk">Android 6.0 SDK</h2>
<p>
预览版 SDK 可通过 <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK 管理器</a>下载。如需了解有关下载和配置预览版 SDK 的详细信息，请参阅<a href="{@docRoot}preview/setup-sdk.html#downloadSdk">设置预览版 SDK</a>。
@@ -203,11 +204,11 @@
<th scope="col">Download / Checksums</th>
</tr>
<tr id="docs-dl">
- <td>Android M Preview 2<br>Developer Docs</td>
+ <td>Android M Preview 3<br>Developer Docs</td>
<td><a href="#top" onclick="onDownload(this)"
- >m-preview-2-developer-docs.zip</a><br>
- MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
- SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ >m-preview-3-developer-docs.zip</a><br>
+ MD5: d99b14b0c06d31c8dfecb25072654ca3<br>
+ SHA-1: 9cefeeda07676130da606a1796e1c00fffc667c1
</td>
</tr>
</table>
@@ -240,34 +241,34 @@
<tr id="hammerhead">
<td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
<td><a href="#top" onclick="onDownload(this)"
- >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
- MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
- SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ >hammerhead-MPA44I-preview-2ebbc049.tgz</a><br>
+ MD5: 91a924fb0c9f8e716e3b4c9954fd0dbb<br>
+ SHA-1: 2ebbc049b68c4da8baeee3e42bb94d7a965ba4a3
</td>
</tr>
<tr id="shamu">
<td>Nexus 6 <br>"shamu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >shamu-MPZ79M-preview-e1024040.tgz</a><br>
- MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
- SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ >shamu-MPA44I-preview-62b9c486.tgz</a><br>
+ MD5: ac6e58da86125073d9c395257fd42664<br>
+ SHA-1: 62b9c486fd7a5020e228d53ca5acd5c1857e48ff
</td>
</tr>
<tr id="volantis">
<td>Nexus 9 <br>"volantis"</td>
<td><a href="#top" onclick="onDownload(this)"
- >volantis-MPZ79M-preview-9f305342.tgz</a><br>
- MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
- SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ >volantis-MPA44I-preview-5c30a6e2.tgz</a><br>
+ MD5: 7f83768757913d3fea945a661020d185<br>
+ SHA-1: 5c30a6e2acd11a81f4105b12d23ff654f534f699
</td>
</tr>
<tr id="fugu">
<td>Nexus Player <br>"fugu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
- MD5: e8d081137a20b66df595ee69523314b5<br>
- SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ >fugu-MPA44I-preview-2860040a.tgz</a><br>
+ MD5: 438da8d37da9e341a69cfb16a4001ac5<br>
+ SHA-1: 2860040a326582f1ff5f702bf9a1ef002717fc98
</td>
</tr>
diff --git a/docs/html-intl/intl/zh-cn/preview/download_mp2.jd b/docs/html-intl/intl/zh-cn/preview/download_mp2.jd
new file mode 100644
index 0000000..ba5249a
--- /dev/null
+++ b/docs/html-intl/intl/zh-cn/preview/download_mp2.jd
@@ -0,0 +1,359 @@
+page.title=下载
+page.image=images/cards/card-download_16-9_2x.png
+
+@jd:body
+
+<div style="position:relative; min-height:600px">
+
+ <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
+
+ <p class="sdk-terms-intro">在下载和安装预览版 Android SDK 的组件之前，您必须同意下列条款和条件。
+</p>
+
+ <h2 class="norule">条款和条件</h2>
+
+ <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
+本协议是 Android SDK 预览版许可协议（以下称为“许可协议”）。
+
+1. 简介
+
+1.1 Android SDK 预览版（在本许可协议中简称为“预览版”，具体包括 Android 系统文件、封装 API 以及预览版库文件（若可用））依据本许可协议的条款授权您使用。本许可协议在您与 Google 之间就您对“预览版”的使用构成具有法律约束力的合约。
+
+1.2 “Android”是指以 Android 开源项目（项目网址为 http://source.android.com/，其内容会不时更新）名义提供、面向设备的 Android 软件栈。
+
+1.3 “Google”是指 Google Inc.，是一家特拉华州公司，主要营业地位于：1600 Amphitheatre Parkway, Mountain View, CA 94043, United States。
+
+2. 接受许可协议
+
+2.1 要使用“预览版”，您必须先同意本许可协议。如果您不接受本许可协议，则不得使用“预览版”。
+
+2.2 点击接受并/或使用“预览版”，即表示您特此同意本许可协议的条款。
+
+2.3 如果依照美国或其他国家/地区（包括您居住或您使用“预览版”所在的国家/地区）的法律，您被禁止获取“预览版”，则您不得使用“预览版”，也不得接受本许可协议。
+
+2.4 如果您将在贵公司或组织内部使用“预览版”，则您同意代表您的雇主或其他实体接受本许可协议的约束，并且您表示并保证您拥有完全的合法授权令您的雇主或上述实体受本许可协议的约束。如果您不具备必要的授权，则不得代表您的雇主或其他实体接受本许可协议或使用“预览版”。
+
+3. Google 预览版许可
+
+3.1 Google 依据本许可协议的条款授予您个人或在贵公司或组织内部有限使用“预览版”的免版税、不可转让、非独占性、不可再授权且可撤销的许可，其用途仅限开发在 Android 平台上运行的应用。
+
+3.2 您同意 Google 或第三方拥有“预览版”中存在或相关的全部合法权利、所有权和利益，包括“预览版”中存在的任何知识产权。“知识产权”是指根据专利法、版权法、商业机密法、商标法享有的任何及全部权利，以及其他任何及全部专有权利。Google 保留所有未明确授予您的权利。
+
+3.3 您不得将“预览版”用于本许可协议未明确允许的任何用途。您不得：(a) 对“预览版”或“预览版”的任何部分进行复制（备份用途除外）、修改、改编、再分发、反编译、逆向工程、反汇编或创建其衍生品；或 (b) 将“预览版”的任何部分加载到移动手持终端或除个人计算机之外的任何其他硬件设备上，将“预览版”的任何部分与其他软件合并，或者发行任何融入“预览版”某一部分的软件或设备。
+
+3.4 您同意您将不会进行任何可能引起或导致 Android 碎片化的行动，包括但不限于分发、参与创建或以任何方式推广从“预览版”衍生的软件开发工具包。
+
+3.5 对于依据开源软件许可授权的“预览版”组件，其使用、复制和分发仅受该开源软件许可条款的制约，不受本许可协议的约束。您同意在依照被授予的所有权利作为被许可方期间，在遵守此类开源软件许可协议方面始终保持良好的信誉，并避免进行任何可能导致终止、暂停或违反此类权利的行动。
+
+3.6 您同意 Google 所提供“预览版”的形式和性质可随时发生变更，而无需事先通知您，并且未来的“预览版”版本可能会与在之前的“预览版”版本上开发的应用不兼容。您同意 Google 可单方面决定在未事先通知您的情况下全面停止（永久性或暂时性）向您或用户提供“预览版”（或“预览版”内的任何功能）。
+
+3.7 本许可协议内没有任何条款授予您使用 Google 的任何商品名、商标、服务标志、徽标、域名或其他独特品牌特征的权利。
+
+3.8 您同意您不会移除、遮盖或篡改“预览版”上可能贴有或“预览版”内可能包含的任何专有权利声明（包括版权声明和商标声明）。
+
+4. 您对“预览版”的使用
+
+4.1 Google 同意本许可协议中的任何条款均未授予 Google 从您（或您的许可方）处获取您依照本许可协议使用“预览版”开发的任何软件应用中存在或与其相关的权利、所有权或利益，包括这些应用中存在的任何知识产权。
+
+4.2 您同意只出于 (a) 本许可协议和 (b) 相关管辖区域内任何适用法律、法规或公认惯例或准则（包括有关向美国或其他相关国家/地区出口数据或软件或从美国或其他相关国家/地区进口数据或软件的任何法律）所允许的目的而使用“预览版”和编写应用。
+
+4.3 您同意，如果您使用“预览版”开发应用，您将会保护用户的隐私权和合法权利。如果用户向您提供用户名、密码或其他登录信息或个人信息，您必须确保用户知晓这些信息将供您的应用使用，并且您必须为这些用户提供足以满足法律要求的隐私声明和保护。如果您的应用存储由用户提供的个人信息或敏感信息，其存储方式必须安全。如果用户向您提供 Google 帐户信息，您的应用只能在用户允许时出于用户所许可的有限目的使用该信息访问用户的 Google 帐户。
+
+4.4 您同意您不会利用“预览版”从事任何干扰、中断、损坏或以未经授权方式访问 Google 或任何第三方的服务器、网络或其他财产或服务的Activity（包括应用的开发或分发）。
+
+4.5 您同意您对通过 Android 和/或 Android 应用创建、传输或显示的任何数据、内容或资源以及您的行为所导致的后果（包括 Google 可能遭受的任何损失或损害）负全责（Google 在上述方面对您或任何第三方不承担任何责任）。
+
+4.6 您同意您为违反本许可协议、任何适用的第三方合约或服务条款或任何适用法律或法规下的义务以及任何上述违规行为所导致的后果（包括 Google 或任何第三方可能遭受的任何损失或损害）负全责（Google 在上述方面对您或任何第三方不承担任何责任）。
+
+4.7 “预览版”正在开发中，您的测试和反馈是开发过程的重要环节。使用“预览版”，即表示您承认某些功能仍在开发实现之中，您不应期望“预览版”具备稳定版本的全部功能。您同意不使用此“预览版”公开发布或发运任何应用，因为此“预览版”在 Android SDK 正式发行之后将不再受支持。
+
+5. 您的开发者凭据
+
+5.1 您同意，对于 Google 可能向您发放或可能由您自行选择的任何开发者凭据，您有责任保持其机密性，并且您对以您的开发者凭据名义开发的所有应用负全责。
+
+6. 隐私权和信息
+
+6.1 为持续创新和改进“预览版”，Google 可能会从软件收集某些使用统计数据，包括但不限于唯一标识符、关联的 IP 地址、软件的版本号以及有关软件使用了“预览版”中哪些工具和/或服务及其使用方式的信息。在收集任何上述信息之前，“预览版”都会通知您并征求您的同意。如果您拒绝同意，我们将不会收集这些信息。
+
+6.2 我们会对收集的数据进行汇总调查，以便改进“预览版”，并会按照 Google 的隐私政策（网址为 http://www.google.com/policies/privacy/）维护数据。
+
+7. 第三方应用
+
+7.1 如果您使用“预览版”运行由第三方开发或访问由第三方提供的数据、内容或资源的应用，您同意 Google 对这些应用、数据、内容或资源不承担任何责任。您理解，您通过上述第三方应用可能访问到的所有数据、内容或资源由其提供者负全责，Google 对您因使用或访问其中任何第三方应用、数据、内容或资源而遭受的任何损失或损害不承担任何责任。
+
+7.2 您应知晓，通过此类第三方应用提供给您的数据、内容和资源可能受提供商（或代表他们的其他人员或公司）所拥有的知识产权的保护。除非相关所有者明确给予许可，否则您不得修改、出租、租赁、借出、出售、分发这些数据、内容或资源（的全部或部分），或以其为基础创建衍生品。
+
+7.3 您承认您对上述第三方应用、数据、内容或资源的使用可能受到您与相关第三方之间单独订立的条款的制约。
+
+8. 使用 Google API
+
+8.1 Google API
+
+8.1.1 如果您使用任何 API 从 Google 检索数据，即表示您承认这些数据可能受到 Google 或这些数据提供方（或代表他们的其他人员或公司）拥有的知识产权的保护。您对任何上述 API 的使用可能受到附加服务条款的制约。除非相关服务条款允许，否则您不得修改、出租、租赁、借出、出售、分发这些数据（的全部或部分），或以其为基础创建衍生品。
+
+8.1.2 如果您使用任何 API 从 Google 检索用户数据，即表示您承认并同意您只有在征得用户明确同意时才会检索数据，并且只能在用户允许时出于用户许可的有限目的检索数据。
+
+9. 终止许可协议
+
+9.1 本许可协议将持续有效，直至您或 Google 按以下规定终止本协议。
+
+9.2 如果您想终止本许可协议，可通过停止使用“预览版”以及任何相关开发者凭据予以终止。
+
+9.3 Google 有权在向您在作出通知后，有理由或无理由地随时终止与您订立的这份许可协议。
+
+9.4 本许可协议将在下列情况下自动终止，而无需另行通知或采取其他行动，以先符合条件者为准：
+(A) Google 在您居住或使用服务所在国家/地区停止向用户提供“预览版”或“预览版”的某些部分；
+(B) Google 发行 Android SDK 的最终版本。
+
+9.5 在本许可协议终止时，本许可协议中向您授予的许可将终止，您应立即完全停止使用“预览版”，并且第 10、11、12 和 14 节的条款将无限期继续存在。
+
+10. 免责声明
+
+10.1 您明确理解并同意，您使用“预览版”的风险将由您自行承担，并且“预览版”是按“原样”和“现状”提供，Google 不提供任何类型的担保。
+
+10.2 您对“预览版”的使用以及通过使用“预览版”下载或以其他方式获得的任何材料由您自行决定，风险自负，并且对于因此类使用而对您的计算机系统或其他设备造成的任何损害或数据损失由您单方面负责。在不对上文所述予以限制的条件下，您了解“预览版”并非稳定版本，可能存在将导致重大损害的错误、缺陷和安全漏洞，包括无法挽回地完全无法使用您的计算机系统或其他设备。
+
+10.3 Google 进一步明确拒绝任何类型的所有担保和条件，无论明示或暗示，包括但不限于有关适销性、特定用途适用性以及非侵权的暗示担保和条件。
+
+11. 有限责任
+
+11.1 您明确理解并同意，对于您可能遭遇的任何直接、间接、附带、特殊、继发或惩罚性损害（包括任何数据损失），Google 及其子公司和附属公司以及其许可方在任何责任理论下对您概不承担任何责任，无论 Google 或其代表是否已被告知或是否本应知晓发生任何上述损失的可能性。
+
+12. 赔偿
+
+12.1 您同意，在法律所允许的最大限度内，为 Google、其附属公司及其各自的董事、高管、员工和代理商提供辩护，使其免于因下列情况引起或产生的任何及所有索赔、诉讼、起诉或诉讼程序以及任何及所有损失、债务、损害、成本和费用（包括合理的律师费用）而承担责任或遭受损害：(a) 您对“预览版”的使用；(b) 您在“预览版”上开发的任何应用侵犯任何人的任何知识产权或诽谤任何人或侵犯其公开权或隐私权；以及 (c) 您的任何行为有悖于本许可协议
+
+13. 许可协议的更改
+
+13.1 Google 可能会在分发新版本“预览版”时对许可协议做出更改。做出这些更改后，Google 将在提供“预览版”的网站上公布新版本的许可协议。
+
+14. 一般法律条款
+
+14.1 本许可协议构成您与 Google 之间的完整法律协议，管辖您对“预览版”（不包括 Google 可能依据另外的书面协议向您提供的任何服务）的使用，并完全取代您之前与 Google 之间签订的、与“预览版”有关的任何协议。
+
+14.2 您同意，如果 Google 未行使或未强制执行本许可协议包含的任何法定权利或救济（或 Google 在任何适用法律下享有的相关利益），不得视为 Google 正式放弃这些权利，Google 仍可获得这些权利或救济。
+
+14.3 如果任何拥有管辖权的法院将本许可协议的任何条款裁定为无效，则该条款将从本许可协议中删除，而不会影响本许可协议的其余部分。本许可协议的其余条款将继续有效且可强制执行。
+
+14.4 您承认并同意，Google 集团旗下的每一家公司都将成为本许可协议的第三方受益人，并且此类其他公司将有权直接强制执行和依赖本许可协议中任何授予其利益（或支持其权利）的条款。除此之外，任何其他人员或公司均不得成为本许可协议的第三方受益人。
+
+14.5 出口限制。“预览版”受美国出口法律和法规的制约。您必须遵守适用于“预览版”的所有国内和国际出口法律和法规。这些法律包括目的地、最终用户和最终用途方面的限制。
+
+14.6 未经 Google 事先书面批准，您不得擅自转让或转移本许可协议，未经此类批准而试图进行的任何转让均为无效。未经 Google 事先书面批准，您不得委托您依据本许可协议所应承担的责任或义务。
+
+14.7 本许可协议以及您与 Google 依据本许可协议而建立的关系受加利福尼亚州法律管辖，而无论其是否与其他法律条款冲突。您与 Google 同意服从位于加利福尼亚州圣克拉拉县内法院的专属司法管辖权，以解决本许可协议引起的任何法律事务。尽管有上述规定，您同意仍允许 Google 在任何管辖区域申请禁令救济（或同等类型的紧急法律救济）。
+ </div><!-- sdk terms -->
+
+
+
+ <div id="sdk-terms-form">
+ <p>
+ <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
+ <label id="agreeLabel" for="agree">我已阅读并同意上述条款和条件</label>
+ </p>
+ <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+ </div>
+
+
+ </div><!-- end TOS -->
+
+
+ <div id="landing">
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>本文内容</h2>
+ <ol>
+ <li><a href="#sdk">预览版 SDK</a></li>
+ <li><a href="#docs">开发者文档</a></li>
+ <li><a href="#images">硬件系统映像</a></li>
+ </ol>
+ <h2>Legacy downloads</h2>
+ <ol>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ </ol>
+ </div>
+</div>
+
+
+<p>
+ Android M 预览版 SDK 包括开发工具、Android 系统文件和库文件，旨在帮助您在下一版本的平台中测试您的应用以及该平台提供的新 API。
+本文旨在介绍如何获得“预览版”的可下载组件，以便测试您的应用。
+
+</p>
+
+
+<h2 id="sdk">预览版 SDK</h2>
+
+<p>
+ 预览版 SDK 可通过 <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK 管理器</a>下载。如需了解有关下载和配置预览版 SDK 的详细信息，请参阅<a href="{@docRoot}preview/setup-sdk.html#downloadSdk">设置预览版 SDK</a>。
+
+</p>
+
+
+<h2 id="docs">开发者文档</h2>
+
+<p>
+ 开发者文档下载软件包提供详细的 API 参考信息和“预览版”的 API 差异报告。
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Description</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="docs-dl">
+ <td>Android M Preview 2<br>Developer Docs</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >m-preview-2-developer-docs.zip</a><br>
+ MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
+ SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ </td>
+ </tr>
+</table>
+
+
+<h2 id="images">硬件系统映像</h2>
+
+<p>
+ 这些系统映像允许您在实际设备上安装预览版平台，以便进行测试。
+通过使用这些映像之一配置设备，您可以安装并测试您的应用，以了解其在下一版本平台上的性能表现。
+在设备上安装系统映像的过程会<em>删除设备中的所有数据</em>，因此您应该在安装系统映像之前备份数据。
+
+
+</p>
+
+<p class="warning">
+ <b>警告：</b>以下 Android 系统映像是预览版，可能会随时发生变化。您对这些系统映像的使用受 Android SDK 预览版许可协议的制约。
+Android 预览版系统映像并非稳定版本，可能包含会对您的计算机系统、设备和数据造成损害的错误和缺陷。
+
+Android 预览版系统映像未经过与出厂操作系统相同的测试，可能会导致您的手机和安装的服务与应用停止工作。
+
+
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Device</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="hammerhead">
+ <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
+ MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
+ SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ </td>
+ </tr>
+ <tr id="shamu">
+ <td>Nexus 6 <br>"shamu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >shamu-MPZ79M-preview-e1024040.tgz</a><br>
+ MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
+ SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ </td>
+ </tr>
+ <tr id="volantis">
+ <td>Nexus 9 <br>"volantis"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >volantis-MPZ79M-preview-9f305342.tgz</a><br>
+ MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
+ SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ </td>
+ </tr>
+
+ <tr id="fugu">
+ <td>Nexus Player <br>"fugu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
+ MD5: e8d081137a20b66df595ee69523314b5<br>
+ SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ </td>
+ </tr>
+
+</table>
+
+<h3 id="install-image">将映像安装到设备</h3>
+
+<p>
+ 要使用设备映像进行测试，您必须将其安装到兼容设备上。请按照下面的说明安装系统映像：
+
+</p>
+
+<ol>
+ <li>下载并解压此处列出的系统映像包之一。</li>
+ <li>备份设备中您希望予以保留的任何数据。</li>
+ <li>按照
+<a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
+ 中的说明将映像刷入设备中。</li>
+</ol>
+
+<p class="note">
+ <strong>注：</strong>为开发设备刷入预览版系统映像之后，它将通过无线 (OTA) 更新自动升级到下一个预览版本。
+
+</p>
+
+<h3 id="revertDevice">将设备还原至出厂规格</h3>
+
+<p>
+ 如果您想要卸载预览版并将设备还原至出厂规格，请转到
+<a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a> 并下载要为设备刷入的映像。
+按照该页面上的说明将映像刷入设备中。
+
+</p>
+
+ </div><!-- landing -->
+
+</div><!-- relative wrapper -->
+
+
+
+<script>
+ var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
+ function onDownload(link) {
+
+ $("#downloadForRealz").html("Download " + $(link).text());
+ $("#downloadForRealz").attr('href', urlRoot + $(link).text());
+
+ $("#tos").fadeIn('fast');
+ $("#landing").fadeOut('fast');
+
+ return true;
+ }
+
+
+ function onAgreeChecked() {
+ /* verify that the TOS is agreed */
+ if ($("input#agree").is(":checked")) {
+ /* reveal the download button */
+ $("a#downloadForRealz").removeClass('disabled');
+ } else {
+ $("a#downloadForRealz").addClass('disabled');
+ }
+ }
+
+ function onDownloadForRealz(link) {
+ if ($("input#agree").is(':checked')) {
+ /*
+ $("#tos").fadeOut('fast');
+ $("#landing").fadeIn('fast');
+ */
+
+ ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
+
+ /*
+ location.hash = "";
+ */
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ $(window).hashchange( function(){
+ if (location.hash == "") {
+ location.reload();
+ }
+ });
+
+</script>
diff --git a/docs/html-intl/intl/zh-cn/preview/index.jd b/docs/html-intl/intl/zh-cn/preview/index.jd
index 36ad718..caed4cb 100644
--- a/docs/html-intl/intl/zh-cn/preview/index.jd
+++ b/docs/html-intl/intl/zh-cn/preview/index.jd
@@ -29,7 +29,7 @@
</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
<div class="dac-section dac-small">
diff --git a/docs/html-intl/intl/zh-tw/index.jd b/docs/html-intl/intl/zh-tw/index.jd
index 53bbd8d..cf1376f 100644
--- a/docs/html-intl/intl/zh-tw/index.jd
+++ b/docs/html-intl/intl/zh-tw/index.jd
@@ -10,19 +10,16 @@
<section class="dac-hero-carousel">
<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
-<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
+<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">
<a href="/preview/index.html">
- <div class="wrap" style="max-width:1100px;">
+ <div class="wrap" style="max-width:1100px;margin-top:0">
<div class="cols dac-hero-content">
- <div class="col-10of16 col-push-6of16 dac-hero-figure">
- <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"
- srcset="{@docRoot}images/home/devices-hero_620px.png 1x,
- {@docRoot}images/home/devices-hero_620px_2x.png 2x">
+ <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">
</div>
- <div class="col-6of16 col-pull-10of16">
+ <div class="col-8of16 col-pull-7of16">
<div class="dac-hero-tag"></div>
- <h1 class="dac-hero-title">Android M Developer Preview</h1>
+ <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>
<p class="dac-hero-description">準備使用新版 Android。在 Nexus 5、6、9 和
Player 上測試您的應用程式。 </p>
@@ -32,7 +29,7 @@
</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
</div>
diff --git a/docs/html-intl/intl/zh-tw/preview/download.jd b/docs/html-intl/intl/zh-tw/preview/download.jd
index 3b54080..163af2c 100644
--- a/docs/html-intl/intl/zh-tw/preview/download.jd
+++ b/docs/html-intl/intl/zh-tw/preview/download.jd
@@ -164,13 +164,14 @@
<div id="qv">
<h2>本文件內容</h2>
<ol>
- <li><a href="#sdk">預覽版 SDK</a></li>
+ <li><a href="#sdk">Android 6.0 SDK</a></li>
<li><a href="#docs">開發人員文件</a></li>
<li><a href="#images">硬體系統映像</a></li>
</ol>
<h2>Legacy downloads</h2>
<ol>
- <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview 1</a></li>
+ <li><a href="{@docRoot}preview/download_mp2.html">Developer Preview 2</a></li>
</ol>
</div>
</div>
@@ -183,7 +184,7 @@
</p>
-<h2 id="sdk">預覽版 SDK</h2>
+<h2 id="sdk">Android 6.0 SDK</h2>
<p>
預覽版 SDK 可透過 <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK 管理器</a>下載取得。如需有關下載和設定預覽版 SDK 的詳細資訊，請參閱<a href="{@docRoot}preview/setup-sdk.html#downloadSdk">設定預覽版 SDK</a>。
@@ -203,11 +204,11 @@
<th scope="col">Download / Checksums</th>
</tr>
<tr id="docs-dl">
- <td>Android M Preview 2<br>Developer Docs</td>
+ <td>Android M Preview 3<br>Developer Docs</td>
<td><a href="#top" onclick="onDownload(this)"
- >m-preview-2-developer-docs.zip</a><br>
- MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
- SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ >m-preview-3-developer-docs.zip</a><br>
+ MD5: d99b14b0c06d31c8dfecb25072654ca3<br>
+ SHA-1: 9cefeeda07676130da606a1796e1c00fffc667c1
</td>
</tr>
</table>
@@ -240,34 +241,34 @@
<tr id="hammerhead">
<td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
<td><a href="#top" onclick="onDownload(this)"
- >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
- MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
- SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ >hammerhead-MPA44I-preview-2ebbc049.tgz</a><br>
+ MD5: 91a924fb0c9f8e716e3b4c9954fd0dbb<br>
+ SHA-1: 2ebbc049b68c4da8baeee3e42bb94d7a965ba4a3
</td>
</tr>
<tr id="shamu">
<td>Nexus 6 <br>"shamu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >shamu-MPZ79M-preview-e1024040.tgz</a><br>
- MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
- SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ >shamu-MPA44I-preview-62b9c486.tgz</a><br>
+ MD5: ac6e58da86125073d9c395257fd42664<br>
+ SHA-1: 62b9c486fd7a5020e228d53ca5acd5c1857e48ff
</td>
</tr>
<tr id="volantis">
<td>Nexus 9 <br>"volantis"</td>
<td><a href="#top" onclick="onDownload(this)"
- >volantis-MPZ79M-preview-9f305342.tgz</a><br>
- MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
- SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ >volantis-MPA44I-preview-5c30a6e2.tgz</a><br>
+ MD5: 7f83768757913d3fea945a661020d185<br>
+ SHA-1: 5c30a6e2acd11a81f4105b12d23ff654f534f699
</td>
</tr>
<tr id="fugu">
<td>Nexus Player <br>"fugu"</td>
<td><a href="#top" onclick="onDownload(this)"
- >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
- MD5: e8d081137a20b66df595ee69523314b5<br>
- SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ >fugu-MPA44I-preview-2860040a.tgz</a><br>
+ MD5: 438da8d37da9e341a69cfb16a4001ac5<br>
+ SHA-1: 2860040a326582f1ff5f702bf9a1ef002717fc98
</td>
</tr>
diff --git a/docs/html-intl/intl/zh-tw/preview/download_mp2.jd b/docs/html-intl/intl/zh-tw/preview/download_mp2.jd
new file mode 100644
index 0000000..3b54080
--- /dev/null
+++ b/docs/html-intl/intl/zh-tw/preview/download_mp2.jd
@@ -0,0 +1,359 @@
+page.title=下載
+page.image=images/cards/card-download_16-9_2x.png
+
+@jd:body
+
+<div style="position:relative; min-height:600px">
+
+ <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;">
+
+ <p class="sdk-terms-intro">在下載和安裝 Android 預覽版
+SDK 的元件之前 ，您必須同意遵守下列條款和條件。</p>
+
+ <h2 class="norule">條款和條件</h2>
+
+ <div class="sdk-terms" onfocus="this.blur()" style="width:678px">
+這是「Android SDK 預覽版授權協議」(以下稱「授權協議」)。
+
+1.簡介
+
+1.1「Android SDK 預覽版」(在「授權協議」中稱為「預覽版」，包括 (如果有可用的) Android 系統檔案、經過封裝的 API 和預覽版程式庫檔案) 是在「授權協議」之條款的約束下授權給您使用。「授權協議」就您對「預覽版」的使用，構成您與 Google 間具法律約束力之合約。
+
+1.2「Android」係指「Android 軟體開放原始碼專案」(http://source.android.com/) 所提供的 Android 裝置軟體堆疊 (不定期更新)。
+
+1.3「Google」係指 Google Inc.，是一家在美國德拉瓦州註冊的公司，地址為 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States。
+
+2.接受「授權協議」
+
+2.1 必須先同意遵守「授權協議」，才能使用此「預覽版」。如果不接受「授權協議」，您就無法使用此「預覽版」。
+
+2.2 按一下 [接受] 且/或使用「預覽版」，即表示您同意「授權協議」的條款。
+
+2.3 如果您是美國或其他國家/地區 (包括您所居住或使用此「預覽版」的國家/地區) 的法律所禁止接收此「預覽版」的人員，就不得使用此「預覽版」及接受「授權協議」。
+
+2.4 如果您將在公司或組織內部使用「預覽版」，您就要代表雇主或其他實體同意受「授權協議」約束，且您代表並保證具備完整法定權限來約束您的雇主或這類實體遵守「授權協議」。如果您不具備必要的權限，就不得代表您的雇主或其他實體接受「授權協議」或使用此「預覽版」。
+
+3.Google 的預覽版授權
+
+3.1 在「授權協議」之條款的約束下，Google 授權您使用此「預覽版」，此授權為買斷式、不可轉讓、非獨占性、不可轉授權、有限且可撤銷，僅在您公司或組織內部私下或內部使用。此「預覽版」僅供您用於開發在 Android 平台上執行的應用程式。
+
+3.2 您同意 Google 或第三方對此「預覽版」擁有一切法定權利及權益，包括存在於此「預覽版」中的任何「智慧財產權」。「智慧財產權」係指專利法、著作權法、商業秘密法、商標法及任何和所有其他專利權下的任何及一切權利。Google 保留一切未明確授予您的權利。
+
+3.3 您不得將此「預覽版」用於「授權協議」未明文許可的任何用途。除非適用的第三方授權所需，否則您不得：(a) 對此「預覽版」或其任何部分進行複製 (備份用途除外)、修改、改編、轉散佈、反向組譯、還原工程、解編或製作衍生成品；或是 (b) 將此「預覽版」的任何部分載入至行動電話或個人電腦以外的任何其他硬體裝置、將此「預覽版」的任何部分與其他軟體結合，或散佈包含此「預覽版」之任一部分的任何軟體或裝置。
+
+3.4 您同意不會從事任何可能導致或造成 Android 分裂的活動，包括但不限於以任何形式散佈從此「預覽版」衍生的軟體開發套件、參其製作或宣傳。
+
+3.5 對開放原始碼軟體授權下所授權之「預覽版」的使用、複製及散佈，完全受該開放原始碼軟體授權的條款管制，而不受「授權協議」管制。您同意遵守從這類開放原始碼軟體授權獲得的所有權利，並且避免採取任何可能終止、中止或侵害這類權利的行為。
+
+3.6 您同意 Google 可在不事先通知您的情況下變更其所提供之「預覽版」的形式和本質，且此「預覽版」的未來版本可與在此「預覽版」的先前版本上開發的應用程式不相容。您同意 Google 通常可全權斟酌永久或暫時停止提供此「預覽版」(或此「預覽版」的任何功能) 給您或使用者，毋須事先通知。
+
+3.7「授權協議」中的所有條款皆未授予您任何使用 Google 之商業名稱、商標、服務標章、標誌、網域名稱或其他明確品牌特徵的權利。
+
+3.8 您同意不會移除、遮蔽或更改可能附加至或內含在此「預覽版」中的任何專利權通知 (包括著作權和商標通知)。
+
+4.您對「預覽版」的使用
+
+4.1 Google 同意在「授權協議」下，任何條款皆未從您 (或您的授權人) 賦予 Google 對您使用此「預覽版」開發之任何軟體應用程式的任何權利及權益，包括存在於這些應用程式中的任何智慧財產權。
+
+4.2 您同意只就 (a)「授權協議」和 (b) 相關管轄權中任何適用法律、規定或是普遍獲得接受之慣例或指導方針 (包括任何有關將資料或軟體輸出或輸入美國或其他相關國家/地區的法律) 所允許的用途使用此「預覽版」及撰寫應用程式。
+
+4.3 您同意如果使用此「預覽版」開發應用程式，您將保護使用者的隱私權和法定權利。如果使用者提供您使用者名稱、密碼或是其他登入資訊或個人資訊，您必須告知使用者這類資訊將提供給您的應用程式使用，並且必須為這些使用者提供法定充分的隱私權通知和保護。如果您的應用程式會儲存使用者所提供的個人或敏感資訊，它必須確保這些資訊安全無虞。如果使用者提供 Google 帳戶資訊給您，則只有在每個使用者已授權您存取其 Google 帳戶並僅限用於使用者所授權之用途的情況下，您的應用程式才能使用該資訊來存取使用者的 Google 帳戶。
+
+4.4 您同意不會使用此「預覽版」從事任何不當Activity，例如開發或散佈會以未經授權的方式干擾、妨礙、損害或存取 Google 或任何第三方之伺服器、網路或是其他財產或服務的應用程式。
+
+4.5 您同意對您透過 Android 裝置和 (或) Android 應用程式建立、傳輸或顯示的任何資料、內容或資源，以及上述行為造成的後果 (包括 Google 可能蒙受的任何損失或損害) 負起全責 (而 Google 對您或任何第三方就上述一切不需負任何責任)。
+
+4.6 您同意對違反在此「授權協議」、任何適用之第三方合約或《服務條款》或是任何適用之法律或規定下所必須遵守的義務，以及違反相關義務造成的後果 (包括 Google 或任何第三方可能蒙受的任何損失或損害) 負起全責 (而 Google 對您或任何第三方就上述一切不需負任何責任)。
+
+4.7「預覽版」目前正在開發中，因此您的測試與意見反應對開發程序非常重要。使用「預覽版」，您即認同某些功能仍處於開發階段，因此您不應期待「預覽版」擁有穩定版本的完整功能。在官方 Android SDK 發行之後，此「預覽版」不再受到支援時，您同意不使用此「預覽版」公開散佈或隨附任何應用程式。
+
+5.您的開發人員認證
+
+5.1 您同意負責保密 Google 可能核發給您或您自己選擇的任何開發人員認證，並且對在您開發人員認證名義下開發的所有應用程式負起全責。
+
+6.隱私權和資訊
+
+6.1 為了持續更新及改進此「預覽版」，Google 可能會從軟體收集某些使用狀況統計數據，包括但不限於軟體的唯一識別碼、相關 IP 位址、版本號碼，以及有關使用此「預覽版」中的哪些工具和 (或) 服務及其使用方式的相關資訊。在收集這類資訊之前，此「預覽版」會先通知您並徵求您的同意。如果您不同意，Google 將不會收集這類資訊。
+
+6.2 Google 會彙總並檢查收集到的資料，據以改善此「預覽版」，並且會依據《Google 隱私權政策》(http://www.google.com/policies/privacy/) 加以妥善保存。
+
+7.第三方應用程式
+
+7.1 如果您使用此「預覽版」來執行第三方開發的應用程式，或是執行會存取第三方所提供之資料、內容或資源的應用程式，您同意 Google 不需對這類應用程式、資料、內容或資源負任何責任。您瞭解您透過第三方應用程式存取的所有資料、內容或資源是由其提供者負起全責，而 Google 對您因使用或存取任何這些第三方應用程式、資料、內容或資源所造成的損失或損害不需負任何責任。
+
+7.2 您瞭解第三方應用程式提供給您的資料、內容或資源可能受到提供者 (或代表他們的其他人員或公司) 所擁有的智慧財產權保護。您不得根據這類資料、內容或資源 (不論是整個或部分) 修改、出租、出借、販售、散佈或製作衍生成品，除非相關擁有者明確授權您從事上述活動。
+
+7.3 您瞭解使用第三方應用程式、資料、內容或資源可能受到您與相關第三方之間的個別條款約束。
+
+8.使用 Google API
+
+8.1 Google API
+
+8.1.1 如果您使用任何 API 從 Google 擷取資料，您瞭解這些資料可能受到 Google 或資料提供者 (或代表他們的其他人員或公司) 所擁有的智慧財產權保護。您對任何這類 API 的使用可能受到其他《服務條款》約束。除非相關《服務條款》明文允許，否則您不得根據這類資料 (不論是整個或部分) 修改、出租、出借、販售、散佈或製作衍生成品。
+
+8.1.2 使用任何 API 從 Google 擷取使用者的資料時，您瞭解並同意只有在該使用者明確同意且授權您擷取其資料，而且僅限用於使用者所授權之用途的情況下，您才能擷取資料。
+
+9.終止「授權協議」
+
+9.1 除非您或 Google 終止「授權協議」(請見下方說明)，否則「授權協議」將持續具有效力。
+
+9.2 如果想終止「授權協議」，只要停止使用此「預覽版」及任何相關的開發人員憑證即可。
+
+9.3 Google 可隨時通知您終止「授權協議」，無論有無原因。
+
+9.4「授權協議」在先發生下列任一情況時，將自動終止而不另行通知或採取其他行動：
+(A) Google 決定不再提供此「預覽版」或此「預覽版」的特定部分給您所居住或使用此服務之國家/地區的使用者；或
+(B) Google 發行最終版本的 Android SDK。
+
+9.5 當「授權條款」終止時，您在「授權協議」所獲得的授權也將會一併終止，您將立即停止「預覽版」的所有使用，而第 10、11、12 和 14 項的條款將無限期持續適用。
+
+10.免責聲明
+
+10.1 您明確瞭解並同意完全自負使用此「預覽版」的風險，並且此「預覽版」是依「現況」和「可提供性」提供，Google 不負任何擔保責任。
+
+10.2 您對使用此「預覽版」及透過此「預覽版」以下載或其他方式取得的任何內容，需自行斟酌和自負風險，而且您對因這類使用而對您的電腦系統或其他裝置所造成的任何損害或資料遺失，需負起全責。不限於前述，您瞭解此「預覽版」不是穩定的版本，可能會包含許多錯誤、瑕疵和安全性弱點而對您的電腦系統或其他裝置造成嚴重的損害，包括完全、不可回復的損失。
+
+10.3 Google 進一步明確表示不提供任何形式的瑕疵擔保和條件 (不論明示或默示)，包括但不限於適售性、適合特定用途及未侵權的默示擔保和條件。
+
+11.責任限制
+
+11.1 您明確瞭解並同意在任何歸責理論下，就可能由您引起的任何直接、間接、附隨性、特殊性、衍生性或懲罰性損害賠償 (包括任何資料遺失)，不論 Google 或其代表是否已獲告知或應已瞭解發生任何這類損失的可能性，Google、其子公司和關係企業及其授權人不必對您負起任何責任。
+
+12.賠償
+
+12.1 在法律允許的最大範圍內，您同意為 Google、其子公司及其個別董監事、主管、員工和代理人，就任何和一切索賠、法律行動、訴訟或訴訟程序，以及因下列原因而引起的任何和一切損失、責任、損害賠償、費用及開支 (包括合理的律師費)，提供辯護、賠償損失並確保其免於承擔賠償責任：(a) 您使用此「預覽版」；(b) 您使用此「預覽版」開發的應用程式侵害任何人的任何智慧財產權，或是詆毀任何人或違反其公開權或隱私權；以及 (c) 您未遵守「授權協議」。
+
+13.對「授權協議」做出的變更
+
+13.1 Google 可在散佈此「預覽版」的新版本時修改「授權協議」。做出這類變更後，Google 會在提供此「預覽版」的網站上提供「授權協議」的新版本。
+
+14.一般法律條款
+
+14.1「授權協議」構成您與 Google 之間的法律協議，用於管制您對此「預覽版」(不包括 Google 依據個別書面協議提供給您的任何服務) 的使用，並完全取代先前您與 Google 之間就此「預覽版」簽署的相關協議。
+
+14.2 您同意如果 Google 未行使或執行「授權協議」所含的任何法律權利或救濟 (或在任何適用法律下對 Google 有利的權益)，並不代表 Google 正式放棄權利，Google 日後仍可行使這些權利或救濟。
+
+14.3 如果經任何法院 (就此事宜依管轄權決定) 裁決「授權協議」中有任何條款無效，則該條款將自「授權協議」中移除，「授權協議」的其餘部分則不受影響。「授權協議」的其餘條款將持續具有效力且可執行。
+
+14.4 您瞭解並同意 Google 旗下子公司體系的每位成員都是「授權協議」的第三方受益人，而且這類其他公司有權直接執行和依據「授權協議」中對其授予權益 (或對其有利之權利) 的任何條款。除此之外的任何其他人員或公司皆非「授權協議」的第三方受益人。
+
+14.5 出口限制。此「預覽版」受美國出口法規約束。您必須遵守適用於此「預覽版」的所有國內和國際出口法規。這些法律包括對目的地、使用者及最終用途的限制。
+
+14.6 未事先取得 Google 事先書面核准的情況下，您不得轉讓或轉移「授權協議」，未經這類核准的任何轉讓將會失效。您不得在未事先取得 Google 書面核准的情況下，委派其「授權協議」涵蓋的責任或義務。
+
+14.7「授權協議」以及您與 Google 就「授權協議」構成的關係皆受加州法律管轄，毋須理會其法律牴觸條款。您和 Google 同意服從位於加州聖塔克拉拉 (Santa Clara, California) 郡內法院的專屬管轄權，以解決由「授權協議」產生的任何法律事務。儘管如此，您同意 Google 仍可在任何管轄權中申請禁制令救濟 (或同等類型的緊急法定救濟)。
+ </div><!-- sdk terms -->
+
+
+
+ <div id="sdk-terms-form">
+ <p>
+ <input id="agree" type="checkbox" name="agree" value="1" onclick="onAgreeChecked()" />
+ <label id="agreeLabel" for="agree">我已閱讀並同意上述條款及細則</label>
+ </p>
+ <p><a href="" class="button disabled" id="downloadForRealz" onclick="return onDownloadForRealz(this);"></a></p>
+ </div>
+
+
+ </div><!-- end TOS -->
+
+
+ <div id="landing">
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>本文件內容</h2>
+ <ol>
+ <li><a href="#sdk">預覽版 SDK</a></li>
+ <li><a href="#docs">開發人員文件</a></li>
+ <li><a href="#images">硬體系統映像</a></li>
+ </ol>
+ <h2>Legacy downloads</h2>
+ <ol>
+ <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>
+ </ol>
+ </div>
+</div>
+
+
+<p>
+ Android M 預覽版 SDK 有開發工具、Android 系統檔案以及程式庫檔案，可以幫助測試您的應用程式和下一個平台版本隨附的新 API。
+本文件會說明如何取得可下載的預覽版元件來測試您的應用程式。
+
+</p>
+
+
+<h2 id="sdk">預覽版 SDK</h2>
+
+<p>
+ 預覽版 SDK 可透過 <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK 管理器</a>下載取得。如需有關下載和設定預覽版 SDK 的詳細資訊，請參閱<a href="{@docRoot}preview/setup-sdk.html#downloadSdk">設定預覽版 SDK</a>。
+
+</p>
+
+
+<h2 id="docs">開發人員文件</h2>
+
+<p>
+ 開發人員文件下載套件提供詳細的 API 參考資料和預覽版的 API 差異報告。
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Description</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="docs-dl">
+ <td>Android M Preview 2<br>Developer Docs</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >m-preview-2-developer-docs.zip</a><br>
+ MD5: 1db6fff9c722b0339757e1cdf43663a8<br>
+ SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157
+ </td>
+ </tr>
+</table>
+
+
+<h2 id="images">硬體系統映像</h2>
+
+<p>
+ 這些系統映像可以讓您在實體裝置上安裝預覽版的平台來進行測試。
+使用其中一個映像設定裝置，您就可以安裝並測試您的應用程式，瞭解應用程式在下一個版本的平台上表現如何。
+在裝置上安裝系統映像的過程中，會「移除裝置當中所有的資料」，因此您應該在安裝系統映像之前備份您的資料。<em></em>
+
+
+</p>
+
+<p class="warning">
+ <b>警告：</b>下列 Android 系統映像是預覽版，可能隨時會有變更。使用這些系統映像受到「Android SDK 預覽版授權協議」的約束。
+Android 預覽版系統映像還不是穩定的版本，可能會包含許多錯誤和瑕疵而對您的電腦系統、裝置和資料造成損害。
+
+預覽版的 Android 系統映像與出廠作業系統的測試不同，可能會導致您的手機和安裝的服務與應用程式停止運作。
+
+
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Device</th>
+ <th scope="col">Download / Checksums</th>
+ </tr>
+ <tr id="hammerhead">
+ <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
+ MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
+ SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+ </td>
+ </tr>
+ <tr id="shamu">
+ <td>Nexus 6 <br>"shamu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >shamu-MPZ79M-preview-e1024040.tgz</a><br>
+ MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
+ SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+ </td>
+ </tr>
+ <tr id="volantis">
+ <td>Nexus 9 <br>"volantis"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >volantis-MPZ79M-preview-9f305342.tgz</a><br>
+ MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
+ SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+ </td>
+ </tr>
+
+ <tr id="fugu">
+ <td>Nexus Player <br>"fugu"</td>
+ <td><a href="#top" onclick="onDownload(this)"
+ >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
+ MD5: e8d081137a20b66df595ee69523314b5<br>
+ SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+ </td>
+ </tr>
+
+</table>
+
+<h3 id="install-image">在裝置上安裝映像</h3>
+
+<p>
+ 如果要使用裝置映像進行測試，您必須先在相容的裝置上安裝映像。請依照下面的指示安裝系統映像：
+
+</p>
+
+<ol>
+ <li>下載此處列出的其中一個系統映像，然後解壓縮。</li>
+ <li>備份您要保留的所有裝置資料。</li>
+ <li>依照
+<a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
+的指示，將映像更新到您的裝置。</li>
+</ol>
+
+<p class="note">
+ <strong>注意：</strong>在您使用預覽版系統映像更新開發裝置之後，裝置就會透過無線 (OTA) 更新方式自動升級為下一個預覽版版本。
+
+</p>
+
+<h3 id="revertDevice">將裝置還原成出廠規格</h3>
+
+<p>
+ 如果您要解除安裝預覽版並將裝置還原成出廠規格，請至
+<a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a> 並下載您要為裝置更新的映像。
+依照該頁面的指示，將映像更新到您的裝置。
+
+</p>
+
+ </div><!-- landing -->
+
+</div><!-- relative wrapper -->
+
+
+
+<script>
+ var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/";
+ function onDownload(link) {
+
+ $("#downloadForRealz").html("Download " + $(link).text());
+ $("#downloadForRealz").attr('href', urlRoot + $(link).text());
+
+ $("#tos").fadeIn('fast');
+ $("#landing").fadeOut('fast');
+
+ return true;
+ }
+
+
+ function onAgreeChecked() {
+ /* verify that the TOS is agreed */
+ if ($("input#agree").is(":checked")) {
+ /* reveal the download button */
+ $("a#downloadForRealz").removeClass('disabled');
+ } else {
+ $("a#downloadForRealz").addClass('disabled');
+ }
+ }
+
+ function onDownloadForRealz(link) {
+ if ($("input#agree").is(':checked')) {
+ /*
+ $("#tos").fadeOut('fast');
+ $("#landing").fadeIn('fast');
+ */
+
+ ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html());
+
+ /*
+ location.hash = "";
+ */
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ $(window).hashchange( function(){
+ if (location.hash == "") {
+ location.reload();
+ }
+ });
+
+</script>
diff --git a/docs/html-intl/intl/zh-tw/preview/index.jd b/docs/html-intl/intl/zh-tw/preview/index.jd
index a9cf1ae..3aaf382 100644
--- a/docs/html-intl/intl/zh-tw/preview/index.jd
+++ b/docs/html-intl/intl/zh-tw/preview/index.jd
@@ -29,7 +29,7 @@
</a><br>
<a class="dac-hero-cta" href="{@docRoot}preview/support.html">
<span class="dac-sprite dac-auto-chevron"></span>
- Developer Preview 2</a>
+ Developer Preview 3 (final SDK)</a>
</div>
</div>
<div class="dac-section dac-small">
diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd
index ecc0c7e..d00f90cbf 100644
--- a/docs/html/preview/download.jd
+++ b/docs/html/preview/download.jd
@@ -164,7 +164,7 @@
<div id="qv">
<h2>In this document</h2>
<ol>
- <li><a href="#sdk">Developer Preview 3 SDK</a></li>
+ <li><a href="#sdk">Android 6.0 SDK</a></li>
<li><a href="#docs">Developer Documentation</a></li>
<li><a href="#images">Hardware System Images</a></li>
</ol>
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index 32af59a..b95c183 100644
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -1146,77 +1146,11 @@
* document, tries to create a Drawable from that tag. Returns {@code null}
* if the tag is not a valid drawable.
*/
- @SuppressWarnings("deprecation")
public static Drawable createFromXmlInner(Resources r, XmlPullParser parser, AttributeSet attrs,
Theme theme) throws XmlPullParserException, IOException {
- final Drawable drawable;
-
- final String name = parser.getName();
- switch (name) {
- case "selector":
- drawable = new StateListDrawable();
- break;
- case "animated-selector":
- drawable = new AnimatedStateListDrawable();
- break;
- case "level-list":
- drawable = new LevelListDrawable();
- break;
- case "layer-list":
- drawable = new LayerDrawable();
- break;
- case "transition":
- drawable = new TransitionDrawable();
- break;
- case "ripple":
- drawable = new RippleDrawable();
- break;
- case "color":
- drawable = new ColorDrawable();
- break;
- case "shape":
- drawable = new GradientDrawable();
- break;
- case "vector":
- drawable = new VectorDrawable();
- break;
- case "animated-vector":
- drawable = new AnimatedVectorDrawable();
- break;
- case "scale":
- drawable = new ScaleDrawable();
- break;
- case "clip":
- drawable = new ClipDrawable();
- break;
- case "rotate":
- drawable = new RotateDrawable();
- break;
- case "animated-rotate":
- drawable = new AnimatedRotateDrawable();
- break;
- case "animation-list":
- drawable = new AnimationDrawable();
- break;
- case "inset":
- drawable = new InsetDrawable();
- break;
- case "bitmap":
- drawable = new BitmapDrawable();
- break;
- case "nine-patch":
- drawable = new NinePatchDrawable();
- break;
- default:
- throw new XmlPullParserException(parser.getPositionDescription() +
- ": invalid drawable tag " + name);
-
- }
- drawable.inflate(r, parser, attrs, theme);
- return drawable;
+ return r.getDrawableInflater().inflateFromXml(parser.getName(), parser, attrs, theme);
}
-
/**
* Create a drawable from file path name.
*/
diff --git a/graphics/java/android/graphics/drawable/DrawableInflater.java b/graphics/java/android/graphics/drawable/DrawableInflater.java
new file mode 100644
index 0000000..f3657d3
--- /dev/null
+++ b/graphics/java/android/graphics/drawable/DrawableInflater.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.graphics.drawable;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import android.annotation.DrawableRes;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.Resources.Theme;
+import android.util.AttributeSet;
+import android.view.InflateException;
+
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+
+/**
+ * Instantiates a drawable XML file into its corresponding
+ * {@link android.graphics.drawable.Drawable} objects.
+ * <p>
+ * For performance reasons, inflation relies heavily on pre-processing of
+ * XML files that is done at build time. Therefore, it is not currently possible
+ * to use this inflater with an XmlPullParser over a plain XML file at runtime;
+ * it only works with an XmlPullParser returned from a compiled resource (R.
+ * <em>something</em> file.)
+ *
+ * @hide Pending API finalization.
+ */
+public final class DrawableInflater {
+ private static final HashMap<String, Constructor<? extends Drawable>> CONSTRUCTOR_MAP =
+ new HashMap<>();
+
+ private final Resources mRes;
+ private final ClassLoader mClassLoader;
+
+ /**
+ * Loads the drawable resource with the specified identifier.
+ *
+ * @param context the context in which the drawable should be loaded
+ * @param id the identifier of the drawable resource
+ * @return a drawable, or {@code null} if the drawable failed to load
+ */
+ @Nullable
+ public static Drawable loadDrawable(@NonNull Context context, @DrawableRes int id) {
+ return loadDrawable(context.getResources(), context.getTheme(), id);
+ }
+
+ /**
+ * Loads the drawable resource with the specified identifier.
+ *
+ * @param resources the resources from which the drawable should be loaded
+ * @param theme the theme against which the drawable should be inflated
+ * @param id the identifier of the drawable resource
+ * @return a drawable, or {@code null} if the drawable failed to load
+ */
+ @Nullable
+ public static Drawable loadDrawable(
+ @NonNull Resources resources, @Nullable Theme theme, @DrawableRes int id) {
+ return resources.getDrawable(id, theme);
+ }
+
+ /**
+ * Constructs a new drawable inflater using the specified resources and
+ * class loader.
+ *
+ * @param res the resources used to resolve resource identifiers
+ * @param classLoader the class loader used to load custom drawables
+ * @hide
+ */
+ public DrawableInflater(@NonNull Resources res, @NonNull ClassLoader classLoader) {
+ mRes = res;
+ mClassLoader = classLoader;
+ }
+
+ /**
+ * Inflates a drawable from inside an XML document using an optional
+ * {@link Theme}.
+ * <p>
+ * This method should be called on a parser positioned at a tag in an XML
+ * document defining a drawable resource. It will attempt to create a
+ * Drawable from the tag at the current position.
+ *
+ * @param name the name of the tag at the current position
+ * @param parser an XML parser positioned at the drawable tag
+ * @param attrs an attribute set that wraps the parser
+ * @param theme the theme against which the drawable should be inflated, or
+ * {@code null} to not inflate against a theme
+ * @return a drawable
+ *
+ * @throws XmlPullParserException
+ * @throws IOException
+ */
+ @NonNull
+ public Drawable inflateFromXml(@NonNull String name, @NonNull XmlPullParser parser,
+ @NonNull AttributeSet attrs, @Nullable Theme theme)
+ throws XmlPullParserException, IOException {
+ // Inner classes must be referenced as Outer$Inner, but XML tag names
+ // can't contain $, so the <drawable> tag allows developers to specify
+ // the class in an attribute. We'll still run it through inflateFromTag
+ // to stay consistent with how LayoutInflater works.
+ if (name.equals("drawable")) {
+ name = attrs.getAttributeValue(null, "class");
+ if (name == null) {
+ throw new InflateException("<drawable> tag must specify class attribute");
+ }
+ }
+
+ Drawable drawable = inflateFromTag(name);
+ if (drawable == null) {
+ drawable = inflateFromClass(name);
+ }
+ drawable.inflate(mRes, parser, attrs, theme);
+ return drawable;
+ }
+
+ @NonNull
+ @SuppressWarnings("deprecation")
+ private Drawable inflateFromTag(@NonNull String name) {
+ switch (name) {
+ case "selector":
+ return new StateListDrawable();
+ case "animated-selector":
+ return new AnimatedStateListDrawable();
+ case "level-list":
+ return new LevelListDrawable();
+ case "layer-list":
+ return new LayerDrawable();
+ case "transition":
+ return new TransitionDrawable();
+ case "ripple":
+ return new RippleDrawable();
+ case "color":
+ return new ColorDrawable();
+ case "shape":
+ return new GradientDrawable();
+ case "vector":
+ return new VectorDrawable();
+ case "animated-vector":
+ return new AnimatedVectorDrawable();
+ case "scale":
+ return new ScaleDrawable();
+ case "clip":
+ return new ClipDrawable();
+ case "rotate":
+ return new RotateDrawable();
+ case "animated-rotate":
+ return new AnimatedRotateDrawable();
+ case "animation-list":
+ return new AnimationDrawable();
+ case "inset":
+ return new InsetDrawable();
+ case "bitmap":
+ return new BitmapDrawable();
+ case "nine-patch":
+ return new NinePatchDrawable();
+ default:
+ return null;
+ }
+ }
+
+ @NonNull
+ private Drawable inflateFromClass(@NonNull String className) {
+ try {
+ Constructor<? extends Drawable> constructor;
+ synchronized (CONSTRUCTOR_MAP) {
+ constructor = CONSTRUCTOR_MAP.get(className);
+ if (constructor == null) {
+ final Class<? extends Drawable> clazz =
+ mClassLoader.loadClass(className).asSubclass(Drawable.class);
+ constructor = clazz.getConstructor();
+ CONSTRUCTOR_MAP.put(className, constructor);
+ }
+ }
+ return constructor.newInstance();
+ } catch (NoSuchMethodException e) {
+ final InflateException ie = new InflateException(
+ "Error inflating class " + className);
+ ie.initCause(e);
+ throw ie;
+ } catch (ClassCastException e) {
+ // If loaded class is not a Drawable subclass.
+ final InflateException ie = new InflateException(
+ "Class is not a Drawable " + className);
+ ie.initCause(e);
+ throw ie;
+ } catch (ClassNotFoundException e) {
+ // If loadClass fails, we should propagate the exception.
+ throw new InflateException("Class not found " + className);
+ } catch (Exception e) {
+ final InflateException ie = new InflateException(
+ "Error inflating class " + className);
+ ie.initCause(e);
+ throw ie;
+ }
+ }
+}
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index b3b3479..676ab1c 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -75,7 +75,8 @@
TessellationCache.cpp \
TextDropShadowCache.cpp \
Texture.cpp \
- TextureCache.cpp
+ TextureCache.cpp \
+ protos/hwui.proto
hwui_cflags := \
-DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES \
@@ -92,6 +93,12 @@
hwui_cflags += -fno-omit-frame-pointer -marm -mapcs
endif
+# This has to be lazy-resolved because it depends on the LOCAL_MODULE_CLASS
+# which varies depending on what is being built
+define hwui_proto_include
+$(call local-generated-sources-dir)/proto/$(LOCAL_PATH)
+endef
+
hwui_c_includes += \
external/skia/src/core
@@ -104,6 +111,7 @@
libskia \
libui \
libgui \
+ libprotobuf-cpp-lite \
ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT))
hwui_cflags += -DANDROID_ENABLE_RENDERSCRIPT
@@ -126,7 +134,8 @@
LOCAL_SHARED_LIBRARIES := $(hwui_shared_libraries)
LOCAL_CFLAGS := $(hwui_cflags)
LOCAL_SRC_FILES := $(hwui_src_files)
-LOCAL_C_INCLUDES := $(hwui_c_includes)
+LOCAL_C_INCLUDES := $(hwui_c_includes) $(call hwui_proto_include)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(hwui_c_includes) $(call hwui_proto_include)
include $(BUILD_STATIC_LIBRARY)
@@ -153,7 +162,6 @@
LOCAL_MODULE_TAGS := tests
LOCAL_SHARED_LIBRARIES := $(hwui_shared_libraries)
LOCAL_STATIC_LIBRARIES := libhwui_static
-LOCAL_C_INCLUDES := $(hwui_c_includes)
LOCAL_CFLAGS := $(hwui_cflags)
LOCAL_SRC_FILES += \
@@ -172,16 +180,20 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp
LOCAL_MODULE:= hwuitest
LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MULTILIB := both
LOCAL_MODULE_STEM_32 := hwuitest
LOCAL_MODULE_STEM_64 := hwuitest64
LOCAL_SHARED_LIBRARIES := $(hwui_shared_libraries)
LOCAL_CFLAGS := $(hwui_cflags)
-LOCAL_C_INCLUDES := $(hwui_c_includes)
HWUI_NULL_GPU := false
ifeq (true, $(HWUI_NULL_GPU))
+ # Only need to specify the includes if we are not linking against
+ # libhwui_static as libhwui_static exports the appropriate includes
+ LOCAL_C_INCLUDES := $(hwui_c_includes) $(call hwui_proto_include)
+
LOCAL_SRC_FILES := \
$(hwui_src_files) \
tests/nullegl.cpp \
diff --git a/libs/hwui/Outline.h b/libs/hwui/Outline.h
index 4bd4ae1..922ff7c 100644
--- a/libs/hwui/Outline.h
+++ b/libs/hwui/Outline.h
@@ -26,6 +26,13 @@
class Outline {
public:
+ enum class Type {
+ None = 0,
+ Empty = 1,
+ ConvexPath = 2,
+ RoundRect = 3
+ };
+
Outline()
: mShouldClip(false)
, mType(Type::None)
@@ -122,14 +129,19 @@
return &mPath;
}
-private:
- enum class Type {
- None = 0,
- Empty = 1,
- ConvexPath = 2,
- RoundRect = 3
- };
+ Type getType() const {
+ return mType;
+ }
+ const Rect& getBounds() const {
+ return mBounds;
+ }
+
+ float getRadius() const {
+ return mRadius;
+ }
+
+private:
bool mShouldClip;
Type mType;
Rect mBounds;
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 7d09c0b..ddc7ecd 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -33,6 +33,9 @@
#include "utils/TraceUtils.h"
#include "renderthread/CanvasContext.h"
+#include "protos/hwui.pb.h"
+#include "protos/ProtoHelpers.h"
+
namespace android {
namespace uirenderer {
@@ -102,6 +105,78 @@
ALOGD("%*sDone (%p, %s)", (level - 1) * 2, "", this, getName());
}
+void RenderNode::copyTo(proto::RenderNode *pnode) {
+ pnode->set_id(static_cast<uint64_t>(
+ reinterpret_cast<uintptr_t>(this)));
+ pnode->set_name(mName.string(), mName.length());
+
+ proto::RenderProperties* pprops = pnode->mutable_properties();
+ pprops->set_left(properties().getLeft());
+ pprops->set_top(properties().getTop());
+ pprops->set_right(properties().getRight());
+ pprops->set_bottom(properties().getBottom());
+ pprops->set_clip_flags(properties().getClippingFlags());
+ pprops->set_alpha(properties().getAlpha());
+ pprops->set_translation_x(properties().getTranslationX());
+ pprops->set_translation_y(properties().getTranslationY());
+ pprops->set_translation_z(properties().getTranslationZ());
+ pprops->set_elevation(properties().getElevation());
+ pprops->set_rotation(properties().getRotation());
+ pprops->set_rotation_x(properties().getRotationX());
+ pprops->set_rotation_y(properties().getRotationY());
+ pprops->set_scale_x(properties().getScaleX());
+ pprops->set_scale_y(properties().getScaleY());
+ pprops->set_pivot_x(properties().getPivotX());
+ pprops->set_pivot_y(properties().getPivotY());
+ pprops->set_has_overlapping_rendering(properties().getHasOverlappingRendering());
+ pprops->set_pivot_explicitly_set(properties().isPivotExplicitlySet());
+ pprops->set_project_backwards(properties().getProjectBackwards());
+ pprops->set_projection_receiver(properties().isProjectionReceiver());
+ set(pprops->mutable_clip_bounds(), properties().getClipBounds());
+
+ const Outline& outline = properties().getOutline();
+ if (outline.getType() != Outline::Type::None) {
+ proto::Outline* poutline = pprops->mutable_outline();
+ poutline->clear_path();
+ if (outline.getType() == Outline::Type::Empty) {
+ poutline->set_type(proto::Outline_Type_Empty);
+ } else if (outline.getType() == Outline::Type::ConvexPath) {
+ poutline->set_type(proto::Outline_Type_ConvexPath);
+ if (const SkPath* path = outline.getPath()) {
+ set(poutline->mutable_path(), *path);
+ }
+ } else if (outline.getType() == Outline::Type::RoundRect) {
+ poutline->set_type(proto::Outline_Type_RoundRect);
+ } else {
+ ALOGW("Uknown outline type! %d", static_cast<int>(outline.getType()));
+ poutline->set_type(proto::Outline_Type_None);
+ }
+ poutline->set_should_clip(outline.getShouldClip());
+ poutline->set_alpha(outline.getAlpha());
+ poutline->set_radius(outline.getRadius());
+ set(poutline->mutable_bounds(), outline.getBounds());
+ } else {
+ pprops->clear_outline();
+ }
+
+ const RevealClip& revealClip = properties().getRevealClip();
+ if (revealClip.willClip()) {
+ proto::RevealClip* prevealClip = pprops->mutable_reveal_clip();
+ prevealClip->set_x(revealClip.getX());
+ prevealClip->set_y(revealClip.getY());
+ prevealClip->set_radius(revealClip.getRadius());
+ } else {
+ pprops->clear_reveal_clip();
+ }
+
+ pnode->clear_children();
+ if (mDisplayListData) {
+ for (auto&& child : mDisplayListData->children()) {
+ child->mRenderNode->copyTo(pnode->add_children());
+ }
+ }
+}
+
int RenderNode::getDebugSize() {
int size = sizeof(RenderNode);
if (mStagingDisplayListData) {
diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h
index 3bff2b3..88fc608 100644
--- a/libs/hwui/RenderNode.h
+++ b/libs/hwui/RenderNode.h
@@ -57,6 +57,10 @@
class DrawRenderNodeOp;
class TreeInfo;
+namespace proto {
+class RenderNode;
+}
+
/**
* Primary class for storing recorded canvas commands, as well as per-View/ViewGroup display properties.
*
@@ -96,7 +100,6 @@
kReplayFlag_ClipChildren = 0x1
};
- static void outputLogBuffer(int fd);
void debugDumpLayers(const char* prefix);
ANDROID_API void setStagingDisplayList(DisplayListData* newData);
@@ -108,6 +111,7 @@
ANDROID_API void output(uint32_t level = 1);
ANDROID_API int getDebugSize();
+ void copyTo(proto::RenderNode* node);
bool isRenderable() const {
return mDisplayListData && !mDisplayListData->isEmpty();
diff --git a/libs/hwui/RenderProperties.cpp b/libs/hwui/RenderProperties.cpp
index a9ae9b5..ad74bff 100644
--- a/libs/hwui/RenderProperties.cpp
+++ b/libs/hwui/RenderProperties.cpp
@@ -70,23 +70,6 @@
return *this;
}
-RenderProperties::PrimitiveFields::PrimitiveFields()
- : mClippingFlags(CLIP_TO_BOUNDS)
- , mProjectBackwards(false)
- , mProjectionReceiver(false)
- , mAlpha(1)
- , mHasOverlappingRendering(true)
- , mElevation(0)
- , mTranslationX(0), mTranslationY(0), mTranslationZ(0)
- , mRotation(0), mRotationX(0), mRotationY(0)
- , mScaleX(1), mScaleY(1)
- , mPivotX(0), mPivotY(0)
- , mLeft(0), mTop(0), mRight(0), mBottom(0)
- , mWidth(0), mHeight(0)
- , mPivotExplicitlySet(false)
- , mMatrixOrPivotDirty(false) {
-}
-
RenderProperties::ComputedFields::ComputedFields()
: mTransformMatrix(nullptr) {
}
diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h
index 11abd70..71589c8 100644
--- a/libs/hwui/RenderProperties.h
+++ b/libs/hwui/RenderProperties.h
@@ -417,7 +417,7 @@
return false;
}
- float getLeft() const {
+ int getLeft() const {
return mPrimitiveFields.mLeft;
}
@@ -432,7 +432,7 @@
return false;
}
- float getTop() const {
+ int getTop() const {
return mPrimitiveFields.mTop;
}
@@ -447,7 +447,7 @@
return false;
}
- float getRight() const {
+ int getRight() const {
return mPrimitiveFields.mRight;
}
@@ -462,7 +462,7 @@
return false;
}
- float getBottom() const {
+ int getBottom() const {
return mPrimitiveFields.mBottom;
}
@@ -541,6 +541,10 @@
return mPrimitiveFields.mClippingFlags & CLIP_TO_BOUNDS;
}
+ const Rect& getClipBounds() const {
+ return mPrimitiveFields.mClipBounds;
+ }
+
void getClippingRectForFlags(uint32_t flags, Rect* outRect) const {
if (flags & CLIP_TO_BOUNDS) {
outRect->set(0, 0, getWidth(), getHeight());
@@ -621,25 +625,23 @@
private:
// Rendering properties
struct PrimitiveFields {
- PrimitiveFields();
-
+ int mLeft = 0, mTop = 0, mRight = 0, mBottom = 0;
+ int mWidth = 0, mHeight = 0;
+ int mClippingFlags = CLIP_TO_BOUNDS;
+ float mAlpha = 1;
+ float mTranslationX = 0, mTranslationY = 0, mTranslationZ = 0;
+ float mElevation = 0;
+ float mRotation = 0, mRotationX = 0, mRotationY = 0;
+ float mScaleX = 1, mScaleY = 1;
+ float mPivotX = 0, mPivotY = 0;
+ bool mHasOverlappingRendering = false;
+ bool mPivotExplicitlySet = false;
+ bool mMatrixOrPivotDirty = false;
+ bool mProjectBackwards = false;
+ bool mProjectionReceiver = false;
+ Rect mClipBounds;
Outline mOutline;
RevealClip mRevealClip;
- int mClippingFlags;
- bool mProjectBackwards;
- bool mProjectionReceiver;
- float mAlpha;
- bool mHasOverlappingRendering;
- float mElevation;
- float mTranslationX, mTranslationY, mTranslationZ;
- float mRotation, mRotationX, mRotationY;
- float mScaleX, mScaleY;
- float mPivotX, mPivotY;
- int mLeft, mTop, mRight, mBottom;
- int mWidth, mHeight;
- bool mPivotExplicitlySet;
- bool mMatrixOrPivotDirty;
- Rect mClipBounds;
} mPrimitiveFields;
SkMatrix* mStaticMatrix;
diff --git a/libs/hwui/RevealClip.h b/libs/hwui/RevealClip.h
index 0084a8e..63821dd 100644
--- a/libs/hwui/RevealClip.h
+++ b/libs/hwui/RevealClip.h
@@ -51,7 +51,10 @@
outBounds->set(mX - mRadius, mY - mRadius,
mX + mRadius, mY + mRadius);
}
+
float getRadius() const { return mRadius; }
+ float getX() const { return mX; }
+ float getY() const { return mY; }
const SkPath* getPath() const {
if (!mShouldClip) return nullptr;
diff --git a/libs/hwui/protos/ProtoHelpers.h b/libs/hwui/protos/ProtoHelpers.h
new file mode 100644
index 0000000..832e312
--- /dev/null
+++ b/libs/hwui/protos/ProtoHelpers.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef PROTOHELPERS_H
+#define PROTOHELPERS_H
+
+#include "Rect.h"
+#include "protos/hwui.pb.h"
+
+namespace android {
+namespace uirenderer {
+
+void set(proto::RectF* dest, const Rect& src) {
+ dest->set_left(src.left);
+ dest->set_top(src.top);
+ dest->set_right(src.right);
+ dest->set_bottom(src.bottom);
+}
+
+void set(std::string* dest, const SkPath& src) {
+ size_t size = src.writeToMemory(nullptr);
+ dest->resize(size);
+ src.writeToMemory(&*dest->begin());
+}
+
+} // namespace uirenderer
+} // namespace android
+
+#endif // PROTOHELPERS_H
diff --git a/libs/hwui/protos/hwui.proto b/libs/hwui/protos/hwui.proto
new file mode 100644
index 0000000..dcff80a
--- /dev/null
+++ b/libs/hwui/protos/hwui.proto
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+syntax = "proto2";
+
+package android.uirenderer.proto;
+
+option optimize_for = LITE_RUNTIME;
+
+message RenderNode {
+ required uint64 id = 1;
+ required string name = 2;
+ required RenderProperties properties = 3;
+ optional DisplayList display_list = 4;
+ repeated RenderNode children = 5;
+};
+
+message RenderProperties {
+ required int32 left = 1;
+ required int32 right = 2;
+ required int32 top = 3;
+ required int32 bottom = 4;
+ required int32 clip_flags = 5;
+ required float alpha = 6;
+ required float translation_x = 7;
+ required float translation_y = 8;
+ required float translation_z = 9;
+ required float elevation = 10;
+ required float rotation = 11;
+ required float rotation_x = 12;
+ required float rotation_y = 13;
+ required float scale_x = 14;
+ required float scale_y = 15;
+ required float pivot_x = 16;
+ required float pivot_y = 17;
+ required bool has_overlapping_rendering = 18;
+ required bool pivot_explicitly_set = 19;
+ required bool project_backwards = 20;
+ required bool projection_receiver = 21;
+ required RectF clip_bounds = 22;
+ optional Outline outline = 23;
+ optional RevealClip reveal_clip = 24;
+};
+
+message RectF {
+ required float left = 1;
+ required float right = 2;
+ required float top = 3;
+ required float bottom = 4;
+}
+
+message Outline {
+ required bool should_clip = 1;
+ enum Type {
+ None = 0;
+ Empty = 1;
+ ConvexPath = 2;
+ RoundRect = 3;
+ }
+ required Type type = 2;
+ required RectF bounds = 3;
+ required float radius = 4;
+ required float alpha = 5;
+ optional bytes path = 6;
+}
+
+message RevealClip {
+ required float x = 1;
+ required float y = 2;
+ required float radius = 3;
+}
+
+message DisplayList {
+ optional int32 projection_receive_index = 1;
+ repeated DrawOp draw_ops = 2;
+}
+
+message DrawOp {
+ oneof drawop {
+ DrawOp_RenderNode render_node = 1;
+ }
+}
+
+message DrawOp_RenderNode {
+ optional RenderNode node = 1;
+}
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 7cb7738..1673802 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -26,15 +26,22 @@
#include "RenderThread.h"
#include "renderstate/RenderState.h"
#include "renderstate/Stencil.h"
+#include "protos/hwui.pb.h"
+
+#include <cutils/properties.h>
+#include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <private/hwui/DrawGlInfo.h>
+#include <strings.h>
#include <algorithm>
-#include <strings.h>
-#include <cutils/properties.h>
-#include <private/hwui/DrawGlInfo.h>
+#include <fcntl.h>
+#include <sys/stat.h>
#define TRIM_MEMORY_COMPLETE 80
#define TRIM_MEMORY_UI_HIDDEN 20
+#define ENABLE_RENDERNODE_SERIALIZATION false
+
#define LOG_FRAMETIME_MMA 0
#if LOG_FRAMETIME_MMA
@@ -480,6 +487,40 @@
mRenderThread.jankTracker().reset();
}
+void CanvasContext::serializeDisplayListTree() {
+#if ENABLE_RENDERNODE_SERIALIZATION
+ using namespace google::protobuf::io;
+ char package[128];
+ // Check whether tracing is enabled for this process.
+ FILE * file = fopen("/proc/self/cmdline", "r");
+ if (file) {
+ if (!fgets(package, 128, file)) {
+ ALOGE("Error reading cmdline: %s (%d)", strerror(errno), errno);
+ fclose(file);
+ return;
+ }
+ fclose(file);
+ } else {
+ ALOGE("Error opening /proc/self/cmdline: %s (%d)", strerror(errno),
+ errno);
+ return;
+ }
+ char path[1024];
+ snprintf(path, 1024, "/data/data/%s/cache/rendertree_dump", package);
+ int fd = open(path, O_CREAT | O_WRONLY, S_IRWXU | S_IRGRP | S_IROTH);
+ if (fd == -1) {
+ ALOGD("Failed to open '%s'", path);
+ return;
+ }
+ proto::RenderNode tree;
+ // TODO: Streaming writes?
+ mRootRenderNode->copyTo(&tree);
+ std::string data = tree.SerializeAsString();
+ write(fd, data.c_str(), data.length());
+ close(fd);
+#endif
+}
+
} /* namespace renderthread */
} /* namespace uirenderer */
} /* namespace android */
diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h
index 0ceb9f1..6a79320 100644
--- a/libs/hwui/renderthread/CanvasContext.h
+++ b/libs/hwui/renderthread/CanvasContext.h
@@ -111,6 +111,8 @@
void setName(const std::string&& name) { mName = name; }
const std::string& name() { return mName; }
+ void serializeDisplayListTree();
+
private:
friend class RegisterFrameCallbackTask;
// TODO: Replace with something better for layer & other GL object
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index a3a0163..b838811 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -490,6 +490,17 @@
post(task);
}
+CREATE_BRIDGE1(serializeDisplayListTree, CanvasContext* context) {
+ args->context->serializeDisplayListTree();
+ return nullptr;
+}
+
+void RenderProxy::serializeDisplayListTree() {
+ SETUP_TASK(serializeDisplayListTree);
+ args->context = mContext;
+ post(task);
+}
+
void RenderProxy::post(RenderTask* task) {
mRenderThread.queue(task);
}
diff --git a/libs/hwui/renderthread/RenderProxy.h b/libs/hwui/renderthread/RenderProxy.h
index 0d2c7be..e7356db 100644
--- a/libs/hwui/renderthread/RenderProxy.h
+++ b/libs/hwui/renderthread/RenderProxy.h
@@ -104,6 +104,8 @@
ANDROID_API void setTextureAtlas(const sp<GraphicBuffer>& buffer, int64_t* map, size_t size);
ANDROID_API void setProcessStatsBuffer(int fd);
+ ANDROID_API void serializeDisplayListTree();
+
private:
RenderThread& mRenderThread;
CanvasContext* mContext;
diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp
index 483fb35..0bbf08c 100644
--- a/libs/hwui/tests/main.cpp
+++ b/libs/hwui/tests/main.cpp
@@ -26,6 +26,8 @@
#include "TestContext.h"
+#include "protos/hwui.pb.h"
+
#include <stdio.h>
#include <unistd.h>
diff --git a/media/java/android/mtp/MtpDevice.java b/media/java/android/mtp/MtpDevice.java
index fbe047d..3cd157e 100644
--- a/media/java/android/mtp/MtpDevice.java
+++ b/media/java/android/mtp/MtpDevice.java
@@ -257,11 +257,12 @@
* on completion, and must be done by the caller.
*
* @param objectHandle handle of the target file
+ * @param size size of the file in bytes
* @param descriptor file descriptor to read the data from.
* @return true if the file transfer succeeds
*/
- public boolean sendObject(int objectHandle, ParcelFileDescriptor descriptor) {
- return native_send_object(objectHandle, descriptor.getFd());
+ public boolean sendObject(int objectHandle, int size, ParcelFileDescriptor descriptor) {
+ return native_send_object(objectHandle, size, descriptor.getFd());
}
/**
@@ -294,6 +295,6 @@
private native long native_get_storage_id(int objectHandle);
private native boolean native_import_file(int objectHandle, String destPath);
private native boolean native_import_file(int objectHandle, int fd);
- private native boolean native_send_object(int objectHandle, int fd);
+ private native boolean native_send_object(int objectHandle, int size, int fd);
private native MtpObjectInfo native_send_object_info(MtpObjectInfo info);
}
diff --git a/media/java/android/mtp/MtpObjectInfo.java b/media/java/android/mtp/MtpObjectInfo.java
index f79d52e..a080c73 100644
--- a/media/java/android/mtp/MtpObjectInfo.java
+++ b/media/java/android/mtp/MtpObjectInfo.java
@@ -273,25 +273,25 @@
public Builder(MtpObjectInfo objectInfo) {
mObjectInfo = new MtpObjectInfo();
mObjectInfo.mHandle = -1;
- mObjectInfo.mAssociationDesc = mObjectInfo.mAssociationDesc;
- mObjectInfo.mAssociationType = mObjectInfo.mAssociationType;
- mObjectInfo.mCompressedSize = mObjectInfo.mCompressedSize;
- mObjectInfo.mDateCreated = mObjectInfo.mDateCreated;
- mObjectInfo.mDateModified = mObjectInfo.mDateModified;
- mObjectInfo.mFormat = mObjectInfo.mFormat;
- mObjectInfo.mImagePixDepth = mObjectInfo.mImagePixDepth;
- mObjectInfo.mImagePixHeight = mObjectInfo.mImagePixHeight;
- mObjectInfo.mImagePixWidth = mObjectInfo.mImagePixWidth;
- mObjectInfo.mKeywords = mObjectInfo.mKeywords;
- mObjectInfo.mName = mObjectInfo.mName;
- mObjectInfo.mParent = mObjectInfo.mParent;
- mObjectInfo.mProtectionStatus = mObjectInfo.mProtectionStatus;
- mObjectInfo.mSequenceNumber = mObjectInfo.mSequenceNumber;
- mObjectInfo.mStorageId = mObjectInfo.mStorageId;
- mObjectInfo.mThumbCompressedSize = mObjectInfo.mThumbCompressedSize;
- mObjectInfo.mThumbFormat = mObjectInfo.mThumbFormat;
- mObjectInfo.mThumbPixHeight = mObjectInfo.mThumbPixHeight;
- mObjectInfo.mThumbPixWidth = mObjectInfo.mThumbPixWidth;
+ mObjectInfo.mAssociationDesc = objectInfo.mAssociationDesc;
+ mObjectInfo.mAssociationType = objectInfo.mAssociationType;
+ mObjectInfo.mCompressedSize = objectInfo.mCompressedSize;
+ mObjectInfo.mDateCreated = objectInfo.mDateCreated;
+ mObjectInfo.mDateModified = objectInfo.mDateModified;
+ mObjectInfo.mFormat = objectInfo.mFormat;
+ mObjectInfo.mImagePixDepth = objectInfo.mImagePixDepth;
+ mObjectInfo.mImagePixHeight = objectInfo.mImagePixHeight;
+ mObjectInfo.mImagePixWidth = objectInfo.mImagePixWidth;
+ mObjectInfo.mKeywords = objectInfo.mKeywords;
+ mObjectInfo.mName = objectInfo.mName;
+ mObjectInfo.mParent = objectInfo.mParent;
+ mObjectInfo.mProtectionStatus = objectInfo.mProtectionStatus;
+ mObjectInfo.mSequenceNumber = objectInfo.mSequenceNumber;
+ mObjectInfo.mStorageId = objectInfo.mStorageId;
+ mObjectInfo.mThumbCompressedSize = objectInfo.mThumbCompressedSize;
+ mObjectInfo.mThumbFormat = objectInfo.mThumbFormat;
+ mObjectInfo.mThumbPixHeight = objectInfo.mThumbPixHeight;
+ mObjectInfo.mThumbPixWidth = objectInfo.mThumbPixWidth;
}
public Builder setAssociationDesc(int value) {
diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp
index 9dd3861..2a46ee7 100644
--- a/media/jni/android_mtp_MtpDevice.cpp
+++ b/media/jni/android_mtp_MtpDevice.cpp
@@ -412,18 +412,13 @@
}
static jboolean
-android_mtp_MtpDevice_send_object(JNIEnv *env, jobject thiz, jint object_id, jint fd)
+android_mtp_MtpDevice_send_object(JNIEnv *env, jobject thiz, jint object_id, jint size, jint fd)
{
MtpDevice* device = get_device_from_object(env, thiz);
if (!device)
return JNI_FALSE;
- MtpObjectInfo* object_info = device->getObjectInfo(object_id);
- if (!object_info)
- return JNI_FALSE;
- bool result = device->sendObject(object_info, fd);
- delete object_info;
- return result;
+ return device->sendObject(object_id, size, fd);
}
static jobject
@@ -516,7 +511,7 @@
{"native_import_file", "(ILjava/lang/String;)Z",
(void *)android_mtp_MtpDevice_import_file},
{"native_import_file", "(II)Z",(void *)android_mtp_MtpDevice_import_file_to_fd},
- {"native_send_object", "(II)Z",(void *)android_mtp_MtpDevice_send_object},
+ {"native_send_object", "(III)Z",(void *)android_mtp_MtpDevice_send_object},
{"native_send_object_info", "(Landroid/mtp/MtpObjectInfo;)Landroid/mtp/MtpObjectInfo;",
(void *)android_mtp_MtpDevice_send_object_info}
};
diff --git a/packages/BackupRestoreConfirmation/res/values-it/strings.xml b/packages/BackupRestoreConfirmation/res/values-it/strings.xml
index 2325d40..b84edbc 100644
--- a/packages/BackupRestoreConfirmation/res/values-it/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-it/strings.xml
@@ -29,7 +29,7 @@
<string name="device_encryption_backup_text" msgid="5866590762672844664">"Inserisci la tua password di crittografia dispositivo di seguito. Verrà utilizzata anche per crittografare l\'archivio di backup."</string>
<string name="backup_enc_password_text" msgid="4981585714795233099">"Inserisci una password da utilizzare per la crittografia dei dati di backup completi. Se non ne inserisci una, verrà utilizzata la tua password di backup corrente:"</string>
<string name="backup_enc_password_optional" msgid="1350137345907579306">"Se desideri crittografare tutti i dati di backup, inserisci una password qui di seguito:"</string>
- <string name="backup_enc_password_required" msgid="7889652203371654149">"Il dispositivo è crittografato, pertanto devi crittografare il backup. Inserisci una password di seguito:"</string>
+ <string name="backup_enc_password_required" msgid="7889652203371654149">"Il dispositivo è criptato, quindi devi criptare il backup. Inserisci una password di seguito:"</string>
<string name="restore_enc_password_text" msgid="6140898525580710823">"Se i dati di ripristino sono crittografati, inserisci la password qui di seguito:"</string>
<string name="toast_backup_started" msgid="550354281452756121">"Avvio del backup..."</string>
<string name="toast_backup_ended" msgid="3818080769548726424">"Backup terminato"</string>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BandSelectManager.java b/packages/DocumentsUI/src/com/android/documentsui/BandSelectManager.java
deleted file mode 100644
index 74170f5..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/BandSelectManager.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (C) 2015 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.documentsui;
-
-import static com.android.documentsui.Events.isMouseEvent;
-import static com.android.internal.util.Preconditions.checkState;
-
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.util.Log;
-import android.util.SparseBooleanArray;
-import android.view.MotionEvent;
-import android.view.View;
-
-/**
- * Provides mouse driven band-select support when used in conjuction with {@link RecyclerView} and
- * {@link MultiSelectManager}. This class is responsible for rendering the band select overlay and
- * selecting overlaid items via MultiSelectManager.
- */
-public class BandSelectManager extends RecyclerView.SimpleOnItemTouchListener {
-
- private static final int NOT_SELECTED = -1;
- private static final int NOT_SET = -1;
-
- // For debugging purposes.
- private static final String TAG = "BandSelectManager";
- private static final boolean DEBUG = false;
-
- private final RecyclerView mRecyclerView;
- private final MultiSelectManager mSelectManager;
- private final Drawable mRegionSelectorDrawable;
- private final SparseBooleanArray mSelectedByBand = new SparseBooleanArray();
-
- private boolean mIsBandSelectActive = false;
- private Point mOrigin;
- private Point mPointer;
- private Rect mBounds;
-
- // Maintain the last selection made by band, so if bounds shrink back, we can deselect
- // the respective items.
- private int mCursorDeltaY = 0;
- private int mFirstSelected = NOT_SELECTED;
-
- // The time at which the current band selection-induced scroll began. If no scroll is in
- // progress, the value is NOT_SET.
- private long mScrollStartTime = NOT_SET;
- private final Runnable mScrollRunnable = new Runnable() {
- /**
- * The number of milliseconds of scrolling at which scroll speed continues to increase. At
- * first, the scroll starts slowly; then, the rate of scrolling increases until it reaches
- * its maximum value at after this many milliseconds.
- */
- private static final long SCROLL_ACCELERATION_LIMIT_TIME_MS = 2000;
-
- @Override
- public void run() {
- // Compute the number of pixels the pointer's y-coordinate is past the view. Negative
- // values mean the pointer is at or before the top of the view, and positive values mean
- // that the pointer is at or after the bottom of the view. Note that one additional
- // pixel is added here so that the view still scrolls when the pointer is exactly at the
- // top or bottom.
- int pixelsPastView = 0;
- if (mPointer.y <= 0) {
- pixelsPastView = mPointer.y - 1;
- } else if (mPointer.y >= mRecyclerView.getHeight() - 1) {
- pixelsPastView = mPointer.y - mRecyclerView.getHeight() + 1;
- }
-
- if (!mIsBandSelectActive || pixelsPastView == 0) {
- // If band selection is inactive, or if it is active but not at the edge of the
- // view, no scrolling is necessary.
- mScrollStartTime = NOT_SET;
- return;
- }
-
- if (mScrollStartTime == NOT_SET) {
- // If the pointer was previously not at the edge of the view but now is, set the
- // start time for the scroll.
- mScrollStartTime = System.currentTimeMillis();
- }
-
- // Compute the number of pixels to scroll, and scroll that many pixels.
- final int numPixels = computeNumPixelsToScroll(
- pixelsPastView, System.currentTimeMillis() - mScrollStartTime);
- mRecyclerView.scrollBy(0, numPixels);
-
- // Adjust the y-coordinate of the origin the opposite number of pixels so that the
- // origin remains in the same place relative to the view's items.
- mOrigin.y -= numPixels;
- resizeBandSelectRectangle();
-
- mRecyclerView.removeCallbacks(mScrollRunnable);
- mRecyclerView.postOnAnimation(this);
- }
-
- /**
- * Computes the number of pixels to scroll based on how far the pointer is past the end of
- * the view and how long it has been there. Roughly based on ItemTouchHelper's algorithm for
- * computing the number of pixels to scroll when an item is dragged to the end of a
- * {@link RecyclerView}.
- * @param pixelsPastView
- * @param scrollDuration
- * @return
- */
- private int computeNumPixelsToScroll(int pixelsPastView, long scrollDuration) {
- final int maxScrollStep = computeMaxScrollStep(mRecyclerView);
- final int direction = (int) Math.signum(pixelsPastView);
- final int absPastView = Math.abs(pixelsPastView);
-
- // Calculate the ratio of how far out of the view the pointer currently resides to the
- // entire height of the view.
- final float outOfBoundsRatio = Math.min(
- 1.0f, (float) absPastView / mRecyclerView.getHeight());
- // Interpolate this ratio and use it to compute the maximum scroll that should be
- // possible for this step.
- final float cappedScrollStep =
- direction * maxScrollStep * smoothOutOfBoundsRatio(outOfBoundsRatio);
-
- // Likewise, calculate the ratio of the time spent in the scroll to the limit.
- final float timeRatio = Math.min(
- 1.0f, (float) scrollDuration / SCROLL_ACCELERATION_LIMIT_TIME_MS);
- // Interpolate this ratio and use it to compute the final number of pixels to scroll.
- final int numPixels = (int) (cappedScrollStep * smoothTimeRatio(timeRatio));
-
- // If the final number of pixels to scroll ends up being 0, the view should still scroll
- // at least one pixel.
- return numPixels != 0 ? numPixels : direction;
- }
-
- /**
- * Computes the maximum scroll allowed for a given animation frame. Currently, this
- * defaults to the height of the view, but this could be tweaked if this results in scrolls
- * that are too fast or too slow.
- * @param rv
- * @return
- */
- private int computeMaxScrollStep(RecyclerView rv) {
- return rv.getHeight();
- }
-
- /**
- * Interpolates the given out of bounds ratio on a curve which starts at (0,0) and ends at
- * (1,1) and quickly approaches 1 near the start of that interval. This ensures that drags
- * that are at the edge or barely past the edge of the view still cause sufficient
- * scrolling. The equation y=(x-1)^5+1 is used, but this could also be tweaked if needed.
- * @param ratio A ratio which is in the range [0, 1].
- * @return A "smoothed" value, also in the range [0, 1].
- */
- private float smoothOutOfBoundsRatio(float ratio) {
- return (float) Math.pow(ratio - 1.0f, 5) + 1.0f;
- }
-
- /**
- * Interpolates the given time ratio on a curve which starts at (0,0) and ends at (1,1) and
- * stays close to 0 for most input values except those very close to 1. This ensures that
- * scrolls start out very slowly but speed up drastically after the scroll has been in
- * progress close to SCROLL_ACCELERATION_LIMIT_TIME_MS. The equation y=x^5 is used, but this
- * could also be tweaked if needed.
- * @param ratio A ratio which is in the range [0, 1].
- * @return A "smoothed" value, also in the range [0, 1].
- */
- private float smoothTimeRatio(float ratio) {
- return (float) Math.pow(ratio, 5);
- }
- };
-
- /**
- * @param recyclerView
- * @param multiSelectManager
- */
- public BandSelectManager(RecyclerView recyclerView, MultiSelectManager multiSelectManager) {
- mRecyclerView = recyclerView;
- mSelectManager = multiSelectManager;
- mRegionSelectorDrawable =
- mRecyclerView.getContext().getTheme().getDrawable(R.drawable.band_select_overlay);
-
- mRecyclerView.addOnItemTouchListener(this);
- }
-
- @Override
- public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
- // Only intercept the event if it was triggered by a mouse. If band select is inactive,
- // do not intercept ACTION_UP events as they will not be processed.
- return isMouseEvent(e) &&
- (mIsBandSelectActive || e.getActionMasked() != MotionEvent.ACTION_UP);
- }
-
- @Override
- public void onTouchEvent(RecyclerView rv, MotionEvent e) {
- checkState(isMouseEvent(e));
- processMotionEvent(e);
- }
-
- /**
- * Processes a MotionEvent by starting, ending, or resizing the band select overlay.
- * @param e
- */
- private void processMotionEvent(MotionEvent e) {
- if (mIsBandSelectActive && e.getActionMasked() == MotionEvent.ACTION_UP) {
- endBandSelect();
- return;
- }
-
- mPointer = new Point((int) e.getX(), (int) e.getY());
- if (!mIsBandSelectActive) {
- startBandSelect();
- }
-
- scrollViewIfNecessary();
- resizeBandSelectRectangle();
- selectChildrenCoveredBySelection();
- }
-
- /**
- * Starts band select by adding the drawable to the RecyclerView's overlay.
- */
- private void startBandSelect() {
- if (DEBUG) Log.d(TAG, "Starting band select from (" + mPointer.x + "," + mPointer.y + ").");
- mIsBandSelectActive = true;
- mOrigin = mPointer;
- mRecyclerView.getOverlay().add(mRegionSelectorDrawable);
- }
-
- /**
- * Scrolls the view if necessary.
- */
- private void scrollViewIfNecessary() {
- mRecyclerView.removeCallbacks(mScrollRunnable);
- mScrollRunnable.run();
- mRecyclerView.invalidate();
- }
-
- /**
- * Resizes the band select rectangle by using the origin and the current pointer positoin as
- * two opposite corners of the selection.
- */
- private void resizeBandSelectRectangle() {
- if (mBounds != null) {
- mCursorDeltaY = mPointer.y - mBounds.bottom;
- }
-
- mBounds = new Rect(Math.min(mOrigin.x, mPointer.x),
- Math.min(mOrigin.y, mPointer.y),
- Math.max(mOrigin.x, mPointer.x),
- Math.max(mOrigin.y, mPointer.y));
-
- mRegionSelectorDrawable.setBounds(mBounds);
- }
-
- /**
- * Selects the children covered by the band select overlay by delegating to MultiSelectManager.
- * TODO: Provide a finished implementation. This is down and dirty, proof of concept code.
- * Final optimized implementation, with support for managing offscreen selection to come.
- */
- private void selectChildrenCoveredBySelection() {
-
- // track top and bottom selections. Details on why this is useful below.
- int first = NOT_SELECTED;
- int last = NOT_SELECTED;
-
- for (int i = 0; i < mRecyclerView.getChildCount(); i++) {
-
- View child = mRecyclerView.getChildAt(i);
- ViewHolder holder = mRecyclerView.getChildViewHolder(child);
- Rect childRect = new Rect();
- child.getHitRect(childRect);
-
- boolean shouldSelect = Rect.intersects(childRect, mBounds);
- int position = holder.getAdapterPosition();
-
- // This also allows us to clear the selection of elements
- // that only temporarily entered the bounds of the band.
- if (mSelectedByBand.get(position) && !shouldSelect) {
- mSelectManager.setItemSelected(position, false);
- mSelectedByBand.delete(position);
- }
-
- // We need to keep track of the first and last items selected.
- // We'll use this information along with cursor direction
- // to determine the starting point of the selection.
- // We provide this information to selection manager
- // to enable more natural user interaction when working
- // with Shift+Click and multiple contiguous selection ranges.
- if (shouldSelect) {
- if (first == NOT_SELECTED) {
- first = position;
- } else {
- last = position;
- }
- mSelectManager.setItemSelected(position, true);
- mSelectedByBand.put(position, true);
- }
- }
-
- // Remember which is the last selected item, so we can
- // share that with selection manager when band select ends.
- // It'll use that as it's begin selection point when
- // user SHIFT+Clicks.
- if (mCursorDeltaY < 0 && last != NOT_SELECTED) {
- mFirstSelected = last;
- } else if (mCursorDeltaY > 0 && first != NOT_SELECTED) {
- mFirstSelected = first;
- }
- }
-
- /**
- * Ends band select by removing the overlay.
- */
- private void endBandSelect() {
- if (DEBUG) Log.d(TAG, "Ending band select.");
- mIsBandSelectActive = false;
- mSelectedByBand.clear();
- mRecyclerView.getOverlay().remove(mRegionSelectorDrawable);
- if (mFirstSelected != NOT_SELECTED) {
- mSelectManager.setSelectionFocusBegin(mFirstSelected);
- }
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BandSelectMatrix.java b/packages/DocumentsUI/src/com/android/documentsui/BandSelectMatrix.java
deleted file mode 100644
index f259059..0000000
--- a/packages/DocumentsUI/src/com/android/documentsui/BandSelectMatrix.java
+++ /dev/null
@@ -1,645 +0,0 @@
-/*
- * 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.documentsui;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.base.Preconditions;
-
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.LayoutManager;
-import android.support.v7.widget.RecyclerView.OnScrollListener;
-import android.util.SparseBooleanArray;
-import android.view.View;
-
-/**
- * Provides a band selection item model for views within a RecyclerView. This class queries the
- * RecyclerView to determine where its items are placed; then, once band selection is underway, it
- * alerts listeners of which items are covered by the selections.
- */
-public final class BandSelectMatrix extends RecyclerView.OnScrollListener {
-
- private final RecyclerViewHelper mHelper;
- private final List<OnSelectionChangedListener> mOnSelectionChangedListeners = new ArrayList<>();
-
- // Map from the x-value of the left side of an item to an ordered list of metadata of all items
- // whose x-values are the same. The list is ordered by the y-values of the items in the column.
- // For example, if the first column of the view starts at an x-value of 5, mColumns.get(5) would
- // return a list of all items in that column, with the top-most item first in the list and the
- // bottom-most item last in the list.
- private final Map<Integer, List<ItemData>> mColumns = new HashMap<>();
-
- // List of limits along the x-axis. For example, if the view has two columns, this list will
- // have two elements, each of which lists the lower- and upper-limits of the x-values of the
- // view items. This list is sorted from furthest left to furthest right.
- private final List<Limits> mXLimitsList = new ArrayList<>();
-
- // Like mXLimitsList, but for y-coordinates. Note that this list only contains items which have
- // been in the viewport. Thus, limits which exist in an area of the view to which the view has
- // not scrolled are not present in the list.
- private final List<Limits> mYLimitsList = new ArrayList<>();
-
- // The adapter positions which have been recorded so far.
- private final SparseBooleanArray mRecordedPositions = new SparseBooleanArray();
-
- // Array passed to registered OnSelectionChangedListeners. One array is created and reused
- // throughout the lifetime of the object.
- private final SparseBooleanArray mSelectionForListeners = new SparseBooleanArray();
-
- // The current pointer (in absolute positioning from the top of the view).
- private Point mPointer = null;
-
- // The bounds of the band selection.
- private RelativePoint mRelativeOrigin;
- private RelativePoint mRelativePointer;
-
- BandSelectMatrix(RecyclerViewHelper helper) {
- mHelper = helper;
- mHelper.addOnScrollListener(this);
- }
-
- BandSelectMatrix(RecyclerView rv) {
- this(new RuntimeRecyclerViewHelper(rv));
- }
-
- /**
- * Stops listening to the view's scrolls. Call this function before discarding a
- * BandSelecMatrix object to prevent memory leaks.
- */
- void stopListening() {
- mHelper.removeOnScrollListener(this);
- }
-
- /**
- * Start a band select operation at the given point.
- * @param relativeOrigin The origin of the band select operation, relative to the viewport.
- * For example, if the view is scrolled to the bottom, the top-left of the viewport would
- * have a relative origin of (0, 0), even though its absolute point has a higher y-value.
- */
- void startSelection(Point relativeOrigin) {
- Point absoluteOrigin = mHelper.createAbsolutePoint(relativeOrigin);
- mPointer = new Point(absoluteOrigin.x, absoluteOrigin.y);
-
- processVisibleChildren();
- mRelativeOrigin = new RelativePoint(absoluteOrigin);
- mRelativePointer = new RelativePoint(mPointer);
- computeCurrentSelection();
- notifyListeners();
- }
-
- /**
- * Resizes the selection by adjusting the pointer (i.e., the corner of the selection opposite
- * the origin.
- * @param relativePointer The pointer (opposite of the origin) of the band select operation,
- * relative to the viewport. For example, if the view is scrolled to the bottom, the
- * top-left of the viewport would have a relative origin of (0, 0), even though its absolute
- * point has a higher y-value.
- */
- void resizeSelection(Point relativePointer) {
- mPointer = mHelper.createAbsolutePoint(relativePointer);
- handlePointerMoved();
- }
-
- @Override
- public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
- if (mPointer == null) {
- return;
- }
-
- mPointer.x += dx;
- mPointer.y += dy;
- processVisibleChildren();
- handlePointerMoved();
- }
-
- /**
- * Queries the view for all children and records their location metadata.
- */
- private void processVisibleChildren() {
- for (int i = 0; i < mHelper.getVisibleChildCount(); i++) {
- int adapterPosition = mHelper.getAdapterPositionAt(i);
- if (!mRecordedPositions.get(adapterPosition)) {
- mRecordedPositions.put(adapterPosition, true);
- captureItemLayoutData(mHelper.getAbsoluteRectForChildViewAt(i), adapterPosition);
- }
- }
- }
-
- /**
- * Updates the limits lists and column map with the given item metadata.
- * @param absoluteChildRect The absolute rectangle for the child view being processed.
- * @param adapterPosition The position of the child view being processed.
- */
- private void captureItemLayoutData(Rect absoluteChildRect, int adapterPosition) {
- if (mXLimitsList.size() != mHelper.getNumColumns()) {
- // If not all x-limits have been recorded, record this one.
- recordLimits(
- mXLimitsList, new Limits(absoluteChildRect.left, absoluteChildRect.right));
- }
-
- if (mYLimitsList.size() != mHelper.getNumRows()) {
- // If not all y-limits have been recorded, record this one.
- recordLimits(
- mYLimitsList, new Limits(absoluteChildRect.top, absoluteChildRect.bottom));
- }
-
- List<ItemData> columnList = mColumns.get(absoluteChildRect.left);
- if (columnList == null) {
- columnList = new ArrayList<ItemData>();
- mColumns.put(absoluteChildRect.left, columnList);
- }
- recordItemData(
- columnList, new ItemData(adapterPosition, absoluteChildRect.top));
- }
-
- /**
- * Ensures limits exists within the sorted list limitsList, and adds it to the list if it does
- * not exist.
- */
- private static void recordLimits(List<Limits> limitsList, Limits limits) {
- int index = Collections.binarySearch(limitsList, limits);
- if (index < 0) {
- limitsList.add(~index, limits);
- }
- }
-
- /**
- * Ensures itemData exists within the sorted list itemDataList, and adds it to the list if it
- * does not exist.
- */
- private static void recordItemData(List<ItemData> itemDataList, ItemData itemData) {
- int index = Collections.binarySearch(itemDataList, itemData);
- if (index < 0) {
- itemDataList.add(~index, itemData);
- }
- }
-
- /**
- * Handles a moved pointer; this function determines whether the pointer movement resulted in a
- * selection change and, if it has, notifies listeners of this change.
- */
- private void handlePointerMoved() {
- RelativePoint old = mRelativePointer;
- mRelativePointer = new RelativePoint(mPointer);
- if (old != null && mRelativePointer.equals(old)) {
- return;
- }
-
- computeCurrentSelection();
- notifyListeners();
- }
-
- /**
- * Computes the currently-selected items.
- */
- private void computeCurrentSelection() {
- Rect selectionRect = mRelativePointer.computeBounds(mRelativeOrigin);
- computePositionsCoveredByRect(selectionRect);
- }
-
- /**
- * Notifies all listeners of a selection change. Note that this function simply passes
- * mSelectionForListeners, so computeCurrentSelection() should be called before this function.
- */
- private void notifyListeners() {
- for (OnSelectionChangedListener listener : mOnSelectionChangedListeners) {
- listener.onSelectionChanged(mSelectionForListeners);
- }
- }
-
- /**
- * @param rect Rectangle including all covered items.
- */
- private void computePositionsCoveredByRect(@Nullable Rect rect) {
- mSelectionForListeners.clear();
- if (rect == null) {
- // If there is no bounding rectangle, there are no items selected, so just return early.
- return;
- }
-
- int columnIndex = Collections.binarySearch(mXLimitsList, new Limits(rect.left, rect.left));
- Preconditions.checkState(columnIndex >= 0);
-
- for (; columnIndex < mXLimitsList.size() &&
- mXLimitsList.get(columnIndex).lowerLimit <= rect.right; columnIndex++) {
- List<ItemData> positions =
- mColumns.get(mXLimitsList.get(columnIndex).lowerLimit);
- int rowIndex = Collections.binarySearch(positions, new ItemData(0, rect.top));
- if (rowIndex < 0) {
- // If band select occurs after the last item in a row with fewer items than columns,
- // go to the next column. This situation occurs in the last row of the grid when the
- // total number of items is not a multiple of the number of columns (e.g., when 10
- // items exist in a grid with 4 columns).
- continue;
- }
-
- for (; rowIndex < positions.size() &&
- positions.get(rowIndex).offset <= rect.bottom; rowIndex++) {
- mSelectionForListeners.append(positions.get(rowIndex).position, true);
- }
- }
- }
-
- /**
- * Provides functionality for interfacing with the view. In practice, RecyclerViewMatrixHelper
- * should be used; this interface exists solely for the purpose of decoupling the view from
- * this class so that the view can be mocked out for tests.
- */
- interface RecyclerViewHelper {
- public void addOnScrollListener(RecyclerView.OnScrollListener listener);
- public void removeOnScrollListener(RecyclerView.OnScrollListener listener);
- public Point createAbsolutePoint(Point relativePoint);
- public int getVisibleChildCount();
- public int getTotalChildCount();
- public int getNumColumns();
- public int getNumRows();
- public int getAdapterPositionAt(int index);
- public Rect getAbsoluteRectForChildViewAt(int index);
- }
-
- /**
- * Concrete MatrixHelper implementation for use within the Files app.
- */
- static class RuntimeRecyclerViewHelper implements RecyclerViewHelper {
- private final RecyclerView mRecyclerView;
-
- RuntimeRecyclerViewHelper(RecyclerView rv) {
- mRecyclerView = rv;
- }
-
- @Override
- public int getAdapterPositionAt(int index) {
- View child = mRecyclerView.getChildAt(index);
- return mRecyclerView.getChildViewHolder(child).getAdapterPosition();
- }
-
- @Override
- public void addOnScrollListener(OnScrollListener listener) {
- mRecyclerView.addOnScrollListener(listener);
- }
-
- @Override
- public void removeOnScrollListener(OnScrollListener listener) {
- mRecyclerView.removeOnScrollListener(listener);
- }
-
- @Override
- public Point createAbsolutePoint(Point relativePoint) {
- return new Point(relativePoint.x + mRecyclerView.computeHorizontalScrollOffset(),
- relativePoint.y + mRecyclerView.computeVerticalScrollOffset());
- }
-
- @Override
- public Rect getAbsoluteRectForChildViewAt(int index) {
- final View child = mRecyclerView.getChildAt(index);
- final Rect childRect = new Rect();
- child.getHitRect(childRect);
- childRect.left += mRecyclerView.computeHorizontalScrollOffset();
- childRect.right += mRecyclerView.computeHorizontalScrollOffset();
- childRect.top += mRecyclerView.computeVerticalScrollOffset();
- childRect.bottom += mRecyclerView.computeVerticalScrollOffset();
- return childRect;
- }
-
- @Override
- public int getVisibleChildCount() {
- return mRecyclerView.getChildCount();
- }
-
- @Override
- public int getTotalChildCount() {
- return mRecyclerView.getAdapter().getItemCount();
- }
-
- @Override
- public int getNumColumns() {
- LayoutManager layoutManager = mRecyclerView.getLayoutManager();
- if (layoutManager instanceof GridLayoutManager) {
- return ((GridLayoutManager) layoutManager).getSpanCount();
- }
-
- // Otherwise, it is a list with 1 column.
- return 1;
- }
-
- @Override
- public int getNumRows() {
- int numFullColumns = getTotalChildCount() / getNumColumns();
- boolean hasPartiallyFullColumn = getTotalChildCount() % getNumColumns() != 0;
- return numFullColumns + (hasPartiallyFullColumn ? 1 : 0);
- }
- }
-
- /**
- * Listener for changes in which items have been band selected.
- */
- interface OnSelectionChangedListener {
- public void onSelectionChanged(SparseBooleanArray updatedSelection);
- }
-
- void addOnSelectionChangedListener(OnSelectionChangedListener listener) {
- mOnSelectionChangedListeners.add(listener);
- }
-
- void removeOnSelectionChangedListener(OnSelectionChangedListener listener) {
- mOnSelectionChangedListeners.remove(listener);
- }
-
- /**
- * Metadata for an item in the view, consisting of the adapter position and the offset from the
- * top of the view (in pixels). Stored in the mColumns map to model the item grid.
- */
- private static class ItemData implements Comparable<ItemData> {
- int position;
- int offset;
-
- ItemData(int position, int offset) {
- this.position = position;
- this.offset = offset;
- }
-
- @Override
- public int compareTo(ItemData other) {
- // The list of columns is sorted via the offset from the top, so PositionMetadata
- // objects with lower y-values are befor those with higher y-values.
- return offset - other.offset;
- }
- }
-
- /**
- * Limits of a view item. For example, if an item's left side is at x-value 5 and its right side
- * is at x-value 10, the limits would be from 5 to 10. Used to record the left- and right sides
- * of item columns and the top- and bottom sides of item rows so that it can be determined
- * whether the pointer is located within the bounds of an item.
- */
- private static class Limits implements Comparable<Limits> {
- int lowerLimit;
- int upperLimit;
-
- Limits(int lowerLimit, int upperLimit) {
- this.lowerLimit = lowerLimit;
- this.upperLimit = upperLimit;
- }
-
- @Override
- public int compareTo(Limits other) {
- return lowerLimit - other.lowerLimit;
- }
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof Limits)) {
- return false;
- }
-
- return ((Limits) other).lowerLimit == lowerLimit &&
- ((Limits) other).upperLimit == upperLimit;
- }
- }
-
- /**
- * The location of a coordinate relative to items. This class represents a general area of the
- * view as it relates to band selection rather than an explicit point. For example, two
- * different points within an item are considered to have the same "location" because band
- * selection originating within the item would select the same items no matter which point
- * was used. Same goes for points between items as well as those at the very beginning or end
- * of the view.
- *
- * Tracking a coordinate (e.g., an x-value) as a CoordinateLocation instead of as an int has the
- * advantage of tying the value to the Limits of items along that axis. This allows easy
- * selection of items within those Limits as opposed to a search through every item to see if a
- * given coordinate value falls within those Limits.
- */
- private static class RelativeCoordinate
- implements Comparable<RelativeCoordinate> {
- /**
- * Location describing points after the last known item.
- */
- static final int AFTER_LAST_ITEM = 0;
-
- /**
- * Location describing points before the first known item.
- */
- static final int BEFORE_FIRST_ITEM = 1;
-
- /**
- * Location describing points between two items.
- */
- static final int BETWEEN_TWO_ITEMS = 2;
-
- /**
- * Location describing points within the limits of one item.
- */
- static final int WITHIN_LIMITS = 3;
-
- /**
- * The type of this coordinate, which is one of AFTER_LAST_ITEM, BEFORE_FIRST_ITEM,
- * BETWEEN_TWO_ITEMS, or WITHIN_LIMITS.
- */
- final int type;
-
- /**
- * The limits before the coordinate; only populated when type == WITHIN_LIMITS or type ==
- * BETWEEN_TWO_ITEMS.
- */
- Limits limitsBeforeCoordinate;
-
- /**
- * The limits after the coordinate; only populated when type == BETWEEN_TWO_ITEMS.
- */
- Limits limitsAfterCoordinate;
-
- // Limits of the first known item; only populated when type == BEFORE_FIRST_ITEM.
- Limits mFirstKnownItem;
- // Limits of the last known item; only populated when type == AFTER_LAST_ITEM.
- Limits mLastKnownItem;
-
- /**
- * @param limitsList The sorted limits list for the coordinate type. If this
- * CoordinateLocation is an x-value, mXLimitsList should be passed; otherwise,
- * mYLimitsList should be pased.
- * @param value The coordinate value.
- */
- RelativeCoordinate(List<Limits> limitsList, int value) {
- Limits dummyLimits = new Limits(value, value);
- int index = Collections.binarySearch(limitsList, dummyLimits);
-
- if (index >= 0) {
- this.type = WITHIN_LIMITS;
- this.limitsBeforeCoordinate = limitsList.get(index);
- } else if (~index == 0) {
- this.type = BEFORE_FIRST_ITEM;
- this.mFirstKnownItem = limitsList.get(0);
- } else if (~index == limitsList.size()) {
- Limits lastLimits = limitsList.get(limitsList.size() - 1);
- if (lastLimits.lowerLimit <= value && value <= lastLimits.upperLimit) {
- this.type = WITHIN_LIMITS;
- this.limitsBeforeCoordinate = lastLimits;
- } else {
- this.type = AFTER_LAST_ITEM;
- this.mLastKnownItem = lastLimits;
- }
- } else {
- Limits limitsBeforeIndex = limitsList.get(~index - 1);
- if (limitsBeforeIndex.lowerLimit <= value && value <= limitsBeforeIndex.upperLimit) {
- this.type = WITHIN_LIMITS;
- this.limitsBeforeCoordinate = limitsList.get(~index - 1);
- } else {
- this.type = BETWEEN_TWO_ITEMS;
- this.limitsBeforeCoordinate = limitsList.get(~index - 1);
- this.limitsAfterCoordinate = limitsList.get(~index);
- }
- }
- }
-
- int toComparisonValue() {
- if (type == BEFORE_FIRST_ITEM) {
- return mFirstKnownItem.lowerLimit - 1;
- } else if (type == AFTER_LAST_ITEM) {
- return mLastKnownItem.upperLimit + 1;
- } else if (type == BETWEEN_TWO_ITEMS) {
- return limitsBeforeCoordinate.upperLimit + 1;
- } else {
- return limitsBeforeCoordinate.lowerLimit;
- }
- }
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof RelativeCoordinate)) {
- return false;
- }
-
- RelativeCoordinate otherCoordinate = (RelativeCoordinate) other;
- return toComparisonValue() == otherCoordinate.toComparisonValue();
- }
-
- @Override
- public int compareTo(RelativeCoordinate other) {
- return toComparisonValue() - other.toComparisonValue();
- }
- }
-
- /**
- * The location of a point relative to the Limits of nearby items; consists of both an x- and
- * y-RelativeCoordinateLocation.
- */
- private class RelativePoint {
- final RelativeCoordinate xLocation;
- final RelativeCoordinate yLocation;
-
- RelativePoint(Point point) {
- this.xLocation = new RelativeCoordinate(mXLimitsList, point.x);
- this.yLocation = new RelativeCoordinate(mYLimitsList, point.y);
- }
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof RelativePoint)) {
- return false;
- }
-
- RelativePoint otherPoint = (RelativePoint) other;
- return xLocation.equals(otherPoint.xLocation) && yLocation.equals(otherPoint.yLocation);
- }
-
- /**
- * Generates a rectangle which contains the items selected by the two points.
- * @param other The other PointLocation. A rectangle will be formed between "this" and
- * "other".
- * @return The rectangle, or null if no items were selected.
- */
- Rect computeBounds(RelativePoint other) {
- if (!areItemsCoveredBySelection(mRelativePointer, mRelativeOrigin)) {
- return null;
- }
-
- RelativeCoordinate minXLocation =
- xLocation.compareTo(other.xLocation) < 0 ? xLocation : other.xLocation;
- RelativeCoordinate maxXLocation =
- minXLocation == xLocation ? other.xLocation : xLocation;
- RelativeCoordinate minYLocation =
- yLocation.compareTo(other.yLocation) < 0 ? yLocation : other.yLocation;
- RelativeCoordinate maxYLocation =
- minYLocation == yLocation ? other.yLocation : yLocation;
-
- Rect rect = new Rect();
- rect.left = getCoordinateValue(minXLocation, mXLimitsList, true);
- rect.right = getCoordinateValue(maxXLocation, mXLimitsList, false);
- rect.top = getCoordinateValue(minYLocation, mYLimitsList, true);
- rect.bottom = getCoordinateValue(maxYLocation, mYLimitsList, false);
- return rect;
- }
-
- int getCoordinateValue(RelativeCoordinate coordinate,
- List<Limits> limitsList, boolean isStartOfRange) {
- switch (coordinate.type) {
- case RelativeCoordinate.BEFORE_FIRST_ITEM:
- return limitsList.get(0).lowerLimit;
- case RelativeCoordinate.AFTER_LAST_ITEM:
- return limitsList.get(limitsList.size() - 1).upperLimit;
- case RelativeCoordinate.BETWEEN_TWO_ITEMS:
- if (isStartOfRange) {
- return coordinate.limitsAfterCoordinate.lowerLimit;
- } else {
- return coordinate.limitsBeforeCoordinate.upperLimit;
- }
- case RelativeCoordinate.WITHIN_LIMITS:
- return coordinate.limitsBeforeCoordinate.lowerLimit;
- }
-
- throw new RuntimeException("Invalid coordinate value.");
- }
- }
-
- private static boolean areItemsCoveredBySelection(
- RelativePoint first, RelativePoint second) {
- return doesCoordinateLocationCoverItems(first.xLocation, second.xLocation) &&
- doesCoordinateLocationCoverItems(first.yLocation, second.yLocation);
- }
-
- private static boolean doesCoordinateLocationCoverItems(
- RelativeCoordinate pointerCoordinate,
- RelativeCoordinate originCoordinate) {
- if (pointerCoordinate.type == RelativeCoordinate.BEFORE_FIRST_ITEM &&
- originCoordinate.type == RelativeCoordinate.BEFORE_FIRST_ITEM) {
- return false;
- }
-
- if (pointerCoordinate.type == RelativeCoordinate.AFTER_LAST_ITEM &&
- originCoordinate.type == RelativeCoordinate.AFTER_LAST_ITEM) {
- return false;
- }
-
- if (pointerCoordinate.type == RelativeCoordinate.BETWEEN_TWO_ITEMS &&
- originCoordinate.type == RelativeCoordinate.BETWEEN_TWO_ITEMS &&
- pointerCoordinate.limitsBeforeCoordinate.equals(originCoordinate) &&
- pointerCoordinate.limitsAfterCoordinate.equals(originCoordinate)) {
- return false;
- }
-
- return true;
- }
-}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
index 240cdda..c28806b 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
@@ -1773,8 +1773,6 @@
}
@Override
- public void afterActivityCreated(DirectoryFragment fragment) {
- new BandSelectManager(fragment.mRecView, fragment.mSelectionManager);
- }
+ public void afterActivityCreated(DirectoryFragment fragment) {}
}
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/MultiSelectManager.java b/packages/DocumentsUI/src/com/android/documentsui/MultiSelectManager.java
index f87fe4c..e972566 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/MultiSelectManager.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/MultiSelectManager.java
@@ -16,24 +16,33 @@
package com.android.documentsui;
+import static com.android.documentsui.Events.isMouseEvent;
import static com.android.internal.util.Preconditions.checkArgument;
import static com.android.internal.util.Preconditions.checkNotNull;
import static com.android.internal.util.Preconditions.checkState;
+import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.Adapter;
import android.support.v7.widget.RecyclerView.AdapterDataObserver;
+import android.support.v7.widget.RecyclerView.LayoutManager;
+import android.support.v7.widget.RecyclerView.OnScrollListener;
import android.util.Log;
+import android.util.SparseArray;
import android.util.SparseBooleanArray;
+import android.util.SparseIntArray;
import android.view.GestureDetector;
import android.view.GestureDetector.OnDoubleTapListener;
import android.view.GestureDetector.OnGestureListener;
import android.view.MotionEvent;
import android.view.View;
-
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
import android.support.annotation.VisibleForTesting;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -61,12 +70,13 @@
private final List<MultiSelectManager.Callback> mCallbacks = new ArrayList<>(1);
private Adapter<?> mAdapter;
- private RecyclerViewHelper mHelper;
+ private MultiSelectHelper mHelper;
private boolean mSingleSelect;
+ private BandSelectManager mBandSelectManager;
/**
* @param recyclerView
- * @param gestureDelegate Option delage gesture listener.
+ * @param gestureDelegate Option delegate gesture listener.
* @param mode Selection mode
* @template A gestureDelegate that implements both {@link OnGestureListener}
* and {@link OnDoubleTapListener}
@@ -76,17 +86,11 @@
this(
recyclerView.getAdapter(),
- new RecyclerViewHelper() {
- @Override
- public int findEventPosition(MotionEvent e) {
- View view = recyclerView.findChildViewUnder(e.getX(), e.getY());
- return view != null
- ? recyclerView.getChildAdapterPosition(view)
- : RecyclerView.NO_POSITION;
- }
- },
+ new RuntimeRecyclerViewHelper(recyclerView),
mode);
+ mBandSelectManager = new BandSelectManager((RuntimeRecyclerViewHelper) mHelper);
+
GestureDetector.SimpleOnGestureListener listener =
new GestureDetector.SimpleOnGestureListener() {
@Override
@@ -101,11 +105,8 @@
CompositeOnGestureListener<? extends Object> compositeListener =
new CompositeOnGestureListener<>(listener, gestureDelegate);
- final GestureDetector detector = new GestureDetector(
- recyclerView.getContext(),
- gestureDelegate == null
- ? listener
- : compositeListener);
+ final GestureDetector detector =
+ new GestureDetector(recyclerView.getContext(), compositeListener);
detector.setOnDoubleTapListener(compositeListener);
@@ -113,9 +114,15 @@
new RecyclerView.OnItemTouchListener() {
public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
detector.onTouchEvent(e);
- return false;
+
+ // Only intercept the event if it was a mouse-based band selection.
+ return isMouseEvent(e) && (mBandSelectManager.mIsActive ||
+ e.getActionMasked() != MotionEvent.ACTION_UP);
}
- public void onTouchEvent(RecyclerView rv, MotionEvent e) {}
+ public void onTouchEvent(RecyclerView rv, MotionEvent e) {
+ checkState(isMouseEvent(e));
+ mBandSelectManager.processMotionEvent(e);
+ }
public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {}
});
}
@@ -125,7 +132,7 @@
* @hide
*/
@VisibleForTesting
- MultiSelectManager(Adapter<?> adapter, RecyclerViewHelper helper, int mode) {
+ MultiSelectManager(Adapter<?> adapter, MultiSelectHelper helper, int mode) {
checkNotNull(adapter, "'adapter' cannot be null.");
checkNotNull(helper, "'helper' cannot be null.");
@@ -207,6 +214,7 @@
* @param selected
* @return True if the selection state of the item changed.
*/
+ @VisibleForTesting
public boolean setItemSelected(int position, boolean selected) {
if (mSingleSelect && !mSelection.isEmpty()) {
clearSelectionQuietly();
@@ -271,7 +279,7 @@
if (DEBUG) Log.i(TAG, "View is null. Cannot handle tap event.");
}
- onLongPress(position);
+ onLongPress(position, e.getMetaState());
}
/**
@@ -279,17 +287,16 @@
* can be mocked.
*
* @param position
+ * @param metaState as returned from {@link MotionEvent#getMetaState()}.
* @hide
*/
@VisibleForTesting
- void onLongPress(int position) {
+ void onLongPress(int position, int metaState) {
if (position == RecyclerView.NO_POSITION) {
if (DEBUG) Log.i(TAG, "View is null. Cannot handle tap event.");
}
- if (toggleSelection(position)) {
- notifySelectionChanged();
- }
+ handlePositionChanged(position, metaState);
}
/**
@@ -327,17 +334,26 @@
return false;
}
+ handlePositionChanged(position, metaState);
+ return false;
+ }
+
+ /**
+ * Handles a change caused by a click on the item with the given position. If the Shift key is
+ * held down, this performs a range select; otherwise, it simply toggles the item's selection
+ * state.
+ */
+ private void handlePositionChanged(int position, int metaState) {
if (Events.hasShiftBit(metaState) && mRanger != null) {
mRanger.snapSelection(position);
- } else {
- toggleSelection(position);
- }
- // We're being lazy here notifying even when something might not have changed.
- // To make this more correct, we'd need to update the Ranger class to return
- // information about what has changed.
- notifySelectionChanged();
- return false;
+ // We're being lazy here notifying even when something might not have changed.
+ // To make this more correct, we'd need to update the Ranger class to return
+ // information about what has changed.
+ notifySelectionChanged();
+ } else if (toggleSelection(position)) {
+ notifySelectionChanged();
+ }
}
/**
@@ -588,10 +604,23 @@
*/
public static final class Selection {
- private SparseBooleanArray mSelection;
+ // This class tracks selected positions by managing two arrays: the saved selection, and
+ // the total selection. Saved selections are those which have been completed by tapping an
+ // item or by completing a band select operation. Provisional selections are selections
+ // which have been temporarily created by an in-progress band select operation (once the
+ // user releases the mouse button during a band select operation, the selected items
+ // become saved). The total selection is the combination of both the saved selection and
+ // the provisional selection. Tracking both separately is necessary to ensure that saved
+ // selections do not become deselected when they are removed from the provisional selection;
+ // for example, if item A is tapped (and selected), then an in-progress band select covers A
+ // then uncovers A, A should still be selected as it has been saved. To ensure this
+ // behavior, the saved selection must be tracked separately.
+ private SparseBooleanArray mSavedSelection;
+ private SparseBooleanArray mTotalSelection;
public Selection() {
- mSelection = new SparseBooleanArray();
+ mSavedSelection = new SparseBooleanArray();
+ mTotalSelection = new SparseBooleanArray();
}
/**
@@ -599,7 +628,7 @@
* @return true if the position is currently selected.
*/
public boolean contains(int position) {
- return mSelection.get(position);
+ return mTotalSelection.get(position);
}
/**
@@ -613,21 +642,85 @@
* @return the position value stored at specified index.
*/
public int get(int index) {
- return mSelection.keyAt(index);
+ return mTotalSelection.keyAt(index);
}
/**
* @return size of the selection.
*/
public int size() {
- return mSelection.size();
+ return mTotalSelection.size();
}
/**
* @return true if the selection is empty.
*/
public boolean isEmpty() {
- return mSelection.size() == 0;
+ return mTotalSelection.size() == 0;
+ }
+
+ /**
+ * Sets the provisional selection, which is a temporary selection that can be saved,
+ * canceled, or adjusted at a later time. When a new provision selection is applied, the old
+ * one (if it exists) is abandoned.
+ * @return Array with entry for each position added or removed. Entries which were added
+ * contain a value of true, and entries which were removed contain a value of false.
+ */
+ @VisibleForTesting
+ protected SparseBooleanArray setProvisionalSelection(
+ SparseBooleanArray provisionalSelection) {
+ SparseBooleanArray delta = new SparseBooleanArray();
+
+ for (int i = 0; i < mTotalSelection.size(); i++) {
+ int position = mTotalSelection.keyAt(i);
+ if (!provisionalSelection.get(position) && !mSavedSelection.get(position)) {
+ // Remove each item that used to be in the selection but is unsaved and not in
+ // the new provisional selection.
+ delta.put(position, false);
+ }
+ }
+
+ for (int i = 0; i < provisionalSelection.size(); i++) {
+ int position = provisionalSelection.keyAt(i);
+ if (!mTotalSelection.get(position)) {
+ // Add each item that was not previously in the selection but is in the
+ // new provisional selection.
+ delta.put(position, true);
+ }
+ }
+
+ // Now, iterate through the changes and actually add/remove them to/from
+ // mCurrentSelection. This could not be done in the previous loops because changing the
+ // size of the selection mid-iteration changes iteration order erroneously.
+ for (int i = 0; i < delta.size(); i++) {
+ int position = delta.keyAt(i);
+ if (delta.get(position)) {
+ mTotalSelection.put(position, true);
+ } else {
+ mTotalSelection.delete(position);
+ }
+ }
+
+ return delta;
+ }
+
+ /**
+ * Saves the existing provisional selection. Once the provisional selection is saved,
+ * subsequent provisional selections which are different from this existing one cannot
+ * cause items in this existing provisional selection to become deselected.
+ */
+ @VisibleForTesting
+ protected void applyProvisionalSelection() {
+ mSavedSelection = mTotalSelection.clone();
+ }
+
+ /**
+ * Abandons the existing provisional selection so that all items provisionally selected are
+ * now deselected.
+ */
+ @VisibleForTesting
+ protected void cancelProvisionalSelection() {
+ mTotalSelection = mSavedSelection.clone();
}
private boolean flip(int position) {
@@ -643,8 +736,9 @@
/** @hide */
@VisibleForTesting
boolean add(int position) {
- if (!mSelection.get(position)) {
- mSelection.put(position, true);
+ if (!mTotalSelection.get(position)) {
+ mTotalSelection.put(position, true);
+ mSavedSelection.put(position, true);
return true;
}
return false;
@@ -653,8 +747,9 @@
/** @hide */
@VisibleForTesting
boolean remove(int position) {
- if (mSelection.get(position)) {
- mSelection.delete(position);
+ if (mTotalSelection.get(position)) {
+ mTotalSelection.delete(position);
+ mSavedSelection.delete(position);
return true;
}
return false;
@@ -663,7 +758,8 @@
/**
* Adjusts the selection range to reflect the existence of newly inserted values at
* the specified positions. This has the effect of adjusting all existing selected
- * positions within the specified range accordingly.
+ * positions within the specified range accordingly. Note that this function discards any
+ * provisional selections which may have been applied.
*
* @param startPosition
* @param count
@@ -673,11 +769,13 @@
void expand(int startPosition, int count) {
checkState(startPosition >= 0);
checkState(count > 0);
+ cancelProvisionalSelection();
- for (int i = 0; i < mSelection.size(); i++) {
- int itemPosition = mSelection.keyAt(i);
+ for (int i = 0; i < mTotalSelection.size(); i++) {
+ int itemPosition = mTotalSelection.keyAt(i);
if (itemPosition >= startPosition) {
- mSelection.setKeyAt(i, itemPosition + count);
+ mTotalSelection.setKeyAt(i, itemPosition + count);
+ mSavedSelection.setKeyAt(i, itemPosition + count);
}
}
}
@@ -685,7 +783,8 @@
/**
* Adjusts the selection range to reflect the removal specified positions. This has
* the effect of adjusting all existing selected positions within the specified range
- * accordingly.
+ * accordingly. Note that this function discards any provisional selections which may have
+ * been applied.
*
* @param startPosition
* @param count The length of the range to collapse. Must be greater than 0.
@@ -699,27 +798,30 @@
int endPosition = startPosition + count - 1;
SparseBooleanArray newSelection = new SparseBooleanArray();
- for (int i = 0; i < mSelection.size(); i++) {
- int itemPosition = mSelection.keyAt(i);
+ for (int i = 0; i < mSavedSelection.size(); i++) {
+ int itemPosition = mSavedSelection.keyAt(i);
if (itemPosition < startPosition) {
newSelection.append(itemPosition, true);
} else if (itemPosition > endPosition) {
newSelection.append(itemPosition - count, true);
}
}
- mSelection = newSelection;
+ mSavedSelection = newSelection;
+ cancelProvisionalSelection();
}
/** @hide */
@VisibleForTesting
void clear() {
- mSelection.clear();
+ mSavedSelection.clear();
+ mTotalSelection.clear();
}
/** @hide */
@VisibleForTesting
void copyFrom(Selection source) {
- mSelection = source.mSelection.clone();
+ mSavedSelection = source.mSavedSelection.clone();
+ mTotalSelection = source.mTotalSelection.clone();
}
@Override
@@ -728,16 +830,16 @@
return "size=0, items=[]";
}
- StringBuilder buffer = new StringBuilder(mSelection.size() * 28);
+ StringBuilder buffer = new StringBuilder(mTotalSelection.size() * 28);
buffer.append("{size=")
- .append(mSelection.size())
+ .append(mTotalSelection.size())
.append(", ")
.append("items=[");
- for (int i=0; i < mSelection.size(); i++) {
+ for (int i=0; i < mTotalSelection.size(); i++) {
if (i > 0) {
buffer.append(", ");
}
- buffer.append(mSelection.keyAt(i));
+ buffer.append(mTotalSelection.keyAt(i));
}
buffer.append("]}");
return buffer.toString();
@@ -745,7 +847,7 @@
@Override
public int hashCode() {
- return mSelection.hashCode();
+ return mSavedSelection.hashCode() ^ mTotalSelection.hashCode();
}
@Override
@@ -758,14 +860,178 @@
return false;
}
- return mSelection.equals(((Selection) that).mSelection);
+ return mSavedSelection.equals(((Selection) that).mSavedSelection) &&
+ mTotalSelection.equals(((Selection) that).mTotalSelection);
}
}
- interface RecyclerViewHelper {
+ /**
+ * Provides functionality for MultiSelectManager. In practice, use RuntimeRecyclerViewHelper;
+ * this interface exists only for mocking in tests.
+ */
+ interface MultiSelectHelper {
int findEventPosition(MotionEvent e);
}
+ /**
+ * Provides functionality for BandSelectManager. In practice, use RuntimeRecyclerViewHelper;
+ * this interface exists only for mocking in tests.
+ */
+ interface BandManagerHelper {
+ void drawBand(Rect rect);
+ void addOnScrollListener(RecyclerView.OnScrollListener listener);
+ int findEventPosition(MotionEvent e);
+ int getHeight();
+ void hideBand();
+ void invalidateView();
+ void postRunnable(Runnable r);
+ void removeCallback(Runnable r);
+ void scrollBy(int dy);
+ }
+
+ /**
+ * Provides functionality for BandSelectModel. In practice, use RuntimeRecyclerViewHelper;
+ * this interface exists only for mocking in tests.
+ */
+ interface BandModelHelper {
+ void addOnScrollListener(RecyclerView.OnScrollListener listener);
+ Point createAbsolutePoint(Point relativePoint);
+ Rect getAbsoluteRectForChildViewAt(int index);
+ int getAdapterPositionAt(int index);
+ int getNumColumns();
+ int getNumRows();
+ int getTotalChildCount();
+ int getVisibleChildCount();
+ void removeOnScrollListener(RecyclerView.OnScrollListener listener);
+ }
+
+ /**
+ * Concrete RecyclerViewHelper implementation for use within the Files app.
+ */
+ private static final class RuntimeRecyclerViewHelper implements MultiSelectHelper,
+ BandManagerHelper, BandModelHelper {
+
+ private final RecyclerView mRecyclerView;
+ private final Drawable mBandSelectRect;
+
+ private boolean mIsOverlayShown = false;
+
+ RuntimeRecyclerViewHelper(RecyclerView rv) {
+ mRecyclerView = rv;
+ mBandSelectRect = mRecyclerView.getContext().getTheme().getDrawable(
+ R.drawable.band_select_overlay);
+ }
+
+ @Override
+ public int getAdapterPositionAt(int index) {
+ View child = mRecyclerView.getChildAt(index);
+ return mRecyclerView.getChildViewHolder(child).getAdapterPosition();
+ }
+
+ @Override
+ public void addOnScrollListener(OnScrollListener listener) {
+ mRecyclerView.addOnScrollListener(listener);
+ }
+
+ @Override
+ public void removeOnScrollListener(OnScrollListener listener) {
+ mRecyclerView.removeOnScrollListener(listener);
+ }
+
+ @Override
+ public Point createAbsolutePoint(Point relativePoint) {
+ return new Point(relativePoint.x + mRecyclerView.computeHorizontalScrollOffset(),
+ relativePoint.y + mRecyclerView.computeVerticalScrollOffset());
+ }
+
+ @Override
+ public Rect getAbsoluteRectForChildViewAt(int index) {
+ final View child = mRecyclerView.getChildAt(index);
+ final Rect childRect = new Rect();
+ child.getHitRect(childRect);
+ childRect.left += mRecyclerView.computeHorizontalScrollOffset();
+ childRect.right += mRecyclerView.computeHorizontalScrollOffset();
+ childRect.top += mRecyclerView.computeVerticalScrollOffset();
+ childRect.bottom += mRecyclerView.computeVerticalScrollOffset();
+ return childRect;
+ }
+
+ @Override
+ public int getVisibleChildCount() {
+ return mRecyclerView.getChildCount();
+ }
+
+ @Override
+ public int getTotalChildCount() {
+ return mRecyclerView.getAdapter().getItemCount();
+ }
+
+ @Override
+ public int getNumColumns() {
+ LayoutManager layoutManager = mRecyclerView.getLayoutManager();
+ if (layoutManager instanceof GridLayoutManager) {
+ return ((GridLayoutManager) layoutManager).getSpanCount();
+ }
+
+ // Otherwise, it is a list with 1 column.
+ return 1;
+ }
+
+ @Override
+ public int getNumRows() {
+ int numFullColumns = getTotalChildCount() / getNumColumns();
+ boolean hasPartiallyFullColumn = getTotalChildCount() % getNumColumns() != 0;
+ return numFullColumns + (hasPartiallyFullColumn ? 1 : 0);
+ }
+
+ @Override
+ public int findEventPosition(MotionEvent e) {
+ View view = mRecyclerView.findChildViewUnder(e.getX(), e.getY());
+ return view != null
+ ? mRecyclerView.getChildAdapterPosition(view)
+ : RecyclerView.NO_POSITION;
+ }
+
+ @Override
+ public int getHeight() {
+ return mRecyclerView.getHeight();
+ }
+
+ @Override
+ public void invalidateView() {
+ mRecyclerView.invalidate();
+ }
+
+ @Override
+ public void postRunnable(Runnable r) {
+ mRecyclerView.postOnAnimation(r);
+ }
+
+ @Override
+ public void removeCallback(Runnable r) {
+ mRecyclerView.removeCallbacks(r);
+ }
+
+ @Override
+ public void scrollBy(int dy) {
+ mRecyclerView.scrollBy(0, dy);
+ }
+
+ @Override
+ public void drawBand(Rect rect) {
+ mBandSelectRect.setBounds(rect);
+
+ if (!mIsOverlayShown) {
+ mRecyclerView.getOverlay().add(mBandSelectRect);
+ }
+ }
+
+ @Override
+ public void hideBand() {
+ mRecyclerView.getOverlay().remove(mBandSelectRect);
+ }
+ }
+
public interface Callback {
/**
* Called when an item is selected or unselected while in selection mode.
@@ -893,4 +1159,846 @@
return false;
}
}
+
+ /**
+ * Provides mouse driven band-select support when used in conjunction with {@link RecyclerView}
+ * and {@link MultiSelectManager}. This class is responsible for rendering the band select
+ * overlay and selecting overlaid items via MultiSelectManager.
+ */
+ public class BandSelectManager extends RecyclerView.OnScrollListener
+ implements BandSelectModel.OnSelectionChangedListener {
+
+ private static final int NOT_SET = -1;
+
+ private final BandManagerHelper mHelper;
+
+ private boolean mIsActive;
+ private Point mOrigin;
+ private Point mPointer;
+ private Rect mBounds;
+ private BandSelectModel mModel;
+
+ // The time at which the current band selection-induced scroll began. If no scroll is in
+ // progress, the value is NOT_SET.
+ private long mScrollStartTime = NOT_SET;
+ private final Runnable mViewScroller = new ViewScroller();
+
+ public <T extends BandManagerHelper & BandModelHelper>
+ BandSelectManager(T helper) {
+ mHelper = helper;
+ mHelper.addOnScrollListener(this);
+ mModel = new BandSelectModel(helper);
+ mModel.addOnSelectionChangedListener(this);
+ }
+
+ /**
+ * Processes a MotionEvent by starting, ending, or resizing the band select overlay.
+ * @param e
+ */
+ private void processMotionEvent(MotionEvent e) {
+ if (!isMouseEvent(e)) {
+ return;
+ }
+
+ if (mIsActive && e.getActionMasked() == MotionEvent.ACTION_UP) {
+ endBandSelect();
+ return;
+ }
+
+ mPointer = new Point((int) e.getX(), (int) e.getY());
+ if (!mIsActive) {
+ // Only start a band select if the pointer is in margins between items, not
+ // actually within an item's bounds.
+ if (mHelper.findEventPosition(e) != RecyclerView.NO_POSITION) {
+ return;
+ }
+ startBandSelect();
+ } else {
+ mModel.resizeSelection(mPointer);
+ }
+
+ scrollViewIfNecessary();
+ resizeBandSelectRectangle();
+ }
+
+ /**
+ * Starts band select by adding the drawable to the RecyclerView's overlay.
+ */
+ private void startBandSelect() {
+ if (DEBUG) {
+ Log.d(TAG, "Starting band select from (" + mPointer.x + "," + mPointer.y + ").");
+ }
+ mIsActive = true;
+ mOrigin = new Point(mPointer.x, mPointer.y);
+ mModel.startSelection(mOrigin);
+ }
+
+ /**
+ * Scrolls the view if necessary.
+ */
+ private void scrollViewIfNecessary() {
+ mHelper.removeCallback(mViewScroller);
+ mViewScroller.run();
+ mHelper.invalidateView();
+ }
+
+ /**
+ * Resizes the band select rectangle by using the origin and the current pointer position as
+ * two opposite corners of the selection.
+ */
+ private void resizeBandSelectRectangle() {
+ mBounds = new Rect(Math.min(mOrigin.x, mPointer.x),
+ Math.min(mOrigin.y, mPointer.y),
+ Math.max(mOrigin.x, mPointer.x),
+ Math.max(mOrigin.y, mPointer.y));
+ mHelper.drawBand(mBounds);
+ }
+
+ /**
+ * Ends band select by removing the overlay.
+ */
+ private void endBandSelect() {
+ if (DEBUG) Log.d(TAG, "Ending band select.");
+ mIsActive = false;
+ mHelper.hideBand();
+ mSelection.applyProvisionalSelection();
+ mModel.endSelection();
+ int firstSelected = mModel.getPositionNearestOrigin();
+ if (firstSelected != BandSelectModel.NOT_SET) {
+ setSelectionFocusBegin(firstSelected);
+ }
+ }
+
+ @Override
+ public void onSelectionChanged(SparseBooleanArray updatedSelection) {
+ SparseBooleanArray delta = mSelection.setProvisionalSelection(updatedSelection);
+ for (int i = 0; i < delta.size(); i++) {
+ int position = delta.keyAt(i);
+ notifyItemStateChanged(position, delta.get(position));
+ }
+ notifySelectionChanged();
+ }
+
+ private class ViewScroller implements Runnable {
+ /**
+ * The number of milliseconds of scrolling at which scroll speed continues to increase.
+ * At first, the scroll starts slowly; then, the rate of scrolling increases until it
+ * reaches its maximum value at after this many milliseconds.
+ */
+ private static final long SCROLL_ACCELERATION_LIMIT_TIME_MS = 2000;
+
+ @Override
+ public void run() {
+ // Compute the number of pixels the pointer's y-coordinate is past the view.
+ // Negative values mean the pointer is at or before the top of the view, and
+ // positive values mean that the pointer is at or after the bottom of the view. Note
+ // that one additional pixel is added here so that the view still scrolls when the
+ // pointer is exactly at the top or bottom.
+ int pixelsPastView = 0;
+ if (mPointer.y <= 0) {
+ pixelsPastView = mPointer.y - 1;
+ } else if (mPointer.y >= mHelper.getHeight() - 1) {
+ pixelsPastView = mPointer.y - mHelper.getHeight() + 1;
+ }
+
+ if (!mIsActive || pixelsPastView == 0) {
+ // If band selection is inactive, or if it is active but not at the edge of the
+ // view, no scrolling is necessary.
+ mScrollStartTime = NOT_SET;
+ return;
+ }
+
+ if (mScrollStartTime == NOT_SET) {
+ // If the pointer was previously not at the edge of the view but now is, set the
+ // start time for the scroll.
+ mScrollStartTime = System.currentTimeMillis();
+ }
+
+ // Compute the number of pixels to scroll, and scroll that many pixels.
+ final int numPixels = computeScrollDistance(
+ pixelsPastView, System.currentTimeMillis() - mScrollStartTime);
+ mHelper.scrollBy(numPixels);
+
+ mHelper.removeCallback(mViewScroller);
+ mHelper.postRunnable(this);
+ }
+
+ /**
+ * Computes the number of pixels to scroll based on how far the pointer is past the end
+ * of the view and how long it has been there. Roughly based on ItemTouchHelper's
+ * algorithm for computing the number of pixels to scroll when an item is dragged to the
+ * end of a {@link RecyclerView}.
+ * @param pixelsPastView
+ * @param scrollDuration
+ * @return
+ */
+ private int computeScrollDistance(int pixelsPastView, long scrollDuration) {
+ final int maxScrollStep = mHelper.getHeight();
+ final int direction = (int) Math.signum(pixelsPastView);
+ final int absPastView = Math.abs(pixelsPastView);
+
+ // Calculate the ratio of how far out of the view the pointer currently resides to
+ // the entire height of the view.
+ final float outOfBoundsRatio = Math.min(
+ 1.0f, (float) absPastView / mHelper.getHeight());
+ // Interpolate this ratio and use it to compute the maximum scroll that should be
+ // possible for this step.
+ final float cappedScrollStep =
+ direction * maxScrollStep * smoothOutOfBoundsRatio(outOfBoundsRatio);
+
+ // Likewise, calculate the ratio of the time spent in the scroll to the limit.
+ final float timeRatio = Math.min(
+ 1.0f, (float) scrollDuration / SCROLL_ACCELERATION_LIMIT_TIME_MS);
+ // Interpolate this ratio and use it to compute the final number of pixels to
+ // scroll.
+ final int numPixels = (int) (cappedScrollStep * smoothTimeRatio(timeRatio));
+
+ // If the final number of pixels to scroll ends up being 0, the view should still
+ // scroll at least one pixel.
+ return numPixels != 0 ? numPixels : direction;
+ }
+
+ /**
+ * Interpolates the given out of bounds ratio on a curve which starts at (0,0) and ends
+ * at (1,1) and quickly approaches 1 near the start of that interval. This ensures that
+ * drags that are at the edge or barely past the edge of the view still cause sufficient
+ * scrolling. The equation y=(x-1)^5+1 is used, but this could also be tweaked if
+ * needed.
+ * @param ratio A ratio which is in the range [0, 1].
+ * @return A "smoothed" value, also in the range [0, 1].
+ */
+ private float smoothOutOfBoundsRatio(float ratio) {
+ return (float) Math.pow(ratio - 1.0f, 5) + 1.0f;
+ }
+
+ /**
+ * Interpolates the given time ratio on a curve which starts at (0,0) and ends at (1,1)
+ * and stays close to 0 for most input values except those very close to 1. This ensures
+ * that scrolls start out very slowly but speed up drastically after the scroll has been
+ * in progress close to SCROLL_ACCELERATION_LIMIT_TIME_MS. The equation y=x^5 is used,
+ * but this could also be tweaked if needed.
+ * @param ratio A ratio which is in the range [0, 1].
+ * @return A "smoothed" value, also in the range [0, 1].
+ */
+ private float smoothTimeRatio(float ratio) {
+ return (float) Math.pow(ratio, 5);
+ }
+ };
+
+ @Override
+ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+ if (!mIsActive) {
+ return;
+ }
+
+ // Adjust the y-coordinate of the origin the opposite number of pixels so that the
+ // origin remains in the same place relative to the view's items.
+ mOrigin.y -= dy;
+ resizeBandSelectRectangle();
+ }
+ }
+
+ /**
+ * Provides a band selection item model for views within a RecyclerView. This class queries the
+ * RecyclerView to determine where its items are placed; then, once band selection is underway,
+ * it alerts listeners of which items are covered by the selections.
+ */
+ public static final class BandSelectModel extends RecyclerView.OnScrollListener {
+
+ public static final int NOT_SET = -1;
+
+ // Enum values used to determine the corner at which the origin is located within the
+ private static final int UPPER = 0x00;
+ private static final int LOWER = 0x01;
+ private static final int LEFT = 0x00;
+ private static final int RIGHT = 0x02;
+ private static final int UPPER_LEFT = UPPER | LEFT;
+ private static final int UPPER_RIGHT = UPPER | RIGHT;
+ private static final int LOWER_LEFT = LOWER | LEFT;
+ private static final int LOWER_RIGHT = LOWER | RIGHT;
+
+ private final BandModelHelper mHelper;
+ private final List<OnSelectionChangedListener> mOnSelectionChangedListeners = new ArrayList<>();
+
+ // Map from the x-value of the left side of a SparseBooleanArray of adapter positions, keyed
+ // by their y-offset. For example, if the first column of the view starts at an x-value of 5,
+ // mColumns.get(5) would return an array of positions in that column. Within that array, the
+ // value for key y is the adapter position for the item whose y-offset is y.
+ private final SparseArray<SparseIntArray> mColumns = new SparseArray<>();
+
+ // List of limits along the x-axis. For example, if the view has two columns, this list will
+ // have two elements, each of which lists the lower- and upper-limits of the x-values of the
+ // view items. This list is sorted from furthest left to furthest right.
+ private final List<Limits> mXLimitsList = new ArrayList<>();
+
+ // Like mXLimitsList, but for y-coordinates. Note that this list only contains items which
+ // have been in the viewport. Thus, limits which exist in an area of the view to which the
+ // view has not scrolled are not present in the list.
+ private final List<Limits> mYLimitsList = new ArrayList<>();
+
+ // The adapter positions which have been recorded so far.
+ private final SparseBooleanArray mKnownPositions = new SparseBooleanArray();
+
+ // Array passed to registered OnSelectionChangedListeners. One array is created and reused
+ // throughout the lifetime of the object.
+ private final SparseBooleanArray mSelection = new SparseBooleanArray();
+
+ // The current pointer (in absolute positioning from the top of the view).
+ private Point mPointer = null;
+
+ // The bounds of the band selection.
+ private RelativePoint mRelativeOrigin;
+ private RelativePoint mRelativePointer;
+
+ private boolean mIsActive;
+
+ // Tracks where the band select originated from. This is used to determine where selections
+ // should expand from when Shift+click is used.
+ private int mPositionNearestOrigin = NOT_SET;
+
+ BandSelectModel(BandModelHelper helper) {
+ mHelper = helper;
+ mHelper.addOnScrollListener(this);
+ }
+
+ /**
+ * Stops listening to the view's scrolls. Call this function before discarding a
+ * BandSelecModel object to prevent memory leaks.
+ */
+ void stopListening() {
+ mHelper.removeOnScrollListener(this);
+ }
+
+ /**
+ * Start a band select operation at the given point.
+ * @param relativeOrigin The origin of the band select operation, relative to the viewport.
+ * For example, if the view is scrolled to the bottom, the top-left of the viewport
+ * would have a relative origin of (0, 0), even though its absolute point has a higher
+ * y-value.
+ */
+ void startSelection(Point relativeOrigin) {
+ mIsActive = true;
+ mPointer = mHelper.createAbsolutePoint(relativeOrigin);
+
+ recordVisibleChildren();
+ mRelativeOrigin = new RelativePoint(mPointer);
+ mRelativePointer = new RelativePoint(mPointer);
+ computeCurrentSelection();
+ notifyListeners();
+ }
+
+ /**
+ * Resizes the selection by adjusting the pointer (i.e., the corner of the selection
+ * opposite the origin.
+ * @param relativePointer The pointer (opposite of the origin) of the band select operation,
+ * relative to the viewport. For example, if the view is scrolled to the bottom, the
+ * top-left of the viewport would have a relative origin of (0, 0), even though its
+ * absolute point has a higher y-value.
+ */
+ void resizeSelection(Point relativePointer) {
+ mPointer = mHelper.createAbsolutePoint(relativePointer);
+ updateModel();
+ }
+
+ /**
+ * Ends the band selection.
+ */
+ void endSelection() {
+ mIsActive = false;
+ }
+
+ /**
+ * @return The adapter position for the item nearest the origin corresponding to the latest
+ * band select operation, or NOT_SET if the selection did not cover any items.
+ */
+ int getPositionNearestOrigin() {
+ return mPositionNearestOrigin;
+ }
+
+ @Override
+ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+ if (!mIsActive) {
+ return;
+ }
+
+ mPointer.x += dx;
+ mPointer.y += dy;
+ recordVisibleChildren();
+ updateModel();
+ }
+
+ /**
+ * Queries the view for all children and records their location metadata.
+ */
+ private void recordVisibleChildren() {
+ for (int i = 0; i < mHelper.getVisibleChildCount(); i++) {
+ int adapterPosition = mHelper.getAdapterPositionAt(i);
+ if (!mKnownPositions.get(adapterPosition)) {
+ mKnownPositions.put(adapterPosition, true);
+ recordItemData(
+ mHelper.getAbsoluteRectForChildViewAt(i), adapterPosition);
+ }
+ }
+ }
+
+ /**
+ * Updates the limits lists and column map with the given item metadata.
+ * @param absoluteChildRect The absolute rectangle for the child view being processed.
+ * @param adapterPosition The position of the child view being processed.
+ */
+ private void recordItemData(Rect absoluteChildRect, int adapterPosition) {
+ if (mXLimitsList.size() != mHelper.getNumColumns()) {
+ // If not all x-limits have been recorded, record this one.
+ recordLimits(
+ mXLimitsList, new Limits(absoluteChildRect.left, absoluteChildRect.right));
+ }
+
+ if (mYLimitsList.size() != mHelper.getNumRows()) {
+ // If not all y-limits have been recorded, record this one.
+ recordLimits(
+ mYLimitsList, new Limits(absoluteChildRect.top, absoluteChildRect.bottom));
+ }
+
+ SparseIntArray columnList = mColumns.get(absoluteChildRect.left);
+ if (columnList == null) {
+ columnList = new SparseIntArray();
+ mColumns.put(absoluteChildRect.left, columnList);
+ }
+ columnList.put(absoluteChildRect.top, adapterPosition);
+ }
+
+ /**
+ * Ensures limits exists within the sorted list limitsList, and adds it to the list if it
+ * does not exist.
+ */
+ private void recordLimits(List<Limits> limitsList, Limits limits) {
+ int index = Collections.binarySearch(limitsList, limits);
+ if (index < 0) {
+ limitsList.add(~index, limits);
+ }
+ }
+
+ /**
+ * Handles a moved pointer; this function determines whether the pointer movement resulted
+ * in a selection change and, if it has, notifies listeners of this change.
+ */
+ private void updateModel() {
+ RelativePoint old = mRelativePointer;
+ mRelativePointer = new RelativePoint(mPointer);
+ if (old != null && mRelativePointer.equals(old)) {
+ return;
+ }
+
+ computeCurrentSelection();
+ notifyListeners();
+ }
+
+ /**
+ * Computes the currently-selected items.
+ */
+ private void computeCurrentSelection() {
+ if (areItemsCoveredBySelection(mRelativePointer, mRelativeOrigin)) {
+ updateSelection(computeBounds());
+ } else {
+ mSelection.clear();
+ mPositionNearestOrigin = NOT_SET;
+ }
+ }
+
+ /**
+ * Notifies all listeners of a selection change. Note that this function simply passes
+ * mSelection, so computeCurrentSelection() should be called before this
+ * function.
+ */
+ private void notifyListeners() {
+ for (OnSelectionChangedListener listener : mOnSelectionChangedListeners) {
+ listener.onSelectionChanged(mSelection);
+ }
+ }
+
+ /**
+ * @param rect Rectangle including all covered items.
+ */
+ private void updateSelection(Rect rect) {
+ int columnStartIndex =
+ Collections.binarySearch(mXLimitsList, new Limits(rect.left, rect.left));
+ checkState(columnStartIndex >= 0);
+ int columnEndIndex = columnStartIndex;
+
+ for (int i = columnStartIndex;
+ i < mXLimitsList.size() && mXLimitsList.get(i).lowerLimit <= rect.right; i++) {
+ columnEndIndex = i;
+ }
+
+ SparseIntArray firstColumn =
+ mColumns.get(mXLimitsList.get(columnStartIndex).lowerLimit);
+ int rowStartIndex = firstColumn.indexOfKey(rect.top);
+ if (rowStartIndex < 0) {
+ mPositionNearestOrigin = NOT_SET;
+ return;
+ }
+
+ int rowEndIndex = rowStartIndex;
+ for (int i = rowStartIndex;
+ i < firstColumn.size() && firstColumn.keyAt(i) <= rect.bottom; i++) {
+ rowEndIndex = i;
+ }
+
+ updateSelection(columnStartIndex, columnEndIndex, rowStartIndex, rowEndIndex);
+ }
+
+ /**
+ * Computes the selection given the previously-computed start- and end-indices for each
+ * row and column.
+ */
+ private void updateSelection(
+ int columnStartIndex, int columnEndIndex, int rowStartIndex, int rowEndIndex) {
+ mSelection.clear();
+ for (int column = columnStartIndex; column <= columnEndIndex; column++) {
+ SparseIntArray items = mColumns.get(mXLimitsList.get(column).lowerLimit);
+ for (int row = rowStartIndex; row <= rowEndIndex; row++) {
+ int position = items.get(items.keyAt(row));
+ mSelection.append(position, true);
+ if (isPossiblePositionNearestOrigin(column, columnStartIndex, columnEndIndex,
+ row, rowStartIndex, rowEndIndex)) {
+ // If this is the position nearest the origin, record it now so that it
+ // can be returned by endSelection() later.
+ mPositionNearestOrigin = position;
+ }
+ }
+ }
+ }
+
+ /**
+ * @return Returns true if the position is the nearest to the origin, or, in the case of the
+ * lower-right corner, whether it is possible that the position is the nearest to the
+ * origin. See comment below for reasoning for this special case.
+ */
+ private boolean isPossiblePositionNearestOrigin(int columnIndex, int columnStartIndex,
+ int columnEndIndex, int rowIndex, int rowStartIndex, int rowEndIndex) {
+ int corner = computeCornerNearestOrigin();
+ switch (corner) {
+ case UPPER_LEFT:
+ return columnIndex == columnStartIndex && rowIndex == rowStartIndex;
+ case UPPER_RIGHT:
+ return columnIndex == columnEndIndex && rowIndex == rowStartIndex;
+ case LOWER_LEFT:
+ return columnIndex == columnStartIndex && rowIndex == rowEndIndex;
+ case LOWER_RIGHT:
+ // Note that in some cases, the last row will not have as many items as there
+ // are columns (e.g., if there are 4 items and 3 columns, the second row will
+ // only have one item in the first column). This function is invoked for each
+ // position from left to right, so return true for any position in the bottom
+ // row and only the right-most position in the bottom row will be recorded.
+ return rowIndex == rowEndIndex;
+ default:
+ throw new RuntimeException("Invalid corner type.");
+ }
+ }
+
+ /**
+ * Listener for changes in which items have been band selected.
+ */
+ static interface OnSelectionChangedListener {
+ public void onSelectionChanged(SparseBooleanArray updatedSelection);
+ }
+
+ void addOnSelectionChangedListener(OnSelectionChangedListener listener) {
+ mOnSelectionChangedListeners.add(listener);
+ }
+
+ void removeOnSelectionChangedListener(OnSelectionChangedListener listener) {
+ mOnSelectionChangedListeners.remove(listener);
+ }
+
+ /**
+ * Limits of a view item. For example, if an item's left side is at x-value 5 and its right side
+ * is at x-value 10, the limits would be from 5 to 10. Used to record the left- and right sides
+ * of item columns and the top- and bottom sides of item rows so that it can be determined
+ * whether the pointer is located within the bounds of an item.
+ */
+ private class Limits implements Comparable<Limits> {
+ int lowerLimit;
+ int upperLimit;
+
+ Limits(int lowerLimit, int upperLimit) {
+ this.lowerLimit = lowerLimit;
+ this.upperLimit = upperLimit;
+ }
+
+ @Override
+ public int compareTo(Limits other) {
+ return lowerLimit - other.lowerLimit;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof Limits)) {
+ return false;
+ }
+
+ return ((Limits) other).lowerLimit == lowerLimit &&
+ ((Limits) other).upperLimit == upperLimit;
+ }
+ }
+
+ /**
+ * The location of a coordinate relative to items. This class represents a general area of the
+ * view as it relates to band selection rather than an explicit point. For example, two
+ * different points within an item are considered to have the same "location" because band
+ * selection originating within the item would select the same items no matter which point
+ * was used. Same goes for points between items as well as those at the very beginning or end
+ * of the view.
+ *
+ * Tracking a coordinate (e.g., an x-value) as a CoordinateLocation instead of as an int has the
+ * advantage of tying the value to the Limits of items along that axis. This allows easy
+ * selection of items within those Limits as opposed to a search through every item to see if a
+ * given coordinate value falls within those Limits.
+ */
+ private class RelativeCoordinate
+ implements Comparable<RelativeCoordinate> {
+ /**
+ * Location describing points after the last known item.
+ */
+ static final int AFTER_LAST_ITEM = 0;
+
+ /**
+ * Location describing points before the first known item.
+ */
+ static final int BEFORE_FIRST_ITEM = 1;
+
+ /**
+ * Location describing points between two items.
+ */
+ static final int BETWEEN_TWO_ITEMS = 2;
+
+ /**
+ * Location describing points within the limits of one item.
+ */
+ static final int WITHIN_LIMITS = 3;
+
+ /**
+ * The type of this coordinate, which is one of AFTER_LAST_ITEM, BEFORE_FIRST_ITEM,
+ * BETWEEN_TWO_ITEMS, or WITHIN_LIMITS.
+ */
+ final int type;
+
+ /**
+ * The limits before the coordinate; only populated when type == WITHIN_LIMITS or type ==
+ * BETWEEN_TWO_ITEMS.
+ */
+ Limits limitsBeforeCoordinate;
+
+ /**
+ * The limits after the coordinate; only populated when type == BETWEEN_TWO_ITEMS.
+ */
+ Limits limitsAfterCoordinate;
+
+ // Limits of the first known item; only populated when type == BEFORE_FIRST_ITEM.
+ Limits mFirstKnownItem;
+ // Limits of the last known item; only populated when type == AFTER_LAST_ITEM.
+ Limits mLastKnownItem;
+
+ /**
+ * @param limitsList The sorted limits list for the coordinate type. If this
+ * CoordinateLocation is an x-value, mXLimitsList should be passed; otherwise,
+ * mYLimitsList should be pased.
+ * @param value The coordinate value.
+ */
+ RelativeCoordinate(List<Limits> limitsList, int value) {
+ Limits dummyLimits = new Limits(value, value);
+ int index = Collections.binarySearch(limitsList, dummyLimits);
+
+ if (index >= 0) {
+ this.type = WITHIN_LIMITS;
+ this.limitsBeforeCoordinate = limitsList.get(index);
+ } else if (~index == 0) {
+ this.type = BEFORE_FIRST_ITEM;
+ this.mFirstKnownItem = limitsList.get(0);
+ } else if (~index == limitsList.size()) {
+ Limits lastLimits = limitsList.get(limitsList.size() - 1);
+ if (lastLimits.lowerLimit <= value && value <= lastLimits.upperLimit) {
+ this.type = WITHIN_LIMITS;
+ this.limitsBeforeCoordinate = lastLimits;
+ } else {
+ this.type = AFTER_LAST_ITEM;
+ this.mLastKnownItem = lastLimits;
+ }
+ } else {
+ Limits limitsBeforeIndex = limitsList.get(~index - 1);
+ if (limitsBeforeIndex.lowerLimit <= value && value <= limitsBeforeIndex.upperLimit) {
+ this.type = WITHIN_LIMITS;
+ this.limitsBeforeCoordinate = limitsList.get(~index - 1);
+ } else {
+ this.type = BETWEEN_TWO_ITEMS;
+ this.limitsBeforeCoordinate = limitsList.get(~index - 1);
+ this.limitsAfterCoordinate = limitsList.get(~index);
+ }
+ }
+ }
+
+ int toComparisonValue() {
+ if (type == BEFORE_FIRST_ITEM) {
+ return mFirstKnownItem.lowerLimit - 1;
+ } else if (type == AFTER_LAST_ITEM) {
+ return mLastKnownItem.upperLimit + 1;
+ } else if (type == BETWEEN_TWO_ITEMS) {
+ return limitsBeforeCoordinate.upperLimit + 1;
+ } else {
+ return limitsBeforeCoordinate.lowerLimit;
+ }
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof RelativeCoordinate)) {
+ return false;
+ }
+
+ RelativeCoordinate otherCoordinate = (RelativeCoordinate) other;
+ return toComparisonValue() == otherCoordinate.toComparisonValue();
+ }
+
+ @Override
+ public int compareTo(RelativeCoordinate other) {
+ return toComparisonValue() - other.toComparisonValue();
+ }
+ }
+
+ /**
+ * The location of a point relative to the Limits of nearby items; consists of both an x- and
+ * y-RelativeCoordinateLocation.
+ */
+ private class RelativePoint {
+ final RelativeCoordinate xLocation;
+ final RelativeCoordinate yLocation;
+
+ RelativePoint(Point point) {
+ this.xLocation = new RelativeCoordinate(mXLimitsList, point.x);
+ this.yLocation = new RelativeCoordinate(mYLimitsList, point.y);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof RelativePoint)) {
+ return false;
+ }
+
+ RelativePoint otherPoint = (RelativePoint) other;
+ return xLocation.equals(otherPoint.xLocation) && yLocation.equals(otherPoint.yLocation);
+ }
+ }
+
+ /**
+ * Generates a rectangle which contains the items selected by the pointer and origin.
+ * @return The rectangle, or null if no items were selected.
+ */
+ private Rect computeBounds() {
+ Rect rect = new Rect();
+ rect.left = getCoordinateValue(
+ min(mRelativeOrigin.xLocation, mRelativePointer.xLocation),
+ mXLimitsList,
+ true);
+ rect.right = getCoordinateValue(
+ max(mRelativeOrigin.xLocation, mRelativePointer.xLocation),
+ mXLimitsList,
+ false);
+ rect.top = getCoordinateValue(
+ min(mRelativeOrigin.yLocation, mRelativePointer.yLocation),
+ mYLimitsList,
+ true);
+ rect.bottom = getCoordinateValue(
+ max(mRelativeOrigin.yLocation, mRelativePointer.yLocation),
+ mYLimitsList,
+ false);
+ return rect;
+ }
+
+ /**
+ * Computes the corner of the selection nearest the origin.
+ * @return
+ */
+ private int computeCornerNearestOrigin() {
+ int cornerValue = 0;
+
+ if (mRelativeOrigin.yLocation ==
+ min(mRelativeOrigin.yLocation, mRelativePointer.yLocation)) {
+ cornerValue |= UPPER;
+ } else {
+ cornerValue |= LOWER;
+ }
+
+ if (mRelativeOrigin.xLocation ==
+ min(mRelativeOrigin.xLocation, mRelativePointer.xLocation)) {
+ cornerValue |= LEFT;
+ } else {
+ cornerValue |= RIGHT;
+ }
+
+ return cornerValue;
+ }
+
+ private RelativeCoordinate min(RelativeCoordinate first, RelativeCoordinate second) {
+ return first.compareTo(second) < 0 ? first : second;
+ }
+
+ private RelativeCoordinate max(RelativeCoordinate first, RelativeCoordinate second) {
+ return first.compareTo(second) > 0 ? first : second;
+ }
+
+ /**
+ * @return The absolute coordinate (i.e., the x- or y-value) of the given relative
+ * coordinate.
+ */
+ private int getCoordinateValue(RelativeCoordinate coordinate,
+ List<Limits> limitsList, boolean isStartOfRange) {
+ switch (coordinate.type) {
+ case RelativeCoordinate.BEFORE_FIRST_ITEM:
+ return limitsList.get(0).lowerLimit;
+ case RelativeCoordinate.AFTER_LAST_ITEM:
+ return limitsList.get(limitsList.size() - 1).upperLimit;
+ case RelativeCoordinate.BETWEEN_TWO_ITEMS:
+ if (isStartOfRange) {
+ return coordinate.limitsAfterCoordinate.lowerLimit;
+ } else {
+ return coordinate.limitsBeforeCoordinate.upperLimit;
+ }
+ case RelativeCoordinate.WITHIN_LIMITS:
+ return coordinate.limitsBeforeCoordinate.lowerLimit;
+ }
+
+ throw new RuntimeException("Invalid coordinate value.");
+ }
+
+ private boolean areItemsCoveredBySelection(
+ RelativePoint first, RelativePoint second) {
+ return doesCoordinateLocationCoverItems(first.xLocation, second.xLocation) &&
+ doesCoordinateLocationCoverItems(first.yLocation, second.yLocation);
+ }
+
+ private boolean doesCoordinateLocationCoverItems(
+ RelativeCoordinate pointerCoordinate,
+ RelativeCoordinate originCoordinate) {
+ if (pointerCoordinate.type == RelativeCoordinate.BEFORE_FIRST_ITEM &&
+ originCoordinate.type == RelativeCoordinate.BEFORE_FIRST_ITEM) {
+ return false;
+ }
+
+ if (pointerCoordinate.type == RelativeCoordinate.AFTER_LAST_ITEM &&
+ originCoordinate.type == RelativeCoordinate.AFTER_LAST_ITEM) {
+ return false;
+ }
+
+ if (pointerCoordinate.type == RelativeCoordinate.BETWEEN_TWO_ITEMS &&
+ originCoordinate.type == RelativeCoordinate.BETWEEN_TWO_ITEMS &&
+ pointerCoordinate.limitsBeforeCoordinate.equals(
+ originCoordinate.limitsBeforeCoordinate) &&
+ pointerCoordinate.limitsAfterCoordinate.equals(
+ originCoordinate.limitsAfterCoordinate)) {
+ return false;
+ }
+
+ return true;
+ }
+ }
}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/BandSelectMatrixTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/BandSelectModelTest.java
similarity index 71%
rename from packages/DocumentsUI/tests/src/com/android/documentsui/BandSelectMatrixTest.java
rename to packages/DocumentsUI/tests/src/com/android/documentsui/BandSelectModelTest.java
index f15a643..20c4548 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/BandSelectMatrixTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/BandSelectModelTest.java
@@ -18,7 +18,7 @@
import static org.junit.Assert.*;
-import com.android.documentsui.BandSelectMatrix;
+import com.android.documentsui.MultiSelectManager.BandSelectModel;
import android.graphics.Point;
import android.graphics.Rect;
@@ -28,13 +28,13 @@
import org.junit.After;
import org.junit.Test;
-public class BandSelectMatrixTest {
+public class BandSelectModelTest {
private static final int VIEW_PADDING_PX = 5;
private static final int CHILD_VIEW_EDGE_PX = 100;
private static final int VIEWPORT_HEIGHT = 500;
- private static BandSelectMatrix matrix;
+ private static BandSelectModel model;
private static TestHelper helper;
private static SparseBooleanArray lastSelection;
private static int viewWidth;
@@ -42,8 +42,8 @@
private static void setUp(int numChildren, int numColumns) {
helper = new TestHelper(numChildren, numColumns);
viewWidth = VIEW_PADDING_PX + numColumns * (VIEW_PADDING_PX + CHILD_VIEW_EDGE_PX);
- matrix = new BandSelectMatrix(helper);
- matrix.addOnSelectionChangedListener(new BandSelectMatrix.OnSelectionChangedListener() {
+ model = new BandSelectModel(helper);
+ model.addOnSelectionChangedListener(new BandSelectModel.OnSelectionChangedListener() {
@Override
public void onSelectionChanged(SparseBooleanArray updatedSelection) {
@@ -54,7 +54,7 @@
@After
public void tearDown() {
- matrix = null;
+ model = null;
helper = null;
lastSelection = null;
}
@@ -62,111 +62,120 @@
@Test
public void testSelectionLeftOfItems() {
setUp(20, 5);
- matrix.startSelection(new Point(0, 10));
- matrix.resizeSelection(new Point(1, 11));
+ model.startSelection(new Point(0, 10));
+ model.resizeSelection(new Point(1, 11));
assertSelected(new int[0]);
+ assertEquals(BandSelectModel.NOT_SET, model.getPositionNearestOrigin());
}
@Test
public void testSelectionRightOfItems() {
setUp(20, 4);
- matrix.startSelection(new Point(viewWidth - 1, 10));
- matrix.resizeSelection(new Point(viewWidth - 2, 11));
+ model.startSelection(new Point(viewWidth - 1, 10));
+ model.resizeSelection(new Point(viewWidth - 2, 11));
assertSelected(new int[0]);
+ assertEquals(BandSelectModel.NOT_SET, model.getPositionNearestOrigin());
}
@Test
public void testSelectionAboveItems() {
setUp(20, 4);
- matrix.startSelection(new Point(10, 0));
- matrix.resizeSelection(new Point(11, 1));
+ model.startSelection(new Point(10, 0));
+ model.resizeSelection(new Point(11, 1));
assertSelected(new int[0]);
+ assertEquals(BandSelectModel.NOT_SET, model.getPositionNearestOrigin());
}
@Test
public void testSelectionBelowItems() {
setUp(5, 4);
- matrix.startSelection(new Point(10, VIEWPORT_HEIGHT - 1));
- matrix.resizeSelection(new Point(11, VIEWPORT_HEIGHT - 2));
+ model.startSelection(new Point(10, VIEWPORT_HEIGHT - 1));
+ model.resizeSelection(new Point(11, VIEWPORT_HEIGHT - 2));
assertSelected(new int[0]);
+ assertEquals(BandSelectModel.NOT_SET, model.getPositionNearestOrigin());
}
@Test
public void testVerticalSelectionBetweenItems() {
setUp(20, 4);
- matrix.startSelection(new Point(106, 0));
- matrix.resizeSelection(new Point(107, 200));
+ model.startSelection(new Point(106, 0));
+ model.resizeSelection(new Point(107, 200));
assertSelected(new int[0]);
+ assertEquals(BandSelectModel.NOT_SET, model.getPositionNearestOrigin());
}
@Test
public void testHorizontalSelectionBetweenItems() {
setUp(20, 4);
- matrix.startSelection(new Point(0, 105));
- matrix.resizeSelection(new Point(200, 106));
+ model.startSelection(new Point(0, 105));
+ model.resizeSelection(new Point(200, 106));
assertSelected(new int[0]);
+ assertEquals(BandSelectModel.NOT_SET, model.getPositionNearestOrigin());
}
@Test
public void testGrowingAndShrinkingSelection() {
setUp(20, 4);
- matrix.startSelection(new Point(0, 0));
- matrix.resizeSelection(new Point(5, 5));
+ model.startSelection(new Point(0, 0));
+ model.resizeSelection(new Point(5, 5));
assertSelected(new int[] {0});
- matrix.resizeSelection(new Point(109, 109));
+ model.resizeSelection(new Point(109, 109));
assertSelected(new int[] {0});
- matrix.resizeSelection(new Point(110, 109));
+ model.resizeSelection(new Point(110, 109));
assertSelected(new int[] {0, 1});
- matrix.resizeSelection(new Point(110, 110));
+ model.resizeSelection(new Point(110, 110));
assertSelected(new int[] {0, 1, 4, 5});
- matrix.resizeSelection(new Point(214, 214));
+ model.resizeSelection(new Point(214, 214));
assertSelected(new int[] {0, 1, 4, 5});
- matrix.resizeSelection(new Point(215, 214));
+ model.resizeSelection(new Point(215, 214));
assertSelected(new int[] {0, 1, 2, 4, 5, 6});
- matrix.resizeSelection(new Point(214, 214));
+ model.resizeSelection(new Point(214, 214));
assertSelected(new int[] {0, 1, 4, 5});
- matrix.resizeSelection(new Point(110, 110));
+ model.resizeSelection(new Point(110, 110));
assertSelected(new int[] {0, 1, 4, 5});
- matrix.resizeSelection(new Point(110, 109));
+ model.resizeSelection(new Point(110, 109));
assertSelected(new int[] {0, 1});
- matrix.resizeSelection(new Point(109, 109));
+ model.resizeSelection(new Point(109, 109));
assertSelected(new int[] {0});
- matrix.resizeSelection(new Point(5, 5));
+ model.resizeSelection(new Point(5, 5));
assertSelected(new int[] {0});
- matrix.resizeSelection(new Point(0, 0));
+ model.resizeSelection(new Point(0, 0));
assertSelected(new int[0]);
+ assertEquals(BandSelectModel.NOT_SET, model.getPositionNearestOrigin());
}
@Test
public void testSelectionMovingAroundOrigin() {
setUp(16, 4);
- matrix.startSelection(new Point(210, 210));
- matrix.resizeSelection(new Point(viewWidth - 1, 0));
+ model.startSelection(new Point(210, 210));
+ model.resizeSelection(new Point(viewWidth - 1, 0));
assertSelected(new int[] {2, 3, 6, 7});
- matrix.resizeSelection(new Point(0, 0));
+ model.resizeSelection(new Point(0, 0));
assertSelected(new int[] {0, 1, 4, 5});
- matrix.resizeSelection(new Point(0, 420));
+ model.resizeSelection(new Point(0, 420));
assertSelected(new int[] {8, 9, 12, 13});
- matrix.resizeSelection(new Point(viewWidth - 1, 420));
+ model.resizeSelection(new Point(viewWidth - 1, 420));
assertSelected(new int[] {10, 11, 14, 15});
+ assertEquals(10, model.getPositionNearestOrigin());
}
@Test
public void testScrollingBandSelect() {
setUp(40, 4);
- matrix.startSelection(new Point(0, 0));
- matrix.resizeSelection(new Point(100, VIEWPORT_HEIGHT - 1));
+ model.startSelection(new Point(0, 0));
+ model.resizeSelection(new Point(100, VIEWPORT_HEIGHT - 1));
assertSelected(new int[] {0, 4, 8, 12, 16});
scroll(CHILD_VIEW_EDGE_PX);
assertSelected(new int[] {0, 4, 8, 12, 16, 20});
- matrix.resizeSelection(new Point(200, VIEWPORT_HEIGHT - 1));
+ model.resizeSelection(new Point(200, VIEWPORT_HEIGHT - 1));
assertSelected(new int[] {0, 1, 4, 5, 8, 9, 12, 13, 16, 17, 20, 21});
scroll(CHILD_VIEW_EDGE_PX);
assertSelected(new int[] {0, 1, 4, 5, 8, 9, 12, 13, 16, 17, 20, 21, 24, 25});
scroll(-2 * CHILD_VIEW_EDGE_PX);
assertSelected(new int[] {0, 1, 4, 5, 8, 9, 12, 13, 16, 17});
- matrix.resizeSelection(new Point(100, VIEWPORT_HEIGHT - 1));
+ model.resizeSelection(new Point(100, VIEWPORT_HEIGHT - 1));
assertSelected(new int[] {0, 4, 8, 12, 16});
+ assertEquals(0, model.getPositionNearestOrigin());
}
private static void assertSelected(int[] selectedPositions) {
@@ -179,10 +188,10 @@
private static void scroll(int dy) {
assertTrue(helper.verticalOffset + VIEWPORT_HEIGHT + dy <= helper.getTotalHeight());
helper.verticalOffset += dy;
- matrix.onScrolled(null, 0, dy);
+ model.onScrolled(null, 0, dy);
}
- private static final class TestHelper implements BandSelectMatrix.RecyclerViewHelper {
+ private static final class TestHelper implements MultiSelectManager.BandModelHelper {
public int horizontalOffset = 0;
public int verticalOffset = 0;
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManagerTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManagerTest.java
index 03ad3d4..b82251c 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManagerTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/MultiSelectManagerTest.java
@@ -19,12 +19,12 @@
import static org.junit.Assert.*;
import android.support.v7.widget.RecyclerView;
+import android.util.SparseBooleanArray;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
-import com.android.documentsui.MultiSelectManager.RecyclerViewHelper;
import com.android.documentsui.MultiSelectManager.Selection;
import org.junit.Before;
@@ -79,7 +79,7 @@
@Test
public void mouseClick_NoPosition_ClearsSelection() {
- mManager.onLongPress(7);
+ mManager.onLongPress(7, 0);
click(11);
click(RecyclerView.NO_POSITION);
assertSelection();
@@ -95,27 +95,27 @@
@Test
public void longPress_StartsSelectionMode() {
- mManager.onLongPress(7);
+ mManager.onLongPress(7, 0);
assertSelection(7);
}
@Test
public void longPress_SecondPressExtendsSelection() {
- mManager.onLongPress(7);
- mManager.onLongPress(99);
+ mManager.onLongPress(7, 0);
+ mManager.onLongPress(99, 0);
assertSelection(7, 99);
}
@Test
public void singleTapUp_UnselectsSelectedItem() {
- mManager.onLongPress(7);
+ mManager.onLongPress(7, 0);
tap(7);
assertSelection();
}
@Test
public void singleTapUp_NoPosition_ClearsSelection() {
- mManager.onLongPress(7);
+ mManager.onLongPress(7, 0);
tap(11);
tap(RecyclerView.NO_POSITION);
assertSelection();
@@ -123,7 +123,7 @@
@Test
public void singleTapUp_ExtendsSelection() {
- mManager.onLongPress(99);
+ mManager.onLongPress(99, 0);
tap(7);
tap(13);
tap(129899);
@@ -132,21 +132,21 @@
@Test
public void singleTapUp_ShiftCreatesRangeSelection() {
- mManager.onLongPress(7);
+ mManager.onLongPress(7, 0);
shiftTap(17);
assertRangeSelection(7, 17);
}
@Test
public void singleTapUp_ShiftCreatesRangeSeletion_Backwards() {
- mManager.onLongPress(17);
+ mManager.onLongPress(17, 0);
shiftTap(7);
assertRangeSelection(7, 17);
}
@Test
public void singleTapUp_SecondShiftClickExtendsSelection() {
- mManager.onLongPress(7);
+ mManager.onLongPress(7, 0);
shiftTap(11);
shiftTap(17);
assertRangeSelection(7, 17);
@@ -154,7 +154,7 @@
@Test
public void singleTapUp_MultipleContiguousRangesSelected() {
- mManager.onLongPress(7);
+ mManager.onLongPress(7, 0);
shiftTap(11);
tap(20);
shiftTap(25);
@@ -165,7 +165,7 @@
@Test
public void singleTapUp_ShiftReducesSelectionRange_FromPreviousShiftClick() {
- mManager.onLongPress(7);
+ mManager.onLongPress(7, 0);
shiftTap(17);
shiftTap(10);
assertRangeSelection(7, 10);
@@ -173,7 +173,7 @@
@Test
public void singleTapUp_ShiftReducesSelectionRange_FromPreviousShiftClick_Backwards() {
- mManager.onLongPress(17);
+ mManager.onLongPress(17, 0);
shiftTap(7);
shiftTap(14);
assertRangeSelection(14, 17);
@@ -182,7 +182,7 @@
@Test
public void singleTapUp_ShiftReversesSelectionDirection() {
- mManager.onLongPress(7);
+ mManager.onLongPress(7, 0);
shiftTap(17);
shiftTap(0);
assertRangeSelection(0, 7);
@@ -206,6 +206,36 @@
assertSelection(20);
}
+ @Test
+ public void provisionaSelection() {
+ Selection s = mManager.getSelection();
+ assertSelection();
+
+ SparseBooleanArray provisional = new SparseBooleanArray();
+ provisional.append(1, true);
+ provisional.append(2, true);
+ s.setProvisionalSelection(provisional);
+ assertSelection(1, 2);
+
+ provisional.delete(1);
+ provisional.append(3, true);
+ s.setProvisionalSelection(provisional);
+ assertSelection(2, 3);
+
+ s.applyProvisionalSelection();
+ assertSelection(2, 3);
+
+ provisional.clear();
+ provisional.append(3, true);
+ provisional.append(4, true);
+ s.setProvisionalSelection(provisional);
+ assertSelection(2, 3, 4);
+
+ provisional.delete(3);
+ s.setProvisionalSelection(provisional);
+ assertSelection(2, 3, 4);
+ }
+
private void tap(int position) {
mManager.onSingleTapUp(position, 0, MotionEvent.TOOL_TYPE_MOUSE);
}
@@ -252,7 +282,8 @@
assertEquals(selection.toString(), expected, selection.size());
}
- private static final class EventHelper implements RecyclerViewHelper {
+ private static final class EventHelper implements MultiSelectManager.MultiSelectHelper {
+
@Override
public int findEventPosition(MotionEvent e) {
throw new UnsupportedOperationException();
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/UnitTests.java b/packages/DocumentsUI/tests/src/com/android/documentsui/UnitTests.java
index 0553270..d90130f 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/UnitTests.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/UnitTests.java
@@ -22,7 +22,7 @@
@RunWith(Suite.class)
@SuiteClasses({
- BandSelectMatrixTest.class,
+ BandSelectModelTest.class,
MultiSelectManager_SelectionTest.class,
MultiSelectManagerTest.class
})
diff --git a/packages/Keyguard/res/values-pl/strings.xml b/packages/Keyguard/res/values-pl/strings.xml
index 8fd2086..04930c5 100644
--- a/packages/Keyguard/res/values-pl/strings.xml
+++ b/packages/Keyguard/res/values-pl/strings.xml
@@ -141,5 +141,5 @@
<item quantity="other">Urządzenie nie zostało odblokowane od <xliff:g id="NUMBER_1">%d</xliff:g> godziny. Potwierdź hasło.</item>
<item quantity="one">Urządzenie nie zostało odblokowane od <xliff:g id="NUMBER_0">%d</xliff:g> godziny. Potwierdź hasło.</item>
</plurals>
- <string name="fingerprint_not_recognized" msgid="2690661881608146617">"Nie rozpoznano"</string>
+ <string name="fingerprint_not_recognized" msgid="2690661881608146617">"Nie rozpoznano odcisku palca."</string>
</resources>
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
index 77215a7..f45b9bd 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -255,7 +255,6 @@
if (DEBUG) Log.d(TAG, "reportFailedPatternAttempt: #" + failedAttempts);
- SecurityMode mode = mSecurityModel.getSecurityMode();
final int currentUser = KeyguardUpdateMonitor.getCurrentUser();
final DevicePolicyManager dpm = mLockPatternUtils.getDevicePolicyManager();
final int failedAttemptsBeforeWipe =
@@ -264,7 +263,6 @@
final int remainingBeforeWipe = failedAttemptsBeforeWipe > 0 ?
(failedAttemptsBeforeWipe - failedAttempts)
: Integer.MAX_VALUE; // because DPM returns 0 if no restriction
- boolean showTimeout = false;
if (remainingBeforeWipe < LockPatternUtils.FAILED_ATTEMPTS_BEFORE_WIPE_GRACE) {
// The user has installed a DevicePolicyManager that requests a user/profile to be wiped
// N attempts. Once we get below the grace period, we post this dialog every time as a
@@ -273,7 +271,8 @@
final int expiringUser = dpm.getProfileWithMinimumFailedPasswordsForWipe(currentUser);
int userType = USER_TYPE_PRIMARY;
if (expiringUser == currentUser) {
- if (expiringUser != UserHandle.USER_OWNER) {
+ // TODO: http://b/23522538
+ if (expiringUser != UserHandle.USER_SYSTEM) {
userType = USER_TYPE_SECONDARY_USER;
}
} else if (expiringUser != UserHandle.USER_NULL) {
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index ead0307..fc6117f 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -523,7 +523,8 @@
final DevicePolicyManager dpm =
(DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
return dpm != null && (dpm.getKeyguardDisabledFeatures(null, userId)
- & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0;
+ & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0
+ || isSimPinSecure();
}
public boolean getUserCanSkipBouncer(int userId) {
@@ -1016,7 +1017,7 @@
private boolean shouldListenForFingerprint() {
return (mKeyguardIsVisible || !mDeviceInteractive) && !mSwitchingUser
- && !mFingerprintAlreadyAuthenticated;
+ && !mFingerprintAlreadyAuthenticated && !isFingerprintDisabled(getCurrentUser());
}
private void startListeningForFingerprint() {
@@ -1090,6 +1091,7 @@
* Handle {@link #MSG_DPM_STATE_CHANGED}
*/
protected void handleDevicePolicyManagerStateChanged() {
+ updateFingerprintListeningState();
for (int i = mCallbacks.size() - 1; i >= 0; i--) {
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
if (cb != null) {
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocument.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocument.java
index 7126694..c1d9609 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocument.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocument.java
@@ -76,18 +76,25 @@
void addToCursor(Identifier rootIdentifier, MatrixCursor.RowBuilder builder) {
final Identifier identifier = new Identifier(
rootIdentifier.mDeviceId, rootIdentifier.mStorageId, mObjectHandle);
+ final String mimeType = formatTypeToMimeType(mFormat);
int flag = 0;
if (mObjectHandle != DUMMY_HANDLE_FOR_ROOT) {
- flag |= DocumentsContract.Document.FLAG_SUPPORTS_DELETE;
if (mThumbSize > 0) {
flag |= DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL;
}
+ if (!mReadOnly) {
+ flag |= DocumentsContract.Document.FLAG_SUPPORTS_DELETE |
+ DocumentsContract.Document.FLAG_SUPPORTS_WRITE;
+ }
+ }
+ if (mimeType == DocumentsContract.Document.MIME_TYPE_DIR && !mReadOnly) {
+ flag |= DocumentsContract.Document.FLAG_DIR_SUPPORTS_CREATE;
}
builder.add(Document.COLUMN_DOCUMENT_ID, identifier.toDocumentId());
builder.add(Document.COLUMN_DISPLAY_NAME, mName);
- builder.add(Document.COLUMN_MIME_TYPE, formatTypeToMimeType(mFormat));
+ builder.add(Document.COLUMN_MIME_TYPE, mimeType);
builder.add(
Document.COLUMN_LAST_MODIFIED,
mDateModified != null ? mDateModified.getTime() : null);
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
index 031cc07..a3cf3e2 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
@@ -167,13 +167,18 @@
public ParcelFileDescriptor openDocument(
String documentId, String mode, CancellationSignal signal)
throws FileNotFoundException {
- if (!"r".equals(mode) && !"w".equals(mode)) {
- // TODO: Support seekable file.
- throw new UnsupportedOperationException("The provider does not support seekable file.");
- }
final Identifier identifier = Identifier.createFromDocumentId(documentId);
try {
- return mPipeManager.readDocument(mMtpManager, identifier);
+ switch (mode) {
+ case "r":
+ return mPipeManager.readDocument(mMtpManager, identifier);
+ case "w":
+ return mPipeManager.writeDocument(getContext(), mMtpManager, identifier);
+ default:
+ // TODO: Add support for seekable files.
+ throw new UnsupportedOperationException(
+ "The provider does not support seekable file.");
+ }
} catch (IOException error) {
throw new FileNotFoundException(error.getMessage());
}
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
index 27ba794..6647009 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
@@ -108,6 +108,11 @@
return results;
}
+ synchronized MtpObjectInfo getObjectInfo(int deviceId, int objectHandle) throws IOException {
+ final MtpDevice device = getDevice(deviceId);
+ return device.getObjectInfo(objectHandle);
+ }
+
synchronized MtpDocument getDocument(int deviceId, int objectHandle) throws IOException {
final MtpDevice device = getDevice(deviceId);
return new MtpDocument(device.getObjectInfo(objectHandle));
@@ -137,15 +142,20 @@
}
}
+ // TODO: Remove this method.
synchronized int createDocument(int deviceId, int storageId, int parentObjectHandle,
String mimeType, String name) throws IOException {
- final MtpDevice device = getDevice(deviceId);
final MtpObjectInfo objectInfo = new MtpObjectInfo.Builder()
.setName(name)
.setStorageId(storageId)
.setParent(parentObjectHandle)
.setFormat(MtpDocument.mimeTypeToFormatType(mimeType))
.build();
+ return createDocument(deviceId, objectInfo);
+ }
+
+ synchronized int createDocument(int deviceId, MtpObjectInfo objectInfo) throws IOException {
+ final MtpDevice device = getDevice(deviceId);
final MtpObjectInfo result = device.sendObjectInfo(objectInfo);
if (result == null) {
throw new IOException("Failed to create a document");
@@ -168,6 +178,13 @@
device.importFile(objectHandle, target);
}
+ synchronized void sendObject(int deviceId, int objectHandle, int size,
+ ParcelFileDescriptor source) throws IOException {
+ final MtpDevice device = getDevice(deviceId);
+ if (!device.sendObject(objectHandle, size, source))
+ throw new IOException("Failed to send a document");
+ }
+
private MtpDevice getDevice(int deviceId) throws IOException {
final MtpDevice device = mDevices.get(deviceId);
if (device == null) {
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/PipeManager.java b/packages/MtpDocumentsProvider/src/com/android/mtp/PipeManager.java
index ba13b31..53f1b65 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/PipeManager.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/PipeManager.java
@@ -16,10 +16,16 @@
package com.android.mtp;
+import android.content.Context;
+import android.mtp.MtpObjectInfo;
import android.os.ParcelFileDescriptor;
import android.util.Log;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -40,6 +46,13 @@
return task.getReadingFileDescriptor();
}
+ ParcelFileDescriptor writeDocument(Context context, MtpManager model, Identifier identifier)
+ throws IOException {
+ final Task task = new WriteDocumentTask(context, model, identifier);
+ mExecutor.execute(task);
+ return task.getWritingFileDescriptor();
+ }
+
ParcelFileDescriptor readThumbnail(MtpManager model, Identifier identifier) throws IOException {
final Task task = new GetThumbnailTask(model, identifier);
mExecutor.execute(task);
@@ -60,6 +73,10 @@
ParcelFileDescriptor getReadingFileDescriptor() {
return mDescriptors[0];
}
+
+ ParcelFileDescriptor getWritingFileDescriptor() {
+ return mDescriptors[1];
+ }
}
private static class ImportFileTask extends Task {
@@ -83,6 +100,70 @@
}
}
+ private static class WriteDocumentTask extends Task {
+ private final Context mContext;
+
+ WriteDocumentTask(Context context, MtpManager model, Identifier identifier)
+ throws IOException {
+ super(model, identifier);
+ mContext = context;
+ }
+
+ @Override
+ public void run() {
+ File tempFile = null;
+ try {
+ // Obtain a temporary file and copy the data to it.
+ tempFile = mContext.getCacheDir().createTempFile("mtp", "tmp");
+ try (
+ final FileOutputStream tempOutputStream =
+ new ParcelFileDescriptor.AutoCloseOutputStream(
+ ParcelFileDescriptor.open(
+ tempFile, ParcelFileDescriptor.MODE_WRITE_ONLY));
+ final ParcelFileDescriptor.AutoCloseInputStream inputStream =
+ new ParcelFileDescriptor.AutoCloseInputStream(mDescriptors[0])
+ ) {
+ final byte[] buffer = new byte[32 * 1024];
+ int bytes;
+ while ((bytes = inputStream.read(buffer)) != -1) {
+ mDescriptors[0].checkError();
+ tempOutputStream.write(buffer, 0, bytes);
+ }
+ tempOutputStream.flush();
+ }
+
+ // Get the placeholder object info.
+ final MtpObjectInfo placeholderObjectInfo =
+ mManager.getObjectInfo(mIdentifier.mDeviceId, mIdentifier.mObjectHandle);
+
+ // Delete the target object info if it already exists (as a placeholder).
+ mManager.deleteDocument(mIdentifier.mDeviceId, mIdentifier.mObjectHandle);
+
+ // Create the target object info with a correct file size.
+ final int targetObjectHandle =
+ mManager.createDocument(
+ mIdentifier.mDeviceId,
+ new MtpObjectInfo.Builder(placeholderObjectInfo)
+ .setCompressedSize((int) tempFile.length())
+ .build());
+
+ // Upload the object.
+ final ParcelFileDescriptor tempInputDescriptor = ParcelFileDescriptor.open(
+ tempFile, ParcelFileDescriptor.MODE_READ_ONLY);
+ mManager.sendObject(mIdentifier.mDeviceId,
+ targetObjectHandle, (int) tempFile.length(), tempInputDescriptor);
+
+ } catch (IOException error) {
+ Log.w(MtpDocumentsProvider.TAG,
+ "Failed to send a file because of: " + error.getMessage());
+ } finally {
+ if (tempFile != null) {
+ tempFile.delete();
+ }
+ }
+ }
+ }
+
private static class GetThumbnailTask extends Task {
GetThumbnailTask(MtpManager model, Identifier identifier) throws IOException {
super(model, identifier);
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
index 16be669..1826bd0 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
@@ -211,7 +211,7 @@
new Date(1422716400000L) /* modified date */,
1024 * 1024 * 5 /* file size */,
1024 * 50 /* thumbnail size */,
- true /* read only */));
+ false /* read only */));
final Cursor cursor = mProvider.queryDocument("0_1_2", null);
assertEquals(1, cursor.getCount());
@@ -222,11 +222,37 @@
assertEquals(1422716400000L, cursor.getLong(3));
assertEquals(
DocumentsContract.Document.FLAG_SUPPORTS_DELETE |
+ DocumentsContract.Document.FLAG_SUPPORTS_WRITE |
DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL,
cursor.getInt(4));
assertEquals(1024 * 1024 * 5, cursor.getInt(5));
}
+ public void testQueryDocument_directory() throws IOException {
+ mMtpManager.setDocument(0, 2, new MtpDocument(
+ 2 /* object handle */,
+ 0x3001 /* directory */,
+ "directory" /* display name */,
+ new Date(1422716400000L) /* modified date */,
+ 0 /* file size */,
+ 0 /* thumbnail size */,
+ false /* read only */));
+ final Cursor cursor = mProvider.queryDocument("0_1_2", null);
+ assertEquals(1, cursor.getCount());
+
+ cursor.moveToNext();
+ assertEquals("0_1_2", cursor.getString(0));
+ assertEquals(DocumentsContract.Document.MIME_TYPE_DIR, cursor.getString(1));
+ assertEquals("directory", cursor.getString(2));
+ assertEquals(1422716400000L, cursor.getLong(3));
+ assertEquals(
+ DocumentsContract.Document.FLAG_SUPPORTS_DELETE |
+ DocumentsContract.Document.FLAG_SUPPORTS_WRITE |
+ DocumentsContract.Document.FLAG_DIR_SUPPORTS_CREATE,
+ cursor.getInt(4));
+ assertEquals(0, cursor.getInt(5));
+ }
+
public void testQueryDocument_forRoot() throws IOException {
mMtpManager.setRoots(0, new MtpRoot[] {
new MtpRoot(
@@ -269,10 +295,7 @@
assertEquals("image/jpeg", cursor.getString(1));
assertEquals("image.jpg", cursor.getString(2));
assertEquals(0, cursor.getLong(3));
- assertEquals(
- DocumentsContract.Document.FLAG_SUPPORTS_DELETE |
- DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL,
- cursor.getInt(4));
+ assertEquals(DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL, cursor.getInt(4));
assertEquals(1024 * 1024 * 5, cursor.getInt(5));
assertFalse(cursor.moveToNext());
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java
index 35918e1..e2cc3ed 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java
@@ -21,6 +21,7 @@
import android.test.suitebuilder.annotation.SmallTest;
import java.io.IOException;
+import java.util.Date;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -53,6 +54,41 @@
assertDescriptorError(descriptor);
}
+ public void testWriteDocument_basic() throws Exception {
+ // Create a placeholder file which should be replaced by a real file later.
+ mtpManager.setDocument(0, 1, new MtpDocument(1, 0, "", new Date(), 0, 0, false));
+
+ // Upload testing bytes.
+ final ParcelFileDescriptor descriptor = pipeManager.writeDocument(
+ getContext(), mtpManager, new Identifier(0, 0, 1));
+ final ParcelFileDescriptor.AutoCloseOutputStream outputStream =
+ new ParcelFileDescriptor.AutoCloseOutputStream(descriptor);
+ outputStream.write(HELLO_BYTES, 0, HELLO_BYTES.length);
+ outputStream.close();
+ executor.awaitTermination(1000, TimeUnit.MILLISECONDS);
+
+ // Check if the placeholder file is removed.
+ try {
+ final MtpDocument placeholderDocument = mtpManager.getDocument(0, 1);
+ fail(); // The placeholder file has not been deleted.
+ } catch (IOException e) {
+ // Expected error, as the file is gone.
+ }
+
+ // Confirm that the target file is created.
+ final MtpDocument targetDocument = mtpManager.getDocument(
+ 0, TestMtpManager.CREATED_DOCUMENT_HANDLE);
+ assertTrue(targetDocument != null);
+
+ // Verify uploaded bytes.
+ final byte[] uploadedBytes = mtpManager.getImportFileBytes(
+ 0, TestMtpManager.CREATED_DOCUMENT_HANDLE);
+ assertEquals(HELLO_BYTES.length, uploadedBytes.length);
+ for (int i = 0; i < HELLO_BYTES.length; i++) {
+ assertEquals(HELLO_BYTES[i], uploadedBytes[i]);
+ }
+ }
+
public void testReadThumbnail_basic() throws Exception {
mtpManager.setThumbnail(0, 1, HELLO_BYTES);
final ParcelFileDescriptor descriptor = pipeManager.readThumbnail(
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java
index 40de7b4..94b5ba0 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java
@@ -17,10 +17,13 @@
package com.android.mtp;
import android.content.Context;
+import android.mtp.MtpObjectInfo;
+import android.mtp.MtpObjectInfo.Builder;
import android.os.ParcelFileDescriptor;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -28,6 +31,8 @@
import java.util.TreeSet;
public class TestMtpManager extends MtpManager {
+ public static final int CREATED_DOCUMENT_HANDLE = 1000;
+
protected static String pack(int... args) {
return Arrays.toString(args);
}
@@ -65,6 +70,10 @@
mImportFileBytes.put(pack(deviceId, objectHandle), bytes);
}
+ byte[] getImportFileBytes(int deviceId, int objectHandle) {
+ return mImportFileBytes.get(pack(deviceId, objectHandle));
+ }
+
void setThumbnail(int deviceId, int objectHandle, byte[] bytes) {
mThumbnailBytes.put(pack(deviceId, objectHandle), bytes);
}
@@ -109,6 +118,15 @@
}
@Override
+ MtpObjectInfo getObjectInfo(int deviceId, int objectHandle) throws IOException {
+ final MtpDocument document = getDocument(deviceId, objectHandle);
+ // It's impossible to set an object id of MtpObjectInfo at this stage. Also,
+ // it's hard to get any information from MtpDocument, as it's designed to return them
+ // only via cursors. Rework these.
+ return new MtpObjectInfo.Builder().build();
+ }
+
+ @Override
int[] getObjectHandles(int deviceId, int storageId, int parentObjectHandle) throws IOException {
final String key = pack(deviceId, storageId, parentObjectHandle);
if (mObjectHandles.containsKey(key)) {
@@ -119,8 +137,9 @@
}
@Override
- void importFile(int deviceId, int storageId, ParcelFileDescriptor target) throws IOException {
- final String key = pack(deviceId, storageId);
+ void importFile(int deviceId, int objectHandle, ParcelFileDescriptor target)
+ throws IOException {
+ final String key = pack(deviceId, objectHandle);
if (mImportFileBytes.containsKey(key)) {
try (final ParcelFileDescriptor.AutoCloseOutputStream outputStream =
new ParcelFileDescriptor.AutoCloseOutputStream(target)) {
@@ -132,6 +151,44 @@
}
@Override
+ int createDocument(int deviceId, MtpObjectInfo objectInfo) throws IOException {
+ // For simplicity, it allows to create only one document, and it always has the hardcoded
+ // CREATED_DOCUMENT_HANDLE document handle.
+ final String key = pack(deviceId, CREATED_DOCUMENT_HANDLE);
+ if (!mDocuments.containsKey(key)) {
+ mDocuments.put(key, new MtpDocument(
+ CREATED_DOCUMENT_HANDLE,
+ objectInfo.getFormat(),
+ objectInfo.getName(),
+ new Date(objectInfo.getDateModified()),
+ objectInfo.getCompressedSize(),
+ objectInfo.getThumbCompressedSize(),
+ false /* Always writable for testing. */));
+ } else {
+ throw new IOException();
+ }
+ return CREATED_DOCUMENT_HANDLE;
+ }
+
+ @Override
+ void sendObject(int deviceId, int objectHandle, int size, ParcelFileDescriptor source)
+ throws IOException {
+ final String key = pack(deviceId, objectHandle);
+ if (!mDocuments.containsKey(key)) {
+ throw new IOException();
+ }
+
+ ParcelFileDescriptor.AutoCloseInputStream inputStream =
+ new ParcelFileDescriptor.AutoCloseInputStream(source);
+ byte[] buffer = new byte[size];
+ if (inputStream.read(buffer, 0, size) != size) {
+ throw new IOException();
+ }
+
+ mImportFileBytes.put(pack(deviceId, objectHandle), buffer);
+ }
+
+ @Override
byte[] getThumbnail(int deviceId, int objectHandle) throws IOException {
final String key = pack(deviceId, objectHandle);
if (mThumbnailBytes.containsKey(key)) {
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index efacd2c..e00b55e 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -65,6 +65,7 @@
<uses-permission android:name="android.permission.READ_INPUT_STATE" />
<uses-permission android:name="android.permission.SET_ORIENTATION" />
<uses-permission android:name="android.permission.INSTALL_PACKAGES" />
+ <uses-permission android:name="android.permission.MOVE_PACKAGE" />
<uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
<uses-permission android:name="android.permission.DELETE_CACHE_FILES" />
<uses-permission android:name="android.permission.DELETE_PACKAGES" />
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml
new file mode 100755
index 0000000..1c50165
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="strokeColor"
+ android:valueFrom="#FFF3511E"
+ android:valueTo="#FFFFFFFF"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="strokeAlpha"
+ android:valueFrom="1.0"
+ android:valueTo="0.5"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="383"
+ android:propertyName="trimPathStart"
+ android:valueFrom="0.5001"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_3" />
+ <objectAnimator
+ android:duration="383"
+ android:propertyName="trimPathEnd"
+ android:valueFrom="1.5"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_1" />
+</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_2_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_2_animation.xml
new file mode 100755
index 0000000..598255c
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_2_animation.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="316"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="233"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M 0.0,-1.988645 c 1.09829830627,0.0 1.988645,0.890346693734 1.988645,1.988645 c 0.0,1.09829830627 -0.890346693734,1.988645 -1.988645,1.988645 c -1.09829830627,0.0 -1.988645,-0.890346693734 -1.988645,-1.988645 c 0.0,-1.09829830627 0.890346693734,-1.988645 1.988645,-1.988645 Z"
+ android:valueType="pathType"
+ android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_1" />
+ </set>
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFF3511E"
+ android:valueTo="#FFFFFFFF"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="1.0"
+ android:valueTo="0.5"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_exclamation_dot_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_exclamation_dot_animation.xml
new file mode 100755
index 0000000..7e0fa43
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_exclamation_dot_animation.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="133"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M -0.00391,5.333 c 0.00065,-0.22217 0.00326,-1.11083 0.00391,-1.333"
+ android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_0" />
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="83"
+ android:propertyName="scaleX"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="16"
+ android:propertyName="scaleX"
+ android:valueFrom="1.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="83"
+ android:propertyName="scaleY"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="16"
+ android:propertyName="scaleY"
+ android:valueFrom="1.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_left_side_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_left_side_animation.xml
new file mode 100755
index 0000000..f413cbf
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_lock_left_side_animation.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="33"
+ android:propertyName="scaleX"
+ android:valueFrom="1.33333"
+ android:valueTo="1.33333"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="183"
+ android:propertyName="scaleX"
+ android:valueFrom="1.33333"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="33"
+ android:propertyName="scaleY"
+ android:valueFrom="1.33333"
+ android:valueTo="1.33333"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="183"
+ android:propertyName="scaleY"
+ android:valueFrom="1.33333"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_right_side_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_right_side_animation.xml
new file mode 100755
index 0000000..f413cbf
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_lock_right_side_animation.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="33"
+ android:propertyName="scaleX"
+ android:valueFrom="1.33333"
+ android:valueTo="1.33333"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="183"
+ android:propertyName="scaleX"
+ android:valueFrom="1.33333"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="33"
+ android:propertyName="scaleY"
+ android:valueFrom="1.33333"
+ android:valueTo="1.33333"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="183"
+ android:propertyName="scaleY"
+ android:valueFrom="1.33333"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml
new file mode 100755
index 0000000..2518041
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="333"
+ android:propertyName="scaleX"
+ android:valueFrom="0.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="16"
+ android:propertyName="scaleX"
+ android:valueFrom="0.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="333"
+ android:propertyName="scaleY"
+ android:valueFrom="0.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="16"
+ android:propertyName="scaleY"
+ android:valueFrom="0.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml
new file mode 100755
index 0000000..15f8d2e
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="33"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.02685546875,-4.96875 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 -0.00936889648438,3.9296875 -0.00936889648438,3.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0028076171875,0.0234375 -0.0028076171875,0.0234375 c 0.0,0.0 0.010498046875,-0.015625 0.010498046875,-0.015625 c 0.0,0.0 0.985595703125,0.0078125 0.985595703125,0.0078125 c 0.0,0.0 0.017578125,-6.015625 0.017578125,-6.015625 c 0.0,0.0 0.104400634766,0.0546875 -0.99560546875,0.0546875 Z"
+ android:valueTo="M 0.02685546875,-4.96875 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 -0.00936889648438,3.9296875 -0.00936889648438,3.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0028076171875,0.0234375 -0.0028076171875,0.0234375 c 0.0,0.0 0.010498046875,-0.015625 0.010498046875,-0.015625 c 0.0,0.0 0.985595703125,0.0078125 0.985595703125,0.0078125 c 0.0,0.0 0.017578125,-6.015625 0.017578125,-6.015625 c 0.0,0.0 0.104400634766,0.0546875 -0.99560546875,0.0546875 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="183"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.02685546875,-4.96875 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 -0.00936889648438,3.9296875 -0.00936889648438,3.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0028076171875,0.0234375 -0.0028076171875,0.0234375 c 0.0,0.0 0.010498046875,-0.015625 0.010498046875,-0.015625 c 0.0,0.0 0.985595703125,0.0078125 0.985595703125,0.0078125 c 0.0,0.0 0.017578125,-6.015625 0.017578125,-6.015625 c 0.0,0.0 0.104400634766,0.0546875 -0.99560546875,0.0546875 Z"
+ android:valueTo="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.0118713378906,7.9296875 0.0118713378906,7.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 -0.01123046875,-7.9296875 -0.01123046875,-7.9296875 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="316"
+ android:propertyName="pathData"
+ android:valueFrom="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.0118713378906,7.9296875 0.0118713378906,7.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 -0.01123046875,-7.9296875 -0.01123046875,-7.9296875 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
+ android:valueTo="M 6.00561523438,-4.046875 c 0.0,0.0 -5.98999023438,0.0 -5.98999023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 5.98812866211,0.0 5.98812866211,0.0 c 0.0,0.0 0.00064086914062,10.0 0.00064086914062,10.0 c 0.0,0.0 -5.98840332031,0.0 -5.98840332031,0.0 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 5.99487304688,0.0 5.99487304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.0 0.0,-10.0 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_4" />
+ </set>
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFF3511E"
+ android:valueTo="#FFFFFFFF"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="1.0"
+ android:valueTo="0.5"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml
new file mode 100755
index 0000000..aa81fcf
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="33"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0252990722656,-2.96914672852 c 0.0,0.0 -0.00390625,0.0160217285156 -0.00390625,0.0160217285156 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 0.005615234375,-0.015625 0.005615234375,-0.015625 c -1.10000610352,0.0 -1.01220703125,-0.0546875 -1.01220703125,-0.0546875 c 0.0,0.0 -0.017578125,6.015625 -0.017578125,6.015625 c 0.0,0.0 -0.0777893066406,-0.0078125 1.02221679688,-0.0078125 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 -0.002685546875,-0.0244140625 -0.002685546875,-0.0244140625 c 0.0,0.0 0.00390625,-0.0152587890625 0.00390625,-0.0152587890625 c 0.0,0.0 0.0104064941406,-3.92947387695 0.0104064941406,-3.92947387695 Z"
+ android:valueTo="M 0.0252990722656,-2.96914672852 c 0.0,0.0 -0.00390625,0.0160217285156 -0.00390625,0.0160217285156 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 0.005615234375,-0.015625 0.005615234375,-0.015625 c -1.10000610352,0.0 -1.01220703125,-0.0546875 -1.01220703125,-0.0546875 c 0.0,0.0 -0.017578125,6.015625 -0.017578125,6.015625 c 0.0,0.0 -0.0777893066406,-0.0078125 1.02221679688,-0.0078125 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 -0.002685546875,-0.0244140625 -0.002685546875,-0.0244140625 c 0.0,0.0 0.00390625,-0.0152587890625 0.00390625,-0.0152587890625 c 0.0,0.0 0.0104064941406,-3.92947387695 0.0104064941406,-3.92947387695 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="183"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0252990722656,-2.96914672852 c 0.0,0.0 -0.00390625,0.0160217285156 -0.00390625,0.0160217285156 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 0.005615234375,-0.015625 0.005615234375,-0.015625 c -1.10000610352,0.0 -1.01220703125,-0.0546875 -1.01220703125,-0.0546875 c 0.0,0.0 -0.017578125,6.015625 -0.017578125,6.015625 c 0.0,0.0 -0.0777893066406,-0.0078125 1.02221679688,-0.0078125 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 -0.002685546875,-0.0244140625 -0.002685546875,-0.0244140625 c 0.0,0.0 0.00390625,-0.0152587890625 0.00390625,-0.0152587890625 c 0.0,0.0 0.0104064941406,-3.92947387695 0.0104064941406,-3.92947387695 Z"
+ android:valueTo="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.01123046875,7.9296875 0.01123046875,7.9296875 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 -0.0108337402344,-7.92947387695 -0.0108337402344,-7.92947387695 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="316"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.01123046875,7.9296875 0.01123046875,7.9296875 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 -0.0108337402344,-7.92947387695 -0.0108337402344,-7.92947387695 Z"
+ android:valueTo="M -5.9959564209,-2.04727172852 c 0.0,0.0 6.01173400879,0.00039672851562 6.01173400879,0.00039672851562 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -6.01000976562,0.0 -6.01000976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.0 0.0,10.0 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 6.01000976562,0.0 6.01000976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 -6.01171875,0.0003662109375 -6.01171875,0.0003662109375 c 0.0,0.0 0.00038146972656,-9.99978637695 0.00038146972656,-9.99978637695 Z"
+ android:valueType="pathType"
+ android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_4" />
+ </set>
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFF3511E"
+ android:valueTo="#FFFFFFFF"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="1.0"
+ android:valueTo="0.5"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml
new file mode 100755
index 0000000..f94fe0a
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="233"
+ android:propertyName="pathData"
+ android:valueFrom="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
+ android:valueTo="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="366"
+ android:propertyName="pathData"
+ android:valueFrom="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
+ android:valueTo="M 5.00619506836,-6.046875 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_2" />
+ </set>
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFF3511E"
+ android:valueTo="#FFFFFFFF"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="1.0"
+ android:valueTo="0.5"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_rectangle_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_rectangle_path_1_animation.xml
new file mode 100755
index 0000000..bcc8c41
--- /dev/null
+++ b/packages/SystemUI/res/anim/error_to_trustedstate_rectangle_path_1_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFF3511E"
+ android:valueTo="#FFFFFFFF"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="1.0"
+ android:valueTo="0.5"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_1_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_1_animation.xml
new file mode 100755
index 0000000..5cf4809
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_1_animation.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="strokeColor"
+ android:valueFrom="#FFFFFFFF"
+ android:valueTo="#FFF3511E"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="strokeAlpha"
+ android:valueFrom="0.5"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="166"
+ android:propertyName="trimPathOffset"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="433"
+ android:propertyName="trimPathOffset"
+ android:valueFrom="1.0"
+ android:valueTo="0.5"
+ android:valueType="floatType"
+ android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_2" />
+ </set>
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="166"
+ android:propertyName="trimPathStart"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="433"
+ android:propertyName="trimPathStart"
+ android:valueFrom="1.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_0" />
+ </set>
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_2_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_2_animation.xml
new file mode 100755
index 0000000..a387f97
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_2_animation.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-1.988645 c 1.09829830627,0.0 1.988645,0.890346693734 1.988645,1.988645 c 0.0,1.09829830627 -0.890346693734,1.988645 -1.988645,1.988645 c -1.09829830627,0.0 -1.988645,-0.890346693734 -1.988645,-1.988645 c 0.0,-1.09829830627 0.890346693734,-1.988645 1.988645,-1.988645 Z"
+ android:valueTo="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFFFFFFF"
+ android:valueTo="#FFF3511E"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="0.5"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_exclamation_dot_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_exclamation_dot_animation.xml
new file mode 100755
index 0000000..7a9fb3b
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_exclamation_dot_animation.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="566"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 0.0,4.0 c -0.00065,0.22217 -0.00326,1.11083 -0.00391,1.333"
+ android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_1" />
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyName="scaleX"
+ android:valueFrom="0.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="16"
+ android:propertyName="scaleX"
+ android:valueFrom="0.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyName="scaleY"
+ android:valueFrom="0.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="16"
+ android:propertyName="scaleY"
+ android:valueFrom="0.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_left_side_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_lock_left_side_animation.xml
new file mode 100755
index 0000000..2a4753a
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_lock_left_side_animation.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleX"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleX"
+ android:valueFrom="1.0"
+ android:valueTo="1.33333"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleY"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleY"
+ android:valueFrom="1.0"
+ android:valueTo="1.33333"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_right_side_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_lock_right_side_animation.xml
new file mode 100755
index 0000000..2a4753a
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_lock_right_side_animation.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleX"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleX"
+ android:valueFrom="1.0"
+ android:valueTo="1.33333"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleY"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleY"
+ android:valueFrom="1.0"
+ android:valueTo="1.33333"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml
new file mode 100755
index 0000000..1f601d3
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="116"
+ android:propertyName="scaleX"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="16"
+ android:propertyName="scaleX"
+ android:valueFrom="1.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="116"
+ android:propertyName="scaleY"
+ android:valueFrom="1.0"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="16"
+ android:propertyName="scaleY"
+ android:valueFrom="1.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml
new file mode 100755
index 0000000..7b9be5c
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="33"
+ android:propertyName="pathData"
+ android:valueFrom="M 6.00561523438,-4.046875 c 0.0,0.0 -5.98999023438,0.0 -5.98999023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 5.98812866211,0.0 5.98812866211,0.0 c 0.0,0.0 0.00064086914062,10.0 0.00064086914062,10.0 c 0.0,0.0 -5.98840332031,0.0 -5.98840332031,0.0 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 5.99487304688,0.0 5.99487304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.0 0.0,-10.0 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
+ android:valueTo="M 6.00561523438,-4.046875 c 0.0,0.0 -5.98999023438,0.0 -5.98999023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 5.98812866211,0.0 5.98812866211,0.0 c 0.0,0.0 0.00064086914062,10.0 0.00064086914062,10.0 c 0.0,0.0 -5.98840332031,0.0 -5.98840332031,0.0 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 5.99487304688,0.0 5.99487304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.0 0.0,-10.0 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="166"
+ android:propertyName="pathData"
+ android:valueFrom="M 6.00561523438,-4.046875 c 0.0,0.0 -5.98999023438,0.0 -5.98999023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 5.98812866211,0.0 5.98812866211,0.0 c 0.0,0.0 0.00064086914062,10.0 0.00064086914062,10.0 c 0.0,0.0 -5.98840332031,0.0 -5.98840332031,0.0 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 5.99487304688,0.0 5.99487304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.0 0.0,-10.0 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
+ android:valueTo="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.00064086914062,10.625 0.00064086914062,10.625 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.625 0.0,-10.625 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="pathData"
+ android:valueFrom="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.00064086914062,10.625 0.00064086914062,10.625 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.625 0.0,-10.625 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
+ android:valueTo="M 0.02685546875,-4.96875 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 -0.00936889648438,3.9296875 -0.00936889648438,3.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0028076171875,0.0234375 -0.0028076171875,0.0234375 c 0.0,0.0 0.010498046875,-0.015625 0.010498046875,-0.015625 c 0.0,0.0 0.985595703125,0.0078125 0.985595703125,0.0078125 c 0.0,0.0 0.017578125,-6.015625 0.017578125,-6.015625 c 0.0,0.0 0.104400634766,0.0546875 -0.99560546875,0.0546875 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFFFFFFF"
+ android:valueTo="#FFF3511E"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="0.5"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml
new file mode 100755
index 0000000..8eb0c62
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="33"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.9959564209,-2.04727172852 c 0.0,0.0 6.01173400879,0.00039672851562 6.01173400879,0.00039672851562 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -6.01000976562,0.0 -6.01000976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.0 0.0,10.0 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 6.01000976562,0.0 6.01000976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 -6.01171875,0.0003662109375 -6.01171875,0.0003662109375 c 0.0,0.0 0.00038146972656,-9.99978637695 0.00038146972656,-9.99978637695 Z"
+ android:valueTo="M -5.9959564209,-2.04727172852 c 0.0,0.0 6.01173400879,0.00039672851562 6.01173400879,0.00039672851562 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -6.01000976562,0.0 -6.01000976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.0 0.0,10.0 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 6.01000976562,0.0 6.01000976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 -6.01171875,0.0003662109375 -6.01171875,0.0003662109375 c 0.0,0.0 0.00038146972656,-9.99978637695 0.00038146972656,-9.99978637695 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="166"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.9959564209,-2.04727172852 c 0.0,0.0 6.01173400879,0.00039672851562 6.01173400879,0.00039672851562 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -6.01000976562,0.0 -6.01000976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.0 0.0,10.0 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 6.01000976562,0.0 6.01000976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 -6.01171875,0.0003662109375 -6.01171875,0.0003662109375 c 0.0,0.0 0.00038146972656,-9.99978637695 0.00038146972656,-9.99978637695 Z"
+ android:valueTo="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.625 0.0,10.625 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 0.00039672851562,-10.624786377 0.00039672851562,-10.624786377 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.625 0.0,10.625 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 0.00039672851562,-10.624786377 0.00039672851562,-10.624786377 Z"
+ android:valueTo="M 0.0252990722656,-2.96914672852 c 0.0,0.0 -0.00390625,0.0160217285156 -0.00390625,0.0160217285156 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 0.005615234375,-0.015625 0.005615234375,-0.015625 c -1.10000610352,0.0 -1.01220703125,-0.0546875 -1.01220703125,-0.0546875 c 0.0,0.0 -0.017578125,6.015625 -0.017578125,6.015625 c 0.0,0.0 -0.0777893066406,-0.0078125 1.02221679688,-0.0078125 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 -0.002685546875,-0.0244140625 -0.002685546875,-0.0244140625 c 0.0,0.0 0.00390625,-0.0152587890625 0.00390625,-0.0152587890625 c 0.0,0.0 0.0104064941406,-3.92947387695 0.0104064941406,-3.92947387695 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFFFFFFF"
+ android:valueTo="#FFF3511E"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="0.5"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml
new file mode 100755
index 0000000..2e86744
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="pathData"
+ android:valueFrom="M 5.00619506836,-6.046875 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
+ android:valueTo="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_3" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFFFFFFF"
+ android:valueTo="#FFF3511E"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="0.5"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_rectangle_path_1_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_rectangle_path_1_animation.xml
new file mode 100755
index 0000000..46d571c
--- /dev/null
+++ b/packages/SystemUI/res/anim/trusted_state_to_error_rectangle_path_1_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillColor"
+ android:valueFrom="#FFFFFFFF"
+ android:valueTo="#FFF3511E"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="600"
+ android:propertyName="fillAlpha"
+ android:valueFrom="0.5"
+ android:valueTo="1.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/packages/SystemUI/res/drawable/error_to_trustedstate.xml b/packages/SystemUI/res/drawable/error_to_trustedstate.xml
new file mode 100755
index 0000000..6211edf
--- /dev/null
+++ b/packages/SystemUI/res/drawable/error_to_trustedstate.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:name="error_to_trustedstate"
+ android:width="32dp"
+ android:viewportWidth="32"
+ android:height="32dp"
+ android:viewportHeight="32" >
+ <group
+ android:name="error_to_trusted_state"
+ android:translateX="16"
+ android:translateY="16" >
+ <group
+ android:name="error_circle" >
+ <path
+ android:name="ellipse_path_1"
+ android:trimPathStart="0"
+ android:trimPathEnd="1"
+ android:trimPathOffset="0.0"
+ android:strokeColor="#FFF3511E"
+ android:strokeWidth="2"
+ android:pathData="M 0.0,-12.0 c 6.6274169976,0.0 12.0,5.3725830024 12.0,12.0 c 0.0,6.6274169976 -5.3725830024,12.0 -12.0,12.0 c -6.6274169976,0.0 -12.0,-5.3725830024 -12.0,-12.0 c 0.0,-6.6274169976 5.3725830024,-12.0 12.0,-12.0 Z" />
+ </group>
+ <group
+ android:name="middle_ellipse"
+ android:translateY="2.9375" >
+ <path
+ android:name="ellipse_path_2"
+ android:fillColor="#FFF3511E"
+ android:pathData="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
+ </group>
+ <group
+ android:name="lock_right_side"
+ android:scaleX="1.33333"
+ android:scaleY="1.33333" >
+ <path
+ android:name="path_1"
+ android:pathData="M 0.02685546875,-4.96875 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 -0.00936889648438,3.9296875 -0.00936889648438,3.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0028076171875,0.0234375 -0.0028076171875,0.0234375 c 0.0,0.0 0.010498046875,-0.015625 0.010498046875,-0.015625 c 0.0,0.0 0.985595703125,0.0078125 0.985595703125,0.0078125 c 0.0,0.0 0.017578125,-6.015625 0.017578125,-6.015625 c 0.0,0.0 0.104400634766,0.0546875 -0.99560546875,0.0546875 Z"
+ android:fillColor="#FFF3511E" />
+ </group>
+ <group
+ android:name="lock_left_side"
+ android:scaleX="1.33333"
+ android:scaleY="1.33333" >
+ <path
+ android:name="path_2"
+ android:pathData="M 0.0252990722656,-2.96914672852 c 0.0,0.0 -0.00390625,0.0160217285156 -0.00390625,0.0160217285156 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 0.005615234375,-0.015625 0.005615234375,-0.015625 c -1.10000610352,0.0 -1.01220703125,-0.0546875 -1.01220703125,-0.0546875 c 0.0,0.0 -0.017578125,6.015625 -0.017578125,6.015625 c 0.0,0.0 -0.0777893066406,-0.0078125 1.02221679688,-0.0078125 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 -0.002685546875,-0.0244140625 -0.002685546875,-0.0244140625 c 0.0,0.0 0.00390625,-0.0152587890625 0.00390625,-0.0152587890625 c 0.0,0.0 0.0104064941406,-3.92947387695 0.0104064941406,-3.92947387695 Z"
+ android:fillColor="#FFF3511E" />
+ </group>
+ <group
+ android:name="lock_top"
+ android:scaleX="0"
+ android:scaleY="0" >
+ <path
+ android:name="path_3"
+ android:pathData="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
+ android:fillColor="#FFF3511E" />
+ </group>
+ <group
+ android:name="exclamation_dot"
+ android:translateX="-0.00391"
+ android:translateY="5.333" >
+ <path
+ android:name="rectangle_path_1"
+ android:fillColor="#FFF3511E"
+ android:pathData="M -1.33871,-1.3335 l 2.67742,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.667 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.67742,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.667 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
+ </group>
+ </group>
+</vector>
diff --git a/packages/SystemUI/res/drawable/error_to_trustedstate_animation.xml b/packages/SystemUI/res/drawable/error_to_trustedstate_animation.xml
new file mode 100755
index 0000000..6befe13
--- /dev/null
+++ b/packages/SystemUI/res/drawable/error_to_trustedstate_animation.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<animated-vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/error_to_trustedstate" >
+ <target
+ android:name="ellipse_path_1"
+ android:animation="@anim/error_to_trustedstate_ellipse_path_1_animation" />
+ <target
+ android:name="ellipse_path_2"
+ android:animation="@anim/error_to_trustedstate_ellipse_path_2_animation" />
+ <target
+ android:name="lock_right_side"
+ android:animation="@anim/error_to_trustedstate_lock_right_side_animation" />
+ <target
+ android:name="path_1"
+ android:animation="@anim/error_to_trustedstate_path_1_animation" />
+ <target
+ android:name="lock_left_side"
+ android:animation="@anim/error_to_trustedstate_lock_left_side_animation" />
+ <target
+ android:name="path_2"
+ android:animation="@anim/error_to_trustedstate_path_2_animation" />
+ <target
+ android:name="lock_top"
+ android:animation="@anim/error_to_trustedstate_lock_top_animation" />
+ <target
+ android:name="path_3"
+ android:animation="@anim/error_to_trustedstate_path_3_animation" />
+ <target
+ android:name="exclamation_dot"
+ android:animation="@anim/error_to_trustedstate_exclamation_dot_animation" />
+ <target
+ android:name="rectangle_path_1"
+ android:animation="@anim/error_to_trustedstate_rectangle_path_1_animation" />
+</animated-vector>
diff --git a/packages/SystemUI/res/drawable/trusted_state_to_error.xml b/packages/SystemUI/res/drawable/trusted_state_to_error.xml
new file mode 100755
index 0000000..534a9a5
--- /dev/null
+++ b/packages/SystemUI/res/drawable/trusted_state_to_error.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:name="trusted_state_to_error"
+ android:width="32dp"
+ android:viewportWidth="32"
+ android:height="32dp"
+ android:viewportHeight="32" >
+ <group
+ android:name="trusted_state_to_error_0"
+ android:translateX="16"
+ android:translateY="16" >
+ <group
+ android:name="error_circle" >
+ <path
+ android:name="ellipse_path_1"
+ android:trimPathStart="1"
+ android:trimPathOffset="1"
+ android:strokeColor="#FFFFFFFF"
+ android:strokeAlpha="0.5"
+ android:strokeWidth="2"
+ android:pathData="M 0.0,-12.0 c 6.6274169976,0.0 12.0,5.3725830024 12.0,12.0 c 0.0,6.6274169976 -5.3725830024,12.0 -12.0,12.0 c -6.6274169976,0.0 -12.0,-5.3725830024 -12.0,-12.0 c 0.0,-6.6274169976 5.3725830024,-12.0 12.0,-12.0 Z" />
+ </group>
+ <group
+ android:name="middle_ellipse"
+ android:translateY="2.9375" >
+ <path
+ android:name="ellipse_path_2"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="0.5"
+ android:pathData="M 0.0,-1.988645 c 1.09829830627,0.0 1.988645,0.890346693734 1.988645,1.988645 c 0.0,1.09829830627 -0.890346693734,1.988645 -1.988645,1.988645 c -1.09829830627,0.0 -1.988645,-0.890346693734 -1.988645,-1.988645 c 0.0,-1.09829830627 0.890346693734,-1.988645 1.988645,-1.988645 Z" />
+ </group>
+ <group
+ android:name="lock_right_side" >
+ <path
+ android:name="path_1"
+ android:pathData="M 6.00561523438,-4.046875 c 0.0,0.0 -5.98999023438,0.0 -5.98999023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 5.98812866211,0.0 5.98812866211,0.0 c 0.0,0.0 0.00064086914062,10.0 0.00064086914062,10.0 c 0.0,0.0 -5.98840332031,0.0 -5.98840332031,0.0 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 5.99487304688,0.0 5.99487304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.0 0.0,-10.0 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="0.5" />
+ </group>
+ <group
+ android:name="lock_left_side" >
+ <path
+ android:name="path_2"
+ android:pathData="M -5.9959564209,-2.04727172852 c 0.0,0.0 6.01173400879,0.00039672851562 6.01173400879,0.00039672851562 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -6.01000976562,0.0 -6.01000976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.0 0.0,10.0 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 6.01000976562,0.0 6.01000976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 -6.01171875,0.0003662109375 -6.01171875,0.0003662109375 c 0.0,0.0 0.00038146972656,-9.99978637695 0.00038146972656,-9.99978637695 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="0.5" />
+ </group>
+ <group
+ android:name="lock_top" >
+ <path
+ android:name="path_3"
+ android:pathData="M 5.00619506836,-6.046875 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="0.5" />
+ </group>
+ <group
+ android:name="exclamation_dot"
+ android:translateY="4"
+ android:scaleX="0"
+ android:scaleY="0" >
+ <path
+ android:name="rectangle_path_1"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="0.5"
+ android:pathData="M -1.33871,-1.3335 l 2.67742,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.667 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.67742,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.667 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
+ </group>
+ </group>
+</vector>
diff --git a/packages/SystemUI/res/drawable/trusted_state_to_error_animation.xml b/packages/SystemUI/res/drawable/trusted_state_to_error_animation.xml
new file mode 100755
index 0000000..5686d54
--- /dev/null
+++ b/packages/SystemUI/res/drawable/trusted_state_to_error_animation.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<animated-vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/trusted_state_to_error" >
+ <target
+ android:name="ellipse_path_1"
+ android:animation="@anim/trusted_state_to_error_ellipse_path_1_animation" />
+ <target
+ android:name="ellipse_path_2"
+ android:animation="@anim/trusted_state_to_error_ellipse_path_2_animation" />
+ <target
+ android:name="lock_right_side"
+ android:animation="@anim/trusted_state_to_error_lock_right_side_animation" />
+ <target
+ android:name="path_1"
+ android:animation="@anim/trusted_state_to_error_path_1_animation" />
+ <target
+ android:name="lock_left_side"
+ android:animation="@anim/trusted_state_to_error_lock_left_side_animation" />
+ <target
+ android:name="path_2"
+ android:animation="@anim/trusted_state_to_error_path_2_animation" />
+ <target
+ android:name="lock_top"
+ android:animation="@anim/trusted_state_to_error_lock_top_animation" />
+ <target
+ android:name="path_3"
+ android:animation="@anim/trusted_state_to_error_path_3_animation" />
+ <target
+ android:name="exclamation_dot"
+ android:animation="@anim/trusted_state_to_error_exclamation_dot_animation" />
+ <target
+ android:name="rectangle_path_1"
+ android:animation="@anim/trusted_state_to_error_rectangle_path_1_animation" />
+</animated-vector>
diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_0.xml
new file mode 100755
index 0000000..262cb88
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_0.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 l 0.254777070064,0.0 c 0.00007,0.0 0.447133757962,1.0 0.745222929936,1.0 L 1.0,1.0" />
diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml
new file mode 100755
index 0000000..9ecee94
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.00010,0.0 0.6,1.0 1.0,1.0" />
diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml
new file mode 100755
index 0000000..ae0b2d7
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.000100000000009,0.0 0.6,1.0 1.0,1.0" />
diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml
new file mode 100755
index 0000000..be7cc69
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.00010,0.0 0.2,1.0 1.0,1.0" />
diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml
new file mode 100755
index 0000000..f8f978d
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.4,0.0 0.6,1.0 1.0,1.0" />
diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml
new file mode 100755
index 0000000..9ecee94
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.00010,0.0 0.6,1.0 1.0,1.0" />
diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml
new file mode 100755
index 0000000..87ef1d4
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 l 0.412907702984,0.0 c 0.00006,0.0 0.35225537821,1.0 0.587092297016,1.0 L 1.0,1.0" />
diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml
new file mode 100755
index 0000000..be7cc69
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.00010,0.0 0.2,1.0 1.0,1.0" />
diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml
new file mode 100755
index 0000000..83af65a
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.4,0.0 0.9999,1.0 1.0,1.0" />
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index 7dd11eb..9c32052 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -270,7 +270,7 @@
<string name="quick_settings_cast_title" msgid="7709016546426454729">"Emet"</string>
<string name="quick_settings_casting" msgid="6601710681033353316">"En emissió"</string>
<string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"Dispositiu sense nom"</string>
- <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"A punt per a l\'emissió"</string>
+ <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"A punt per emetre"</string>
<string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"No hi ha cap dispositiu disponible."</string>
<string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Brillantor"</string>
<string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMÀTICA"</string>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index 5c0966c..898611d 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -270,7 +270,7 @@
<string name="quick_settings_cast_title" msgid="7709016546426454729">"Трансляція"</string>
<string name="quick_settings_casting" msgid="6601710681033353316">"Трансляція"</string>
<string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"Пристрій без назви"</string>
- <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"Можна транслювати"</string>
+ <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"Готово до трансляції"</string>
<string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"Немає пристроїв"</string>
<string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Яскравість"</string>
<string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"АВТО"</string>
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 12d5f36..6f49fd6 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -1461,6 +1461,15 @@
}
mHiding = false;
+ if (mWakeAndUnlocking && mDrawnCallback != null) {
+
+ // Hack level over 9000: To speed up wake-and-unlock sequence, force it to report
+ // the next draw from here so we don't have to wait for window manager to signal
+ // this to our ViewRootImpl.
+ mStatusBarKeyguardViewManager.getViewRootImpl().setReportNextDraw();
+ notifyDrawn(mDrawnCallback);
+ }
+
// only play "unlock" noises if not on a call (since the incall UI
// disables the keyguard)
if (TelephonyManager.EXTRA_STATE_IDLE.equals(mPhoneState)) {
@@ -1474,9 +1483,6 @@
updateActivityLockScreenState();
adjustStatusBarLocked();
sendUserPresentBroadcast();
- if (mWakeAndUnlocking && mDrawnCallback != null) {
- notifyDrawn(mDrawnCallback);
- }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
index 463abfc..93ecb06 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -100,6 +100,8 @@
// TODO: Real icon for facelock.
int state = getState();
boolean anyFingerprintIcon = state == STATE_FINGERPRINT || state == STATE_FINGERPRINT_ERROR;
+ boolean useAdditionalPadding = anyFingerprintIcon;
+ boolean trustHidden = anyFingerprintIcon;
if (state != mLastState || mDeviceInteractive != mLastDeviceInteractive
|| mScreenOn != mLastScreenOn) {
boolean isAnim = true;
@@ -107,6 +109,16 @@
mDeviceInteractive, mLastScreenOn, mScreenOn);
if (iconRes == R.drawable.lockscreen_fingerprint_draw_off_animation) {
anyFingerprintIcon = true;
+ useAdditionalPadding = true;
+ trustHidden = true;
+ } else if (iconRes == R.drawable.trusted_state_to_error_animation) {
+ anyFingerprintIcon = true;
+ useAdditionalPadding = false;
+ trustHidden = true;
+ } else if (iconRes == R.drawable.error_to_trustedstate_animation) {
+ anyFingerprintIcon = true;
+ useAdditionalPadding = false;
+ trustHidden = false;
}
if (iconRes == -1) {
iconRes = getIconForState(state, mScreenOn, mDeviceInteractive);
@@ -124,7 +136,7 @@
|| icon.getIntrinsicWidth() != iconWidth)) {
icon = new IntrinsicSizeDrawable(icon, iconWidth, iconHeight);
}
- setPaddingRelative(0, 0, 0, anyFingerprintIcon
+ setPaddingRelative(0, 0, 0, useAdditionalPadding
? getResources().getDimensionPixelSize(
R.dimen.fingerprint_icon_additional_padding)
: 0);
@@ -145,7 +157,7 @@
}
// Hide trust circle when fingerprint is running.
- boolean trustManaged = mUnlockMethodCache.isTrustManaged() && !anyFingerprintIcon;
+ boolean trustManaged = mUnlockMethodCache.isTrustManaged() && !trustHidden;
mTrustDrawable.setTrustManaged(trustManaged);
updateClickability();
}
@@ -208,6 +220,10 @@
boolean oldScreenOn, boolean screenOn) {
if (oldState == STATE_FINGERPRINT && newState == STATE_FINGERPRINT_ERROR) {
return R.drawable.lockscreen_fingerprint_fp_to_error_state_animation;
+ } else if (oldState == STATE_LOCK_OPEN && newState == STATE_FINGERPRINT_ERROR) {
+ return R.drawable.trusted_state_to_error_animation;
+ } else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_LOCK_OPEN) {
+ return R.drawable.error_to_trustedstate_animation;
} else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_FINGERPRINT) {
return R.drawable.lockscreen_fingerprint_error_state_to_fp_animation;
} else if (oldState == STATE_FINGERPRINT && newState == STATE_LOCK_OPEN
@@ -225,10 +241,10 @@
KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
boolean fingerprintRunning = updateMonitor.isFingerprintDetectionRunning();
boolean unlockingAllowed = updateMonitor.isUnlockingWithFingerprintAllowed();
- if (mUnlockMethodCache.canSkipBouncer()) {
- return STATE_LOCK_OPEN;
- } else if (mTransientFpError) {
+ if (mTransientFpError) {
return STATE_FINGERPRINT_ERROR;
+ } else if (mUnlockMethodCache.canSkipBouncer()) {
+ return STATE_LOCK_OPEN;
} else if (fingerprintRunning && unlockingAllowed) {
return STATE_FINGERPRINT;
} else if (mUnlockMethodCache.isFaceUnlockRunning()) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarApps.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarApps.java
index 4c1aab9..04038bb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarApps.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarApps.java
@@ -46,6 +46,9 @@
import com.android.internal.content.PackageMonitor;
import com.android.systemui.R;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Container for application icons that appear in the navigation bar. Their appearance is similar
* to the launcher hotseat. Clicking an icon launches the associated activity. A long click will
@@ -73,12 +76,12 @@
// This view has two roles:
// 1) If the drag started outside the pinned apps list, it is a placeholder icon with a null
- // data model entry.
+ // tag.
// 2) If the drag started inside the pinned apps list, it is the icon for the app being dragged
- // with the associated data model entry.
+ // with the associated AppInfo tag.
// The icon is set invisible for the duration of the drag, creating a visual space for a drop.
// When the user is not dragging this member is null.
- private View mDragView;
+ private ImageView mDragView;
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override
@@ -87,6 +90,9 @@
if (Intent.ACTION_USER_SWITCHED.equals(action)) {
int currentUserId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1);
onUserSwitched(currentUserId);
+ } else if (Intent.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) {
+ UserHandle removedProfile = intent.getParcelableExtra(Intent.EXTRA_USER);
+ onManagedProfileRemoved(removedProfile);
}
}
};
@@ -168,8 +174,10 @@
private void removeIfUnlauncheable(String packageName, UserHandle user) {
// Remove icons for all apps that match a package that perhaps became unlauncheable.
- for(int i = sAppsModel.getAppCount() - 1; i >= 0; --i) {
- AppInfo appInfo = sAppsModel.getApp(i);
+ for(int i = getChildCount() - 1; i >= 0; --i) {
+ View child = getChildAt(i);
+ AppInfo appInfo = (AppInfo)child.getTag();
+ if (appInfo == null) continue; // Skip the drag placeholder.
if (!appInfo.getUser().equals(user)) continue;
ComponentName appComponentName = appInfo.getComponentName();
@@ -180,8 +188,9 @@
}
removeViewAt(i);
- sAppsModel.removeApp(i);
- sAppsModel.savePrefs();
+ }
+ if (getChildCount() != sAppsModel.getApps().size()) {
+ saveApps();
}
}
@@ -205,6 +214,7 @@
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_USER_SWITCHED);
+ filter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED);
mContext.registerReceiver(mBroadcastReceiver, filter);
mAppPackageMonitor.register(mContext, null, UserHandle.ALL, true);
@@ -225,12 +235,13 @@
// Remove any existing icon buttons.
removeAllViews();
- int appCount = sAppsModel.getAppCount();
+ List<AppInfo> apps = sAppsModel.getApps();
+ int appCount = apps.size();
for (int i = 0; i < appCount; i++) {
- ImageView button = createAppButton();
+ AppInfo app = apps.get(i);
+ ImageView button = createAppButton(app);
addView(button);
- AppInfo app = sAppsModel.getApp(i);
CharSequence appLabel = getAppLabel(mPackageManager, app.getComponentName());
button.setContentDescription(appLabel);
@@ -240,16 +251,32 @@
}
/**
+ * Saves apps stored in app icons into the data model.
+ */
+ private void saveApps() {
+ List<AppInfo> apps = new ArrayList<AppInfo>();
+ int childCount = getChildCount();
+ for (int i = 0; i != childCount; ++i) {
+ View child = getChildAt(i);
+ AppInfo appInfo = (AppInfo)child.getTag();
+ if (appInfo == null) continue; // Skip the drag placeholder.
+ apps.add(appInfo);
+ }
+ sAppsModel.setApps(apps);
+ }
+
+ /**
* Creates a new ImageView for a launcher activity, inflated from
* R.layout.navigation_bar_app_item.
*/
- private ImageView createAppButton() {
+ private ImageView createAppButton(AppInfo appInfo) {
ImageView button = (ImageView) mLayoutInflater.inflate(
R.layout.navigation_bar_app_item, this, false /* attachToRoot */);
button.setOnClickListener(new AppClickListener());
// TODO: Ripple effect. Use either KeyButtonRipple or the default ripple background.
button.setOnLongClickListener(new AppLongClickListener());
button.setOnDragListener(new AppIconDragListener());
+ button.setTag(appInfo);
return button;
}
@@ -257,10 +284,9 @@
private class AppLongClickListener implements View.OnLongClickListener {
@Override
public boolean onLongClick(View v) {
- mDragView = v;
- ImageView icon = (ImageView) v;
- AppInfo app = sAppsModel.getApp(indexOfChild(v));
- startAppDrag(icon, app);
+ mDragView = (ImageView) v;
+ AppInfo app = (AppInfo) v.getTag();
+ startAppDrag(mDragView, app);
return true;
}
}
@@ -364,13 +390,11 @@
}
/**
- * Creates a blank icon-sized View to create an empty space during a drag. Also creates a data
- * model entry so the rest of the code can assume it is reordering existing entries.
+ * Creates a blank icon-sized View to create an empty space during a drag.
*/
private ImageView createPlaceholderDragView(int index) {
- ImageView button = createAppButton();
+ ImageView button = createAppButton(null);
addView(button, index);
- sAppsModel.addApp(index, null /* name */);
return button;
}
@@ -395,7 +419,6 @@
}
// "Move" the dragged app by removing it and adding it back at the target location.
- int dragViewIndex = indexOfChild(mDragView);
int targetIndex = indexOfChild(target);
// This works, but is subtle:
// * If dragViewIndex > targetIndex then the dragged app is moving from right to left and
@@ -405,10 +428,6 @@
// the view at targetIndex will therefore place the app *after* the target.
removeView(mDragView);
addView(mDragView, targetIndex);
-
- // Update the data model.
- AppInfo app = sAppsModel.removeApp(dragViewIndex);
- sAppsModel.addApp(targetIndex, app);
}
private boolean onDrop(DragEvent event) {
@@ -419,23 +438,21 @@
return true;
}
- // If this was an existing app being dragged then end the drag.
- int dragViewIndex = indexOfChild(mDragView);
- if (sAppsModel.getApp(dragViewIndex) != null) {
- endDrag();
- return true;
- }
-
- // The drag view was a placeholder. Unpack the drop.
AppInfo appInfo = getAppFromDragEvent(event);
if (appInfo == null) {
- // This wasn't a valid drop. Clean up the placeholder and model.
+ // This wasn't a valid drop. Clean up the placeholder.
removePlaceholderDragViewIfNeeded();
return false;
}
- // The drop had valid data. Update the placeholder with a real activity and icon.
- updateAppAt(dragViewIndex, appInfo);
+ // If this was an existing app being dragged then end the drag.
+ if (mDragView.getTag() != null) {
+ endDrag();
+ return true;
+ }
+
+ // The drop had valid data. Convert the placeholder to a real icon.
+ updateApp(mDragView, appInfo);
endDrag();
return true;
}
@@ -444,7 +461,7 @@
private void endDrag() {
mDragView.setVisibility(View.VISIBLE);
mDragView = null;
- sAppsModel.savePrefs();
+ saveApps();
}
/** Returns an app info from a DragEvent, or null if the data wasn't valid. */
@@ -484,21 +501,18 @@
}
/** Updates the app at a given view index. */
- private void updateAppAt(int index, AppInfo appInfo) {
- sAppsModel.setApp(index, appInfo);
- ImageView button = (ImageView) getChildAt(index);
+ private void updateApp(ImageView button, AppInfo appInfo) {
+ button.setTag(appInfo);
new GetActivityIconTask(mPackageManager, button).execute(appInfo);
}
- /** Removes the empty placeholder view and cleans up the data model. */
+ /** Removes the empty placeholder view. */
private void removePlaceholderDragViewIfNeeded() {
// If the drag has ended already there is nothing to do.
if (mDragView == null) {
return;
}
- int index = indexOfChild(mDragView);
- removeViewAt(index);
- sAppsModel.removeApp(index);
+ removeView(mDragView);
endDrag();
}
@@ -544,7 +558,7 @@
private class AppClickListener implements View.OnClickListener {
@Override
public void onClick(View v) {
- AppInfo appInfo = sAppsModel.getApp(indexOfChild(v));
+ AppInfo appInfo = (AppInfo)v.getTag();
Intent launchIntent = sAppsModel.buildAppLaunchIntent(appInfo);
if (launchIntent == null) {
Toast.makeText(
@@ -571,4 +585,18 @@
sAppsModel.setCurrentUser(currentUserId);
recreateAppButtons();
}
+
+ private void onManagedProfileRemoved(UserHandle removedProfile) {
+ for(int i = getChildCount() - 1; i >= 0; --i) {
+ View view = getChildAt(i);
+ AppInfo appInfo = (AppInfo)view.getTag();
+ if (appInfo == null) return; // Skip the drag placeholder.
+ if (!appInfo.getUser().equals(removedProfile)) continue;
+
+ removeViewAt(i);
+ }
+ if (getChildCount() != sAppsModel.getApps().size()) {
+ saveApps();
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarAppsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarAppsModel.java
index c7b9e1c..832a3e9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarAppsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarAppsModel.java
@@ -28,7 +28,6 @@
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
-import android.util.Log;
import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting;
@@ -78,7 +77,7 @@
private final SharedPreferences mPrefs;
// Apps are represented as an ordered list of app infos.
- private final List<AppInfo> mApps = new ArrayList<AppInfo>();
+ private List<AppInfo> mApps = new ArrayList<AppInfo>();
// Id of the current user.
private int mCurrentUserId = -1;
@@ -119,7 +118,7 @@
|| appUserInfo.profileGroupId == UserInfo.NO_PROFILE_GROUP_ID
|| appUserInfo.profileGroupId != currentUserInfo.profileGroupId
|| !appUserInfo.isEnabled()) {
- Log.e(TAG, "User " + appUserId +
+ Slog.e(TAG, "User " + appUserId +
" is is not a profile of the current user, or is disabled.");
return null;
}
@@ -134,16 +133,16 @@
try {
ActivityInfo info = getPackageManager().getActivityInfo(component, 0, appUserId);
if (info == null) {
- Log.e(TAG, "Activity " + component + " is not installed.");
+ Slog.e(TAG, "Activity " + component + " is not installed.");
return null;
}
if (!info.exported) {
- Log.e(TAG, "Activity " + component + " doesn't have 'exported' attribute.");
+ Slog.e(TAG, "Activity " + component + " doesn't have 'exported' attribute.");
return null;
}
} catch (RemoteException e) {
- Log.e(TAG, "Failed to get activity info for " + component, e);
+ Slog.e(TAG, "Failed to get activity info for " + component, e);
return null;
}
@@ -164,7 +163,7 @@
}
}
- Log.e(TAG, "Activity doesn't have category Intent.CATEGORY_LAUNCHER " + component);
+ Slog.e(TAG, "Activity doesn't have category Intent.CATEGORY_LAUNCHER " + component);
return null;
}
@@ -231,33 +230,19 @@
edit.apply();
}
- /** Returns the number of apps. */
- public int getAppCount() {
- return mApps.size();
+ /** Returns the list of apps. */
+ public List<AppInfo> getApps() {
+ return mApps;
}
- /** Returns the app at the given index. */
- public AppInfo getApp(int index) {
- return mApps.get(index);
- }
-
- /** Adds the app before the given index. */
- public void addApp(int index, AppInfo appInfo) {
- mApps.add(index, appInfo);
- }
-
- /** Sets the app at the given index. */
- public void setApp(int index, AppInfo appInfo) {
- mApps.set(index, appInfo);
- }
-
- /** Remove the app at the given index. */
- public AppInfo removeApp(int index) {
- return mApps.remove(index);
+ /** Sets the list of apps and saves it. */
+ public void setApps(List<AppInfo> apps) {
+ mApps = apps;
+ savePrefs();
}
/** Saves the current model to disk. */
- public void savePrefs() {
+ private void savePrefs() {
SharedPreferences.Editor edit = mPrefs.edit();
int appCount = mApps.size();
edit.putInt(userPrefixed(APP_COUNT_PREF), appCount);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarRecents.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarRecents.java
index 1f71bc0..3bfa4d5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarRecents.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarRecents.java
@@ -30,7 +30,6 @@
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.AttributeSet;
-import android.util.Log;
import android.util.Slog;
import android.util.SparseBooleanArray;
import android.view.LayoutInflater;
@@ -173,9 +172,9 @@
try {
manager.startActivityFromRecents(taskPersistentId, null /* options */);
} catch (RemoteException e) {
- Log.e(TAG, "Exception when activating a recent task", e);
+ Slog.e(TAG, "Exception when activating a recent task", e);
} catch (IllegalArgumentException e) {
- Log.e(TAG, "Exception when activating a recent task", e);
+ Slog.e(TAG, "Exception when activating a recent task", e);
}
}
});
@@ -244,7 +243,7 @@
ris = packageManager.queryIntentActivitiesAsUser(intentToResolve, 0, userId);
}
if (ris == null || ris.size() <= 0) {
- Log.e(TAG, "Failed to build intent for " + packageName);
+ Slog.e(TAG, "Failed to build intent for " + packageName);
return null;
}
return new ComponentName(ris.get(0).activityInfo.packageName,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index d0604c5..e26f423 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -24,6 +24,7 @@
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewRootImpl;
import android.view.WindowManagerGlobal;
import com.android.internal.widget.LockPatternUtils;
@@ -533,4 +534,8 @@
public void showBouncerMessage(String message, int color) {
mBouncer.showMessage(message, color);
}
+
+ public ViewRootImpl getViewRootImpl() {
+ return mPhoneStatusBar.getStatusBarView().getViewRootImpl();
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
index 6d791bf..0f9dd5c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
@@ -36,6 +36,7 @@
import android.util.Log;
import android.util.SparseArray;
+import com.android.internal.annotations.GuardedBy;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnInfo;
@@ -62,8 +63,9 @@
private final IConnectivityManager mConnectivityManagerService;
private final DevicePolicyManager mDevicePolicyManager;
private final UserManager mUserManager;
- private final ArrayList<SecurityControllerCallback> mCallbacks
- = new ArrayList<SecurityControllerCallback>();
+
+ @GuardedBy("mCallbacks")
+ private final ArrayList<SecurityControllerCallback> mCallbacks = new ArrayList<>();
private SparseArray<VpnConfig> mCurrentVpns = new SparseArray<>();
private int mCurrentUserId;
@@ -161,16 +163,20 @@
@Override
public void removeCallback(SecurityControllerCallback callback) {
- if (callback == null) return;
- if (DEBUG) Log.d(TAG, "removeCallback " + callback);
- mCallbacks.remove(callback);
+ synchronized (mCallbacks) {
+ if (callback == null) return;
+ if (DEBUG) Log.d(TAG, "removeCallback " + callback);
+ mCallbacks.remove(callback);
+ }
}
@Override
public void addCallback(SecurityControllerCallback callback) {
- if (callback == null || mCallbacks.contains(callback)) return;
- if (DEBUG) Log.d(TAG, "addCallback " + callback);
- mCallbacks.add(callback);
+ synchronized (mCallbacks) {
+ if (callback == null || mCallbacks.contains(callback)) return;
+ if (DEBUG) Log.d(TAG, "addCallback " + callback);
+ mCallbacks.add(callback);
+ }
}
@Override
@@ -203,8 +209,10 @@
}
private void fireCallbacks() {
- for (SecurityControllerCallback callback : mCallbacks) {
- callback.onStateChanged();
+ synchronized (mCallbacks) {
+ for (SecurityControllerCallback callback : mCallbacks) {
+ callback.onStateChanged();
+ }
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarAppsModelTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarAppsModelTest.java
index fce6b29..e7a40d7 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarAppsModelTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarAppsModelTest.java
@@ -218,11 +218,12 @@
/** Tests initializing the model from SharedPreferences. */
public void testInitializeFromPrefs() {
initializeModelFromPrefs();
- assertEquals(2, mModel.getAppCount());
- assertEquals("package1/class1", mModel.getApp(0).getComponentName().flattenToString());
- assertEquals(new UserHandle(4), mModel.getApp(0).getUser());
- assertEquals("package2/class2", mModel.getApp(1).getComponentName().flattenToString());
- assertEquals(new UserHandle(5), mModel.getApp(1).getUser());
+ List<AppInfo> apps = mModel.getApps();
+ assertEquals(2, apps.size());
+ assertEquals("package1/class1", apps.get(0).getComponentName().flattenToString());
+ assertEquals(new UserHandle(4), apps.get(0).getUser());
+ assertEquals("package2/class2", apps.get(1).getComponentName().flattenToString());
+ assertEquals(new UserHandle(5), apps.get(1).getUser());
}
/** Tests initializing the model when the SharedPreferences aren't available. */
@@ -247,11 +248,12 @@
// Setting the user should load the installed activities.
mModel.setCurrentUser(2);
- assertEquals(2, mModel.getAppCount());
- assertEquals("package1/class1", mModel.getApp(0).getComponentName().flattenToString());
- assertEquals(new UserHandle(2), mModel.getApp(0).getUser());
- assertEquals("package2/class2", mModel.getApp(1).getComponentName().flattenToString());
- assertEquals(new UserHandle(2), mModel.getApp(1).getUser());
+ List<AppInfo> apps = mModel.getApps();
+ assertEquals(2, apps.size());
+ assertEquals("package1/class1", apps.get(0).getComponentName().flattenToString());
+ assertEquals(new UserHandle(2), apps.get(0).getUser());
+ assertEquals("package2/class2", apps.get(1).getComponentName().flattenToString());
+ assertEquals(new UserHandle(2), apps.get(1).getUser());
InOrder order = inOrder(mMockEdit);
order.verify(mMockEdit).apply();
order.verify(mMockEdit).putInt("222|app_count", 2);
@@ -293,9 +295,10 @@
// Initializing the model should load from prefs and skip the missing one.
mModel.setCurrentUser(2);
- assertEquals(1, mModel.getAppCount());
- assertEquals("package0/class0", mModel.getApp(0).getComponentName().flattenToString());
- assertEquals(new UserHandle(5), mModel.getApp(0).getUser());
+ List<AppInfo> apps = mModel.getApps();
+ assertEquals(1, apps.size());
+ assertEquals("package0/class0", apps.get(0).getComponentName().flattenToString());
+ assertEquals(new UserHandle(5), apps.get(0).getUser());
InOrder order = inOrder(mMockEdit);
order.verify(mMockEdit).putInt("222|app_count", 1);
order.verify(mMockEdit).putString("222|app_0", "package0/class0");
@@ -333,9 +336,10 @@
// Initializing the model should load from prefs and skip the unlauncheable one.
mModel.setCurrentUser(2);
- assertEquals(1, mModel.getAppCount());
- assertEquals("package0/class0", mModel.getApp(0).getComponentName().flattenToString());
- assertEquals(new UserHandle(5), mModel.getApp(0).getUser());
+ List<AppInfo> apps = mModel.getApps();
+ assertEquals(1, apps.size());
+ assertEquals("package0/class0", apps.get(0).getComponentName().flattenToString());
+ assertEquals(new UserHandle(5), apps.get(0).getUser());
// Once an unlauncheable app is detected, the model should save all apps excluding the
// unlauncheable one.
@@ -350,7 +354,7 @@
public void testSavePrefs() {
initializeModelFromPrefs();
- mModel.savePrefs();
+ mModel.setApps(mModel.getApps());
verify(mMockEdit).putInt("222|app_count", 2);
verify(mMockEdit).putString("222|app_0", "package1/class1");
verify(mMockEdit).putLong("222|app_user_0", 444L);
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index f724749..ff02b94 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -1955,10 +1955,12 @@
.setPackage(pkgInfo.packageName);
List<ResolveInfo> hosts = mPackageManager.queryIntentServicesAsUser(
intent, 0, UserHandle.USER_OWNER);
- final int N = hosts.size();
- for (int i = 0; i < N; i++) {
- final ServiceInfo info = hosts.get(i).serviceInfo;
- tryBindTransport(info);
+ if (hosts != null) {
+ final int N = hosts.size();
+ for (int i = 0; i < N; i++) {
+ final ServiceInfo info = hosts.get(i).serviceInfo;
+ tryBindTransport(info);
+ }
}
}
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 8b0e6f2..7aef38d 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -511,10 +511,17 @@
Account[] sharedAccounts = getSharedAccountsAsUser(userId);
if (sharedAccounts == null || sharedAccounts.length == 0) return;
Account[] accounts = getAccountsAsUser(null, userId);
+ int parentUserId = UserManager.isSplitSystemUser()
+ ? mUserManager.getUserInfo(userId).restrictedProfileParentId
+ : UserHandle.USER_SYSTEM;
+ if (parentUserId < 0) {
+ Log.w(TAG, "User " + userId + " has shared accounts, but no parent user");
+ return;
+ }
for (Account sa : sharedAccounts) {
if (ArrayUtils.contains(accounts, sa)) continue;
// Account doesn't exist. Copy it now.
- copyAccountToUser(null /*no response*/, sa, UserHandle.USER_OWNER, userId);
+ copyAccountToUser(null /*no response*/, sa, parentUserId, userId);
}
}
@@ -740,7 +747,7 @@
@Override
public void copyAccountToUser(final IAccountManagerResponse response, final Account account,
- int userFrom, int userTo) {
+ final int userFrom, int userTo) {
int callingUid = Binder.getCallingUid();
if (isCrossUser(callingUid, UserHandle.USER_ALL)) {
throw new SecurityException("Calling copyAccountToUser requires "
@@ -784,7 +791,7 @@
if (result != null
&& result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT, false)) {
// Create a Session for the target user and pass in the bundle
- completeCloningAccount(response, result, account, toAccounts);
+ completeCloningAccount(response, result, account, toAccounts, userFrom);
} else {
super.onResult(result);
}
@@ -851,7 +858,8 @@
}
private void completeCloningAccount(IAccountManagerResponse response,
- final Bundle accountCredentials, final Account account, final UserAccounts targetUser) {
+ final Bundle accountCredentials, final Account account, final UserAccounts targetUser,
+ final int parentUserId){
long id = clearCallingIdentity();
try {
new Session(targetUser, response, account.type, false,
@@ -866,9 +874,9 @@
@Override
public void run() throws RemoteException {
// Confirm that the owner's account still exists before this step.
- UserAccounts owner = getUserAccounts(UserHandle.USER_OWNER);
+ UserAccounts owner = getUserAccounts(parentUserId);
synchronized (owner.cacheLock) {
- for (Account acc : getAccounts(UserHandle.USER_OWNER)) {
+ for (Account acc : getAccounts(parentUserId)) {
if (acc.equals(account)) {
mAuthenticator.addAccountFromCredentials(
this, account, accountCredentials);
@@ -949,27 +957,27 @@
}
sendAccountsChangedBroadcast(accounts.userId);
}
- if (accounts.userId == UserHandle.USER_OWNER) {
- addAccountToLimitedUsers(account);
+ if (getUserManager().getUserInfo(accounts.userId).canHaveProfile()) {
+ addAccountToLinkedRestrictedUsers(account, accounts.userId);
}
return true;
}
/**
- * Adds the account to all limited users as shared accounts. If the user is currently
+ * Adds the account to all linked restricted users as shared accounts. If the user is currently
* running, then clone the account too.
* @param account the account to share with limited users
+ *
*/
- private void addAccountToLimitedUsers(Account account) {
+ private void addAccountToLinkedRestrictedUsers(Account account, int parentUserId) {
List<UserInfo> users = getUserManager().getUsers();
for (UserInfo user : users) {
- if (user.isRestricted()) {
+ if (user.isRestricted() && (parentUserId == user.restrictedProfileParentId)) {
addSharedAccountAsUser(account, user.id);
try {
if (ActivityManagerNative.getDefault().isUserRunning(user.id, false)) {
mMessageHandler.sendMessage(mMessageHandler.obtainMessage(
- MESSAGE_COPY_SHARED_ACCOUNT, UserHandle.USER_OWNER, user.id,
- account));
+ MESSAGE_COPY_SHARED_ACCOUNT, parentUserId, user.id, account));
}
} catch (RemoteException re) {
// Shouldn't happen
@@ -1172,14 +1180,16 @@
new AtomicReference<String>(accountToRename.name));
resultAccount = renamedAccount;
- if (accounts.userId == UserHandle.USER_OWNER) {
+ int parentUserId = accounts.userId;
+ if (canHaveProfile(parentUserId)) {
/*
- * Owner's account was renamed, rename the account for
+ * Owner or system user account was renamed, rename the account for
* those users with which the account was shared.
*/
List<UserInfo> users = mUserManager.getUsers(true);
for (UserInfo user : users) {
- if (!user.isPrimary() && user.isRestricted()) {
+ if (user.isRestricted()
+ && (user.restrictedProfileParentId == parentUserId)) {
renameSharedAccountAsUser(accountToRename, newName, user.id);
}
}
@@ -1191,6 +1201,11 @@
return resultAccount;
}
+ private boolean canHaveProfile(final int parentUserId) {
+ final UserInfo userInfo = mUserManager.getUserInfo(parentUserId);
+ return userInfo != null && userInfo.canHaveProfile();
+ }
+
@Override
public void removeAccount(IAccountManagerResponse response, Account account,
boolean expectActivityLaunch) {
@@ -1304,7 +1319,7 @@
logRecord(accounts, DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE, TABLE_ACCOUNTS);
long identityToken = clearCallingIdentity();
try {
- return removeAccountInternal(accounts, account);
+ return removeAccountInternal(accounts, account, callingUid);
} finally {
restoreCallingIdentity(identityToken);
}
@@ -1337,7 +1352,7 @@
&& !result.containsKey(AccountManager.KEY_INTENT)) {
final boolean removalAllowed = result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT);
if (removalAllowed) {
- removeAccountInternal(mAccounts, mAccount);
+ removeAccountInternal(mAccounts, mAccount, getCallingUid());
}
IAccountManagerResponse response = getResponseAndClose();
if (response != null) {
@@ -1360,10 +1375,10 @@
/* For testing */
protected void removeAccountInternal(Account account) {
- removeAccountInternal(getUserAccountsForCaller(), account);
+ removeAccountInternal(getUserAccountsForCaller(), account, getCallingUid());
}
- private boolean removeAccountInternal(UserAccounts accounts, Account account) {
+ private boolean removeAccountInternal(UserAccounts accounts, Account account, int callingUid) {
int deleted;
synchronized (accounts.cacheLock) {
final SQLiteDatabase db = accounts.openHelper.getWritableDatabase();
@@ -1376,21 +1391,20 @@
logRecord(db, DebugDbHelper.ACTION_ACCOUNT_REMOVE, TABLE_ACCOUNTS, accountId, accounts);
}
- if (accounts.userId == UserHandle.USER_OWNER) {
- // Owner's account was removed, remove from any users that are sharing
- // this account.
- int callingUid = getCallingUid();
- long id = Binder.clearCallingIdentity();
- try {
+ long id = Binder.clearCallingIdentity();
+ try {
+ int parentUserId = accounts.userId;
+ if (canHaveProfile(parentUserId)) {
+ // Remove from any restricted profiles that are sharing this account.
List<UserInfo> users = mUserManager.getUsers(true);
for (UserInfo user : users) {
- if (!user.isPrimary() && user.isRestricted()) {
+ if (user.isRestricted() && parentUserId == (user.restrictedProfileParentId)) {
removeSharedAccountAsUser(account, user.id, callingUid);
}
}
- } finally {
- Binder.restoreCallingIdentity(id);
}
+ } finally {
+ Binder.restoreCallingIdentity(id);
}
return (deleted > 0);
}
@@ -2707,7 +2721,7 @@
if (r > 0) {
logRecord(db, DebugDbHelper.ACTION_ACCOUNT_REMOVE, TABLE_SHARED_ACCOUNTS,
sharedTableAccountId, accounts, callingUid);
- removeAccountInternal(accounts, account);
+ removeAccountInternal(accounts, account, callingUid);
}
return r > 0;
}
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 8e24127..4aef23b 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -19,6 +19,7 @@
import static android.Manifest.permission.INTERACT_ACROSS_USERS;
import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
import static android.Manifest.permission.START_TASKS_FROM_RECENTS;
+import static android.app.ActivityManager.FREEFORM_WORKSPACE_STACK_ID;
import static android.app.ActivityManager.DOCKED_STACK_ID;
import static android.app.ActivityManager.HOME_STACK_ID;
import static android.app.ActivityManager.INVALID_STACK_ID;
@@ -2700,6 +2701,40 @@
}
}
+ /**
+ * Activate an activity by bringing it to the top and set the focus on it.
+ * Note: This is only allowed for activities which are on the freeform stack.
+ * @param token The token of the activity calling which will get activated.
+ */
+ @Override
+ public void activateActivity(IBinder token) {
+ if (DEBUG_FOCUS) Slog.d(TAG_FOCUS, "ActivateActivity token=" + token);
+ long callingId = Binder.clearCallingIdentity();
+ try {
+ synchronized (ActivityManagerService.this) {
+ final ActivityRecord anyTaskRecord = ActivityRecord.isInStackLocked(token);
+ if (anyTaskRecord == null) {
+ Slog.w(TAG, "ActivateActivity: token=" + token + " not found");
+ return;
+ }
+ TaskRecord task = anyTaskRecord.task;
+ final boolean runsOnFreeformStack =
+ task.stack.getStackId() == FREEFORM_WORKSPACE_STACK_ID;
+ if (!runsOnFreeformStack) {
+ Slog.w(TAG, "Tried to use activateActivity on a non freeform workspace!");
+ } else if (task != null) {
+ ActivityRecord topTaskRecord = task.topRunningActivityLocked(null);
+ if (topTaskRecord != null) {
+ setFocusedActivityLocked(topTaskRecord, "activateActivity");
+ mStackSupervisor.resumeTopActivitiesLocked(task.stack, null, null);
+ }
+ }
+ }
+ } finally {
+ Binder.restoreCallingIdentity(callingId);
+ }
+ }
+
@Override
public void setFocusedTask(int taskId) {
if (DEBUG_FOCUS) Slog.d(TAG_FOCUS, "setFocusedTask: taskId=" + taskId);
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 965f5b6..f50df3a 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -902,7 +902,14 @@
prev.task.touchActiveTime();
clearLaunchTime(prev);
final ActivityRecord next = mStackSupervisor.topRunningActivityLocked();
- if (mService.mHasRecents && (next == null || next.noDisplay || next.task != prev.task || uiSleeping)) {
+ // In freeform mode we only update the thumbnail when there is no thumbnail yet since every
+ // focus change will request a thumbnail to be taken.
+ // Note furthermore that since windows can change their content in freeform mode all the
+ // time a thumbnail is possibly constantly outdated.
+ if (mService.mHasRecents &&
+ (next == null || next.noDisplay || next.task != prev.task || uiSleeping) &&
+ (!prev.task.hasThumbnail() ||
+ prev.task.stack.mStackId != FREEFORM_WORKSPACE_STACK_ID)) {
prev.updateThumbnailLocked(screenshotActivities(prev), null);
}
stopFullyDrawnTraceIfNeeded();
diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 712b8cc..9cbaec5 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -478,6 +478,14 @@
}
/**
+ * Returns true when we have a thumbnail.
+ * @return Returns true if there is a thumbnail.
+ */
+ boolean hasThumbnail() {
+ return mLastThumbnail != null;
+ }
+
+ /**
* Sets the last thumbnail.
* @return whether the thumbnail was set
*/
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index 470bd5a..7e46db8 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -129,7 +129,7 @@
public void binderDied() {
Slog.v(TAG, "fingerprintd died");
mDaemon = null;
- dispatchError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
+ handleError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
}
public IFingerprintDaemon getFingerprintDaemon() {
@@ -157,7 +157,7 @@
return mDaemon;
}
- protected void dispatchEnumerate(long deviceId, int[] fingerIds, int[] groupIds) {
+ protected void handleEnumerate(long deviceId, int[] fingerIds, int[] groupIds) {
if (fingerIds.length != groupIds.length) {
Slog.w(TAG, "fingerIds and groupIds differ in length: f[]="
+ fingerIds + ", g[]=" + groupIds);
@@ -167,7 +167,7 @@
// TODO: update fingerprint/name pairs
}
- protected void dispatchRemoved(long deviceId, int fingerId, int groupId) {
+ protected void handleRemoved(long deviceId, int fingerId, int groupId) {
final ClientMonitor client = mRemoveClient;
if (fingerId != 0) {
removeTemplateForUser(mRemoveClient, fingerId);
@@ -177,7 +177,7 @@
}
}
- protected void dispatchError(long deviceId, int error) {
+ protected void handleError(long deviceId, int error) {
if (mEnrollClient != null) {
final IBinder token = mEnrollClient.token;
if (mEnrollClient.sendError(error)) {
@@ -193,7 +193,7 @@
}
}
- protected void dispatchAuthenticated(long deviceId, int fingerId, int groupId) {
+ protected void handleAuthenticated(long deviceId, int fingerId, int groupId) {
if (mAuthClient != null) {
final IBinder token = mAuthClient.token;
if (mAuthClient.sendAuthenticated(fingerId, groupId)) {
@@ -203,7 +203,7 @@
}
}
- protected void dispatchAcquired(long deviceId, int acquiredInfo) {
+ protected void handleAcquired(long deviceId, int acquiredInfo) {
if (mEnrollClient != null) {
if (mEnrollClient.sendAcquired(acquiredInfo)) {
removeClient(mEnrollClient);
@@ -215,16 +215,7 @@
}
}
- private void userActivity() {
- long now = SystemClock.uptimeMillis();
- mPowerManager.userActivity(now, PowerManager.USER_ACTIVITY_EVENT_TOUCH, 0);
- }
-
- void handleUserSwitching(int userId) {
- updateActiveGroup(userId);
- }
-
- protected void dispatchEnrollResult(long deviceId, int fingerId, int groupId, int remaining) {
+ protected void handleEnrollResult(long deviceId, int fingerId, int groupId, int remaining) {
if (mEnrollClient != null) {
if (mEnrollClient.sendEnrollResult(fingerId, groupId, remaining)) {
if (remaining == 0) {
@@ -235,6 +226,15 @@
}
}
+ private void userActivity() {
+ long now = SystemClock.uptimeMillis();
+ mPowerManager.userActivity(now, PowerManager.USER_ACTIVITY_EVENT_TOUCH, 0);
+ }
+
+ void handleUserSwitching(int userId) {
+ updateActiveGroup(userId);
+ }
+
private void removeClient(ClientMonitor client) {
if (client == null) return;
client.destroy();
@@ -298,7 +298,7 @@
final int result = daemon.enroll(cryptoToken, groupId, timeout);
if (result != 0) {
Slog.w(TAG, "startEnroll failed, result=" + result);
- dispatchError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
+ handleError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
}
} catch (RemoteException e) {
Slog.e(TAG, "startEnroll failed", e);
@@ -392,7 +392,7 @@
final int result = daemon.authenticate(opId, groupId);
if (result != 0) {
Slog.w(TAG, "startAuthentication failed, result=" + result);
- dispatchError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
+ handleError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
}
} catch (RemoteException e) {
Slog.e(TAG, "startAuthentication failed", e);
@@ -442,7 +442,7 @@
final int result = daemon.remove(fingerId, userId);
if (result != 0) {
Slog.w(TAG, "startRemove with id = " + fingerId + " failed, result=" + result);
- dispatchError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
+ handleError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
}
} catch (RemoteException e) {
Slog.e(TAG, "startRemove failed", e);
@@ -657,33 +657,64 @@
private IFingerprintDaemonCallback mDaemonCallback = new IFingerprintDaemonCallback.Stub() {
@Override
- public void onEnrollResult(long deviceId, int fingerId, int groupId, int remaining) {
- dispatchEnrollResult(deviceId, fingerId, groupId, remaining);
+ public void onEnrollResult(final long deviceId, final int fingerId, final int groupId,
+ final int remaining) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ handleEnrollResult(deviceId, fingerId, groupId, remaining);
+ }
+ });
}
@Override
- public void onAcquired(long deviceId, int acquiredInfo) {
- dispatchAcquired(deviceId, acquiredInfo);
+ public void onAcquired(final long deviceId, final int acquiredInfo) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ handleAcquired(deviceId, acquiredInfo);
+ }
+ });
}
@Override
- public void onAuthenticated(long deviceId, int fingerId, int groupId) {
- dispatchAuthenticated(deviceId, fingerId, groupId);
+ public void onAuthenticated(final long deviceId, final int fingerId, final int groupId) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ handleAuthenticated(deviceId, fingerId, groupId);
+ }
+ });
}
@Override
- public void onError(long deviceId, int error) {
- dispatchError(deviceId, error);
+ public void onError(final long deviceId, final int error) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ handleError(deviceId, error);
+ }
+ });
}
@Override
- public void onRemoved(long deviceId, int fingerId, int groupId) {
- dispatchRemoved(deviceId, fingerId, groupId);
+ public void onRemoved(final long deviceId, final int fingerId, final int groupId) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ handleRemoved(deviceId, fingerId, groupId);
+ }
+ });
}
@Override
- public void onEnumerate(long deviceId, int[] fingerIds, int[] groupIds) {
- dispatchEnumerate(deviceId, fingerIds, groupIds);
+ public void onEnumerate(final long deviceId, final int[] fingerIds, final int[] groupIds) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ handleEnumerate(deviceId, fingerIds, groupIds);
+ }
+ });
}
};
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 9e878e7..b25653e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4248,16 +4248,18 @@
if (ri != null) {
return ri;
}
+ ri = new ResolveInfo(mResolveInfo);
+ ri.activityInfo = new ActivityInfo(ri.activityInfo);
+ ri.activityInfo.applicationInfo = new ApplicationInfo(
+ ri.activityInfo.applicationInfo);
if (userId != 0) {
- ri = new ResolveInfo(mResolveInfo);
- ri.activityInfo = new ActivityInfo(ri.activityInfo);
- ri.activityInfo.applicationInfo = new ApplicationInfo(
- ri.activityInfo.applicationInfo);
ri.activityInfo.applicationInfo.uid = UserHandle.getUid(userId,
UserHandle.getAppId(ri.activityInfo.applicationInfo.uid));
- return ri;
}
- return mResolveInfo;
+ // Make sure that the resolver is displayable in car mode
+ if (ri.activityInfo.metaData == null) ri.activityInfo.metaData = new Bundle();
+ ri.activityInfo.metaData.putBoolean(Intent.METADATA_DOCK_HOME, true);
+ return ri;
}
}
return null;
@@ -13728,9 +13730,14 @@
libDirRoot = ps.legacyNativeLibraryPathString;
}
if (p != null && (isExternal(p) || p.isForwardLocked())) {
- String secureContainerId = cidFromCodePath(p.applicationInfo.getBaseCodePath());
- if (secureContainerId != null) {
- asecPath = PackageHelper.getSdFilesystem(secureContainerId);
+ final long token = Binder.clearCallingIdentity();
+ try {
+ String secureContainerId = cidFromCodePath(p.applicationInfo.getBaseCodePath());
+ if (secureContainerId != null) {
+ asecPath = PackageHelper.getSdFilesystem(secureContainerId);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
}
}
}
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 4bfcb90..1924bab 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -61,7 +61,6 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IAppOpsService;
-import com.android.internal.util.ArrayUtils;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.XmlUtils;
@@ -102,6 +101,7 @@
private static final String ATTR_GUEST_TO_REMOVE = "guestToRemove";
private static final String ATTR_USER_VERSION = "version";
private static final String ATTR_PROFILE_GROUP_ID = "profileGroupId";
+ private static final String ATTR_RESTRICTED_PROFILE_PARENT_ID = "restrictedProfileParentId";
private static final String TAG_GUEST_RESTRICTIONS = "guestRestrictions";
private static final String TAG_USERS = "users";
private static final String TAG_USER = "user";
@@ -927,7 +927,10 @@
serializer.attribute(null, ATTR_PROFILE_GROUP_ID,
Integer.toString(userInfo.profileGroupId));
}
-
+ if (userInfo.restrictedProfileParentId != UserInfo.NO_PROFILE_GROUP_ID) {
+ serializer.attribute(null, ATTR_RESTRICTED_PROFILE_PARENT_ID,
+ Integer.toString(userInfo.restrictedProfileParentId));
+ }
serializer.startTag(null, TAG_NAME);
serializer.text(userInfo.name);
serializer.endTag(null, TAG_NAME);
@@ -1037,6 +1040,7 @@
long creationTime = 0L;
long lastLoggedInTime = 0L;
int profileGroupId = UserInfo.NO_PROFILE_GROUP_ID;
+ int restrictedProfileParentId = UserInfo.NO_PROFILE_GROUP_ID;
boolean partial = false;
boolean guestToRemove = false;
Bundle restrictions = new Bundle();
@@ -1072,6 +1076,8 @@
lastLoggedInTime = readLongAttribute(parser, ATTR_LAST_LOGGED_IN_TIME, 0);
profileGroupId = readIntAttribute(parser, ATTR_PROFILE_GROUP_ID,
UserInfo.NO_PROFILE_GROUP_ID);
+ restrictedProfileParentId = readIntAttribute(parser,
+ ATTR_RESTRICTED_PROFILE_PARENT_ID, UserInfo.NO_PROFILE_GROUP_ID);
String valueString = parser.getAttributeValue(null, ATTR_PARTIAL);
if ("true".equals(valueString)) {
partial = true;
@@ -1106,6 +1112,7 @@
userInfo.partial = partial;
userInfo.guestToRemove = guestToRemove;
userInfo.profileGroupId = profileGroupId;
+ userInfo.restrictedProfileParentId = restrictedProfileParentId;
mUserRestrictions.append(id, restrictions);
return userInfo;
@@ -1262,6 +1269,7 @@
}
final boolean isGuest = (flags & UserInfo.FLAG_GUEST) != 0;
final boolean isManagedProfile = (flags & UserInfo.FLAG_MANAGED_PROFILE) != 0;
+ final boolean isRestricted = (flags & UserInfo.FLAG_RESTRICTED) != 0;
final long ident = Binder.clearCallingIdentity();
UserInfo userInfo = null;
final int userId;
@@ -1286,6 +1294,24 @@
if (isGuest && findCurrentGuestUserLocked() != null) {
return null;
}
+ // In legacy mode, restricted profile's parent can only be the owner user
+ if (isRestricted && !UserManager.isSplitSystemUser()
+ && (parentId != UserHandle.USER_SYSTEM)) {
+ Log.w(LOG_TAG, "Cannot add restricted profile - parent user must be owner");
+ return null;
+ }
+ if (isRestricted && UserManager.isSplitSystemUser()) {
+ if (parent == null) {
+ Log.w(LOG_TAG, "Cannot add restricted profile - parent user must be "
+ + "specified");
+ return null;
+ }
+ if (!parent.canHaveProfile()) {
+ Log.w(LOG_TAG, "Cannot add restricted profile - profiles cannot be "
+ + "created for the specified parent user id " + parentId);
+ return null;
+ }
+ }
// In split system user mode, we assign the first human user the primary flag.
// And if there is no device owner, we also assign the admin flag to primary
// user.
@@ -1309,11 +1335,22 @@
mUsers.put(userId, userInfo);
writeUserListLocked();
if (parent != null) {
- if (parent.profileGroupId == UserInfo.NO_PROFILE_GROUP_ID) {
- parent.profileGroupId = parent.id;
- scheduleWriteUserLocked(parent);
+ if (isManagedProfile) {
+ if (parent.profileGroupId == UserInfo.NO_PROFILE_GROUP_ID) {
+ parent.profileGroupId = parent.id;
+ scheduleWriteUserLocked(parent);
+ }
+ userInfo.profileGroupId = parent.profileGroupId;
+ } else if (isRestricted) {
+ if (!parent.canHaveProfile()) {
+ Log.w(LOG_TAG, "Cannot add restricted profile - parent user must be owner");
+ }
+ if (parent.restrictedProfileParentId == UserInfo.NO_PROFILE_GROUP_ID) {
+ parent.restrictedProfileParentId = parent.id;
+ scheduleWriteUserLocked(parent);
+ }
+ userInfo.restrictedProfileParentId = parent.restrictedProfileParentId;
}
- userInfo.profileGroupId = parent.profileGroupId;
}
final StorageManager storage = mContext.getSystemService(StorageManager.class);
for (VolumeInfo vol : storage.getWritablePrivateVolumes()) {
@@ -1348,24 +1385,9 @@
return userInfo;
}
- private int numberOfUsersOfTypeLocked(int flags, boolean excludeDying) {
- int count = 0;
- for (int i = mUsers.size() - 1; i >= 0; i--) {
- UserInfo user = mUsers.valueAt(i);
- if (!excludeDying || !mRemovingUserIds.get(user.id)) {
- if ((user.flags & flags) != 0) {
- count++;
- }
- }
- }
- return count;
- }
-
/**
* Find the current guest user. If the Guest user is partial,
* then do not include it in the results as it is about to die.
- * This is different than {@link #numberOfUsersOfTypeLocked(int, boolean)} due to
- * the special handling of Guests being removed.
*/
private UserInfo findCurrentGuestUserLocked() {
final int size = mUsers.size();
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 4aaba14..9ddbcca 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -773,6 +773,13 @@
}
class MyOrientationListener extends WindowOrientationListener {
+ private final Runnable mUpdateRotationRunnable = new Runnable() {
+ @Override
+ public void run() {
+ updateRotation(false);
+ }
+ };
+
MyOrientationListener(Context context, Handler handler) {
super(context, handler);
}
@@ -780,7 +787,7 @@
@Override
public void onProposedRotationChanged(int rotation) {
if (localLOGV) Slog.v(TAG, "onProposedRotationChanged, rotation=" + rotation);
- updateRotation(false);
+ mHandler.post(mUpdateRotationRunnable);
}
}
MyOrientationListener mOrientationListener;
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index d1145d0..de7c07e 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -870,10 +870,10 @@
}
private Animation createAspectScaledThumbnailEnterNonFullscreenAnimationLocked(
- Rect containingFrame, @Nullable Rect surfaceInsets, int taskId) {
+ Rect frame, @Nullable Rect surfaceInsets, int taskId) {
getNextAppTransitionStartRect(taskId, mTmpStartRect);
- float width = containingFrame.width();
- float height = containingFrame.height();
+ float width = frame.width();
+ float height = frame.height();
float scaleWidth = mTmpStartRect.width() / width;
float scaleHeight = mTmpStartRect.height() / height;
AnimationSet set = new AnimationSet(true);
@@ -886,9 +886,9 @@
ScaleAnimation scale = new ScaleAnimation(scaleWidth, 1, scaleHeight, 1,
(width + surfaceInsetsHorizontal) / 2, (height + surfaceInsetsVertical) / 2);
int fromX = mTmpStartRect.left + mTmpStartRect.width() / 2
- - (containingFrame.left + containingFrame.width() / 2);
+ - (frame.left + frame.width() / 2);
int fromY = mTmpStartRect.top + mTmpStartRect.height() / 2
- - (containingFrame.top + containingFrame.height() / 2);
+ - (frame.top + frame.height() / 2);
TranslateAnimation translation = new TranslateAnimation(fromX, 0, fromY, 0);
set.addAnimation(scale);
set.addAnimation(translation);
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 52aaf64..cf690a5 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -2806,12 +2806,17 @@
Rect appFrame = new Rect(0, 0, width, height);
Rect surfaceInsets = null;
final boolean fullscreen = win != null && win.isFullscreen(width, height);
- // Dialog activities have windows with containing frame being very large, but not
- // exactly fullscreen and much smaller mFrame. We use this distinction to identify
- // dialog activities.
- final boolean dialogWindow = win != null && !win.mContainingFrame.equals(win.mFrame);
+ final boolean freeform = win != null && win.inFreeformWorkspace();
if (win != null) {
- containingFrame.set(win.mContainingFrame);
+ // Containing frame will usually cover the whole screen, including dialog windows.
+ // For freeform workspace windows it will not cover the whole screen and it also
+ // won't exactly match the final freeform window frame (e.g. when overlapping with
+ // the status bar). In that case we need to use the final frame.
+ if (freeform) {
+ containingFrame.set(win.mFrame);
+ } else {
+ containingFrame.set(win.mContainingFrame);
+ }
surfaceInsets = win.getAttrs().surfaceInsets;
if (fullscreen) {
// For fullscreen windows use the window frames and insets to set the thumbnail
@@ -2830,11 +2835,9 @@
// screen gets the enter animation. Both appear in the mOpeningApps set.
enter = false;
}
- final boolean resizedWindow = !fullscreen && !dialogWindow;
Animation a = mAppTransition.loadAnimation(lp, transit, enter, containingWidth,
containingHeight, mCurConfiguration.orientation, containingFrame, contentInsets,
- surfaceInsets, appFrame, isVoiceInteraction, resizedWindow,
- atoken.mTask.mTaskId);
+ surfaceInsets, appFrame, isVoiceInteraction, freeform, atoken.mTask.mTaskId);
if (a != null) {
if (DEBUG_ANIM) {
RuntimeException e = null;
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 092a6d1..761e5eb 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -1629,7 +1629,7 @@
}
}
- private boolean inFreeformWorkspace() {
+ boolean inFreeformWorkspace() {
final Task task = getTask();
return task != null && task.mStack != null &&
task.mStack.mStackId == FREEFORM_WORKSPACE_STACK_ID;
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java
index 7bd27f2..791d0dd 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java
@@ -19,12 +19,14 @@
import android.app.AppGlobals;
import android.app.admin.SystemUpdatePolicy;
import android.content.ComponentName;
+import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.UserInfo;
import android.os.Environment;
-import android.os.PersistableBundle;
import android.os.RemoteException;
+import android.os.UserManager;
import android.util.AtomicFile;
import android.util.Slog;
import android.util.Xml;
@@ -40,13 +42,15 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
+import libcore.io.IoUtils;
+
/**
* Stores and restores state for the Device and Profile owners. By definition there can be
* only one device owner, but there may be a profile owner for each user.
@@ -54,21 +58,27 @@
class DeviceOwner {
private static final String TAG = "DevicePolicyManagerService";
- private static final String DEVICE_OWNER_XML = "device_owner.xml";
+ private static final String DEVICE_OWNER_XML_LEGACY = "device_owner.xml";
+
+ private static final String DEVICE_OWNER_XML = "device_owner_2.xml";
+
+ private static final String PROFILE_OWNER_XML = "profile_owner.xml";
+
+ private static final String TAG_ROOT = "root";
+
private static final String TAG_DEVICE_OWNER = "device-owner";
private static final String TAG_DEVICE_INITIALIZER = "device-initializer";
private static final String TAG_PROFILE_OWNER = "profile-owner";
+
private static final String ATTR_NAME = "name";
private static final String ATTR_PACKAGE = "package";
private static final String ATTR_COMPONENT_NAME = "component";
private static final String ATTR_USERID = "userId";
+
private static final String TAG_SYSTEM_UPDATE_POLICY = "system-update-policy";
- private AtomicFile fileForWriting;
-
- // Input/Output streams for testing.
- private InputStream mInputStreamForTest;
- private OutputStream mOutputStreamForTest;
+ private final Context mContext;
+ private final UserManager mUserManager;
// Internal state for the device owner package.
private OwnerInfo mDeviceOwner;
@@ -82,56 +92,41 @@
// Local system update policy controllable by device owner.
private SystemUpdatePolicy mSystemUpdatePolicy;
- // Private default constructor.
- private DeviceOwner() {
- }
-
- @VisibleForTesting
- DeviceOwner(InputStream in, OutputStream out) {
- mInputStreamForTest = in;
- mOutputStreamForTest = out;
+ public DeviceOwner(Context context) {
+ mContext = context;
+ mUserManager = UserManager.get(mContext);
}
/**
- * Loads the device owner state from disk.
+ * Load configuration from the disk.
*/
- static DeviceOwner load() {
- DeviceOwner owner = new DeviceOwner();
- if (new File(Environment.getSystemSecureDirectory(), DEVICE_OWNER_XML).exists()) {
- owner.readOwnerFile();
- return owner;
- } else {
- return null;
+ void load() {
+ synchronized (this) {
+ // First, try to read from the legacy file.
+ final File legacy = getLegacyConfigFileWithTestOverride();
+
+ if (readLegacyOwnerFile(legacy)) {
+ // Legacy file exists, write to new files and remove the legacy one.
+ writeDeviceOwner();
+ for (int userId : getProfileOwnerKeys()) {
+ writeProfileOwner(userId);
+ }
+ if (!legacy.delete()) {
+ Slog.e(TAG, "Failed to remove the legacy setting file");
+ }
+ return;
+ }
+
+ // No legacy file, read from the new format files.
+ new DeviceOwnerReadWriter().readFromFileLocked();
+
+ final List<UserInfo> users = mUserManager.getUsers(); // XXX double check this is the correct profile set.
+ for (UserInfo ui : users) {
+ new ProfileOwnerReadWriter(ui.id).readFromFileLocked(); // XXX double check ID is the right one.
+ }
}
}
- /**
- * Creates an instance of the device owner object with the device owner set.
- */
- static DeviceOwner createWithDeviceOwner(String packageName, String ownerName) {
- DeviceOwner owner = new DeviceOwner();
- owner.mDeviceOwner = new OwnerInfo(ownerName, packageName);
- return owner;
- }
-
- /**
- * Creates an instance of the device owner object with the device initializer set.
- */
- static DeviceOwner createWithDeviceInitializer(ComponentName admin) {
- DeviceOwner owner = new DeviceOwner();
- owner.mDeviceInitializer = new OwnerInfo(null, admin);
- return owner;
- }
-
- /**
- * Creates an instance of the device owner object with the profile owner set.
- */
- static DeviceOwner createWithProfileOwner(ComponentName admin, String ownerName, int userId) {
- DeviceOwner owner = new DeviceOwner();
- owner.mProfileOwners.put(userId, new OwnerInfo(ownerName, admin));
- return owner;
- }
-
String getDeviceOwnerPackageName() {
return mDeviceOwner != null ? mDeviceOwner.packageName : null;
}
@@ -234,10 +229,13 @@
return false;
}
- @VisibleForTesting
- void readOwnerFile() {
+ private boolean readLegacyOwnerFile(File file) {
+ if (!file.exists()) {
+ // Already migrated or the device has no owners.
+ return false;
+ }
try {
- InputStream input = openRead();
+ InputStream input = new AtomicFile(file).openRead();
XmlPullParser parser = Xml.newPullParser();
parser.setInput(input, StandardCharsets.UTF_8.name());
int type;
@@ -295,99 +293,212 @@
}
}
input.close();
- } catch (XmlPullParserException xppe) {
- Slog.e(TAG, "Error parsing device-owner file\n" + xppe);
- } catch (IOException ioe) {
- Slog.e(TAG, "IO Exception when reading device-owner file\n" + ioe);
+ } catch (XmlPullParserException|IOException e) {
+ Slog.e(TAG, "Error parsing device-owner file", e);
}
+ return true;
}
- @VisibleForTesting
- void writeOwnerFile() {
+ void writeDeviceOwner() {
synchronized (this) {
- writeOwnerFileLocked();
+ new DeviceOwnerReadWriter().writeToFileLocked();
}
}
- private void writeOwnerFileLocked() {
- try {
- OutputStream outputStream = startWrite();
- XmlSerializer out = new FastXmlSerializer();
- out.setOutput(outputStream, StandardCharsets.UTF_8.name());
- out.startDocument(null, true);
+ void writeProfileOwner(int userId) {
+ synchronized (this) {
+ new ProfileOwnerReadWriter(userId).writeToFileLocked();
+ }
+ }
- // Write device owner tag
- if (mDeviceOwner != null) {
- out.startTag(null, TAG_DEVICE_OWNER);
- out.attribute(null, ATTR_PACKAGE, mDeviceOwner.packageName);
- if (mDeviceOwner.name != null) {
- out.attribute(null, ATTR_NAME, mDeviceOwner.name);
- }
- out.endTag(null, TAG_DEVICE_OWNER);
- }
+ private abstract static class FileReadWriter {
+ private final File mFile;
- // Write device initializer tag
- if (mDeviceInitializer != null) {
- out.startTag(null, TAG_DEVICE_INITIALIZER);
- out.attribute(null, ATTR_PACKAGE, mDeviceInitializer.packageName);
- if (mDeviceInitializer.admin != null) {
- out.attribute(
- null, ATTR_COMPONENT_NAME, mDeviceInitializer.admin.flattenToString());
- }
- out.endTag(null, TAG_DEVICE_INITIALIZER);
- }
+ protected FileReadWriter(File file) {
+ mFile = file;
+ }
- // Write profile owner tags
- if (mProfileOwners.size() > 0) {
- for (HashMap.Entry<Integer, OwnerInfo> owner : mProfileOwners.entrySet()) {
- out.startTag(null, TAG_PROFILE_OWNER);
- OwnerInfo ownerInfo = owner.getValue();
- out.attribute(null, ATTR_PACKAGE, ownerInfo.packageName);
- out.attribute(null, ATTR_NAME, ownerInfo.name);
- out.attribute(null, ATTR_USERID, Integer.toString(owner.getKey()));
- if (ownerInfo.admin != null) {
- out.attribute(null, ATTR_COMPONENT_NAME, ownerInfo.admin.flattenToString());
+ abstract boolean shouldWrite();
+
+ void writeToFileLocked() {
+ if (!shouldWrite()) {
+ // No contents, remove the file.
+ if (mFile.exists()) {
+ if (!mFile.delete()) {
+ Slog.e(TAG, "Failed to remove " + mFile.getPath());
}
- out.endTag(null, TAG_PROFILE_OWNER);
}
+ return;
}
- // Write system update policy tag
+ final AtomicFile f = new AtomicFile(mFile);
+ FileOutputStream outputStream = null;
+ try {
+ outputStream = f.startWrite();
+ final XmlSerializer out = new FastXmlSerializer();
+ out.setOutput(outputStream, StandardCharsets.UTF_8.name());
+
+ // Root tag
+ out.startDocument(null, true);
+ out.startTag(null, TAG_ROOT);
+
+ // Actual content
+ writeInner(out);
+
+ // Close root
+ out.endTag(null, TAG_ROOT);
+ out.endDocument();
+ out.flush();
+
+ // Commit the content.
+ f.finishWrite(outputStream);
+ outputStream = null;
+
+ } catch (IOException e) {
+ Slog.e(TAG, "Exception when writing", e);
+ if (outputStream != null) {
+ f.failWrite(outputStream);
+ }
+ }
+ }
+
+ void readFromFileLocked() {
+ if (!mFile.exists()) {
+ return;
+ }
+ final AtomicFile f = new AtomicFile(mFile);
+ InputStream input = null;
+ try {
+ input = f.openRead();
+ final XmlPullParser parser = Xml.newPullParser();
+ parser.setInput(input, StandardCharsets.UTF_8.name());
+
+ int type;
+ int depth = 0;
+ while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {
+ switch (type) {
+ case XmlPullParser.START_TAG:
+ depth++;
+ break;
+ case XmlPullParser.END_TAG:
+ depth--;
+ // fallthrough
+ default:
+ continue;
+ }
+ // Check the root tag
+ final String tag = parser.getName();
+ if (depth == 1) {
+ if (!TAG_ROOT.equals(tag)) {
+ Slog.e(TAG, "Invalid root tag: " + tag);
+ return;
+ }
+ }
+ // readInner() will only see START_TAG at depth >= 2.
+ if (!readInner(parser, depth, tag)) {
+ return; // Error
+ }
+ }
+ } catch (XmlPullParserException | IOException e) {
+ Slog.e(TAG, "Error parsing device-owner file", e);
+ } finally {
+ IoUtils.closeQuietly(input);
+ }
+ }
+
+ abstract void writeInner(XmlSerializer out) throws IOException;
+
+ abstract boolean readInner(XmlPullParser parser, int depth, String tag);
+
+ }
+
+ private class DeviceOwnerReadWriter extends FileReadWriter {
+
+ protected DeviceOwnerReadWriter() {
+ super(getDeviceOwnerFileWithTestOverride());
+ }
+
+ @Override
+ boolean shouldWrite() {
+ return (mDeviceOwner != null) || (mDeviceInitializer != null)
+ || (mSystemUpdatePolicy != null);
+ }
+
+ @Override
+ void writeInner(XmlSerializer out) throws IOException {
+ if (mDeviceOwner != null) {
+ mDeviceOwner.writeToXml(out, TAG_DEVICE_OWNER);
+ }
+ if (mDeviceInitializer != null) {
+ mDeviceInitializer.writeToXml(out, TAG_DEVICE_INITIALIZER);
+ }
if (mSystemUpdatePolicy != null) {
out.startTag(null, TAG_SYSTEM_UPDATE_POLICY);
mSystemUpdatePolicy.saveToXml(out);
out.endTag(null, TAG_SYSTEM_UPDATE_POLICY);
}
- out.endDocument();
- out.flush();
- finishWrite(outputStream);
- } catch (IOException ioe) {
- Slog.e(TAG, "IO Exception when writing device-owner file\n" + ioe);
+ }
+
+ @Override
+ boolean readInner(XmlPullParser parser, int depth, String tag) {
+ if (depth > 2) {
+ return true; // Ignore
+ }
+ switch (tag) {
+ case TAG_DEVICE_OWNER:
+ mDeviceOwner = OwnerInfo.readFromXml(parser);
+ break;
+ case TAG_DEVICE_INITIALIZER:
+ mDeviceInitializer = OwnerInfo.readFromXml(parser);
+ break;
+ case TAG_SYSTEM_UPDATE_POLICY:
+ mSystemUpdatePolicy = SystemUpdatePolicy.restoreFromXml(parser);
+ break;
+ default:
+ Slog.e(TAG, "Unexpected tag: " + tag);
+ return false;
+
+ }
+ return true;
}
}
- private InputStream openRead() throws IOException {
- if (mInputStreamForTest != null) {
- return mInputStreamForTest;
+ private class ProfileOwnerReadWriter extends FileReadWriter {
+ private final int mUserId;
+
+ ProfileOwnerReadWriter(int userId) {
+ super(getProfileOwnerFileWithTestOverride(userId));
+ mUserId = userId;
}
- return new AtomicFile(new File(Environment.getSystemSecureDirectory(),
- DEVICE_OWNER_XML)).openRead();
- }
-
- private OutputStream startWrite() throws IOException {
- if (mOutputStreamForTest != null) {
- return mOutputStreamForTest;
+ @Override
+ boolean shouldWrite() {
+ return mProfileOwners.get(mUserId) != null;
}
- fileForWriting = new AtomicFile(new File(Environment.getSystemSecureDirectory(),
- DEVICE_OWNER_XML));
- return fileForWriting.startWrite();
- }
+ @Override
+ void writeInner(XmlSerializer out) throws IOException {
+ final OwnerInfo profileOwner = mProfileOwners.get(mUserId);
+ if (profileOwner != null) {
+ profileOwner.writeToXml(out, TAG_PROFILE_OWNER);
+ }
+ }
- private void finishWrite(OutputStream stream) {
- if (fileForWriting != null) {
- fileForWriting.finishWrite((FileOutputStream) stream);
+ @Override
+ boolean readInner(XmlPullParser parser, int depth, String tag) {
+ if (depth > 2) {
+ return true; // Ignore
+ }
+ switch (tag) {
+ case TAG_PROFILE_OWNER:
+ mProfileOwners.put(mUserId, OwnerInfo.readFromXml(parser));
+ break;
+ default:
+ Slog.e(TAG, "Unexpected tag: " + tag);
+ return false;
+
+ }
+ return true;
}
}
@@ -407,9 +518,46 @@
this.admin = admin;
this.packageName = admin.getPackageName();
}
+
+ public void writeToXml(XmlSerializer out, String tag) throws IOException {
+ out.startTag(null, tag);
+ out.attribute(null, ATTR_PACKAGE, packageName);
+ if (name != null) {
+ out.attribute(null, ATTR_NAME, name);
+ }
+ if (admin != null) {
+ out.attribute(null, ATTR_COMPONENT_NAME, admin.flattenToString());
+ }
+ out.endTag(null, tag);
+ }
+
+ public static OwnerInfo readFromXml(XmlPullParser parser) {
+ final String packageName = parser.getAttributeValue(null, ATTR_PACKAGE);
+ final String name = parser.getAttributeValue(null, ATTR_NAME);
+ final String componentName =
+ parser.getAttributeValue(null, ATTR_COMPONENT_NAME);
+
+ // Has component name? If so, return [name, component]
+ if (componentName != null) {
+ final ComponentName admin = ComponentName.unflattenFromString(componentName);
+ if (admin != null) {
+ return new OwnerInfo(name, admin);
+ } else {
+ // This shouldn't happen but switch from package name -> component name
+ // might have written bad device owner files. b/17652534
+ Slog.e(TAG, "Error parsing device-owner file. Bad component name " +
+ componentName);
+ }
+ }
+
+ // Else, build with [name, package]
+ return new OwnerInfo(name, packageName);
+ }
+
public void dump(String prefix, PrintWriter pw) {
pw.println(prefix + "admin=" + admin);
pw.println(prefix + "name=" + name);
+ pw.println(prefix + "package=" + packageName);
pw.println();
}
}
@@ -426,4 +574,16 @@
}
}
}
+
+ File getLegacyConfigFileWithTestOverride() {
+ return new File(Environment.getSystemSecureDirectory(), DEVICE_OWNER_XML_LEGACY);
+ }
+
+ File getDeviceOwnerFileWithTestOverride() {
+ return new File(Environment.getSystemSecureDirectory(), DEVICE_OWNER_XML);
+ }
+
+ File getProfileOwnerFileWithTestOverride(int userId) {
+ return new File(Environment.getUserSystemDirectory(userId), PROFILE_OWNER_XML);
+ }
}
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 0f60cc8..00a3c5c 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -279,7 +279,7 @@
NotificationManager mNotificationManager;
// Stores and loads state on device and profile owners.
- private DeviceOwner mDeviceOwner;
+ private final DeviceOwner mDeviceOwner;
private final Binder mToken = new Binder();
@@ -1044,6 +1044,7 @@
*/
public DevicePolicyManagerService(Context context) {
mContext = context;
+ mDeviceOwner = new DeviceOwner(mContext);
mUserManager = UserManager.get(mContext);
mHasFeature = context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_DEVICE_ADMIN);
@@ -1119,10 +1120,8 @@
Slog.w(LOG_TAG, "Tried to remove device policy file for user 0! Ignoring.");
return;
}
- if (mDeviceOwner != null) {
- mDeviceOwner.removeProfileOwner(userHandle);
- mDeviceOwner.writeOwnerFile();
- }
+ mDeviceOwner.removeProfileOwner(userHandle);
+ mDeviceOwner.writeProfileOwner(userHandle);
DevicePolicyData policy = mUserData.get(userHandle);
if (policy != null) {
@@ -1138,7 +1137,7 @@
void loadDeviceOwner() {
synchronized (this) {
- mDeviceOwner = DeviceOwner.load();
+ mDeviceOwner.load();
updateDeviceOwnerLocked();
}
}
@@ -1806,8 +1805,7 @@
Set<Integer> usersWithProfileOwners;
Set<Integer> usersWithData;
synchronized(this) {
- usersWithProfileOwners = mDeviceOwner != null
- ? mDeviceOwner.getProfileOwnerKeys() : new HashSet<Integer>();
+ usersWithProfileOwners = mDeviceOwner.getProfileOwnerKeys();
usersWithData = new HashSet<Integer>();
for (int i = 0; i < mUserData.size(); i++) {
usersWithData.add(mUserData.keyAt(i));
@@ -4137,14 +4135,8 @@
Binder.restoreCallingIdentity(ident);
}
- if (mDeviceOwner == null) {
- // Device owner is not set and does not exist, set it.
- mDeviceOwner = DeviceOwner.createWithDeviceOwner(packageName, ownerName);
- } else {
- // Device owner state already exists, update it.
- mDeviceOwner.setDeviceOwner(packageName, ownerName);
- }
- mDeviceOwner.writeOwnerFile();
+ mDeviceOwner.setDeviceOwner(packageName, ownerName);
+ mDeviceOwner.writeDeviceOwner();
updateDeviceOwnerLocked();
Intent intent = new Intent(DevicePolicyManager.ACTION_DEVICE_OWNER_CHANGED);
@@ -4164,8 +4156,7 @@
return false;
}
synchronized (this) {
- return mDeviceOwner != null
- && mDeviceOwner.hasDeviceOwner()
+ return mDeviceOwner.hasDeviceOwner()
&& mDeviceOwner.getDeviceOwnerPackageName().equals(packageName);
}
}
@@ -4176,11 +4167,8 @@
return null;
}
synchronized (this) {
- if (mDeviceOwner != null && mDeviceOwner.hasDeviceOwner()) {
- return mDeviceOwner.getDeviceOwnerPackageName();
- }
+ return mDeviceOwner.getDeviceOwnerPackageName();
}
- return null;
}
@Override
@@ -4190,7 +4178,7 @@
}
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USERS, null);
synchronized (this) {
- if (mDeviceOwner == null || !mDeviceOwner.hasDeviceOwner()) {
+ if (!mDeviceOwner.hasDeviceOwner()) {
return null;
}
String deviceOwnerPackage = mDeviceOwner.getDeviceOwnerPackageName();
@@ -4232,10 +4220,20 @@
}
synchronized (this) {
clearUserPoliciesLocked(new UserHandle(UserHandle.USER_OWNER));
- if (mDeviceOwner != null) {
- mDeviceOwner.clearDeviceOwner();
- mDeviceOwner.writeOwnerFile();
- updateDeviceOwnerLocked();
+
+ mDeviceOwner.clearDeviceOwner();
+ mDeviceOwner.writeDeviceOwner();
+ updateDeviceOwnerLocked();
+ // Reactivate backup service.
+ long ident = Binder.clearCallingIdentity();
+ try {
+ IBackupManager ibm = IBackupManager.Stub.asInterface(
+ ServiceManager.getService(Context.BACKUP_SERVICE));
+ ibm.setBackupServiceActive(UserHandle.USER_OWNER, true);
+ } catch (RemoteException e) {
+ throw new IllegalStateException("Failed reactivating backup service.", e);
+ } finally {
+ Binder.restoreCallingIdentity(ident);
}
}
}
@@ -4264,21 +4262,15 @@
synchronized (this) {
enforceCanSetDeviceInitializer(who);
- if (mDeviceOwner != null && mDeviceOwner.hasDeviceInitializer()) {
+ if (mDeviceOwner.hasDeviceInitializer()) {
throw new IllegalStateException(
"Trying to set device initializer but device initializer is already set.");
}
- if (mDeviceOwner == null) {
- // Device owner state does not exist, create it.
- mDeviceOwner = DeviceOwner.createWithDeviceInitializer(initializer);
- } else {
- // Device owner already exists, update it.
- mDeviceOwner.setDeviceInitializer(initializer);
- }
+ mDeviceOwner.setDeviceInitializer(initializer);
addDeviceInitializerToLockTaskPackagesLocked(UserHandle.USER_OWNER);
- mDeviceOwner.writeOwnerFile();
+ mDeviceOwner.writeDeviceOwner();
return true;
}
}
@@ -4302,8 +4294,7 @@
return false;
}
synchronized (this) {
- return mDeviceOwner != null
- && mDeviceOwner.hasDeviceInitializer()
+ return mDeviceOwner.hasDeviceInitializer()
&& mDeviceOwner.getDeviceInitializerPackageName().equals(packageName);
}
}
@@ -4314,7 +4305,7 @@
return null;
}
synchronized (this) {
- if (mDeviceOwner != null && mDeviceOwner.hasDeviceInitializer()) {
+ if (mDeviceOwner.hasDeviceInitializer()) {
return mDeviceOwner.getDeviceInitializerPackageName();
}
}
@@ -4327,7 +4318,7 @@
return null;
}
synchronized (this) {
- if (mDeviceOwner != null && mDeviceOwner.hasDeviceInitializer()) {
+ if (mDeviceOwner.hasDeviceInitializer()) {
return mDeviceOwner.getDeviceInitializerComponent();
}
}
@@ -4356,10 +4347,8 @@
synchronized (this) {
long ident = Binder.clearCallingIdentity();
try {
- if (mDeviceOwner != null) {
- mDeviceOwner.clearDeviceInitializer();
- mDeviceOwner.writeOwnerFile();
- }
+ mDeviceOwner.clearDeviceInitializer();
+ mDeviceOwner.writeDeviceOwner();
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -4378,15 +4367,8 @@
}
synchronized (this) {
enforceCanSetProfileOwner(userHandle);
- if (mDeviceOwner == null) {
- // Device owner state does not exist, create it.
- mDeviceOwner = DeviceOwner.createWithProfileOwner(who, ownerName,
- userHandle);
- } else {
- // Device owner state already exists, update it.
- mDeviceOwner.setProfileOwner(who, ownerName, userHandle);
- }
- mDeviceOwner.writeOwnerFile();
+ mDeviceOwner.setProfileOwner(who, ownerName, userHandle);
+ mDeviceOwner.writeProfileOwner(userHandle);
return true;
}
}
@@ -4401,10 +4383,9 @@
getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
synchronized (this) {
clearUserPoliciesLocked(callingUser);
- if (mDeviceOwner != null) {
- mDeviceOwner.removeProfileOwner(callingUser.getIdentifier());
- mDeviceOwner.writeOwnerFile();
- }
+ final int userId = callingUser.getIdentifier();
+ mDeviceOwner.removeProfileOwner(userId);
+ mDeviceOwner.writeProfileOwner(userId);
}
}
@@ -4561,18 +4542,14 @@
}
synchronized (this) {
- if (mDeviceOwner != null) {
- return mDeviceOwner.getProfileOwnerComponent(userHandle);
- }
+ return mDeviceOwner.getProfileOwnerComponent(userHandle);
}
- return null;
}
// Returns the active profile owner for this user or null if the current user has no
// profile owner.
private ActiveAdmin getProfileOwnerAdmin(int userHandle) {
- ComponentName profileOwner =
- mDeviceOwner != null ? mDeviceOwner.getProfileOwnerComponent(userHandle) : null;
+ ComponentName profileOwner = mDeviceOwner.getProfileOwnerComponent(userHandle);
if (profileOwner == null) {
return null;
}
@@ -4774,9 +4751,7 @@
synchronized (this) {
p.println("Current Device Policy Manager state:");
- if (mDeviceOwner != null) {
- mDeviceOwner.dump(" ", pw);
- }
+ mDeviceOwner.dump(" ", pw);
int userCount = mUserData.size();
for (int u = 0; u < userCount; u++) {
DevicePolicyData policy = getUserData(mUserData.keyAt(u));
@@ -6340,7 +6315,7 @@
} else {
mDeviceOwner.setSystemUpdatePolicy(policy);
}
- mDeviceOwner.writeOwnerFile();
+ mDeviceOwner.writeDeviceOwner();
}
mContext.sendBroadcastAsUser(
new Intent(DevicePolicyManager.ACTION_SYSTEM_UPDATE_POLICY_CHANGED),
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DeviceOwnerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DeviceOwnerTest.java
index 7c3014c..8ad7eea 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DeviceOwnerTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DeviceOwnerTest.java
@@ -17,11 +17,13 @@
package com.android.server.devicepolicy;
import android.content.ComponentName;
+import android.content.Context;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.File;
/**
* Tests for the DeviceOwner object that saves & loads device and policy owner information.
@@ -32,69 +34,34 @@
*/
public class DeviceOwnerTest extends AndroidTestCase {
- private ByteArrayInputStream mInputStreamForTest;
- private final ByteArrayOutputStream mOutputStreamForTest = new ByteArrayOutputStream();
+ private static class DeviceOwnerSub extends DeviceOwner{
+ private final File mLegacyFile;
+ private final File mDeviceOwnerFile;
+ private final File mProfileOwnerBase;
- @SmallTest
- public void testDeviceOwnerOnly() throws Exception {
- DeviceOwner out = new DeviceOwner(null, mOutputStreamForTest);
- out.setDeviceOwner("some.device.owner.package", "owner");
- out.writeOwnerFile();
+ public DeviceOwnerSub(Context context, File legacyFile, File deviceOwnerFile,
+ File profileOwnerBase) {
+ super(context);
+ mLegacyFile = legacyFile;
+ mDeviceOwnerFile = deviceOwnerFile;
+ mProfileOwnerBase = profileOwnerBase;
+ }
- mInputStreamForTest = new ByteArrayInputStream(mOutputStreamForTest.toByteArray());
- DeviceOwner in = new DeviceOwner(mInputStreamForTest, null);
- in.readOwnerFile();
+ @Override
+ File getLegacyConfigFileWithTestOverride() {
+ return mLegacyFile;
+ }
- assertEquals("some.device.owner.package", in.getDeviceOwnerPackageName());
- assertEquals("owner", in.getDeviceOwnerName());
- assertNull(in.getProfileOwnerComponent(1));
+ @Override
+ File getDeviceOwnerFileWithTestOverride() {
+ return mDeviceOwnerFile;
+ }
+
+ @Override
+ File getProfileOwnerFileWithTestOverride(int userId) {
+ return new File(mDeviceOwnerFile.getAbsoluteFile() + "-" + userId);
+ }
}
- @SmallTest
- public void testProfileOwnerOnly() throws Exception {
- DeviceOwner out = new DeviceOwner(null, mOutputStreamForTest);
- ComponentName admin = new ComponentName(
- "some.profile.owner.package", "some.profile.owner.package.Class");
- out.setProfileOwner(admin, "some-company", 1);
- out.writeOwnerFile();
-
- mInputStreamForTest = new ByteArrayInputStream(mOutputStreamForTest.toByteArray());
- DeviceOwner in = new DeviceOwner(mInputStreamForTest, null);
- in.readOwnerFile();
-
- assertNull(in.getDeviceOwnerPackageName());
- assertNull(in.getDeviceOwnerName());
- assertEquals(admin, in.getProfileOwnerComponent(1));
- assertEquals("some-company", in.getProfileOwnerName(1));
- }
-
- @SmallTest
- public void testDeviceAndProfileOwners() throws Exception {
- DeviceOwner out = new DeviceOwner(null, mOutputStreamForTest);
- ComponentName profileAdmin = new ComponentName(
- "some.profile.owner.package", "some.profile.owner.package.Class");
- ComponentName otherProfileAdmin = new ComponentName(
- "some.other.profile.owner", "some.other.profile.owner.OtherClass");
- // Old code used package name rather than component name, so the class
- // bit could be empty.
- ComponentName legacyComponentName = new ComponentName("legacy.profile.owner.package", "");
- out.setDeviceOwner("some.device.owner.package", "owner");
- out.setProfileOwner(profileAdmin, "some-company", 1);
- out.setProfileOwner(otherProfileAdmin, "some-other-company", 2);
- out.setProfileOwner(legacyComponentName, "legacy-company", 3);
- out.writeOwnerFile();
-
- mInputStreamForTest = new ByteArrayInputStream(mOutputStreamForTest.toByteArray());
-
- DeviceOwner in = new DeviceOwner(mInputStreamForTest, null);
- in.readOwnerFile();
-
- assertEquals("some.device.owner.package", in.getDeviceOwnerPackageName());
- assertEquals("owner", in.getDeviceOwnerName());
- assertEquals(profileAdmin, in.getProfileOwnerComponent(1));
- assertEquals("some-company", in.getProfileOwnerName(1));
- assertEquals(otherProfileAdmin, in.getProfileOwnerComponent(2));
- assertEquals("some-other-company", in.getProfileOwnerName(2));
- assertEquals(legacyComponentName, in.getProfileOwnerComponent(3));
- }
+ // TODO Write tests
}
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index e3f3c75..bfb7a50 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -372,6 +372,12 @@
public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";
/**
+ * Determine whether user can toggle Enhanced 4G LTE Mode in Settings.
+ * @hide
+ */
+ public static final String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool";
+
+ /**
* If this is true, the SIM card (through Customer Service Profile EF file) will be able to
* prevent manual operator selection. If false, this SIM setting will be ignored and manual
* operator selection will always be available. See CPHS4_2.WW6, CPHS B.4.7.1 for more
@@ -473,6 +479,7 @@
sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);
sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);
sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);
+ sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);
diff --git a/tests/TileBenchmark/Android.mk b/tests/TileBenchmark/Android.mk
deleted file mode 100644
index 9a057af..0000000
--- a/tests/TileBenchmark/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2011 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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES :=
-
-LOCAL_PACKAGE_NAME := TileBenchmark
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-include $(BUILD_PACKAGE)
diff --git a/tests/TileBenchmark/AndroidManifest.xml b/tests/TileBenchmark/AndroidManifest.xml
deleted file mode 100644
index c569ff4..0000000
--- a/tests/TileBenchmark/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- android:versionCode="1"
- android:versionName="1.0" package="com.test.tilebenchmark">
- <uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
- <application android:icon="@drawable/icon"
- android:label="@string/app_name"
- android:hardwareAccelerated="true">
- <activity android:name=".ProfileActivity"
- android:label="@string/profile_activity"
- android:theme="@android:style/Theme.Holo.NoActionBar">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- <activity android:name=".PlaybackActivity"
- android:label="@string/playback_activity"
- android:theme="@android:style/Theme.Holo.NoActionBar">
- </activity>
- <uses-library android:name="android.test.runner" />
- </application>
- <instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.test.tilebenchmark"
- android:label="Tests for WebView Tiles."/>
-</manifest>
diff --git a/tests/TileBenchmark/res/drawable-hdpi/icon.png b/tests/TileBenchmark/res/drawable-hdpi/icon.png
deleted file mode 100644
index 8074c4c..0000000
--- a/tests/TileBenchmark/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/TileBenchmark/res/drawable-ldpi/icon.png b/tests/TileBenchmark/res/drawable-ldpi/icon.png
deleted file mode 100644
index 1095584..0000000
--- a/tests/TileBenchmark/res/drawable-ldpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/TileBenchmark/res/drawable-mdpi/icon.png b/tests/TileBenchmark/res/drawable-mdpi/icon.png
deleted file mode 100644
index a07c69f..0000000
--- a/tests/TileBenchmark/res/drawable-mdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/tests/TileBenchmark/res/layout/main.xml b/tests/TileBenchmark/res/layout/main.xml
deleted file mode 100644
index 1b39d5d..0000000
--- a/tests/TileBenchmark/res/layout/main.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
- <HorizontalScrollView
- android:id="@+id/horizontalScrollView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- >
- <LinearLayout
- android:id="@+id/top"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
- <Spinner
- android:id="@+id/movement"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:prompt="@string/movement_method"
- />
- <Spinner
- android:id="@+id/velocity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:prompt="@string/desired_scroll_velocity"
- />
- <ToggleButton
- android:id="@+id/capture"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textOn="@string/capture_stop"
- android:textOff="@string/capture_start"
- />
- <EditText
- android:id="@+id/url"
- android:layout_width="400dp"
- android:layout_height="wrap_content"
- android:inputType="textUri"
- android:imeOptions="actionGo|flagNoExtractUi"
- android:layout_weight="1"
- />
- <Button
- android:id="@+id/inspect"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/inspect_log"
- />
- </LinearLayout>
- </HorizontalScrollView>
- <com.test.tilebenchmark.ProfiledWebView
- android:id="@+id/web"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
-</LinearLayout>
diff --git a/tests/TileBenchmark/res/layout/playback.xml b/tests/TileBenchmark/res/layout/playback.xml
deleted file mode 100644
index aa1c8a4..0000000
--- a/tests/TileBenchmark/res/layout/playback.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
- <LinearLayout
- android:id="@+id/top"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
- <Button
- android:id="@+id/backward"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/backward"
- />
- <TextView
- android:id="@+id/frame_display"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:layout_weight="1"
- />
- <Button
- android:id="@+id/forward"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/forward"
- />
- <SeekBar
- android:id="@+id/seek_bar"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="10"
- />
- </LinearLayout>
- <com.test.tilebenchmark.PlaybackView
- android:id="@+id/playback"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
-</LinearLayout>
diff --git a/tests/TileBenchmark/res/values/colors.xml b/tests/TileBenchmark/res/values/colors.xml
deleted file mode 100644
index dbb8e72..0000000
--- a/tests/TileBenchmark/res/values/colors.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<resources>
- <!-- The color of tiles with valid textures -->
- <color name="ready_tile">#ff4ac230</color>
- <!-- The color of tiles with stale / invalid textures -->
- <color name="unready_tile">#ff744400</color>
- <!-- Viewport overlay in playback -->
- <color name="view">#50000050</color>
- <!-- Invalidated region overlay in playback - start color -->
- <color name="inval_region_start">#80ff0000</color>
- <!-- Invalidated region overlay in playback - stop color-->
- <color name="inval_region_stop">#80ffffff</color>
-
- <!-- Background color for not testing -->
- <color name="background_not_testing">#ff000000</color>
- <!-- Background color for during testing -->
- <color name="background_start_testing">#ff400000</color>
- <!-- Background color for testing complete -->
- <color name="background_stop_testing">#ff004000</color>
-</resources>
diff --git a/tests/TileBenchmark/res/values/strings.xml b/tests/TileBenchmark/res/values/strings.xml
deleted file mode 100644
index 6c7055b..0000000
--- a/tests/TileBenchmark/res/values/strings.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<resources>
- <!-- Button, steps back a single frame [CHAR LIMIT=15] -->
- <string name="backward">Backward</string>
- <!-- Button, steps forward a single frame [CHAR LIMIT=15] -->
- <string name="forward">Forward</string>
- <!-- The name of the application [CHAR LIMIT=20] -->
- <string name="app_name">TileBenchmark</string>
- <!-- name of the auto-scroller / tile logger activity [CHAR LIMIT=100] -->
- <string name="profile_activity">Webview Profiler</string>
- <!-- name of the tile log playback activity [CHAR LIMIT=100] -->
- <string name="playback_activity">Webview Tile Playback</string>
- <!-- Button, loads another tile log [CHAR LIMIT=30] -->
- <string name="loadbutton">Load</string>
- <!-- Button, opens the playback activity [CHAR LIMIT=20] -->
- <string name="inspect_log">Inspect Log</string>
- <!-- ToggleButton label when pressing starts capture [CHAR LIMIT=15] -->
- <string name="capture_start">Start Capture</string>
- <!-- ToggleButton label when pressing stops capture [CHAR LIMIT=15] -->
- <string name="capture_stop">Stop Capture</string>
- <!-- The speed of auto-scrolling [CHAR LIMIT=30] -->
- <string name="desired_scroll_velocity">Choose Scroll Velocity</string>
- <!-- Pixels moved per frame [CHAR LIMIT=10] -->
- <string-array name="velocity_array">
- <item>1</item>
- <item>25</item>
- <item>50</item>
- <item>100</item>
- <item>200</item>
- <item>400</item>
- </string-array>
- <!-- Drop down menu for selecting scrolling vs manual navigation for
- capturing [CHAR LIMIT=15] -->
- <string name="movement_method">Movement Method</string>
- <!-- Drop down menu entry - automatically scroll to the end of the page
- with scrollBy() [CHAR LIMIT=15] -->
- <string name="movement_auto_scroll">Auto-scroll</string>
- <!-- Drop down menu entry - automatically record for a set time before
- stopping [CHAR LIMIT=15] -->
- <string name="movement_timed">Timed</string>
- <!-- Drop down menu entry - manually navigate the page(s), hit 'capture'
- button [CHAR LIMIT=15] -->
- <string name="movement_manual">Manual</string>
-
- <!-- Error popup indicating log data couldn't be loaded [CHAR LIMIT=60] -->
- <string name="error_no_data">Error: log data could not be loaded.</string>
-
- <!-- 25th percentile - 25% of frames fall below this value [CHAR LIMIT=12]
- -->
- <string name="percentile_25">25%ile</string>
- <!-- 50th percentile - 50% of frames fall below this value (aka median)
- [CHAR LIMIT=12] -->
- <string name="percentile_50">median</string>
- <!-- 75th percentile - 75% of frames fall below this value [CHAR LIMIT=12]
- -->
- <string name="percentile_75">75%ile</string>
- <!-- standard deviation [CHAR LIMIT=12] -->
- <string name="std_dev">StdDev</string>
- <!-- mean [CHAR LIMIT=12] -->
- <string name="mean">mean</string>
-
-
-
- <!-- Frame rate [CHAR LIMIT=15] -->
- <string name="frames_per_second">Frames/sec</string>
- <!-- Portion of viewport covered by good tiles [CHAR LIMIT=15] -->
- <string name="viewport_coverage">Coverage</string>
- <!-- Milliseconds taken to inval, and re-render the page [CHAR LIMIT=15] -->
- <string name="render_millis">RenderMillis</string>
- <!-- Animation Framerate [CHAR LIMIT=15] -->
- <string name="animation_framerate">AnimFramerate</string>
- <!-- Format string for stat value overlay [CHAR LIMIT=15] -->
- <string name="format_stat">%4.4f</string>
-
- <!-- Format string for viewport position value overlay [CHAR LIMIT=25] -->
- <string name="format_view_pos">View:(%1$d,%2$d)-(%3$d,%4$d)</string>
- <!-- Format string for viewport position value overlay [CHAR LIMIT=25] -->
- <string name="format_inval_pos">Inval:(%1$d,%2$d)-(%3$d,%4$d)</string>
-
- <!-- Format string for displaying aggregate stats+values (nr of valid tiles,
- etc.) [CHAR LIMIT=20] -->
- <string name="format_stat_name">%1$-20s %2$3d</string>
- <!-- Text hovering over canvas, number of tiles ready [CHAR LIMIT=15] -->
- <string name="ready_tiles">Ready Tiles</string>
- <!-- Text hovering over canvas, number tiles not ready [CHAR LIMIT=15] -->
- <string name="unready_tiles">Unready Tiles</string>
- <!-- Text hovering over canvas, number of tiles that haven't been
- allocated to a place on the page [CHAR LIMIT=15] -->
- <string name="unplaced_tiles">Unplaced Tiles</string>
- <!-- Text hovering over canvas, number of invalidated regions this frame
- [CHAR LIMIT=15] -->
- <string name="number_invalidates">Invalidates</string>
-</resources>
diff --git a/tests/UiBench/.gitignore b/tests/UiBench/.gitignore
new file mode 100644
index 0000000..c39eac2
--- /dev/null
+++ b/tests/UiBench/.gitignore
@@ -0,0 +1,5 @@
+.gradle
+.idea
+*.iml
+build
+local.properties
diff --git a/tests/UiBench/Android.mk b/tests/UiBench/Android.mk
new file mode 100644
index 0000000..1e5b117
--- /dev/null
+++ b/tests/UiBench/Android.mk
@@ -0,0 +1,24 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+# omit gradle 'build' dir
+LOCAL_SRC_FILES := $(call all-java-files-under,src)
+
+# use appcompat/support lib from the tree, so improvements/
+# regressions are reflected in test data
+LOCAL_RESOURCE_DIR := \
+ $(LOCAL_PATH)/res \
+ frameworks/support/v7/appcompat/res
+
+LOCAL_AAPT_FLAGS := \
+ --extra-packages android.support.v7.appcompat
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-v4 \
+ android-support-v7-appcompat
+
+LOCAL_PACKAGE_NAME := UiBench
+
+include $(BUILD_PACKAGE)
diff --git a/tests/UiBench/AndroidManifest.xml b/tests/UiBench/AndroidManifest.xml
new file mode 100644
index 0000000..6677e0d
--- /dev/null
+++ b/tests/UiBench/AndroidManifest.xml
@@ -0,0 +1,69 @@
+<!--
+ ~ Copyright (C) 2015 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
+ -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.test.uibench">
+
+ <application
+ android:allowBackup="false"
+ android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
+ <uses-library android:name="android.test.runner" />
+
+ <!-- Root navigation activity -->
+ <activity
+ android:name=".MainActivity"
+ android:label="UiBench">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ <!-- Tests -->
+ <activity
+ android:name=".GlTextureViewActivity"
+ android:label="Microbenchmarks/GL TextureView" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.test.uibench.TEST" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name=".FullscreenOverdrawActivity"
+ android:label="Microbenchmarks/Fullscreen Overdraw" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.test.uibench.TEST" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name=".TrivialAnimationActivity"
+ android:label="Microbenchmarks/Trivial Animation" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.test.uibench.TEST" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name=".TrivialListActivity"
+ android:label="Microbenchmarks/Trivial ListView" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.test.uibench.TEST" />
+ </intent-filter>
+ </activity>
+ </application>
+</manifest>
diff --git a/tests/UiBench/build.gradle b/tests/UiBench/build.gradle
new file mode 100644
index 0000000..bf0ed11
--- /dev/null
+++ b/tests/UiBench/build.gradle
@@ -0,0 +1,37 @@
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.3.0'
+
+ }
+}
+
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 23
+ buildToolsVersion "22.0.0"
+
+ defaultConfig {
+ minSdkVersion 14
+ targetSdkVersion 23
+ versionCode 1
+ versionName "1.0"
+ }
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ res.srcDirs = ['res']
+ }
+ }
+}
+
+dependencies {
+ // Dependencies enumerated specifically for platform-independent / reproducible builds.
+ compile 'com.android.support:support-v4:23.0.0'
+ compile 'com.android.support:appcompat-v7:23.0.0'
+}
diff --git a/tests/UiBench/gradle/wrapper/gradle-wrapper.jar b/tests/UiBench/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..8c0fb64
--- /dev/null
+++ b/tests/UiBench/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/tests/UiBench/gradle/wrapper/gradle-wrapper.properties b/tests/UiBench/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..12582f8
--- /dev/null
+++ b/tests/UiBench/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Aug 26 10:51:13 PDT 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/tests/UiBench/res/drawable-nodpi/large_photo.jpg b/tests/UiBench/res/drawable-nodpi/large_photo.jpg
new file mode 100644
index 0000000..e23dbb0
--- /dev/null
+++ b/tests/UiBench/res/drawable-nodpi/large_photo.jpg
Binary files differ
diff --git a/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java b/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java
new file mode 100644
index 0000000..f1ecc56
--- /dev/null
+++ b/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2015 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.test.uibench;
+
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+/**
+ * Draws hundreds of levels of overdraw over the content area.
+ *
+ * This should all be optimized out by the renderer.
+ */
+public class FullscreenOverdrawActivity extends AppCompatActivity {
+ private class OverdrawView extends View {
+ Paint paint = new Paint();
+ int mColorValue = 0;
+
+ public OverdrawView(Context context) {
+ super(context);
+ }
+
+ @SuppressWarnings("unused")
+ public void setColorValue(int colorValue) {
+ mColorValue = colorValue;
+ invalidate();
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ paint.setColor(Color.rgb(mColorValue, 255 - mColorValue, 255));
+
+ for (int i = 0; i < 400; i++) {
+ canvas.drawRect(0, 0, getWidth(), getHeight(), paint);
+ }
+ }
+ }
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ OverdrawView overdrawView = new OverdrawView(this);
+ setContentView(overdrawView);
+
+ ObjectAnimator objectAnimator = ObjectAnimator.ofInt(overdrawView, "colorValue", 0, 255);
+ objectAnimator.setRepeatMode(ValueAnimator.REVERSE);
+ objectAnimator.setRepeatCount(ValueAnimator.INFINITE);
+ objectAnimator.start();
+ }
+}
diff --git a/tests/UiBench/src/com/android/test/uibench/GlTextureViewActivity.java b/tests/UiBench/src/com/android/test/uibench/GlTextureViewActivity.java
new file mode 100644
index 0000000..ce79259
--- /dev/null
+++ b/tests/UiBench/src/com/android/test/uibench/GlTextureViewActivity.java
@@ -0,0 +1,413 @@
+/*
+ * Copyright (C) 2015 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.test.uibench;
+
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.SurfaceTexture;
+import android.opengl.GLUtils;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.TextureView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.egl.EGLSurface;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+import static android.opengl.GLES20.*;
+
+public class GlTextureViewActivity extends AppCompatActivity implements TextureView.SurfaceTextureListener {
+ private RenderThread mRenderThread;
+ private TextureView mTextureView;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ mTextureView = new TextureView(this);
+ mTextureView.setSurfaceTextureListener(this);
+ setContentView(mTextureView, new FrameLayout.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
+ Gravity.CENTER));
+ }
+
+ @Override
+ public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+ mRenderThread = new RenderThread(getResources(), surface);
+ mRenderThread.start();
+
+ mTextureView.setCameraDistance(5000);
+
+ ObjectAnimator animator = ObjectAnimator.ofFloat(mTextureView, "rotationY", 0.0f, 360.0f);
+ animator.setRepeatMode(ObjectAnimator.REVERSE);
+ animator.setRepeatCount(ObjectAnimator.INFINITE);
+ animator.setDuration(4000);
+ animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ mTextureView.invalidate();
+ }
+ });
+ animator.start();
+ }
+
+ @Override
+ public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+ }
+
+ @Override
+ public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+ mRenderThread.finish();
+ try {
+ mRenderThread.join();
+ } catch (InterruptedException e) {
+ Log.e(RenderThread.LOG_TAG, "Could not wait for render thread");
+ }
+ return true;
+ }
+
+ @Override
+ public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+ }
+
+ private static class RenderThread extends Thread {
+ private static final String LOG_TAG = "GLTextureView";
+
+ static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+ static final int EGL_OPENGL_ES2_BIT = 4;
+
+ private volatile boolean mFinished;
+
+ private final Resources mResources;
+ private final SurfaceTexture mSurface;
+
+ private EGL10 mEgl;
+ private EGLDisplay mEglDisplay;
+ private EGLConfig mEglConfig;
+ private EGLContext mEglContext;
+ private EGLSurface mEglSurface;
+
+ RenderThread(Resources resources, SurfaceTexture surface) {
+ mResources = resources;
+ mSurface = surface;
+ }
+
+ private static final String sSimpleVS =
+ "attribute vec4 position;\n" +
+ "attribute vec2 texCoords;\n" +
+ "varying vec2 outTexCoords;\n" +
+ "\nvoid main(void) {\n" +
+ " outTexCoords = texCoords;\n" +
+ " gl_Position = position;\n" +
+ "}\n\n";
+ private static final String sSimpleFS =
+ "precision mediump float;\n\n" +
+ "varying vec2 outTexCoords;\n" +
+ "uniform sampler2D texture;\n" +
+ "\nvoid main(void) {\n" +
+ " gl_FragColor = texture2D(texture, outTexCoords);\n" +
+ "}\n\n";
+
+ private static final int FLOAT_SIZE_BYTES = 4;
+ private static final int TRIANGLE_VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
+ private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0;
+ private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3;
+ private final float[] mTriangleVerticesData = {
+ // X, Y, Z, U, V
+ -1.0f, -1.0f, 0.0f, 0.0f, 0.0f,
+ 1.0f, -1.0f, 0.0f, 1.0f, 0.0f,
+ -1.0f, 1.0f, 0.0f, 0.0f, 1.0f,
+ 1.0f, 1.0f, 0.0f, 1.0f, 1.0f,
+ };
+
+ @Override
+ public void run() {
+ initGL();
+
+ FloatBuffer triangleVertices = ByteBuffer.allocateDirect(mTriangleVerticesData.length
+ * FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
+ triangleVertices.put(mTriangleVerticesData).position(0);
+
+ int texture = loadTexture(R.drawable.large_photo);
+ int program = buildProgram(sSimpleVS, sSimpleFS);
+
+ int attribPosition = glGetAttribLocation(program, "position");
+ checkGlError();
+
+ int attribTexCoords = glGetAttribLocation(program, "texCoords");
+ checkGlError();
+
+ int uniformTexture = glGetUniformLocation(program, "texture");
+ checkGlError();
+
+ glBindTexture(GL_TEXTURE_2D, texture);
+ checkGlError();
+
+ glUseProgram(program);
+ checkGlError();
+
+ glEnableVertexAttribArray(attribPosition);
+ checkGlError();
+
+ glEnableVertexAttribArray(attribTexCoords);
+ checkGlError();
+
+ glUniform1i(uniformTexture, 0);
+ checkGlError();
+
+ // drawQuad
+ triangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
+ glVertexAttribPointer(attribPosition, 3, GL_FLOAT, false,
+ TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices);
+ checkGlError();
+
+ triangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
+ glVertexAttribPointer(attribTexCoords, 3, GL_FLOAT, false,
+ TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices);
+ checkGlError();
+
+ glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+ checkGlError();
+
+ while (!mFinished) {
+ checkCurrent();
+
+ glClear(GL_COLOR_BUFFER_BIT);
+ checkGlError();
+
+ glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+ checkGlError();
+
+ if (!mEgl.eglSwapBuffers(mEglDisplay, mEglSurface)) {
+ throw new RuntimeException("Cannot swap buffers");
+ }
+ checkEglError();
+
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ // Ignore
+ }
+ }
+
+ finishGL();
+ }
+
+ private int loadTexture(int resource) {
+ int[] textures = new int[1];
+
+ glActiveTexture(GL_TEXTURE0);
+ glGenTextures(1, textures, 0);
+ checkGlError();
+
+ int texture = textures[0];
+ glBindTexture(GL_TEXTURE_2D, texture);
+ checkGlError();
+
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+ Bitmap bitmap = BitmapFactory.decodeResource(mResources, resource);
+
+ GLUtils.texImage2D(GL_TEXTURE_2D, 0, GL_RGBA, bitmap, GL_UNSIGNED_BYTE, 0);
+ checkGlError();
+
+ bitmap.recycle();
+
+ return texture;
+ }
+
+ private static int buildProgram(String vertex, String fragment) {
+ int vertexShader = buildShader(vertex, GL_VERTEX_SHADER);
+ if (vertexShader == 0) return 0;
+
+ int fragmentShader = buildShader(fragment, GL_FRAGMENT_SHADER);
+ if (fragmentShader == 0) return 0;
+
+ int program = glCreateProgram();
+ glAttachShader(program, vertexShader);
+ checkGlError();
+
+ glAttachShader(program, fragmentShader);
+ checkGlError();
+
+ glLinkProgram(program);
+ checkGlError();
+
+ int[] status = new int[1];
+ glGetProgramiv(program, GL_LINK_STATUS, status, 0);
+ if (status[0] != GL_TRUE) {
+ String error = glGetProgramInfoLog(program);
+ Log.d(LOG_TAG, "Error while linking program:\n" + error);
+ glDeleteShader(vertexShader);
+ glDeleteShader(fragmentShader);
+ glDeleteProgram(program);
+ return 0;
+ }
+
+ return program;
+ }
+
+ private static int buildShader(String source, int type) {
+ int shader = glCreateShader(type);
+
+ glShaderSource(shader, source);
+ checkGlError();
+
+ glCompileShader(shader);
+ checkGlError();
+
+ int[] status = new int[1];
+ glGetShaderiv(shader, GL_COMPILE_STATUS, status, 0);
+ if (status[0] != GL_TRUE) {
+ String error = glGetShaderInfoLog(shader);
+ Log.d(LOG_TAG, "Error while compiling shader:\n" + error);
+ glDeleteShader(shader);
+ return 0;
+ }
+
+ return shader;
+ }
+
+ private void checkEglError() {
+ int error = mEgl.eglGetError();
+ if (error != EGL10.EGL_SUCCESS) {
+ Log.w(LOG_TAG, "EGL error = 0x" + Integer.toHexString(error));
+ }
+ }
+
+ private static void checkGlError() {
+ int error = glGetError();
+ if (error != GL_NO_ERROR) {
+ Log.w(LOG_TAG, "GL error = 0x" + Integer.toHexString(error));
+ }
+ }
+
+ private void finishGL() {
+ mEgl.eglDestroyContext(mEglDisplay, mEglContext);
+ mEgl.eglDestroySurface(mEglDisplay, mEglSurface);
+ }
+
+ private void checkCurrent() {
+ if (!mEglContext.equals(mEgl.eglGetCurrentContext()) ||
+ !mEglSurface.equals(mEgl.eglGetCurrentSurface(EGL10.EGL_DRAW))) {
+ if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
+ throw new RuntimeException("eglMakeCurrent failed "
+ + GLUtils.getEGLErrorString(mEgl.eglGetError()));
+ }
+ }
+ }
+
+ private void initGL() {
+ mEgl = (EGL10) EGLContext.getEGL();
+
+ mEglDisplay = mEgl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+ if (mEglDisplay == EGL10.EGL_NO_DISPLAY) {
+ throw new RuntimeException("eglGetDisplay failed "
+ + GLUtils.getEGLErrorString(mEgl.eglGetError()));
+ }
+
+ int[] version = new int[2];
+ if (!mEgl.eglInitialize(mEglDisplay, version)) {
+ throw new RuntimeException("eglInitialize failed " +
+ GLUtils.getEGLErrorString(mEgl.eglGetError()));
+ }
+
+ mEglConfig = chooseEglConfig();
+ if (mEglConfig == null) {
+ throw new RuntimeException("eglConfig not initialized");
+ }
+
+ mEglContext = createContext(mEgl, mEglDisplay, mEglConfig);
+
+ mEglSurface = mEgl.eglCreateWindowSurface(mEglDisplay, mEglConfig, mSurface, null);
+
+ if (mEglSurface == null || mEglSurface == EGL10.EGL_NO_SURFACE) {
+ int error = mEgl.eglGetError();
+ if (error == EGL10.EGL_BAD_NATIVE_WINDOW) {
+ Log.e(LOG_TAG, "createWindowSurface returned EGL_BAD_NATIVE_WINDOW.");
+ return;
+ }
+ throw new RuntimeException("createWindowSurface failed "
+ + GLUtils.getEGLErrorString(error));
+ }
+
+ if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
+ throw new RuntimeException("eglMakeCurrent failed "
+ + GLUtils.getEGLErrorString(mEgl.eglGetError()));
+ }
+ }
+
+
+ EGLContext createContext(EGL10 egl, EGLDisplay eglDisplay, EGLConfig eglConfig) {
+ int[] attrib_list = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
+ return egl.eglCreateContext(eglDisplay, eglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
+ }
+
+ private EGLConfig chooseEglConfig() {
+ int[] configsCount = new int[1];
+ EGLConfig[] configs = new EGLConfig[1];
+ int[] configSpec = getConfig();
+ if (!mEgl.eglChooseConfig(mEglDisplay, configSpec, configs, 1, configsCount)) {
+ throw new IllegalArgumentException("eglChooseConfig failed " +
+ GLUtils.getEGLErrorString(mEgl.eglGetError()));
+ } else if (configsCount[0] > 0) {
+ return configs[0];
+ }
+ return null;
+ }
+
+ private static int[] getConfig() {
+ return new int[] {
+ EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+ EGL10.EGL_RED_SIZE, 8,
+ EGL10.EGL_GREEN_SIZE, 8,
+ EGL10.EGL_BLUE_SIZE, 8,
+ EGL10.EGL_ALPHA_SIZE, 8,
+ EGL10.EGL_DEPTH_SIZE, 0,
+ EGL10.EGL_STENCIL_SIZE, 0,
+ EGL10.EGL_NONE
+ };
+ }
+
+ void finish() {
+ mFinished = true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/UiBench/src/com/android/test/uibench/MainActivity.java b/tests/UiBench/src/com/android/test/uibench/MainActivity.java
new file mode 100644
index 0000000..2111274
--- /dev/null
+++ b/tests/UiBench/src/com/android/test/uibench/MainActivity.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2015 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.test.uibench;
+
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.ListFragment;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MainActivity extends AppCompatActivity {
+ private static final String EXTRA_PATH = "activity_path";
+ private static final String CATEGORY_HWUI_TEST = "com.android.test.uibench.TEST";
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ Intent intent = getIntent();
+ String path = intent.getStringExtra(EXTRA_PATH);
+
+ if (path == null) {
+ path = "";
+ } else {
+ // not root level, display where we are in the hierarchy
+ setTitle(path);
+ }
+
+ FragmentManager fm = getSupportFragmentManager();
+ if (fm.findFragmentById(android.R.id.content) == null) {
+ ListFragment listFragment = new ListFragment() {
+ @Override
+ @SuppressWarnings("unchecked")
+ public void onListItemClick(ListView l, View v, int position, long id) {
+ Map<String, Object> map = (Map<String, Object>)l.getItemAtPosition(position);
+
+ Intent intent = (Intent) map.get("intent");
+ startActivity(intent);
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ getListView().setTextFilterEnabled(true);
+ }
+ };
+ listFragment.setListAdapter(new SimpleAdapter(this, getData(path),
+ android.R.layout.simple_list_item_1, new String[] { "title" },
+ new int[] { android.R.id.text1 }));
+ fm.beginTransaction().add(android.R.id.content, listFragment).commit();
+ }
+ }
+
+ protected List<Map<String, Object>> getData(String prefix) {
+ List<Map<String, Object>> myData = new ArrayList<>();
+
+ Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
+ mainIntent.addCategory(CATEGORY_HWUI_TEST);
+
+ PackageManager pm = getPackageManager();
+ List<ResolveInfo> list = pm.queryIntentActivities(mainIntent, 0);
+
+ if (null == list)
+ return myData;
+
+ String[] prefixPath;
+ String prefixWithSlash = prefix;
+
+ if (prefix.equals("")) {
+ prefixPath = null;
+ } else {
+ prefixPath = prefix.split("/");
+ prefixWithSlash = prefix + "/";
+ }
+
+ int len = list.size();
+
+ Map<String, Boolean> entries = new HashMap<>();
+
+ for (int i = 0; i < len; i++) {
+ ResolveInfo info = list.get(i);
+ CharSequence labelSeq = info.loadLabel(pm);
+ String label = labelSeq != null
+ ? labelSeq.toString()
+ : info.activityInfo.name;
+
+ if (prefixWithSlash.length() == 0 || label.startsWith(prefixWithSlash)) {
+
+ String[] labelPath = label.split("/");
+
+ String nextLabel = prefixPath == null ? labelPath[0] : labelPath[prefixPath.length];
+
+ if ((prefixPath != null ? prefixPath.length : 0) == labelPath.length - 1) {
+ addItem(myData, nextLabel, activityIntent(
+ info.activityInfo.applicationInfo.packageName,
+ info.activityInfo.name));
+ } else {
+ if (entries.get(nextLabel) == null) {
+ addItem(myData, nextLabel, browseIntent(prefix.equals("") ?
+ nextLabel : prefix + "/" + nextLabel));
+ entries.put(nextLabel, true);
+ }
+ }
+ }
+ }
+
+ Collections.sort(myData, sDisplayNameComparator);
+
+ return myData;
+ }
+
+ private final static Comparator<Map<String, Object>> sDisplayNameComparator =
+ new Comparator<Map<String, Object>>() {
+ private final Collator collator = Collator.getInstance();
+
+ public int compare(Map<String, Object> map1, Map<String, Object> map2) {
+ return collator.compare(map1.get("title"), map2.get("title"));
+ }
+ };
+
+ protected Intent activityIntent(String pkg, String componentName) {
+ Intent result = new Intent();
+ result.setClassName(pkg, componentName);
+ return result;
+ }
+
+ protected Intent browseIntent(String path) {
+ Intent result = new Intent();
+ result.setClass(this, MainActivity.class);
+ result.putExtra(EXTRA_PATH, path);
+ return result;
+ }
+
+ protected void addItem(List<Map<String, Object>> data, String name, Intent intent) {
+ Map<String, Object> temp = new HashMap<>();
+ temp.put("title", name);
+ temp.put("intent", intent);
+ data.add(temp);
+ }
+}
diff --git a/tests/UiBench/src/com/android/test/uibench/TrivialAnimationActivity.java b/tests/UiBench/src/com/android/test/uibench/TrivialAnimationActivity.java
new file mode 100644
index 0000000..6e98472
--- /dev/null
+++ b/tests/UiBench/src/com/android/test/uibench/TrivialAnimationActivity.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2015 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.test.uibench;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+public class TrivialAnimationActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ getWindow().setBackgroundDrawable(new ColorDrawable() {
+ int colorValue = 0;
+ int colorDelta = 1;
+
+ @Override
+ public void draw(Canvas canvas) {
+ colorValue += colorDelta;
+ if (colorValue == 255 || colorValue == 0) {
+ colorDelta *= -1;
+ }
+
+ setColor(Color.rgb(255, colorValue, 255 - colorValue));
+ invalidateSelf();
+ super.draw(canvas);
+ }
+ });
+ }
+}
diff --git a/tests/UiBench/src/com/android/test/uibench/TrivialListActivity.java b/tests/UiBench/src/com/android/test/uibench/TrivialListActivity.java
new file mode 100644
index 0000000..0af3471
--- /dev/null
+++ b/tests/UiBench/src/com/android/test/uibench/TrivialListActivity.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 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.test.uibench;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.ListFragment;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.ArrayAdapter;
+
+import java.util.Random;
+
+public class TrivialListActivity extends AppCompatActivity {
+ static final int STRING_LENGTH = 10;
+
+ static String[] buildStringList() {
+ String[] strings = new String[200];
+ Random random = new Random(0);
+ for (int i = 0; i < strings.length; i++) {
+ String result = "";
+ for (int j = 0; j < STRING_LENGTH; j++) {
+ // add random letter
+ result += (char)(random.nextInt(26) + 65);
+ }
+ strings[i] = result;
+ }
+ return strings;
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ FragmentManager fm = getSupportFragmentManager();
+ if (fm.findFragmentById(android.R.id.content) == null) {
+ ListFragment listFragment = new ListFragment();
+ listFragment.setListAdapter(new ArrayAdapter<>(TrivialListActivity.this,
+ android.R.layout.simple_list_item_1, buildStringList()));
+ fm.beginTransaction().add(android.R.id.content, listFragment).commit();
+ }
+ }
+}
diff --git a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
index 1e33e3a..f1726eb 100644
--- a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
+++ b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
@@ -36,6 +36,7 @@
import android.annotation.NonNull;
import android.content.Context;
+import android.content.res.TypedArray;
import android.util.AttributeSet;
import java.io.File;
@@ -54,6 +55,9 @@
private ResourceReference mResourceReference;
private Map<View, String> mOpenDrawerLayouts;
+ // Keep in sync with the same value in LayoutInflater.
+ private static final int[] ATTRS_THEME = new int[] {com.android.internal.R.attr.theme };
+
/**
* List of class prefixes which are tried first by default.
* <p/>
@@ -135,11 +139,23 @@
@Override
public View createViewFromTag(View parent, String name, Context context, AttributeSet attrs,
- boolean ignoreThemeAttrs) {
+ boolean ignoreThemeAttr) {
View view;
try {
- view = super.createViewFromTag(parent, name, context, attrs, ignoreThemeAttrs);
+ view = super.createViewFromTag(parent, name, context, attrs, ignoreThemeAttr);
} catch (InflateException e) {
+ // Creation of ContextThemeWrapper code is same as in the super method.
+ // Apply a theme wrapper, if allowed and one is specified.
+ if (!ignoreThemeAttr) {
+ final TypedArray ta = context.obtainStyledAttributes(attrs, ATTRS_THEME);
+ final int themeResId = ta.getResourceId(0, 0);
+ if (themeResId != 0) {
+ context = new ContextThemeWrapper(context, themeResId);
+ }
+ ta.recycle();
+ }
+ final Object lastContext = mConstructorArgs[0];
+ mConstructorArgs[0] = context;
// try to load the class from using the custom view loader
try {
view = loadCustomView(name, attrs);
@@ -153,6 +169,8 @@
exception.initCause(e);
}
throw exception;
+ } finally {
+ mConstructorArgs[0] = lastContext;
}
}
diff --git a/tools/layoutlib/bridge/src/android/widget/SimpleMonthView_Delegate.java b/tools/layoutlib/bridge/src/android/widget/SimpleMonthView_Delegate.java
deleted file mode 100644
index 8e41e51..0000000
--- a/tools/layoutlib/bridge/src/android/widget/SimpleMonthView_Delegate.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.widget;
-
-import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.icu.text.SimpleDateFormat;
-import android.text.format.DateFormat;
-
-import java.util.Calendar;
-import java.util.Locale;
-
-/**
- * Delegate that provides implementation for some methods in {@link SimpleMonthView}.
- * <p/>
- * Through the layoutlib_create tool, selected methods of SimpleMonthView have been replaced by
- * calls to methods of the same name in this delegate class.
- * <p/>
- * The main purpose of this class is to use {@link android.icu.text.SimpleDateFormat} instead of
- * {@link java.text.SimpleDateFormat}.
- */
-public class SimpleMonthView_Delegate {
-
- private static final String DEFAULT_TITLE_FORMAT = "MMMMy";
- private static final String DAY_OF_WEEK_FORMAT = "EEEEE";
-
- // Maintain a cache of the last view used, so that the formatters can be reused.
- @Nullable private static SimpleMonthView sLastView;
- @Nullable private static SimpleMonthView_Delegate sLastDelegate;
-
- private SimpleDateFormat mTitleFormatter;
- private SimpleDateFormat mDayOfWeekFormatter;
-
- private Locale locale;
-
- @LayoutlibDelegate
- /*package*/ static CharSequence getTitle(SimpleMonthView view) {
- if (view.mTitle == null) {
- SimpleMonthView_Delegate delegate = getDelegate(view);
- if (delegate.mTitleFormatter == null) {
- delegate.mTitleFormatter = new SimpleDateFormat(DateFormat.getBestDateTimePattern(
- getLocale(delegate, view), DEFAULT_TITLE_FORMAT));
- }
- view.mTitle = delegate.mTitleFormatter.format(view.mCalendar.getTime());
- }
- return view.mTitle;
- }
-
- @LayoutlibDelegate
- /*package*/ static String getDayOfWeekLabel(SimpleMonthView view, int dayOfWeek) {
- view.mDayOfWeekLabelCalendar.set(Calendar.DAY_OF_WEEK, dayOfWeek);
- SimpleMonthView_Delegate delegate = getDelegate(view);
- if (delegate.mDayOfWeekFormatter == null) {
- delegate.mDayOfWeekFormatter =
- new SimpleDateFormat(DAY_OF_WEEK_FORMAT, getLocale(delegate, view));
- }
- return delegate.mDayOfWeekFormatter.format(view.mDayOfWeekLabelCalendar.getTime());
- }
-
- private static Locale getLocale(SimpleMonthView_Delegate delegate, SimpleMonthView view) {
- if (delegate.locale == null) {
- delegate.locale = view.getContext().getResources().getConfiguration().locale;
- }
- return delegate.locale;
- }
-
- @NonNull
- private static SimpleMonthView_Delegate getDelegate(SimpleMonthView view) {
- if (view == sLastView) {
- assert sLastDelegate != null;
- return sLastDelegate;
- } else {
- sLastView = view;
- sLastDelegate = new SimpleMonthView_Delegate();
- return sLastDelegate;
- }
- }
-
- public static void clearCache() {
- sLastView = null;
- sLastDelegate = null;
- }
-}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
index 92b39e3..a833ebe 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
@@ -36,7 +36,6 @@
import android.view.ViewConfiguration_Accessor;
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodManager_Accessor;
-import android.widget.SimpleMonthView_Delegate;
import java.util.Locale;
import java.util.concurrent.TimeUnit;
@@ -278,7 +277,6 @@
mContext.getRenderResources().setLogger(null);
}
ParserFactory.setParserFactory(null);
- SimpleMonthView_Delegate.clearCache();
}
public static BridgeContext getCurrentContext() {
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java
index 8f0ad01..f6c2626 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java
@@ -77,8 +77,6 @@
/** Methods to inject. FQCN of class in which method should be injected => runnable that does
* the injection. */
private final Map<String, ICreateInfo.InjectMethodRunnable> mInjectedMethodsMap;
- /** A map { FQCN => set { field names } } which should be promoted to public visibility */
- private final Map<String, Set<String>> mPromotedFields;
/**
* Creates a new generator that can generate the output JAR with the stubbed classes.
@@ -111,8 +109,20 @@
// Create the map/set of methods to change to delegates
mDelegateMethods = new HashMap<String, Set<String>>();
- addToMap(createInfo.getDelegateMethods(), mDelegateMethods);
-
+ for (String signature : createInfo.getDelegateMethods()) {
+ int pos = signature.indexOf('#');
+ if (pos <= 0 || pos >= signature.length() - 1) {
+ continue;
+ }
+ String className = binaryToInternalClassName(signature.substring(0, pos));
+ String methodName = signature.substring(pos + 1);
+ Set<String> methods = mDelegateMethods.get(className);
+ if (methods == null) {
+ methods = new HashSet<String>();
+ mDelegateMethods.put(className, methods);
+ }
+ methods.add(methodName);
+ }
for (String className : createInfo.getDelegateClassNatives()) {
className = binaryToInternalClassName(className);
Set<String> methods = mDelegateMethods.get(className);
@@ -177,34 +187,10 @@
returnTypes.add(binaryToInternalClassName(className));
}
- mPromotedFields = new HashMap<String, Set<String>>();
- addToMap(createInfo.getPromotedFields(), mPromotedFields);
-
mInjectedMethodsMap = createInfo.getInjectedMethodsMap();
}
/**
- * For each value in the array, split the value on '#' and add the parts to the map as key
- * and value.
- */
- private void addToMap(String[] entries, Map<String, Set<String>> map) {
- for (String entry : entries) {
- int pos = entry.indexOf('#');
- if (pos <= 0 || pos >= entry.length() - 1) {
- return;
- }
- String className = binaryToInternalClassName(entry.substring(0, pos));
- String methodOrFieldName = entry.substring(pos + 1);
- Set<String> set = map.get(className);
- if (set == null) {
- set = new HashSet<String>();
- map.put(className, set);
- }
- set.add(methodOrFieldName);
- }
- }
-
- /**
* Returns the list of classes that have not been renamed yet.
* <p/>
* The names are "internal class names" rather than FQCN, i.e. they use "/" instead "."
@@ -394,10 +380,6 @@
}
}
- Set<String> promoteFields = mPromotedFields.get(className);
- if (promoteFields != null && !promoteFields.isEmpty()) {
- cv = new PromoteFieldClassAdapter(cv, promoteFields);
- }
cr.accept(cv, 0);
return cw.toByteArray();
}
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
index 484240f..499bea4 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
@@ -120,11 +120,6 @@
}
@Override
- public String[] getPromotedFields() {
- return PROMOTED_FIELDS;
- }
-
- @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
return INJECTED_METHODS;
}
@@ -190,8 +185,6 @@
"android.view.RenderNode#nSetElevation",
"android.view.RenderNode#nGetElevation",
"android.view.ViewGroup#drawChild",
- "android.widget.SimpleMonthView#getTitle",
- "android.widget.SimpleMonthView#getDayOfWeekLabel",
"android.widget.TimePickerClockDelegate#getAmOrPmKeyCode",
"com.android.internal.view.menu.MenuBuilder#createNewMenuItem",
"com.android.internal.util.XmlUtils#convertValueToInt",
@@ -296,12 +289,6 @@
"org.kxml2.io.KXmlParser"
};
- private final static String[] PROMOTED_FIELDS = new String[] {
- "android.widget.SimpleMonthView#mTitle",
- "android.widget.SimpleMonthView#mCalendar",
- "android.widget.SimpleMonthView#mDayOfWeekLabelCalendar"
- };
-
/**
* List of classes for which the methods returning them should be deleted.
* The array contains a list of null terminated section starting with the name of the class
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java
index 6c62423..54b1fe6 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java
@@ -78,13 +78,6 @@
Set<String> getExcludedClasses();
/**
- * Returns a list of fields which should be promoted to public visibility. The array values
- * are in the form of the binary FQCN of the class containing the field and the field name
- * separated by a '#'.
- */
- String[] getPromotedFields();
-
- /**
* Returns a map from binary FQCN className to {@link InjectMethodRunnable} which will be
* called to inject methods into a class.
* Can be empty but must not be null.
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java
deleted file mode 100644
index e4b70da..0000000
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2015 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.tools.layoutlib.create;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
-
-import java.util.Set;
-
-import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
-import static org.objectweb.asm.Opcodes.ACC_PROTECTED;
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ASM4;
-
-/**
- * Promotes given fields to public visibility.
- */
-public class PromoteFieldClassAdapter extends ClassVisitor {
-
- private final Set<String> mFieldNames;
- private static final int ACC_NOT_PUBLIC = ~(ACC_PRIVATE | ACC_PROTECTED);
-
- public PromoteFieldClassAdapter(ClassVisitor cv, Set<String> fieldNames) {
- super(ASM4, cv);
- mFieldNames = fieldNames;
- }
-
- @Override
- public FieldVisitor visitField(int access, String name, String desc, String signature,
- Object value) {
- if (mFieldNames.contains(name)) {
- if ((access & ACC_PUBLIC) == 0) {
- access = (access & ACC_NOT_PUBLIC) | ACC_PUBLIC;
- }
- }
- return super.visitField(access, name, desc, signature, value);
- }
-}
diff --git a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java
index 8a2235b..2c21470 100644
--- a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java
+++ b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java
@@ -138,11 +138,6 @@
}
@Override
- public String[] getPromotedFields() {
- return new String[0];
- }
-
- @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
return new HashMap<String, InjectMethodRunnable>(0);
}
@@ -218,11 +213,6 @@
}
@Override
- public String[] getPromotedFields() {
- return new String[0];
- }
-
- @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
return new HashMap<String, InjectMethodRunnable>(0);
}
@@ -306,11 +296,6 @@
}
@Override
- public String[] getPromotedFields() {
- return new String[0];
- }
-
- @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
return new HashMap<String, InjectMethodRunnable>(0);
}
@@ -389,11 +374,6 @@
}
@Override
- public String[] getPromotedFields() {
- return new String[0];
- }
-
- @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
HashMap<String, InjectMethodRunnable> map =
new HashMap<String, InjectMethodRunnable>(1);
