diff options
98 files changed, 1912 insertions, 245 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4b7e61589424..de1df56ba100 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4722,6 +4722,13 @@ public final class Settings { public static final String UNSAFE_VOLUME_MUSIC_ACTIVE_MS = "unsafe_volume_music_active_ms"; /** + * This preference enables notification display on the lockscreen. + * @hide + */ + public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = + "lock_screen_show_notifications"; + + /** * This are the settings to be backed up. * * NOTE: Settings are backed up and restored in the order they appear @@ -6365,15 +6372,6 @@ public final class Settings { */ public static final String POLICY_CONTROL = "policy_control"; - - /** - * This preference enables notification display even over a securely - * locked screen. - * @hide - */ - public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = - "lock_screen_show_notifications"; - /** * Defines global zen mode. ZEN_MODE_OFF, ZEN_MODE_IMPORTANT_INTERRUPTIONS, * or ZEN_MODE_NO_INTERRUPTIONS. diff --git a/core/java/android/widget/Scroller.java b/core/java/android/widget/Scroller.java index 1a0ce9c8333d..5e88a968271e 100644 --- a/core/java/android/widget/Scroller.java +++ b/core/java/android/widget/Scroller.java @@ -589,10 +589,10 @@ public class Scroller { @Override public float getInterpolation(float input) { final float interpolated = VISCOUS_FLUID_NORMALIZE * viscousFluid(input); - if (input > 0) { - return input + VISCOUS_FLUID_OFFSET; + if (interpolated > 0) { + return interpolated + VISCOUS_FLUID_OFFSET; } - return input; + return interpolated; } } } diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index f9da127b5600..33bb90bcdb70 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -1293,6 +1293,12 @@ android_media_AudioSystem_eventHandlerFinalize(JNIEnv *env, jobject thiz) AudioSystem::setAudioPortCallback(callback); } +static jint +android_media_AudioSystem_getAudioHwSyncForSession(JNIEnv *env, jobject thiz, jint sessionId) +{ + return (jint)AudioSystem::getAudioHwSyncForSession((audio_session_t)sessionId); +} + // ---------------------------------------------------------------------------- static JNINativeMethod gMethods[] = { @@ -1332,6 +1338,8 @@ static JNINativeMethod gMethods[] = { (void *)android_media_AudioSystem_listAudioPatches}, {"setAudioPortConfig", "(Landroid/media/AudioPortConfig;)I", (void *)android_media_AudioSystem_setAudioPortConfig}, + {"getAudioHwSyncForSession", "(I)I", + (void *)android_media_AudioSystem_getAudioHwSyncForSession}, }; diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index d82fc96bbd75..81e887de781e 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -179,7 +179,10 @@ static void report_exception(JNIEnv* env, jthrowable excep, const char* msg) env->ExceptionClear(); jstring tagstr = env->NewStringUTF(LOG_TAG); - jstring msgstr = env->NewStringUTF(msg); + jstring msgstr = NULL; + if (tagstr != NULL) { + msgstr = env->NewStringUTF(msg); + } if ((tagstr == NULL) || (msgstr == NULL)) { env->ExceptionClear(); /* assume exception (OOM?) was thrown */ diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index ce76b26d6c89..afcfaf6b50ae 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -348,7 +348,12 @@ static void android_view_GLES20Canvas_drawBitmap(JNIEnv* env, jobject clazz, DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr); Paint* paint = reinterpret_cast<Paint*>(paintPtr); - renderer->drawBitmap(bitmap, left, top, paint); + + // apply transform directly to canvas, so it affects shaders correctly + renderer->save(SkCanvas::kMatrix_SaveFlag); + renderer->translate(left, top); + renderer->drawBitmap(bitmap, paint); + renderer->restore(); } static void android_view_GLES20Canvas_drawBitmapRect(JNIEnv* env, jobject clazz, @@ -375,7 +380,12 @@ static void android_view_GLES20Canvas_drawBitmapMatrix(JNIEnv* env, jobject claz DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr); SkMatrix* matrix = reinterpret_cast<SkMatrix*>(matrixPtr); Paint* paint = reinterpret_cast<Paint*>(paintPtr); - renderer->drawBitmap(bitmap, *matrix, paint); + + // apply transform directly to canvas, so it affects shaders correctly + renderer->save(SkCanvas::kMatrix_SaveFlag); + renderer->concatMatrix(*matrix); + renderer->drawBitmap(bitmap, paint); + renderer->restore(); } static void android_view_GLES20Canvas_drawBitmapData(JNIEnv* env, jobject clazz, @@ -399,7 +409,12 @@ static void android_view_GLES20Canvas_drawBitmapData(JNIEnv* env, jobject clazz, DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr); Paint* paint = reinterpret_cast<Paint*>(paintPtr); - renderer->drawBitmapData(bitmap, left, top, paint); + + // apply transform directly to canvas, so it affects shaders correctly + renderer->save(SkCanvas::kMatrix_SaveFlag); + renderer->translate(left, top); + renderer->drawBitmapData(bitmap, paint); + renderer->restore(); // Note - bitmap isn't deleted as DisplayListRenderer owns it now } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e3504fa349a0..d57a8b868e9f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -880,6 +880,15 @@ android:description="@string/permdesc_bluetoothPriv" android:label="@string/permlab_bluetoothPriv" /> + <!-- Control access to email providers exclusively for Bluetooth + @hide + --> + <permission android:name="android.permission.BLUETOOTH_MAP" + android:permissionGroup="android.permission-group.BLUETOOTH_NETWORK" + android:protectionLevel="signature" + android:description="@string/permdesc_bluetoothMap" + android:label="@string/permlab_bluetoothMap" /> + <!-- Allows bluetooth stack to access files @hide This should only be used by Bluetooth apk. --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 21f48431d40c..4761f1a271fe 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1974,6 +1974,13 @@ <string name="permdesc_bluetoothPriv" product="default">Allows the app to pair with remote devices without user interaction.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_bluetoothMap">access Bluetooth MAP data</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_bluetoothMap" product="tablet">Allows the app to access Bluetooth MAP data.</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_bluetoothMap" product="default">Allows the app to access Bluetooth MAP data.</string> + <string name="permlab_accessWimaxState">connect and disconnect from WiMAX</string> <string name="permdesc_accessWimaxState">Allows the app to determine whether WiMAX is enabled and information about any WiMAX networks that are diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 54683aa9268d..00c92fa57367 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -312,9 +312,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable { final int size = animators.size(); for (int i = 0; i < size; i++) { final Animator animator = animators.get(i); - if (animator.isPaused()) { - animator.resume(); - } else if (!animator.isRunning()) { + if (!animator.isRunning()) { animator.start(); } } @@ -327,7 +325,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable { final int size = animators.size(); for (int i = 0; i < size; i++) { final Animator animator = animators.get(i); - animator.pause(); + animator.end(); } } diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 777a35a589a5..6883cc5c1bee 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -639,9 +639,10 @@ private: class DrawBitmapOp : public DrawBoundedOp { public: - DrawBitmapOp(const SkBitmap* bitmap, float left, float top, const SkPaint* paint) - : DrawBoundedOp(left, top, left + bitmap->width(), top + bitmap->height(), paint), - mBitmap(bitmap), mAtlas(Caches::getInstance().assetAtlas) { + DrawBitmapOp(const SkBitmap* bitmap, const SkPaint* paint) + : DrawBoundedOp(0, 0, bitmap->width(), bitmap->height(), paint) + , mBitmap(bitmap) + , mAtlas(Caches::getInstance().assetAtlas) { mEntry = mAtlas.getEntry(bitmap); if (mEntry) { mEntryGenerationId = mAtlas.getGenerationId(); @@ -650,8 +651,7 @@ public: } virtual status_t applyDraw(OpenGLRenderer& renderer, Rect& dirty) { - return renderer.drawBitmap(mBitmap, mLocalBounds.left, mLocalBounds.top, - getPaint(renderer)); + return renderer.drawBitmap(mBitmap, getPaint(renderer)); } AssetAtlas::Entry* getAtlasEntry() { @@ -745,35 +745,6 @@ protected: UvMapper mUvMapper; }; -class DrawBitmapMatrixOp : public DrawBoundedOp { -public: - DrawBitmapMatrixOp(const SkBitmap* bitmap, const SkMatrix& matrix, const SkPaint* paint) - : DrawBoundedOp(paint), mBitmap(bitmap), mMatrix(matrix) { - mLocalBounds.set(0, 0, bitmap->width(), bitmap->height()); - const mat4 transform(matrix); - transform.mapRect(mLocalBounds); - } - - virtual status_t applyDraw(OpenGLRenderer& renderer, Rect& dirty) { - return renderer.drawBitmap(mBitmap, mMatrix, getPaint(renderer)); - } - - virtual void output(int level, uint32_t logFlags) const { - OP_LOG("Draw bitmap %p matrix " SK_MATRIX_STRING, mBitmap, SK_MATRIX_ARGS(&mMatrix)); - } - - virtual const char* name() { return "DrawBitmapMatrix"; } - - virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo, - const DeferredDisplayState& state) { - deferInfo.batchId = DeferredDisplayList::kOpBatch_Bitmap; - } - -private: - const SkBitmap* mBitmap; - const SkMatrix mMatrix; -}; - class DrawBitmapRectOp : public DrawBoundedOp { public: DrawBitmapRectOp(const SkBitmap* bitmap, @@ -807,12 +778,11 @@ private: class DrawBitmapDataOp : public DrawBitmapOp { public: - DrawBitmapDataOp(const SkBitmap* bitmap, float left, float top, const SkPaint* paint) - : DrawBitmapOp(bitmap, left, top, paint) {} + DrawBitmapDataOp(const SkBitmap* bitmap, const SkPaint* paint) + : DrawBitmapOp(bitmap, paint) {} virtual status_t applyDraw(OpenGLRenderer& renderer, Rect& dirty) { - return renderer.drawBitmapData(mBitmap, mLocalBounds.left, - mLocalBounds.top, getPaint(renderer)); + return renderer.drawBitmapData(mBitmap, getPaint(renderer)); } virtual void output(int level, uint32_t logFlags) const { diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp index 5286ef8ca580..b210e6458831 100644 --- a/libs/hwui/DisplayListRenderer.cpp +++ b/libs/hwui/DisplayListRenderer.cpp @@ -194,51 +194,42 @@ status_t DisplayListRenderer::drawLayer(Layer* layer, float x, float y) { return DrawGlInfo::kStatusDone; } -status_t DisplayListRenderer::drawBitmap(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint) { - bitmap = refBitmap(bitmap); - paint = refPaint(paint); - - addDrawOp(new (alloc()) DrawBitmapOp(bitmap, left, top, paint)); - return DrawGlInfo::kStatusDone; -} - -status_t DisplayListRenderer::drawBitmap(const SkBitmap* bitmap, const SkMatrix& matrix, - const SkPaint* paint) { +status_t DisplayListRenderer::drawBitmap(const SkBitmap* bitmap, const SkPaint* paint) { bitmap = refBitmap(bitmap); paint = refPaint(paint); - addDrawOp(new (alloc()) DrawBitmapMatrixOp(bitmap, matrix, paint)); + addDrawOp(new (alloc()) DrawBitmapOp(bitmap, paint)); return DrawGlInfo::kStatusDone; } status_t DisplayListRenderer::drawBitmap(const SkBitmap* bitmap, float srcLeft, float srcTop, float srcRight, float srcBottom, float dstLeft, float dstTop, float dstRight, float dstBottom, const SkPaint* paint) { - bitmap = refBitmap(bitmap); - paint = refPaint(paint); - - if (srcLeft == 0 && srcTop == 0 && - srcRight == bitmap->width() && srcBottom == bitmap->height() && - (srcBottom - srcTop == dstBottom - dstTop) && - (srcRight - srcLeft == dstRight - dstLeft)) { + if (srcLeft == 0 && srcTop == 0 + && srcRight == bitmap->width() && srcBottom == bitmap->height() + && (srcBottom - srcTop == dstBottom - dstTop) + && (srcRight - srcLeft == dstRight - dstLeft)) { // transform simple rect to rect drawing case into position bitmap ops, since they merge - addDrawOp(new (alloc()) DrawBitmapOp(bitmap, dstLeft, dstTop, paint)); - return DrawGlInfo::kStatusDone; - } + save(SkCanvas::kMatrix_SaveFlag); + translate(dstLeft, dstTop); + drawBitmap(bitmap, paint); + restore(); + } else { + bitmap = refBitmap(bitmap); + paint = refPaint(paint); - addDrawOp(new (alloc()) DrawBitmapRectOp(bitmap, - srcLeft, srcTop, srcRight, srcBottom, - dstLeft, dstTop, dstRight, dstBottom, paint)); + addDrawOp(new (alloc()) DrawBitmapRectOp(bitmap, + srcLeft, srcTop, srcRight, srcBottom, + dstLeft, dstTop, dstRight, dstBottom, paint)); + } return DrawGlInfo::kStatusDone; } -status_t DisplayListRenderer::drawBitmapData(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint) { +status_t DisplayListRenderer::drawBitmapData(const SkBitmap* bitmap, const SkPaint* paint) { bitmap = refBitmapData(bitmap); paint = refPaint(paint); - addDrawOp(new (alloc()) DrawBitmapDataOp(bitmap, left, top, paint)); + addDrawOp(new (alloc()) DrawBitmapDataOp(bitmap, paint)); return DrawGlInfo::kStatusDone; } diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h index d1d857299e86..1b3a48a0233b 100644 --- a/libs/hwui/DisplayListRenderer.h +++ b/libs/hwui/DisplayListRenderer.h @@ -105,15 +105,11 @@ public: virtual status_t drawColor(int color, SkXfermode::Mode mode); // Bitmap-based - virtual status_t drawBitmap(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint); - virtual status_t drawBitmap(const SkBitmap* bitmap, const SkMatrix& matrix, - const SkPaint* paint); + virtual status_t drawBitmap(const SkBitmap* bitmap, const SkPaint* paint); virtual status_t drawBitmap(const SkBitmap* bitmap, float srcLeft, float srcTop, float srcRight, float srcBottom, float dstLeft, float dstTop, float dstRight, float dstBottom, const SkPaint* paint); - virtual status_t drawBitmapData(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint); + virtual status_t drawBitmapData(const SkBitmap* bitmap, const SkPaint* paint); virtual status_t drawBitmapMesh(const SkBitmap* bitmap, int meshWidth, int meshHeight, const float* vertices, const int* colors, const SkPaint* paint); virtual status_t drawPatch(const SkBitmap* bitmap, const Res_png_9patch* patch, diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 5fbef2e80249..e00d2e3286ac 100755 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2034,12 +2034,8 @@ status_t OpenGLRenderer::drawBitmaps(const SkBitmap* bitmap, AssetAtlas::Entry* return DrawGlInfo::kStatusDrew; } -status_t OpenGLRenderer::drawBitmap(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint) { - const float right = left + bitmap->width(); - const float bottom = top + bitmap->height(); - - if (quickRejectSetupScissor(left, top, right, bottom)) { +status_t OpenGLRenderer::drawBitmap(const SkBitmap* bitmap, const SkPaint* paint) { + if (quickRejectSetupScissor(0, 0, bitmap->width(), bitmap->height())) { return DrawGlInfo::kStatusDone; } @@ -2049,49 +2045,16 @@ status_t OpenGLRenderer::drawBitmap(const SkBitmap* bitmap, float left, float to const AutoTexture autoCleanup(texture); if (CC_UNLIKELY(bitmap->colorType() == kAlpha_8_SkColorType)) { - drawAlphaBitmap(texture, left, top, paint); + drawAlphaBitmap(texture, 0, 0, paint); } else { - drawTextureRect(left, top, right, bottom, texture, paint); + drawTextureRect(0, 0, bitmap->width(), bitmap->height(), texture, paint); } return DrawGlInfo::kStatusDrew; } -status_t OpenGLRenderer::drawBitmap(const SkBitmap* bitmap, const SkMatrix& matrix, - const SkPaint* paint) { - Rect r(0.0f, 0.0f, bitmap->width(), bitmap->height()); - const mat4 transform(matrix); - transform.mapRect(r); - - if (quickRejectSetupScissor(r.left, r.top, r.right, r.bottom)) { - return DrawGlInfo::kStatusDone; - } - - mCaches.activeTexture(0); - Texture* texture = getTexture(bitmap); - if (!texture) return DrawGlInfo::kStatusDone; - const AutoTexture autoCleanup(texture); - - // This could be done in a cheaper way, all we need is pass the matrix - // to the vertex shader. The save/restore is a bit overkill. - save(SkCanvas::kMatrix_SaveFlag); - concatMatrix(matrix); - if (CC_UNLIKELY(bitmap->colorType() == kAlpha_8_SkColorType)) { - drawAlphaBitmap(texture, 0.0f, 0.0f, paint); - } else { - drawTextureRect(0.0f, 0.0f, bitmap->width(), bitmap->height(), texture, paint); - } - restore(); - - return DrawGlInfo::kStatusDrew; -} - -status_t OpenGLRenderer::drawBitmapData(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint) { - const float right = left + bitmap->width(); - const float bottom = top + bitmap->height(); - - if (quickRejectSetupScissor(left, top, right, bottom)) { +status_t OpenGLRenderer::drawBitmapData(const SkBitmap* bitmap, const SkPaint* paint) { + if (quickRejectSetupScissor(0, 0, bitmap->width(), bitmap->height())) { return DrawGlInfo::kStatusDone; } @@ -2100,9 +2063,9 @@ status_t OpenGLRenderer::drawBitmapData(const SkBitmap* bitmap, float left, floa const AutoTexture autoCleanup(texture); if (CC_UNLIKELY(bitmap->colorType() == kAlpha_8_SkColorType)) { - drawAlphaBitmap(texture, left, top, paint); + drawAlphaBitmap(texture, 0, 0, paint); } else { - drawTextureRect(left, top, right, bottom, texture, paint); + drawTextureRect(0, 0, bitmap->width(), bitmap->height(), texture, paint); } return DrawGlInfo::kStatusDrew; diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index 3bc591f45e63..fd228db58541 100755 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -161,17 +161,13 @@ public: virtual status_t drawRenderNode(RenderNode* displayList, Rect& dirty, int32_t replayFlags = 1); virtual status_t drawLayer(Layer* layer, float x, float y); - virtual status_t drawBitmap(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint); + virtual status_t drawBitmap(const SkBitmap* bitmap, const SkPaint* paint); status_t drawBitmaps(const SkBitmap* bitmap, AssetAtlas::Entry* entry, int bitmapCount, TextureVertex* vertices, bool pureTranslate, const Rect& bounds, const SkPaint* paint); - virtual status_t drawBitmap(const SkBitmap* bitmap, const SkMatrix& matrix, - const SkPaint* paint); virtual status_t drawBitmap(const SkBitmap* bitmap, float srcLeft, float srcTop, float srcRight, float srcBottom, float dstLeft, float dstTop, float dstRight, float dstBottom, const SkPaint* paint); - virtual status_t drawBitmapData(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint); + virtual status_t drawBitmapData(const SkBitmap* bitmap, const SkPaint* paint); virtual status_t drawBitmapMesh(const SkBitmap* bitmap, int meshWidth, int meshHeight, const float* vertices, const int* colors, const SkPaint* paint); status_t drawPatches(const SkBitmap* bitmap, AssetAtlas::Entry* entry, diff --git a/libs/hwui/Renderer.h b/libs/hwui/Renderer.h index 40a21e4a5173..f5cd2668e19e 100644 --- a/libs/hwui/Renderer.h +++ b/libs/hwui/Renderer.h @@ -160,15 +160,11 @@ public: virtual status_t drawColor(int color, SkXfermode::Mode mode) = 0; // Bitmap-based - virtual status_t drawBitmap(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint) = 0; - virtual status_t drawBitmap(const SkBitmap* bitmap, const SkMatrix& matrix, - const SkPaint* paint) = 0; + virtual status_t drawBitmap(const SkBitmap* bitmap, const SkPaint* paint) = 0; virtual status_t drawBitmap(const SkBitmap* bitmap, float srcLeft, float srcTop, float srcRight, float srcBottom, float dstLeft, float dstTop, float dstRight, float dstBottom, const SkPaint* paint) = 0; - virtual status_t drawBitmapData(const SkBitmap* bitmap, float left, float top, - const SkPaint* paint) = 0; + virtual status_t drawBitmapData(const SkBitmap* bitmap, const SkPaint* paint) = 0; virtual status_t drawBitmapMesh(const SkBitmap* bitmap, int meshWidth, int meshHeight, const float* vertices, const int* colors, const SkPaint* paint) = 0; virtual status_t drawPatch(const SkBitmap* bitmap, const Res_png_9patch* patch, diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index 3f030936185e..986e80805a00 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -336,11 +336,14 @@ CREATE_BRIDGE2(timMemory, RenderThread* thread, int level) { } void RenderProxy::trimMemory(int level) { - RenderThread& thread = RenderThread::getInstance(); - SETUP_TASK(timMemory); - args->thread = &thread; - args->level = level; - thread.queue(task); + // Avoid creating a RenderThread to do a trimMemory. + if (RenderThread::hasInstance()) { + RenderThread& thread = RenderThread::getInstance(); + SETUP_TASK(timMemory); + args->thread = &thread; + args->level = level; + thread.queue(task); + } } CREATE_BRIDGE0(fence) { diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 46fc66b922df..ce9a74264a59 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -152,6 +152,12 @@ public final class AudioAttributes implements Parcelable { */ public final static int FLAG_SCO = 0x1 << 2; + /** + * @hide + * CANDIDATE FOR PUBLIC API + * Flag requesting the use of an output stream supporting hardware A/V synchronization. + */ + public final static int FLAG_HW_AV_SYNC = 0x1 << 4; private int mUsage = USAGE_UNKNOWN; private int mContentType = CONTENT_TYPE_UNKNOWN; @@ -196,7 +202,7 @@ public final class AudioAttributes implements Parcelable { */ public int getFlags() { // only return the flags that are public - return (mFlags & (FLAG_AUDIBILITY_ENFORCED)); + return (mFlags & (FLAG_AUDIBILITY_ENFORCED | FLAG_HW_AV_SYNC)); } /** @@ -340,7 +346,7 @@ public final class AudioAttributes implements Parcelable { */ public Builder setFlags(int flags) { flags &= (AudioAttributes.FLAG_AUDIBILITY_ENFORCED | AudioAttributes.FLAG_SCO - | AudioAttributes.FLAG_SECURE); + | AudioAttributes.FLAG_SECURE | AudioAttributes.FLAG_HW_AV_SYNC); mFlags |= flags; return this; } diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 8e2ca9538071..e11aab1df485 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -487,5 +487,10 @@ public class AudioSystem public static native int releaseAudioPatch(AudioPatch patch); public static native int listAudioPatches(ArrayList<AudioPatch> patches, int[] generation); public static native int setAudioPortConfig(AudioPortConfig config); + + // must be kept in sync with value in include/system/audio.h + public static final int AUDIO_HW_SYNC_INVALID = 0; + + public static native int getAudioHwSyncForSession(int sessionId); } diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index a92ab7e3e75e..478a5decd6c7 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -183,7 +183,7 @@ <!-- Default for Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE --> <integer name="def_wifi_scan_always_available">0</integer> - <!-- Default for Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, 1==on --> + <!-- Default for Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 1==on --> <integer name="def_lock_screen_show_notifications">1</integer> <!-- Default for Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, 1==on --> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 09e6a9467775..7c92cded7bcf 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -70,7 +70,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { // database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion' // is properly propagated through your change. Not doing so will result in a loss of user // settings. - private static final int DATABASE_VERSION = 105; + private static final int DATABASE_VERSION = 106; private Context mContext; private int mUserHandle; @@ -1558,54 +1558,25 @@ public class DatabaseHelper extends SQLiteOpenHelper { } if (upgradeVersion == 98) { - if (mUserHandle == UserHandle.USER_OWNER) { - db.beginTransaction(); - SQLiteStatement stmt = null; - try { - stmt = db.compileStatement("INSERT OR REPLACE INTO global(name,value)" - + " VALUES(?,?);"); - loadIntegerSetting(stmt, Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, - R.integer.def_lock_screen_show_notifications); - db.setTransactionSuccessful(); - } finally { - db.endTransaction(); - if (stmt != null) stmt.close(); - } - } + // no-op; LOCK_SCREEN_SHOW_NOTIFICATIONS now handled in version 106 upgradeVersion = 99; } if (upgradeVersion == 99) { - if (mUserHandle == UserHandle.USER_OWNER) { - db.beginTransaction(); - SQLiteStatement stmt = null; - try { - stmt = db.compileStatement("INSERT OR REPLACE INTO global(name,value)" - + " VALUES(?,?);"); - loadIntegerSetting(stmt, Global.HEADS_UP_NOTIFICATIONS_ENABLED, - R.integer.def_heads_up_enabled); - db.setTransactionSuccessful(); - } finally { - db.endTransaction(); - if (stmt != null) stmt.close(); - } - } + // no-op; HEADS_UP_NOTIFICATIONS_ENABLED now handled in version 100 upgradeVersion = 100; } + if (upgradeVersion == 100) { - // Catch devices that were initialized to version 100 and missed these in onCreate() + // note: LOCK_SCREEN_SHOW_NOTIFICATIONS now handled in version 106 if (mUserHandle == UserHandle.USER_OWNER) { db.beginTransaction(); SQLiteStatement stmt = null; try { - stmt = db.compileStatement("INSERT OR IGNORE INTO global(name,value)" + stmt = db.compileStatement("INSERT OR REPLACE INTO global(name,value)" + " VALUES(?,?);"); - loadIntegerSetting(stmt, Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, - R.integer.def_lock_screen_show_notifications); - loadIntegerSetting(stmt, Global.HEADS_UP_NOTIFICATIONS_ENABLED, R.integer.def_heads_up_enabled); - db.setTransactionSuccessful(); } finally { db.endTransaction(); @@ -1695,6 +1666,34 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 105; } + if (upgradeVersion < 106) { + // LOCK_SCREEN_SHOW_NOTIFICATIONS is now per-user. + db.beginTransaction(); + SQLiteStatement stmt = null; + try { + stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)" + + " VALUES(?,?);"); + loadBooleanSetting(stmt, Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, + R.bool.def_guest_user_enabled); + if (mUserHandle == UserHandle.USER_OWNER) { + final int oldShow = getIntValueFromTable(db, + TABLE_GLOBAL, Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, -1); + if (oldShow >= 0) { + // overwrite the default with whatever you had + loadSetting(stmt, Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, oldShow); + final SQLiteStatement deleteStmt + = db.compileStatement("DELETE FROM global WHERE name=?"); + deleteStmt.bindString(1, Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS); + deleteStmt.execute(); + } + } + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + if (stmt != null) stmt.close(); + } + upgradeVersion = 106; + } // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { @@ -2260,6 +2259,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadBooleanSetting(stmt, Settings.Secure.WAKE_GESTURE_ENABLED, R.bool.def_wake_gesture_enabled); + loadIntegerSetting(stmt, Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, + R.integer.def_lock_screen_show_notifications); + } finally { if (stmt != null) stmt.close(); } @@ -2420,9 +2422,6 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadIntegerSetting(stmt, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, R.integer.def_wifi_scan_always_available); - loadIntegerSetting(stmt, Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, - R.integer.def_lock_screen_show_notifications); - loadIntegerSetting(stmt, Global.HEADS_UP_NOTIFICATIONS_ENABLED, R.integer.def_heads_up_enabled); diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 0aab7231c4d2..4c4306980fee 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Vee alles uit"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Begin nou"</string> <string name="empty_shade_text" msgid="708135716272867002">"Geen kennisgewings nie"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index d554e45124a9..faf82846395a 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"ሁሉንም አጽዳ"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"አሁን ጀምር"</string> <string name="empty_shade_text" msgid="708135716272867002">"ምንም ማሳወቂያ የለም"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 04812e5e9c6e..66f51d712842 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"محو الكل"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"البدء الآن"</string> <string name="empty_shade_text" msgid="708135716272867002">"ليس هناك أي اشعارات"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index e5ab744d6aec..9382e023d7e9 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Изчистване на всички"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Стартиране сега"</string> <string name="empty_shade_text" msgid="708135716272867002">"Няма известия"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml index 21f58b583f84..4015eab705f0 100644 --- a/packages/SystemUI/res/values-bn-rBD/strings.xml +++ b/packages/SystemUI/res/values-bn-rBD/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"সবকিছু সাফ করুন"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"এখন শুরু করুন"</string> <string name="empty_shade_text" msgid="708135716272867002">"কোনো বিজ্ঞপ্তি নেই"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index c69b68edb90e..ee5594082df9 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Esborra-ho tot"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Comença ara"</string> <string name="empty_shade_text" msgid="708135716272867002">"Cap notificació"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 1884c3a14232..5280acd85314 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Smazat vše"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Spustit"</string> <string name="empty_shade_text" msgid="708135716272867002">"Žádná oznámení"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 98353a985972..9d3416ddcdc1 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Ryd alt"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Start nu"</string> <string name="empty_shade_text" msgid="708135716272867002">"Ingen underretninger"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index e7e629c95ffe..6688c6aed7a4 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Alle löschen"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Jetzt starten"</string> <string name="empty_shade_text" msgid="708135716272867002">"Keine Benachrichtigungen"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 5377c95816a6..dee321b515f6 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Διαγραφή όλων"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Έναρξη τώρα"</string> <string name="empty_shade_text" msgid="708135716272867002">"Δεν υπάρχουν ειδοποιήσεις"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index f7d959db5b0c..3fc88e9b3b6f 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -39,12 +39,9 @@ <string name="invalid_charger_title" msgid="3515740382572798460">"USB charging not supported."</string> <string name="invalid_charger_text" msgid="5474997287953892710">"Use only the supplied charger."</string> <string name="battery_low_why" msgid="4553600287639198111">"Settings"</string> - <!-- no translation found for battery_saver_confirmation_title (5299585433050361634) --> - <skip /> - <!-- no translation found for battery_saver_confirmation_ok (7507968430447930257) --> - <skip /> - <!-- no translation found for battery_saver_start_action (5576697451677486320) --> - <skip /> + <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"Turn on battery saver?"</string> + <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Turn on"</string> + <string name="battery_saver_start_action" msgid="5576697451677486320">"Turn on battery saver"</string> <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Settings"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Aeroplane mode"</string> @@ -288,10 +285,8 @@ <item quantity="other" msgid="5408537517529822157">"For %d hours"</item> </plurals> <string name="battery_saver_notification_title" msgid="237918726750955859">"Battery saver is on"</string> - <!-- no translation found for battery_saver_notification_text (820318788126672692) --> - <skip /> - <!-- no translation found for battery_saver_notification_action_text (109158658238110382) --> - <skip /> + <string name="battery_saver_notification_text" msgid="820318788126672692">"Reduces performance and background data"</string> + <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Turn off battery saver"</string> <string name="battery_level_template" msgid="1609636980292580020">"<xliff:g id="LEVEL">%d</xliff:g>%%"</string> <string name="notification_hidden_text" msgid="1135169301897151909">"Contents hidden"</string> <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> will start capturing everything that\'s displayed on your screen."</string> @@ -299,4 +294,15 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Clear all"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Start now"</string> <string name="empty_shade_text" msgid="708135716272867002">"No notifications"</string> + <string name="device_owned_footer" msgid="3802752663326030053">"Device may be monitored"</string> + <string name="vpn_footer" msgid="2388611096129106812">"Network may be monitored"</string> + <string name="monitoring_title_device_owned" msgid="7121079311903859610">"Device monitoring"</string> + <string name="monitoring_title" msgid="169206259253048106">"Network monitoring"</string> + <string name="open_app" msgid="4011771120339160755">"Open app"</string> + <string name="disconnect_vpn" msgid="1324915059568548655">"Disconnect VPN"</string> + <string name="monitoring_description_device_owned" msgid="7801926679066533391">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator can monitor your network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator."</string> + <string name="monitoring_description_vpn" msgid="93140751707065515">"You gave \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" permission to set up a VPN connection.\n\nThis app can monitor your network activity, including emails, apps and secure websites."</string> + <string name="monitoring_description_legacy_vpn" msgid="5397847778080663075">"You\'re connected to a VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nYour VPN service provider can monitor your network activity including emails, apps and secure websites."</string> + <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps and secure websites. For more information, contact your administrator.\n\nAlso, you gave \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" permission to set up a VPN connection. This app can monitor network activity too."</string> + <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Your VPN service provider can monitor network activity too."</string> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index f7d959db5b0c..3fc88e9b3b6f 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -39,12 +39,9 @@ <string name="invalid_charger_title" msgid="3515740382572798460">"USB charging not supported."</string> <string name="invalid_charger_text" msgid="5474997287953892710">"Use only the supplied charger."</string> <string name="battery_low_why" msgid="4553600287639198111">"Settings"</string> - <!-- no translation found for battery_saver_confirmation_title (5299585433050361634) --> - <skip /> - <!-- no translation found for battery_saver_confirmation_ok (7507968430447930257) --> - <skip /> - <!-- no translation found for battery_saver_start_action (5576697451677486320) --> - <skip /> + <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"Turn on battery saver?"</string> + <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Turn on"</string> + <string name="battery_saver_start_action" msgid="5576697451677486320">"Turn on battery saver"</string> <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Settings"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Aeroplane mode"</string> @@ -288,10 +285,8 @@ <item quantity="other" msgid="5408537517529822157">"For %d hours"</item> </plurals> <string name="battery_saver_notification_title" msgid="237918726750955859">"Battery saver is on"</string> - <!-- no translation found for battery_saver_notification_text (820318788126672692) --> - <skip /> - <!-- no translation found for battery_saver_notification_action_text (109158658238110382) --> - <skip /> + <string name="battery_saver_notification_text" msgid="820318788126672692">"Reduces performance and background data"</string> + <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Turn off battery saver"</string> <string name="battery_level_template" msgid="1609636980292580020">"<xliff:g id="LEVEL">%d</xliff:g>%%"</string> <string name="notification_hidden_text" msgid="1135169301897151909">"Contents hidden"</string> <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> will start capturing everything that\'s displayed on your screen."</string> @@ -299,4 +294,15 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Clear all"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Start now"</string> <string name="empty_shade_text" msgid="708135716272867002">"No notifications"</string> + <string name="device_owned_footer" msgid="3802752663326030053">"Device may be monitored"</string> + <string name="vpn_footer" msgid="2388611096129106812">"Network may be monitored"</string> + <string name="monitoring_title_device_owned" msgid="7121079311903859610">"Device monitoring"</string> + <string name="monitoring_title" msgid="169206259253048106">"Network monitoring"</string> + <string name="open_app" msgid="4011771120339160755">"Open app"</string> + <string name="disconnect_vpn" msgid="1324915059568548655">"Disconnect VPN"</string> + <string name="monitoring_description_device_owned" msgid="7801926679066533391">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator can monitor your network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator."</string> + <string name="monitoring_description_vpn" msgid="93140751707065515">"You gave \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" permission to set up a VPN connection.\n\nThis app can monitor your network activity, including emails, apps and secure websites."</string> + <string name="monitoring_description_legacy_vpn" msgid="5397847778080663075">"You\'re connected to a VPN (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nYour VPN service provider can monitor your network activity including emails, apps and secure websites."</string> + <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps and secure websites. For more information, contact your administrator.\n\nAlso, you gave \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" permission to set up a VPN connection. This app can monitor network activity too."</string> + <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"This device is managed by:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). Your VPN service provider can monitor network activity too."</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index b19a15782bf1..b9f7c8dc7997 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Borrar todo"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Comenzar ahora"</string> <string name="empty_shade_text" msgid="708135716272867002">"No hay notificaciones"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 326d2ba375b0..2260d7dc5033 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Borrar todo"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Iniciar ahora"</string> <string name="empty_shade_text" msgid="708135716272867002">"Ninguna notificación"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml index 7600e15409eb..8c3ee9025949 100644 --- a/packages/SystemUI/res/values-et-rEE/strings.xml +++ b/packages/SystemUI/res/values-et-rEE/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Tühjenda kõik"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Alusta kohe"</string> <string name="empty_shade_text" msgid="708135716272867002">"Märguandeid pole"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml index 1ef65996f040..4c6708631863 100644 --- a/packages/SystemUI/res/values-eu-rES/strings.xml +++ b/packages/SystemUI/res/values-eu-rES/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Garbitu guztiak"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Hasi"</string> <string name="empty_shade_text" msgid="708135716272867002">"Ez dago jakinarazpenik"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index c02d1e95307e..9f39599cce2b 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -243,7 +243,7 @@ <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"هشدار <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="recents_empty_message" msgid="7883614615463619450">"هیچ برنامه جدیدی موجود نیست"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"اطلاعات برنامه"</string> - <string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"قفل در برنامه"</string> + <string name="recents_lock_to_app_button_label" msgid="4793991421811647489">"قفل به برنامه"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"جستجو"</string> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"شارژ کامل شد"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"در حال شارژ شدن"</string> @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"پاک کردن همه موارد"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"اکنون شروع شود"</string> <string name="empty_shade_text" msgid="708135716272867002">"اعلانی موجود نیست"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index d9e53c551463..7bef3aa80a6a 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Poista kaikki"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Aloita nyt"</string> <string name="empty_shade_text" msgid="708135716272867002">"Ei ilmoituksia"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index ea63cccfe4c9..cf0095bc1269 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Tout effacer"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Commencer maintenant"</string> <string name="empty_shade_text" msgid="708135716272867002">"Aucune notification"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 8db8975aec1d..41f4df435ea7 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Tout effacer"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Commencer"</string> <string name="empty_shade_text" msgid="708135716272867002">"Aucune notification"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml index b3e88e6ad289..aedbd03fc6fd 100644 --- a/packages/SystemUI/res/values-gl-rES/strings.xml +++ b/packages/SystemUI/res/values-gl-rES/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Eliminar todas"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Iniciar agora"</string> <string name="empty_shade_text" msgid="708135716272867002">"Non hai notificacións"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 7001f8220588..5a53ee948516 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"सभी साफ करें"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"अब प्रारंभ करें"</string> <string name="empty_shade_text" msgid="708135716272867002">"कोई सूचना नहीं"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 4fc775c57379..43c9207244bc 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Izbriši sve"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Započni sad"</string> <string name="empty_shade_text" msgid="708135716272867002">"Nema obavijesti"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 6d5a15c7b694..ed26b93b5f40 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Az összes törlése"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Indítás most"</string> <string name="empty_shade_text" msgid="708135716272867002">"Nincs értesítés"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml index f4375ce1c6ef..80d1aa44141d 100644 --- a/packages/SystemUI/res/values-hy-rAM/strings.xml +++ b/packages/SystemUI/res/values-hy-rAM/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Մաքրել բոլորը"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Մեկնարկել հիմա"</string> <string name="empty_shade_text" msgid="708135716272867002">"Ծանուցումներ չկան"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 96b1165d3b3f..1e8d88253cfe 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Hapus semua"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Mulai sekarang"</string> <string name="empty_shade_text" msgid="708135716272867002">"Tidak ada pemberitahuan"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml index 266af50970a9..153ece3e80ed 100644 --- a/packages/SystemUI/res/values-is-rIS/strings.xml +++ b/packages/SystemUI/res/values-is-rIS/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Hreinsa allt"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Byrja núna"</string> <string name="empty_shade_text" msgid="708135716272867002">"Engar tilkynningar"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 7da2268149c4..3828e23d8db1 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Cancella tutto"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Avvia adesso"</string> <string name="empty_shade_text" msgid="708135716272867002">"Nessuna notifica"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index fba167e95299..1f64088254fd 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"נקה הכל"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"התחל כעת"</string> <string name="empty_shade_text" msgid="708135716272867002">"אין הודעות"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 3baf0c8267d6..2307b6eec9af 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"すべて消去"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"今すぐ開始"</string> <string name="empty_shade_text" msgid="708135716272867002">"通知はありません"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml index 13421f94df85..331c4c8b1198 100644 --- a/packages/SystemUI/res/values-ka-rGE/strings.xml +++ b/packages/SystemUI/res/values-ka-rGE/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"ყველას გასუფთავება"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"დაწყება ახლავე"</string> <string name="empty_shade_text" msgid="708135716272867002">"შეტყობინებები არ არის."</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml index edbd25fc5fec..6991615fd768 100644 --- a/packages/SystemUI/res/values-kk-rKZ/strings.xml +++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Барлығын тазалау"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Қазір бастау"</string> <string name="empty_shade_text" msgid="708135716272867002">"Хабарландырулар жоқ"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml index ac210d45c3bc..d9d84021c29d 100644 --- a/packages/SystemUI/res/values-km-rKH/strings.xml +++ b/packages/SystemUI/res/values-km-rKH/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"សម្អាតទាំងអស់"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"ចាប់ផ្ដើមឥឡូវ"</string> <string name="empty_shade_text" msgid="708135716272867002">"គ្មានការជូនដំណឹង"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml index f86779e558b3..1bd31d2b2076 100644 --- a/packages/SystemUI/res/values-kn-rIN/strings.xml +++ b/packages/SystemUI/res/values-kn-rIN/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"ಎಲ್ಲವನ್ನೂ ತೆರವುಗೊಳಿಸು"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"ಈಗ ಪ್ರಾರಂಭಿಸಿ"</string> <string name="empty_shade_text" msgid="708135716272867002">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳಿಲ್ಲ"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index a4e67128bee3..a62d501febbd 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"모두 지우기"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"시작하기"</string> <string name="empty_shade_text" msgid="708135716272867002">"알림 없음"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml index d726e245a353..750c1d9ef77d 100644 --- a/packages/SystemUI/res/values-ky-rKG/strings.xml +++ b/packages/SystemUI/res/values-ky-rKG/strings.xml @@ -325,4 +325,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Бардыгын тазалап салуу"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Азыр баштоо"</string> <string name="empty_shade_text" msgid="708135716272867002">"Эскертмелер жок"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml index 5950d8d79c5a..a433b8577583 100644 --- a/packages/SystemUI/res/values-lo-rLA/strings.xml +++ b/packages/SystemUI/res/values-lo-rLA/strings.xml @@ -39,12 +39,9 @@ <string name="invalid_charger_title" msgid="3515740382572798460">"ບໍ່ຮອງຮັບການສາກຜ່ານ USB."</string> <string name="invalid_charger_text" msgid="5474997287953892710">"ໃຊ້ສະເພາະສາຍສາກທີ່ມາກັບເຄື່ອງ."</string> <string name="battery_low_why" msgid="4553600287639198111">"ການຕັ້ງຄ່າ"</string> - <!-- no translation found for battery_saver_confirmation_title (5299585433050361634) --> - <skip /> - <!-- no translation found for battery_saver_confirmation_ok (7507968430447930257) --> - <skip /> - <!-- no translation found for battery_saver_start_action (5576697451677486320) --> - <skip /> + <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"ເປີດໃຊ້ການປະຢັດແບັດເຕີຣີບໍ?"</string> + <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"ເປີດໃຊ້"</string> + <string name="battery_saver_start_action" msgid="5576697451677486320">"ເປີດໃຊ້ໂຕປະຢັດແບັດເຕີຣີ"</string> <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"ການຕັ້ງຄ່າ"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"ໂໝດເທິງຍົນ"</string> @@ -288,10 +285,8 @@ <item quantity="other" msgid="5408537517529822157">"ເປັນເວລາ %d ຊົ່ວໂມງ"</item> </plurals> <string name="battery_saver_notification_title" msgid="237918726750955859">"ເປີດໃຊ້ໂຕປະຢັດແບັດເຕີຣີແລ້ວ"</string> - <!-- no translation found for battery_saver_notification_text (820318788126672692) --> - <skip /> - <!-- no translation found for battery_saver_notification_action_text (109158658238110382) --> - <skip /> + <string name="battery_saver_notification_text" msgid="820318788126672692">"ຫຼຸດປະສິທິພາບແລະການນຳໃຊ້ຂໍ້ມູນພື້ນຫຼັງ"</string> + <string name="battery_saver_notification_action_text" msgid="109158658238110382">"ປິດໂຕປະຢັດແບັດເຕີຣີ"</string> <string name="battery_level_template" msgid="1609636980292580020">"<xliff:g id="LEVEL">%d</xliff:g>%%"</string> <string name="notification_hidden_text" msgid="1135169301897151909">"ເນື້ອຫາຖືກເຊື່ອງແລ້ວ"</string> <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> ຈະເລີ່ມບັນທຶກທຸກຢ່າງທີ່ສະແດງຜົນໃນໜ້າຈໍທ່ານ."</string> @@ -299,4 +294,15 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"ລຶບລ້າງທັງໝົດ"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"ເລີ່ມດຽວນີ້"</string> <string name="empty_shade_text" msgid="708135716272867002">"ບໍ່ມີການແຈ້ງເຕືອນ"</string> + <string name="device_owned_footer" msgid="3802752663326030053">"ອຸປະກອນອາດມີການເຝົ້າຕິດຕາມ"</string> + <string name="vpn_footer" msgid="2388611096129106812">"ເຄືອຂ່າຍອາດມີການເຝົ້າຕິດຕາມ"</string> + <string name="monitoring_title_device_owned" msgid="7121079311903859610">"ການກວດສອບຕິດຕາມອຸປະກອນ"</string> + <string name="monitoring_title" msgid="169206259253048106">"ການກວດສອບຕິດຕາມເຄືອຂ່າຍ"</string> + <string name="open_app" msgid="4011771120339160755">"ເປີດແອັບຯ"</string> + <string name="disconnect_vpn" msgid="1324915059568548655">"ຕັດການເຊື່ອມຕໍ່ VPN"</string> + <string name="monitoring_description_device_owned" msgid="7801926679066533391">"ອຸປະກອນນີ້ຖືກຈັດການໂດຍ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nຜູ່ເບິ່ງແຍງລະບົບສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານ ຮວມເຖິງ: ອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດ.\n\nສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານ."</string> + <string name="monitoring_description_vpn" msgid="93140751707065515">"ທ່ານມອບສິດອະນຸຍາດໃຫ້ \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" ເພື່ອຕັ້ງຄ່າການເຊື່ອມຕໍ່ VPN.\n\nແອັບຯນີ້ສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ ຮວມເຖິງອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດ."</string> + <string name="monitoring_description_legacy_vpn" msgid="5397847778080663075">"ທ່ານເຊື່ອມຕໍ່ຫາ VPN ແລ້ວ (\"<xliff:g id="APPLICATION">%1$s</xliff:g>\").\n\nຜູ່ໃຫ້ບໍລິການ VPN ຂອງທ່ານສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ ຮວມເຖິງອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດ."</string> + <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"ອຸປະກອນຂອງທ່ານຖືກຈັດການໂດຍ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ ຮວມເຖິງອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດ. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານ.\n\nອີກຢ່າງນຶ່ງ, ທ່ານມອບສິດອະນຸຍາດໃຫ້ \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" ເພື່ອຕັ້ງຄ່າການເຊື່ອມຕໍ່ VPN. ແອັບຯນີ້ສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້."</string> + <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"ອຸປະກອນຂອງທ່ານຖືກຈັດການໂດຍ:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ ຮວມເຖິງອີເມວ, ແອັບຯ ແລະເວັບໄຊທີ່ເຂົ້າລະຫັດ. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານ.\n\nນອກຈາກນັ້ນ, ທ່ານໄດ້ເຊື່ອມຕໍ່ຫາ VPN (\"<xliff:g id="APPLICATION">%2$s</xliff:g>\"). ຜູ່ໃຫ້ບໍລິການ VPN ຂອງທ່ານສາມາດເຝົ້າຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານໄດ້ເຊັ່ນກັນ."</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index c39b885cb0e4..3ea3f0b9d619 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Viską išvalyti"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Pradėti dabar"</string> <string name="empty_shade_text" msgid="708135716272867002">"Nėra įspėjimų"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 0a52f23cfb4d..b9a4994cf889 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Dzēst visu"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Sākt tūlīt"</string> <string name="empty_shade_text" msgid="708135716272867002">"Nav paziņojumu"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml index 03e665ff7317..82adb409c391 100644 --- a/packages/SystemUI/res/values-mk-rMK/strings.xml +++ b/packages/SystemUI/res/values-mk-rMK/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Исчисти сè"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Започни сега"</string> <string name="empty_shade_text" msgid="708135716272867002">"Нема известувања"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml index f87238fad11b..06f51900b15a 100644 --- a/packages/SystemUI/res/values-ml-rIN/strings.xml +++ b/packages/SystemUI/res/values-ml-rIN/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"എല്ലാം മായ്ക്കുക"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"ഇപ്പോൾ ആരംഭിക്കുക"</string> <string name="empty_shade_text" msgid="708135716272867002">"അറിയിപ്പുകൾ ഒന്നുമില്ല"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml index 12c9741c29af..0faf210cd7e9 100644 --- a/packages/SystemUI/res/values-mn-rMN/strings.xml +++ b/packages/SystemUI/res/values-mn-rMN/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Бүгдийг арилгах"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Одоо эхлүүлэх"</string> <string name="empty_shade_text" msgid="708135716272867002">"Мэдэгдэл байхгүй"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml index d25fc41b013a..d670ab6377e9 100644 --- a/packages/SystemUI/res/values-mr-rIN/strings.xml +++ b/packages/SystemUI/res/values-mr-rIN/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"सर्व साफ करा"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"आता प्रारंभ करा"</string> <string name="empty_shade_text" msgid="708135716272867002">"सूचना नाहीत"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml index 2ac2ba9d2312..93acf791cfee 100644 --- a/packages/SystemUI/res/values-ms-rMY/strings.xml +++ b/packages/SystemUI/res/values-ms-rMY/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Kosongkan semua"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Mulakan sekarang"</string> <string name="empty_shade_text" msgid="708135716272867002">"Tiada pemberitahuan"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml index 934946f68f4c..52883dd3377c 100644 --- a/packages/SystemUI/res/values-my-rMM/strings.xml +++ b/packages/SystemUI/res/values-my-rMM/strings.xml @@ -295,4 +295,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"အားလုံး ရှင်းလင်းရန်"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"ယခု စတင်ပါ"</string> <string name="empty_shade_text" msgid="708135716272867002">"အကြောင်းကြားချက်များ မရှိ"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 697d016e722e..2690ceb1c63f 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Fjern alt"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Start nå"</string> <string name="empty_shade_text" msgid="708135716272867002">"Ingen varsler"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml index ac0af13c28e4..2e45f22292c9 100644 --- a/packages/SystemUI/res/values-ne-rNP/strings.xml +++ b/packages/SystemUI/res/values-ne-rNP/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"सबै हटाउनुहोस्"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"अहिले सुरु गर्नुहोस्"</string> <string name="empty_shade_text" msgid="708135716272867002">"कुनै सूचनाहरू छैनन्"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 03088d838bfd..0f59a3f92b02 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Alles wissen"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Nu starten"</string> <string name="empty_shade_text" msgid="708135716272867002">"Geen meldingen"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 8fa2149c6593..d30124877ab1 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Usuń wszystkie"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Rozpocznij teraz"</string> <string name="empty_shade_text" msgid="708135716272867002">"Brak powiadomień"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 43d715a63369..c06f267d1a04 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Limpar tudo"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Começar agora"</string> <string name="empty_shade_text" msgid="708135716272867002">"Sem notificações"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 6c384a62048c..87c501f1d04d 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Limpar tudo"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Iniciar agora"</string> <string name="empty_shade_text" msgid="708135716272867002">"Sem notificações"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 0c979ed89f8c..a5736afebea5 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -305,4 +305,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Ștergeți toate notificările"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Începeți acum"</string> <string name="empty_shade_text" msgid="708135716272867002">"Nicio notificare"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 3ee1e473af1a..e8900fe565e9 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Очистить все"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Начать"</string> <string name="empty_shade_text" msgid="708135716272867002">"Нет уведомлений"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml index 964f7703f7e3..6dd4a57d03eb 100644 --- a/packages/SystemUI/res/values-si-rLK/strings.xml +++ b/packages/SystemUI/res/values-si-rLK/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"සියල්ල හිස් කරන්න"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"දැන් අරඹන්න"</string> <string name="empty_shade_text" msgid="708135716272867002">"දැනුම්දීම් නැත"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index f618864fdd43..516a9aca1536 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -39,12 +39,9 @@ <string name="invalid_charger_title" msgid="3515740382572798460">"Nabíjanie prostredníctvom USB nie je podporované."</string> <string name="invalid_charger_text" msgid="5474997287953892710">"Používajte iba originálnu nabíjačku."</string> <string name="battery_low_why" msgid="4553600287639198111">"Nastavenia"</string> - <!-- no translation found for battery_saver_confirmation_title (5299585433050361634) --> - <skip /> - <!-- no translation found for battery_saver_confirmation_ok (7507968430447930257) --> - <skip /> - <!-- no translation found for battery_saver_start_action (5576697451677486320) --> - <skip /> + <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"Zapnúť šetrič batérie?"</string> + <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Zapnúť"</string> + <string name="battery_saver_start_action" msgid="5576697451677486320">"Zapnúť šetrič batérie"</string> <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Nastavenia"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Režim V lietadle"</string> @@ -290,10 +287,8 @@ <item quantity="other" msgid="5408537517529822157">"Na %d h"</item> </plurals> <string name="battery_saver_notification_title" msgid="237918726750955859">"Šetrič batérie je zapnutý"</string> - <!-- no translation found for battery_saver_notification_text (820318788126672692) --> - <skip /> - <!-- no translation found for battery_saver_notification_action_text (109158658238110382) --> - <skip /> + <string name="battery_saver_notification_text" msgid="820318788126672692">"Obmedzí výkonnosť a prenos údajov na pozadí"</string> + <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Vypnúť šetrič batérie"</string> <string name="battery_level_template" msgid="1609636980292580020">"<xliff:g id="LEVEL">%d</xliff:g> %%"</string> <string name="notification_hidden_text" msgid="1135169301897151909">"Skrytý obsah"</string> <string name="media_projection_dialog_text" msgid="3071431025448218928">"Aplikácia <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> začne zaznamenávať všetok obsah zobrazený na vašej obrazovke."</string> @@ -301,4 +296,15 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Vymazať všetko"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Spustiť"</string> <string name="empty_shade_text" msgid="708135716272867002">"Žiadne upozornenia"</string> + <string name="device_owned_footer" msgid="3802752663326030053">"Zariadenie môže byť sledované"</string> + <string name="vpn_footer" msgid="2388611096129106812">"Sieť môže byť sledovaná"</string> + <string name="monitoring_title_device_owned" msgid="7121079311903859610">"Sledovanie zariadenia"</string> + <string name="monitoring_title" msgid="169206259253048106">"Sledovanie siete"</string> + <string name="open_app" msgid="4011771120339160755">"Otvoriť aplikáciu"</string> + <string name="disconnect_vpn" msgid="1324915059568548655">"Odpojiť sieť VPN"</string> + <string name="monitoring_description_device_owned" msgid="7801926679066533391">"Toto zariadenie spravuje organizácia:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nSprávca môže sledovať vašu aktivitu v sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok.\n\nĎalšie informácie získate od svojho správcu."</string> + <string name="monitoring_description_vpn" msgid="93140751707065515">"Aplikácii <xliff:g id="APPLICATION">%1$s</xliff:g> ste povolili nastaviť pripojenie VPN.\n\nTáto aplikácia môže sledovať vašu aktivitu v sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok."</string> + <string name="monitoring_description_legacy_vpn" msgid="5397847778080663075">"Ste pripojený/-á k sieti VPN (<xliff:g id="APPLICATION">%1$s</xliff:g>).\n\nPoskytovateľ služby VPN môže sledovať vašu aktivitu v sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok."</string> + <string name="monitoring_description_vpn_device_owned" msgid="696121105616356493">"Toto zariadenie spravuje organizácia:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nSprávca môže sledovať vašu aktivitu v sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok. Ďalšie informácie získate od svojho správcu.\n\nZároveň ste aplikácii <xliff:g id="APPLICATION">%2$s</xliff:g> povolili nastaviť pripojenie VPN. Táto aplikácia môže tiež sledovať vašu aktivitu v sieti."</string> + <string name="monitoring_description_legacy_vpn_device_owned" msgid="649791650224064248">"Toto zariadenie spravuje organizácia:\n<xliff:g id="ORGANIZATION">%1$s</xliff:g>\n\nSprávca môže sledovať vašu aktivitu v sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok. Ďalšie informácie získate od svojho správcu.\n\nZároveň ste pripojený/-á aj k sieti VPN (<xliff:g id="APPLICATION">%2$s</xliff:g>). Poskytovateľ služby VPN môže tiež sledovať vašu aktivitu v sieti."</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index dc6ec170bde7..d67b6468f4ce 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Izbriši vse"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Začni zdaj"</string> <string name="empty_shade_text" msgid="708135716272867002">"Ni obvestil"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index e639caf9fef0..b1712f9c125e 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Обриши све"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Започни одмах"</string> <string name="empty_shade_text" msgid="708135716272867002">"Нема обавештења"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 547699fba7f3..09efed1086bf 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Rensa alla"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Starta nu"</string> <string name="empty_shade_text" msgid="708135716272867002">"Inga aviseringar"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 5c6f4ad52f44..f5425bc36e6e 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -245,7 +245,7 @@ <string name="recents_search_bar_label" msgid="8074997400187836677">"tafuta"</string> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Betri imejaa"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Inachaji"</string> - <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> hadi ijae"</string> + <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Imebakisha <xliff:g id="CHARGING_TIME">%s</xliff:g> ijae"</string> <string name="expanded_header_battery_not_charging" msgid="4798147152367049732">"Haichaji"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Huenda mtandao\nunafuatiliwa"</string> <string name="description_target_search" msgid="3091587249776033139">"Tafuta"</string> @@ -267,7 +267,7 @@ <string name="interruption_level_none" msgid="3831278883136066646">"Hamna"</string> <string name="interruption_level_priority" msgid="6517366750688942030">"Kipaumbele"</string> <string name="interruption_level_all" msgid="1330581184930945764">"Zote"</string> - <string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Inachaji ( <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> hadi ijae)"</string> + <string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Inachaji (Imebakisha <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> ijae)"</string> <string name="guest_nickname" msgid="8059989128963789678">"Aliyealikwa"</string> <string name="guest_new_guest" msgid="4259024453643879653">"+ Aliyealikwa"</string> <string name="guest_exit_guest" msgid="1619100760451149682">"Ondoa aliyealikwa"</string> @@ -297,4 +297,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Futa zote"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Anza sasa"</string> <string name="empty_shade_text" msgid="708135716272867002">"Hakuna arifa"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml index fca4882937c9..2d4682245011 100644 --- a/packages/SystemUI/res/values-ta-rIN/strings.xml +++ b/packages/SystemUI/res/values-ta-rIN/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"எல்லாவற்றையும் அழி"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"இப்போது தொடங்கு"</string> <string name="empty_shade_text" msgid="708135716272867002">"அறிவிப்புகள் இல்லை"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml index c742810c26fd..a41bd75e87d5 100644 --- a/packages/SystemUI/res/values-te-rIN/strings.xml +++ b/packages/SystemUI/res/values-te-rIN/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"అన్నీ క్లియర్ చేయండి"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"ఇప్పుడే ప్రారంభించు"</string> <string name="empty_shade_text" msgid="708135716272867002">"నోటిఫికేషన్లు లేవు"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 6693e08b7c5c..ec35d9efc0cc 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"ล้างทั้งหมด"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"เริ่มเลย"</string> <string name="empty_shade_text" msgid="708135716272867002">"ไม่มีการแจ้งเตือน"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 2045be0ee832..b05dd4ac4784 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"I-clear lahat"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Magsimula ngayon"</string> <string name="empty_shade_text" msgid="708135716272867002">"Walang mga notification"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 7cbfcc920a5a..110dd0562dd1 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Tümü temizle"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Şimdi başla"</string> <string name="empty_shade_text" msgid="708135716272867002">"Bildirim yok"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 803f38113881..79193d85b7c3 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Очистити все"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Почати зараз"</string> <string name="empty_shade_text" msgid="708135716272867002">"Сповіщень немає"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml index beaa55abf58f..0416be3869c6 100644 --- a/packages/SystemUI/res/values-ur-rPK/strings.xml +++ b/packages/SystemUI/res/values-ur-rPK/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"سبھی کو صاف کریں"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"ابھی شروع کریں"</string> <string name="empty_shade_text" msgid="708135716272867002">"کوئی اطلاعات نہیں ہیں"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml index d9ad468df2d8..62bcb12e51bf 100644 --- a/packages/SystemUI/res/values-uz-rUZ/strings.xml +++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Barchasini tozalash"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Boshlash"</string> <string name="empty_shade_text" msgid="708135716272867002">"Bildirishnomalar yo‘q"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index c6e8c6356578..ffc06211aa29 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Xóa tất cả"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Bắt đầu ngay"</string> <string name="empty_shade_text" msgid="708135716272867002">"Không có thông báo nào"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 3c62aa86f38f..0556c29acf06 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"全部清除"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"立即开始"</string> <string name="empty_shade_text" msgid="708135716272867002">"没有通知"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 1fd795734cb8..21ee7fb02de7 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"全部清除"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"立即開始"</string> <string name="empty_shade_text" msgid="708135716272867002">"沒有通知"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 5cfdf54db688..9a29ed8615cb 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -301,4 +301,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"全部清除"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"立即開始"</string> <string name="empty_shade_text" msgid="708135716272867002">"沒有通知"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index f71ec15270fa..23975023a867 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -299,4 +299,26 @@ <string name="clear_all_notifications_text" msgid="814192889771462828">"Sula konke"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Qala manje"</string> <string name="empty_shade_text" msgid="708135716272867002">"Azikho izaziso"</string> + <!-- no translation found for device_owned_footer (3802752663326030053) --> + <skip /> + <!-- no translation found for vpn_footer (2388611096129106812) --> + <skip /> + <!-- no translation found for monitoring_title_device_owned (7121079311903859610) --> + <skip /> + <!-- no translation found for monitoring_title (169206259253048106) --> + <skip /> + <!-- no translation found for open_app (4011771120339160755) --> + <skip /> + <!-- no translation found for disconnect_vpn (1324915059568548655) --> + <skip /> + <!-- no translation found for monitoring_description_device_owned (7801926679066533391) --> + <skip /> + <!-- no translation found for monitoring_description_vpn (93140751707065515) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn (5397847778080663075) --> + <skip /> + <!-- no translation found for monitoring_description_vpn_device_owned (696121105616356493) --> + <skip /> + <!-- no translation found for monitoring_description_legacy_vpn_device_owned (649791650224064248) --> + <skip /> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index ebde080f3494..0a9e062f2f6e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -220,9 +220,8 @@ public abstract class BaseStatusBar extends SystemUI implements final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.ZEN_MODE, Settings.Global.ZEN_MODE_OFF); setZenMode(mode); - final boolean show = Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, 1) != 0; - mShowLockscreenNotifications = show; + + updateLockscreenNotificationSetting(); } }; @@ -289,6 +288,9 @@ public abstract class BaseStatusBar extends SystemUI implements mCurrentUserId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1); updateCurrentProfilesCache(); if (true) Log.v(TAG, "userId " + mCurrentUserId + " is in the house"); + + updateLockscreenNotificationSetting(); + userSwitched(mCurrentUserId); } else if (Intent.ACTION_USER_ADDED.equals(action)) { updateCurrentProfilesCache(); @@ -387,8 +389,9 @@ public abstract class BaseStatusBar extends SystemUI implements Settings.Global.getUriFor(Settings.Global.ZEN_MODE), false, mSettingsObserver); mContext.getContentResolver().registerContentObserver( - Settings.Global.getUriFor(Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS), false, - mSettingsObserver); + Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS), false, + mSettingsObserver, + UserHandle.USER_ALL); mContext.getContentResolver().registerContentObserver( Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS), @@ -1424,6 +1427,19 @@ public abstract class BaseStatusBar extends SystemUI implements updateNotifications(); } + // extended in PhoneStatusBar + protected void setShowLockscreenNotifications(boolean show) { + mShowLockscreenNotifications = show; + } + + private void updateLockscreenNotificationSetting() { + final boolean show = Settings.Secure.getIntForUser(mContext.getContentResolver(), + Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, + 1, + mCurrentUserId) != 0; + setShowLockscreenNotifications(show); + } + protected abstract void haltTicker(); protected abstract void setAreThereNotifications(); protected abstract void updateNotifications(); diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index c77c5b2020e8..59aef328ef76 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -1819,18 +1819,23 @@ public class BackupManagerService extends IBackupManager.Stub { @Override public void onServiceConnected(ComponentName component, IBinder service) { if (DEBUG) Slog.v(TAG, "Connected to transport " + component); + final String name = component.flattenToShortString(); try { IBackupTransport transport = IBackupTransport.Stub.asInterface(service); - registerTransport(transport.name(), component.flattenToShortString(), transport); + registerTransport(transport.name(), name, transport); + EventLog.writeEvent(EventLogTags.BACKUP_TRANSPORT_LIFECYCLE, name, 1); } catch (RemoteException e) { Slog.e(TAG, "Unable to register transport " + component); + EventLog.writeEvent(EventLogTags.BACKUP_TRANSPORT_LIFECYCLE, name, 0); } } @Override public void onServiceDisconnected(ComponentName component) { if (DEBUG) Slog.v(TAG, "Disconnected from transport " + component); - registerTransport(null, component.flattenToShortString(), null); + final String name = component.flattenToShortString(); + EventLog.writeEvent(EventLogTags.BACKUP_TRANSPORT_LIFECYCLE, name, 0); + registerTransport(null, name, null); } }; @@ -3690,6 +3695,9 @@ public class BackupManagerService extends IBackupManager.Stub { Slog.i(TAG, "Initiating full-data transport backup of " + currentPackage.packageName); } + EventLog.writeEvent(EventLogTags.FULL_BACKUP_PACKAGE, + currentPackage.packageName); + transportPipes = ParcelFileDescriptor.createPipe(); // Tell the transport the data's coming @@ -3780,12 +3788,19 @@ public class BackupManagerService extends IBackupManager.Stub { + currentPackage.packageName + ", skipping"); } + EventLog.writeEvent(EventLogTags.FULL_BACKUP_AGENT_FAILURE, + currentPackage.packageName, "transport rejected"); // do nothing, clean up, and continue looping } else if (result != BackupTransport.TRANSPORT_OK) { if (DEBUG) { Slog.i(TAG, "Transport failed; aborting backup: " + result); + EventLog.writeEvent(EventLogTags.FULL_BACKUP_TRANSPORT_FAILURE); return; } + } else { + // Success! + EventLog.writeEvent(EventLogTags.FULL_BACKUP_SUCCESS, + currentPackage.packageName); } cleanUpPipes(transportPipes); cleanUpPipes(enginePipes); @@ -7339,6 +7354,9 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF UnifiedRestoreState nextState = UnifiedRestoreState.RUNNING_QUEUE; int status = BackupTransport.TRANSPORT_OK; + EventLog.writeEvent(EventLogTags.FULL_RESTORE_PACKAGE, + mCurrentPackage.packageName); + mEngine = new FullRestoreEngine(null, mCurrentPackage, false, false); EngineThread eThread = new EngineThread(mEngine, mEnginePipes[0]); @@ -7390,6 +7408,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // handling will deal properly with that. Slog.e(TAG, "Error " + result + " streaming restore for " + mCurrentPackage.packageName); + EventLog.writeEvent(EventLogTags.RESTORE_TRANSPORT_FAILURE); status = result; } } @@ -7399,12 +7418,15 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // but potentially recoverable; abandon this package's restore but // carry on with the next restore target. Slog.e(TAG, "Unable to route data for restore"); + EventLog.writeEvent(EventLogTags.RESTORE_AGENT_FAILURE, + mCurrentPackage.packageName, "I/O error on pipes"); status = BackupTransport.AGENT_ERROR; } catch (RemoteException e) { // The transport went away; terminate the whole operation. Closing // the sockets will wake up the engine and it will then tidy up the // remote end. Slog.e(TAG, "Transport failed during restore"); + EventLog.writeEvent(EventLogTags.RESTORE_TRANSPORT_FAILURE); status = BackupTransport.TRANSPORT_ERROR; } finally { // Close the transport pipes and *our* end of the engine pipe, diff --git a/services/core/java/com/android/server/EventLogTags.logtags b/services/core/java/com/android/server/EventLogTags.logtags index 3c50947ea65d..5aaeb6a2060e 100644 --- a/services/core/java/com/android/server/EventLogTags.logtags +++ b/services/core/java/com/android/server/EventLogTags.logtags @@ -102,6 +102,14 @@ option java_package com.android.server 2833 restore_package (Package|3),(Size|1|2) 2834 restore_success (Packages|1|1),(Time|1|3) +2840 full_backup_package (Package|3) +2841 full_backup_agent_failure (Package|3),(Message|3) +2842 full_backup_transport_failure +2843 full_backup_success (Package|3) +2844 full_restore_package (Package|3) + +2850 backup_transport_lifecycle (Transport|3),(Bound|1|1) + # --------------------------- # SystemServer.java diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable26.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable26.xml new file mode 100644 index 000000000000..29cff525543b --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable26.xml @@ -0,0 +1,45 @@ +<!-- + Copyright (C) 2014 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:height="64dp" + android:viewportHeight="200" + android:viewportWidth="200" + android:width="64dp" > + + <group> + <path + android:name="background1" + android:fillColor="#FF000000" + android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" /> + <path + android:name="background2" + android:fillColor="#FF000000" + android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" /> + </group> + <group + android:translateX="50" + android:translateY="50" > + <path + android:name="twoLines" + android:pathData="M 100,20 l 0 80 l -30 -80" + android:strokeColor="#FF00FF00" + android:strokeLineCap="butt" + android:strokeLineJoin="miter" + android:strokeMiterLimit="5" + android:strokeWidth="20" /> + </group> + +</vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable27.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable27.xml new file mode 100644 index 000000000000..b0f0cee86a73 --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable27.xml @@ -0,0 +1,45 @@ +<!-- + Copyright (C) 2014 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:height="64dp" + android:viewportHeight="200" + android:viewportWidth="200" + android:width="64dp" > + + <group> + <path + android:name="background1" + android:fillColor="#FF000000" + android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" /> + <path + android:name="background2" + android:fillColor="#FF000000" + android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" /> + </group> + <group + android:translateX="50" + android:translateY="50" > + <path + android:name="twoLines" + android:pathData="M 100,20 l 0 80 l -30 -80" + android:strokeColor="#FF00FF00" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeMiterLimit="10" + android:strokeWidth="20" /> + </group> + +</vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable28.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable28.xml new file mode 100644 index 000000000000..cd7bb168dd05 --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable28.xml @@ -0,0 +1,45 @@ +<!-- + Copyright (C) 2014 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:height="64dp" + android:viewportHeight="200" + android:viewportWidth="200" + android:width="64dp" > + + <group> + <path + android:name="background1" + android:fillColor="#FF000000" + android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" /> + <path + android:name="background2" + android:fillColor="#FF000000" + android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" /> + </group> + <group + android:translateX="50" + android:translateY="50" > + <path + android:name="twoLines" + android:pathData="M 100,20 l 0 80 l -30 -80" + android:strokeColor="#FF00FF00" + android:strokeLineCap="square" + android:strokeLineJoin="bevel" + android:strokeMiterLimit="10" + android:strokeWidth="20" /> + </group> + +</vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java index e8b69523ee18..37e043551805 100644 --- a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java +++ b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java @@ -53,6 +53,9 @@ public class VectorDrawablePerformance extends Activity { R.drawable.vector_drawable23, R.drawable.vector_drawable24, R.drawable.vector_drawable25, + R.drawable.vector_drawable26, + R.drawable.vector_drawable27, + R.drawable.vector_drawable28, }; @Override |