diff options
66 files changed, 585 insertions, 221 deletions
diff --git a/api/current.txt b/api/current.txt index fffa1fed124c..137b6728edb1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16080,6 +16080,7 @@ package android.provider { protected static abstract interface CalendarContract.RemindersColumns { field public static final java.lang.String EVENT_ID = "event_id"; field public static final java.lang.String METHOD = "method"; + field public static final int METHOD_ALARM = 4; // 0x4 field public static final int METHOD_ALERT = 1; // 0x1 field public static final int METHOD_DEFAULT = 0; // 0x0 field public static final int METHOD_EMAIL = 2; // 0x2 diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index 16dc5178504a..ebe28db61191 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -88,11 +88,11 @@ static void dumpstate() { if (screenshot_path[0]) { ALOGI("taking screenshot\n"); - run_command(NULL, 5, "su", "root", "screenshot", screenshot_path, NULL); + run_command(NULL, 5, SU_PATH, "root", "screenshot", screenshot_path, NULL); ALOGI("wrote screenshot: %s\n", screenshot_path); } - run_command("SYSTEM SETTINGS", 20, "su", "root", "sqlite3", + run_command("SYSTEM SETTINGS", 20, SU_PATH, "root", "sqlite3", "/data/data/com.android.providers.settings/databases/settings.db", "pragma user_version; select * from system; select * from secure;", NULL); run_command("SYSTEM LOG", 20, "logcat", "-v", "threadtime", "-d", "*:v", NULL); @@ -118,7 +118,7 @@ static void dumpstate() { run_command("EVENT LOG", 20, "logcat", "-b", "events", "-v", "threadtime", "-d", "*:v", NULL); run_command("RADIO LOG", 20, "logcat", "-b", "radio", "-v", "threadtime", "-d", "*:v", NULL); - run_command("NETWORK INTERFACES", 10, "su", "root", "netcfg", NULL); + run_command("NETWORK INTERFACES", 10, SU_PATH, "root", "netcfg", NULL); dump_file("NETWORK DEV INFO", "/proc/net/dev"); dump_file("QTAGUID NETWORK INTERFACES INFO", "/proc/net/xt_qtaguid/iface_stat_all"); dump_file("QTAGUID CTRL INFO", "/proc/net/xt_qtaguid/ctrl"); @@ -133,28 +133,28 @@ static void dumpstate() { run_command("ROUTE TABLE 61", 10, "ip", "route", "show", "table", "61", NULL); run_command("ROUTE TABLE 61 v6", 10, "ip", "-6", "route", "show", "table", "61", NULL); dump_file("ARP CACHE", "/proc/net/arp"); - run_command("IPTABLES", 10, "su", "root", "iptables", "-L", "-nvx", NULL); - run_command("IP6TABLES", 10, "su", "root", "ip6tables", "-L", "-nvx", NULL); - run_command("IPTABLE NAT", 10, "su", "root", "iptables", "-t", "nat", "-L", "-n", NULL); - run_command("IPT6ABLE NAT", 10, "su", "root", "ip6tables", "-t", "nat", "-L", "-n", NULL); + run_command("IPTABLES", 10, SU_PATH, "root", "iptables", "-L", "-nvx", NULL); + run_command("IP6TABLES", 10, SU_PATH, "root", "ip6tables", "-L", "-nvx", NULL); + run_command("IPTABLE NAT", 10, SU_PATH, "root", "iptables", "-t", "nat", "-L", "-n", NULL); + run_command("IPT6ABLE NAT", 10, SU_PATH, "root", "ip6tables", "-t", "nat", "-L", "-n", NULL); run_command("WIFI NETWORKS", 20, - "su", "root", "wpa_cli", "list_networks", NULL); + SU_PATH, "root", "wpa_cli", "list_networks", NULL); property_get("dhcp.wlan0.gateway", network, ""); if (network[0]) - run_command("PING GATEWAY", 10, "su", "root", "ping", "-c", "3", "-i", ".5", network, NULL); + run_command("PING GATEWAY", 10, SU_PATH, "root", "ping", "-c", "3", "-i", ".5", network, NULL); property_get("dhcp.wlan0.dns1", network, ""); if (network[0]) - run_command("PING DNS1", 10, "su", "root", "ping", "-c", "3", "-i", ".5", network, NULL); + run_command("PING DNS1", 10, SU_PATH, "root", "ping", "-c", "3", "-i", ".5", network, NULL); property_get("dhcp.wlan0.dns2", network, ""); if (network[0]) - run_command("PING DNS2", 10, "su", "root", "ping", "-c", "3", "-i", ".5", network, NULL); + run_command("PING DNS2", 10, SU_PATH, "root", "ping", "-c", "3", "-i", ".5", network, NULL); #ifdef FWDUMP_bcm4329 run_command("DUMP WIFI STATUS", 20, - "su", "root", "dhdutil", "-i", "wlan0", "dump", NULL); + SU_PATH, "root", "dhdutil", "-i", "wlan0", "dump", NULL); run_command("DUMP WIFI INTERNAL COUNTERS", 20, - "su", "root", "wlutil", "counters", NULL); + SU_PATH, "root", "wlutil", "counters", NULL); #endif char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0}; @@ -168,7 +168,7 @@ static void dumpstate() { "vril-dump", NULL); } else { run_command("DUMP VENDOR RIL LOGS", atoi(ril_dumpstate_timeout), - "su", "root", "vril-dump", NULL); + SU_PATH, "root", "vril-dump", NULL); } } @@ -192,7 +192,7 @@ static void dumpstate() { dump_file("BINDER STATS", "/sys/kernel/debug/binder/stats"); dump_file("BINDER STATE", "/sys/kernel/debug/binder/state"); - run_command("FILESYSTEMS & FREE SPACE", 10, "su", "root", "df", NULL); + run_command("FILESYSTEMS & FREE SPACE", 10, SU_PATH, "root", "df", NULL); dump_file("PACKAGE SETTINGS", "/data/system/packages.xml"); dump_file("PACKAGE UID ERRORS", "/data/system/uiderrors.txt"); @@ -218,7 +218,7 @@ static void dumpstate() { dump_file(NULL, "/sys/class/leds/lcd-backlight/registers"); printf("\n"); - run_command("LIST OF OPEN FILES", 10, "su", "root", "lsof", NULL); + run_command("LIST OF OPEN FILES", 10, SU_PATH, "root", "lsof", NULL); for_each_pid(do_showmap, "SMAPS OF ALL PROCESSES"); diff --git a/cmds/dumpstate/dumpstate.h b/cmds/dumpstate/dumpstate.h index b02db0b96e30..c1c2ad8a2207 100644 --- a/cmds/dumpstate/dumpstate.h +++ b/cmds/dumpstate/dumpstate.h @@ -21,6 +21,8 @@ #include <unistd.h> #include <stdio.h> +#define SU_PATH "/system/xbin/su" + /* prints the contents of a file */ int dump_file(const char *title, const char* path); diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c index 21526f9c1b61..0d5ab9019405 100644 --- a/cmds/dumpstate/utils.c +++ b/cmds/dumpstate/utils.c @@ -127,7 +127,7 @@ void do_showmap(int pid, const char *name) { sprintf(title, "SHOW MAP %d (%s)", pid, name); sprintf(arg, "%d", pid); - run_command(title, 10, "su", "root", "showmap", arg, NULL); + run_command(title, 10, SU_PATH, "root", "showmap", arg, NULL); } /* prints the contents of a file */ diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index f427e78db96a..492fcc73540c 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -149,7 +149,7 @@ final class FragmentState implements Parcelable { * {@link Fragment#getFragmentManager() Fragment.getFragmentManager()}. * * <p>The Fragment class can be used many ways to achieve a wide variety of - * results. It is core, it represents a particular operation or interface + * results. In its core, it represents a particular operation or interface * that is running within a larger {@link Activity}. A Fragment is closely * tied to the Activity it is in, and can not be used apart from one. Though * Fragment defines its own lifecycle, that lifecycle is dependent on its diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index 413150b69a4f..fa59b32fddfc 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -402,8 +402,8 @@ public final class CalendarContract { * A comma separated list of reminder methods supported for this * calendar in the format "#,#,#". Valid types are * {@link Reminders#METHOD_DEFAULT}, {@link Reminders#METHOD_ALERT}, - * {@link Reminders#METHOD_EMAIL}, {@link Reminders#METHOD_SMS}. Column - * name. + * {@link Reminders#METHOD_EMAIL}, {@link Reminders#METHOD_SMS}, + * {@link Reminders#METHOD_ALARM}. Column name. * <P>Type: TEXT</P> */ public static final String ALLOWED_REMINDERS = "allowedReminders"; @@ -1930,11 +1930,11 @@ public final class CalendarContract { /** * The alarm method, as set on the server. {@link #METHOD_DEFAULT}, - * {@link #METHOD_ALERT}, {@link #METHOD_EMAIL}, and {@link #METHOD_SMS} - * are possible values; the device will only process - * {@link #METHOD_DEFAULT} and {@link #METHOD_ALERT} reminders (the - * other types are simply stored so we can send the same reminder info - * back to the server when we make changes). + * {@link #METHOD_ALERT}, {@link #METHOD_EMAIL}, {@link #METHOD_SMS} and + * {@link #METHOD_ALARM} are possible values; the device will only + * process {@link #METHOD_DEFAULT} and {@link #METHOD_ALERT} reminders + * (the other types are simply stored so we can send the same reminder + * info back to the server when we make changes). */ public static final String METHOD = "method"; @@ -1942,6 +1942,7 @@ public final class CalendarContract { public static final int METHOD_ALERT = 1; public static final int METHOD_EMAIL = 2; public static final int METHOD_SMS = 3; + public static final int METHOD_ALARM = 4; } /** diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index e7ab826f2757..86185103c5d5 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -479,6 +479,38 @@ public class WebView extends AbsoluteLayout return super.deleteSurroundingText(leftLength, rightLength); } + @Override + public boolean performEditorAction(int editorAction) { + + boolean handled = true; + switch (editorAction) { + case EditorInfo.IME_ACTION_NEXT: + WebView.this.requestFocus(FOCUS_FORWARD); + break; + case EditorInfo.IME_ACTION_PREVIOUS: + WebView.this.requestFocus(FOCUS_BACKWARD); + break; + case EditorInfo.IME_ACTION_DONE: + WebView.this.hideSoftKeyboard(); + break; + case EditorInfo.IME_ACTION_GO: + case EditorInfo.IME_ACTION_SEARCH: + WebView.this.hideSoftKeyboard(); + String text = getEditable().toString(); + passToJavaScript(text, new KeyEvent(KeyEvent.ACTION_DOWN, + KeyEvent.KEYCODE_ENTER)); + passToJavaScript(text, new KeyEvent(KeyEvent.ACTION_UP, + KeyEvent.KEYCODE_ENTER)); + break; + + default: + handled = super.performEditorAction(editorAction); + break; + } + + return handled; + } + public void initEditorInfo(WebViewCore.TextFieldInitData initData) { int type = initData.mType; int inputType = InputType.TYPE_CLASS_TEXT @@ -578,7 +610,7 @@ public class WebView extends AbsoluteLayout if (isCharacterAdd) { sendCharacter(text.charAt(textLength - 1)); } else if (isCharacterDelete) { - sendDeleteKey(); + sendKey(KeyEvent.KEYCODE_DEL); } else if ((textLength != originalLength) || !TextUtils.regionMatches(text, 0, original, 0, textLength)) { @@ -613,16 +645,18 @@ public class WebView extends AbsoluteLayout } /** - * Send the delete character as a key down and up event. + * Send a key event for a specific key code, not a standard + * unicode character. + * @param keyCode The key code to send. */ - private void sendDeleteKey() { + private void sendKey(int keyCode) { long eventTime = SystemClock.uptimeMillis(); sendKeyEvent(new KeyEvent(eventTime, eventTime, - KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL, 0, 0, + KeyEvent.ACTION_DOWN, keyCode, 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_SOFT_KEYBOARD)); sendKeyEvent(new KeyEvent(SystemClock.uptimeMillis(), eventTime, - KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL, 0, 0, + KeyEvent.ACTION_UP, keyCode, 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_SOFT_KEYBOARD)); } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index d6dd15e48300..f384dc1c0467 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -406,9 +406,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private InputFilter[] mFilters = NO_FILTERS; + // It is possible to have a selection even when mEditor is null (programmatically set, like when + // a link is pressed). These highlight-related fields do not go in mEditor. + private int mHighlightColor = 0x6633B5E5; + private Path mHighlightPath; + private final Paint mHighlightPaint; + private boolean mHighlightPathBogus = true; + // Although these fields are specific to editable text, they are not added to Editor because // they are defined by the TextView's style and are theme-dependent. - private int mHighlightColor = 0x6633B5E5; private int mCursorDrawableRes; // These four fields, could be moved to Editor, since we know their default values and we // could condition the creation of the Editor to a non standard value. This is however @@ -477,6 +483,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener mTextPaint.density = res.getDisplayMetrics().density; mTextPaint.setCompatibilityScaling(compat.applicationScale); + mHighlightPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + mHighlightPaint.setCompatibilityScaling(compat.applicationScale); + mMovement = getDefaultMovementMethod(); mTransformation = null; @@ -4064,7 +4073,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } private void invalidateCursorPath() { - if (getEditor().mHighlightPathBogus) { + if (mHighlightPathBogus) { invalidateCursor(); } else { final int horizontalPadding = getCompoundPaddingLeft(); @@ -4088,7 +4097,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener thick /= 2.0f; - getEditor().mHighlightPath.computeBounds(TEMP_RECTF, false); + // mHighlightPath is guaranteed to be non null at that point. + mHighlightPath.computeBounds(TEMP_RECTF, false); invalidate((int) FloatMath.floor(horizontalPadding + TEMP_RECTF.left - thick), (int) FloatMath.floor(verticalPadding + TEMP_RECTF.top - thick), @@ -4150,7 +4160,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener int bottom = mLayout.getLineBottom(lineEnd); - if (invalidateCursor) { + // mEditor can be null in case selection is set programmatically. + if (invalidateCursor && mEditor != null) { for (int i = 0; i < getEditor().mCursorCount; i++) { Rect bounds = getEditor().mCursorDrawable[i].getBounds(); top = Math.min(top, bounds.top); @@ -4515,6 +4526,55 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return drawableState; } + private Path getUpdatedHighlightPath() { + Path highlight = null; + Paint highlightPaint = mHighlightPaint; + + final int selStart = getSelectionStart(); + final int selEnd = getSelectionEnd(); + if (mMovement != null && (isFocused() || isPressed()) && selStart >= 0) { + if (selStart == selEnd) { + if (mEditor != null && isCursorVisible() && + (SystemClock.uptimeMillis() - getEditor().mShowCursor) % (2 * BLINK) < BLINK) { + if (mHighlightPathBogus) { + if (mHighlightPath == null) mHighlightPath = new Path(); + mHighlightPath.reset(); + mLayout.getCursorPath(selStart, mHighlightPath, mText); + getEditor().updateCursorsPositions(); + mHighlightPathBogus = false; + } + + // XXX should pass to skin instead of drawing directly + highlightPaint.setColor(mCurTextColor); + if (mCurrentAlpha != 255) { + highlightPaint.setAlpha( + (mCurrentAlpha * Color.alpha(mCurTextColor)) / 255); + } + highlightPaint.setStyle(Paint.Style.STROKE); + highlight = mHighlightPath; + } + } else { + if (mHighlightPathBogus) { + if (mHighlightPath == null) mHighlightPath = new Path(); + mHighlightPath.reset(); + mLayout.getSelectionPath(selStart, selEnd, mHighlightPath); + mHighlightPathBogus = false; + } + + // XXX should pass to skin instead of drawing directly + highlightPaint.setColor(mHighlightColor); + if (mCurrentAlpha != 255) { + highlightPaint.setAlpha( + (mCurrentAlpha * Color.alpha(mHighlightColor)) / 255); + } + highlightPaint.setStyle(Paint.Style.FILL); + + highlight = mHighlightPath; + } + } + return highlight; + } + @Override protected void onDraw(Canvas canvas) { if (mCurrentAlpha <= ViewConfiguration.ALPHA_THRESHOLD_INT) return; @@ -4666,68 +4726,21 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener final int cursorOffsetVertical = voffsetCursor - voffsetText; + Path highlight = getUpdatedHighlightPath(); if (mEditor != null) { - getEditor().onDraw(canvas, layout, cursorOffsetVertical); + getEditor().onDraw(canvas, layout, highlight, cursorOffsetVertical); } else { - layout.draw(canvas, null, null, cursorOffsetVertical); + layout.draw(canvas, highlight, mHighlightPaint, cursorOffsetVertical); if (mMarquee != null && mMarquee.shouldDrawGhost()) { canvas.translate((int) mMarquee.getGhostOffset(), 0.0f); - layout.draw(canvas, null, null, cursorOffsetVertical); + layout.draw(canvas, highlight, mHighlightPaint, cursorOffsetVertical); } } canvas.restore(); } - private void updateCursorsPositions() { - if (mCursorDrawableRes == 0) { - getEditor().mCursorCount = 0; - return; - } - - final int offset = getSelectionStart(); - final int line = mLayout.getLineForOffset(offset); - final int top = mLayout.getLineTop(line); - final int bottom = mLayout.getLineTop(line + 1); - - getEditor().mCursorCount = mLayout.isLevelBoundary(offset) ? 2 : 1; - - int middle = bottom; - if (getEditor().mCursorCount == 2) { - // Similar to what is done in {@link Layout.#getCursorPath(int, Path, CharSequence)} - middle = (top + bottom) >> 1; - } - - updateCursorPosition(0, top, middle, mLayout.getPrimaryHorizontal(offset)); - - if (getEditor().mCursorCount == 2) { - updateCursorPosition(1, middle, bottom, mLayout.getSecondaryHorizontal(offset)); - } - } - - private void updateCursorPosition(int cursorIndex, int top, int bottom, float horizontal) { - if (getEditor().mCursorDrawable[cursorIndex] == null) - getEditor().mCursorDrawable[cursorIndex] = mContext.getResources().getDrawable(mCursorDrawableRes); - - if (mTempRect == null) mTempRect = new Rect(); - getEditor().mCursorDrawable[cursorIndex].getPadding(mTempRect); - final int width = getEditor().mCursorDrawable[cursorIndex].getIntrinsicWidth(); - horizontal = Math.max(0.5f, horizontal - 0.5f); - final int left = (int) (horizontal) - mTempRect.left; - getEditor().mCursorDrawable[cursorIndex].setBounds(left, top - mTempRect.top, left + width, - bottom + mTempRect.bottom); - } - - private void drawCursor(Canvas canvas, int cursorOffsetVertical) { - final boolean translate = cursorOffsetVertical != 0; - if (translate) canvas.translate(0, cursorOffsetVertical); - for (int i = 0; i < getEditor().mCursorCount; i++) { - getEditor().mCursorDrawable[i].draw(canvas); - } - if (translate) canvas.translate(0, -cursorOffsetVertical); - } - @Override public void getFocusedRect(Rect r) { if (mLayout == null) { @@ -4759,21 +4772,16 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } else { // Selection extends across multiple lines -- make the focused // rect cover the entire width. - if (mEditor != null) { - if (getEditor().mHighlightPath == null) getEditor().mHighlightPath = new Path(); - if (getEditor().mHighlightPathBogus) { - getEditor().mHighlightPath.reset(); - mLayout.getSelectionPath(selStart, selEnd, getEditor().mHighlightPath); - getEditor().mHighlightPathBogus = false; - } - synchronized (TEMP_RECTF) { - getEditor().mHighlightPath.computeBounds(TEMP_RECTF, true); - r.left = (int)TEMP_RECTF.left-1; - r.right = (int)TEMP_RECTF.right+1; - } - } else { - r.left = 0; - r.right = getMeasuredWidth(); + if (mHighlightPathBogus) { + if (mHighlightPath == null) mHighlightPath = new Path(); + mHighlightPath.reset(); + mLayout.getSelectionPath(selStart, selEnd, mHighlightPath); + mHighlightPathBogus = false; + } + synchronized (TEMP_RECTF) { + mHighlightPath.computeBounds(TEMP_RECTF, true); + r.left = (int)TEMP_RECTF.left-1; + r.right = (int)TEMP_RECTF.right+1; } } } @@ -5584,7 +5592,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } if (curs >= 0) { - getEditor().mHighlightPathBogus = true; + mHighlightPathBogus = true; makeBlink(); bringPointIntoView(curs); } @@ -5741,7 +5749,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener mOldMaximum = mMaximum; mOldMaxMode = mMaxMode; - if (mEditor != null) getEditor().mHighlightPathBogus = true; + mHighlightPathBogus = true; if (wantWidth < 0) { wantWidth = 0; @@ -6982,10 +6990,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener */ protected void onSelectionChanged(int selStart, int selEnd) { sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED); - // mEditor may be null if selection is created programatically. - createEditorIfNeeded("onSelectionChanged"); - // Invalidate even when selection range is empty, to remove previous highlight - getEditor().mTextDisplayListIsValid = false; + if (mEditor != null) getEditor().mTextDisplayListIsValid = false; } /** @@ -7141,10 +7146,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } if (selChanged) { - if (mEditor != null) { - getEditor().mHighlightPathBogus = true; - if (!isFocused()) getEditor().mSelectionMoved = true; - } + mHighlightPathBogus = true; + if (mEditor != null && !isFocused()) getEditor().mSelectionMoved = true; if ((buf.getSpanFlags(what)&Spanned.SPAN_INTERMEDIATE) == 0) { if (newSelStart < 0) { @@ -7161,7 +7164,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener what instanceof CharacterStyle) { if (ims == null || ims.mBatchEditNesting == 0) { invalidate(); - if (mEditor != null) getEditor().mHighlightPathBogus = true; + mHighlightPathBogus = true; checkForResize(); } else { ims.mContentChanged = true; @@ -7170,7 +7173,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } if (MetaKeyKeyListener.isMetaTracker(buf, what)) { - if (mEditor != null) getEditor().mHighlightPathBogus = true; + mHighlightPathBogus = true; if (ims != null && MetaKeyKeyListener.isSelectingMetaTracker(buf, what)) { ims.mSelectionModeChanged = true; } @@ -8222,7 +8225,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } // Start a new selection - if (!handled) { + if (!handled && mEditor != null) { vibrate = handled = startSelectionActionMode(); } @@ -8619,7 +8622,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener public boolean onDragEvent(DragEvent event) { switch (event.getAction()) { case DragEvent.ACTION_DRAG_STARTED: - return hasInsertionController(); + return mEditor != null && hasInsertionController(); case DragEvent.ACTION_DRAG_ENTERED: TextView.this.requestFocus(); @@ -11330,12 +11333,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } private class Editor { - Editor() { - mHighlightPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - final CompatibilityInfo compat = TextView.this.getResources().getCompatibilityInfo(); - mHighlightPaint.setCompatibilityScaling(compat.applicationScale); - } - // Cursor Controllers. InsertionPointCursorController mInsertionPointCursorController; SelectionModifierCursorController mSelectionModifierCursorController; @@ -11349,10 +11346,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener InputContentType mInputContentType; InputMethodState mInputMethodState; - Path mHighlightPath; - boolean mHighlightPathBogus = true; - final Paint mHighlightPaint; - DisplayList mTextDisplayList; boolean mTextDisplayListIsValid; @@ -11391,7 +11384,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener Runnable mShowSuggestionRunnable; final Drawable[] mCursorDrawable = new Drawable[2]; - int mCursorCount; // Actual current number of used mCursorDrawable: 0, 1 or 2 (split) + int mCursorCount; // Current number of used mCursorDrawable: 0 (resource=0), 1 or 2 (split) Drawable mSelectHandleLeft; Drawable mSelectHandleRight; @@ -11649,65 +11642,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } } - void onDraw(Canvas canvas, Layout layout, int cursorOffsetVertical) { - Path highlight = null; - Paint highlightPaint = null; - - int selStart = -1, selEnd = -1; - boolean drawCursor = false; - - highlightPaint = mHighlightPaint; - // If there is no movement method, then there can be no selection. - // Check that first and attempt to skip everything having to do with - // the cursor. - // XXX This is not strictly true -- a program could set the - // selection manually if it really wanted to. - if (mMovement != null && (isFocused() || isPressed())) { - selStart = getSelectionStart(); - selEnd = getSelectionEnd(); - - if (selStart >= 0) { - if (mHighlightPath == null) mHighlightPath = new Path(); - - if (selStart == selEnd) { - if (isCursorVisible() && - (SystemClock.uptimeMillis() - mShowCursor) % (2 * BLINK) < BLINK) { - if (mHighlightPathBogus) { - mHighlightPath.reset(); - mLayout.getCursorPath(selStart, mHighlightPath, mText); - updateCursorsPositions(); - mHighlightPathBogus = false; - } - - // XXX should pass to skin instead of drawing directly - highlightPaint.setColor(mCurTextColor); - if (mCurrentAlpha != 255) { - highlightPaint.setAlpha( - (mCurrentAlpha * Color.alpha(mCurTextColor)) / 255); - } - highlightPaint.setStyle(Paint.Style.STROKE); - highlight = mHighlightPath; - drawCursor = mCursorCount > 0; - } - } else if (textCanBeSelected()) { - if (mHighlightPathBogus) { - mHighlightPath.reset(); - mLayout.getSelectionPath(selStart, selEnd, mHighlightPath); - mHighlightPathBogus = false; - } - - // XXX should pass to skin instead of drawing directly - highlightPaint.setColor(mHighlightColor); - if (mCurrentAlpha != 255) { - highlightPaint.setAlpha( - (mCurrentAlpha * Color.alpha(mHighlightColor)) / 255); - } - highlightPaint.setStyle(Paint.Style.FILL); - - highlight = mHighlightPath; - } - } - } + void onDraw(Canvas canvas, Layout layout, Path highlight, int cursorOffsetVertical) { + final int selectionStart = getSelectionStart(); + final int selectionEnd = getSelectionEnd(); final InputMethodState ims = mInputMethodState; if (ims != null && ims.mBatchEditNesting == 0) { @@ -11729,7 +11666,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener candStart = EditableInputConnection.getComposingSpanStart(sp); candEnd = EditableInputConnection.getComposingSpanEnd(sp); } - imm.updateSelection(TextView.this, selStart, selEnd, candStart, candEnd); + imm.updateSelection(TextView.this, + selectionStart, selectionEnd, candStart, candEnd); } } @@ -11758,7 +11696,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener mCorrectionHighlighter.draw(canvas, cursorOffsetVertical); } - if (drawCursor) { + if (highlight != null && selectionStart == selectionEnd && mCursorCount > 0) { drawCursor(canvas, cursorOffsetVertical); // Rely on the drawable entirely, do not draw the cursor line. // Has to be done after the IMM related code above which relies on the highlight. @@ -11781,7 +11719,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // The dirty rect should always be null for a display list hardwareCanvas.onPreDraw(null); hardwareCanvas.translate(-mScrollX, -mScrollY); - layout.draw(hardwareCanvas, highlight, highlightPaint, cursorOffsetVertical); + layout.draw(hardwareCanvas, highlight, mHighlightPaint, cursorOffsetVertical); hardwareCanvas.translate(mScrollX, mScrollY); } finally { hardwareCanvas.onPostDraw(); @@ -11794,13 +11732,61 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener DisplayList.FLAG_CLIP_CHILDREN); canvas.translate(-mScrollX, -mScrollY); } else { - layout.draw(canvas, highlight, highlightPaint, cursorOffsetVertical); + layout.draw(canvas, highlight, mHighlightPaint, cursorOffsetVertical); } if (mMarquee != null && mMarquee.shouldDrawGhost()) { canvas.translate((int) mMarquee.getGhostOffset(), 0.0f); - layout.draw(canvas, highlight, highlightPaint, cursorOffsetVertical); + layout.draw(canvas, highlight, mHighlightPaint, cursorOffsetVertical); + } + } + + private void drawCursor(Canvas canvas, int cursorOffsetVertical) { + final boolean translate = cursorOffsetVertical != 0; + if (translate) canvas.translate(0, cursorOffsetVertical); + for (int i = 0; i < getEditor().mCursorCount; i++) { + mCursorDrawable[i].draw(canvas); } + if (translate) canvas.translate(0, -cursorOffsetVertical); + } + + private void updateCursorsPositions() { + if (mCursorDrawableRes == 0) { + mCursorCount = 0; + return; + } + + final int offset = getSelectionStart(); + final int line = mLayout.getLineForOffset(offset); + final int top = mLayout.getLineTop(line); + final int bottom = mLayout.getLineTop(line + 1); + + mCursorCount = mLayout.isLevelBoundary(offset) ? 2 : 1; + + int middle = bottom; + if (mCursorCount == 2) { + // Similar to what is done in {@link Layout.#getCursorPath(int, Path, CharSequence)} + middle = (top + bottom) >> 1; + } + + updateCursorPosition(0, top, middle, mLayout.getPrimaryHorizontal(offset)); + + if (mCursorCount == 2) { + updateCursorPosition(1, middle, bottom, mLayout.getSecondaryHorizontal(offset)); + } + } + + private void updateCursorPosition(int cursorIndex, int top, int bottom, float horizontal) { + if (mCursorDrawable[cursorIndex] == null) + mCursorDrawable[cursorIndex] = mContext.getResources().getDrawable(mCursorDrawableRes); + + if (mTempRect == null) mTempRect = new Rect(); + mCursorDrawable[cursorIndex].getPadding(mTempRect); + final int width = mCursorDrawable[cursorIndex].getIntrinsicWidth(); + horizontal = Math.max(0.5f, horizontal - 0.5f); + final int left = (int) (horizontal) - mTempRect.left; + mCursorDrawable[cursorIndex].setBounds(left, top - mTempRect.top, left + width, + bottom + mTempRect.bottom); } } } diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index abf667693b01..49e0fd518390 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -315,6 +315,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"aktiveer of deaktiveer programkomponente"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Laat die program toe om te verander of \'n komponent van ander program geaktiveer is of nie. Kwaadwillige programme kan dit dalk gebruik om belangrike tabletvermoëns te deaktiveer. Wees versigtig met hierdie toestemming, want dit kan programkomponente tot \'n onbruikbare, inkonsekwente of onstabiele toestand bring."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Laat die program toe om te verander of \'n komponent van ander program geaktiveer is of nie. Kwaadwillige programme kan dit gebruik om belangrike foonvermoëns te deaktiveer. Wees versigtig met hierdie toestemming, want dit kan programkomponente tot \'n onbruikbare, inkonsekwente of onstabiele toestand bring."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"stel voorkeurprogramme"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Laat die program toe om jou voorkeur-programme te verander. Kwaadwillige programme kan stilweg die programme wat loop, verander, wat jou bestaande programme bedrieg om private data oor jou in te samel."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"verander globale stelselinstellings"</string> @@ -1006,6 +1010,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Stel datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Stel"</string> <string name="default_permission_group" msgid="2690160991405646128">"Verstek"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Geen toestemmings benodig nie"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Versteek"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Wys alle"</b></string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index bb175e71d9ff..5cd17b35ae74 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"የመተግበሪያ ምንዝሮችን አንቃ ወይም አቦዝን"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"የሌላ መተግበሪያ ክፍለ አካል እንደነቃ ወይም እንዳልነቃ መተግበሪያው እንዲለውጥ ይፈቅዳል፡፡ አስፈላጊ የጡባዊ ተኮ አቅሞችን ለማስወገድ ጎጂ መተግበሪያዎች ይሄንን ሊጠቀሙበት ይችላሉ፡፡ ከፍቃድ ጋር ጥንቃቄ መወሰድ ይገባል፤ ልክ የማያገለግል፣ ወጥ ያልሆነ፣ ወይም ያልተረጋጋ ሁኔታ ወደ የመተግበሪያ ክፍለ አካል ማግኘት እንደሚቻል ሁሉ፡፡"</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"የሌላ መተግበሪያ ክፍለ አካል እንደነቃ ወይም እንዳልነቃ መተግበሪያው እንዲለውጥ ይፈቅዳል፡፡ አስፈላጊ የስልክ አቅሞችን ለማስወገድ ተንኮል አዘል መተግበሪያዎች ይሄንን ሊጠቀሙበት ይችላሉ፡፡ ከፍቃድ ጋር ጥንቃቄ መወሰድ ይገባል፤ ልክ የማያገለግል፣ ወጥ ያልሆነ፣ ወይም ያልተረጋጋ ሁኔታ ወደ የመተግበሪያ ክፍለ አካል ማግኘት እንደሚቻል ሁሉ፡፡"</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"ተመራጭ መተግበሪያዎች አዘጋጅ"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"ተመራጭ መተግበሪያዎችህን ለመቀየር ለመተግበሪያው ይፈቅዳሉ፡፡ ካንተ የግል ውሂብ ለመሰብሰብ ያሉትን መተግበሪያዎች በመላክ፤ በመሄድ ላይ ያሉ መተግበሪያዎችን ተንኮል አዘል መተግበሪያዎች በዝምታ ሊለውጡ ይችላሉ፡፡"</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"የሁሉንም ስርዓት ቅንብሮች ቀይር"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"ውሂብ አዘጋጅ"</string> <string name="date_time_set" msgid="5777075614321087758">"አዘጋጅ"</string> <string name="default_permission_group" msgid="2690160991405646128">"ነባሪ"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"ምንም ፍቃዶች አይጠየቁም"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"ደብቅ "</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"ሁሉንም አሳይ"</b></string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index a98a7d4bf6e3..7300fa5439eb 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"تمكين مكونات التطبيق أو تعطيلها"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"للسماح للتطبيق بتغيير ما إذا كان سيتم تمكين مكون لتطبيق آخر أم لا. يمكن أن تستخدم التطبيقات الضارة ذلك لتعطيل قدرات الجهاز اللوحي المهمة. يجب توخي الحذر عند استخدام هذا الإذن، وذلك لأنه من الممكن أن يؤدي ذلك إلى جعل حالة مكونات التطبيق غير قابلة للاستخدام أو غير متناسقة أو غير مستقرة."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"للسماح للتطبيق بتغيير ما إذا كان سيتم تمكين مكون لتطبيق آخر أم لا. يمكن أن تستخدم التطبيقات الضارة ذلك لتعطيل قدرات الهاتف المهمة. يجب توخي الحذر عند استخدام هذا الإذن، وذلك لأنه من الممكن أن يؤدي ذلك إلى جعل حالة مكونات التطبيق غير قابلة للاستخدام أو غير متناسقة أو غير مستقرة."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"تعيين التطبيقات المفضلة"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"للسماح للتطبيق بتعديل التطبيقات المفضلة. يمكن أن تغيّر التطبيقات الضارة التطبيقات قيد التشغيل بشكل غير ملحوظ، وانتحال صفة التطبيقات الحالية لجمع بيانات خاصة منك."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"تعديل إعدادات النظام العمومية"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"تعيين التاريخ"</string> <string name="date_time_set" msgid="5777075614321087758">"تعيين"</string> <string name="default_permission_group" msgid="2690160991405646128">"افتراضي"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"لا أذونات مطلوبة"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"إخفاء"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"عرض الكل"</b></string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 233d5a95f02a..9a578da31f6a 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"уключыць або адключыць кампаненты прыкладання"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Дазваляе прыкладанням змяняць вызначэнне таго, будзе ўключаны кампанент іншага прыкладання ці не. Шкоднасныя прыкладанні могуць выкарыстоўваць гэта для адключэння важных магчымасцяў планшэта. З гэтым дазволам трэба быць уважлівым, бо можна прывесці кампаненты прыкладання ў непрыдатны, супярэчлівы або няўстойлівы стан."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Дазваляе прыкладанням змяняць вызначэнне таго, будзе ўключаны кампанент іншага прыкладання ці не. Шкоднасныя прыкладанні могуць выкарыстоўваць гэта для адключэння важных магчымасцяў тэлефона. З гэтым дазволам трэба быць уважлівым, бо можна прывесці кампаненты прыкладання ў непрыдатны, супярэчлівы або няўстойлівы стан."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"усталяваць пажаданыя прыкладанні"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Дазваляе прыкладанням змяняць вашы пажаданыя прыкладанні. Шкоднасныя прыкладанні могуць непрыкметна змяняць запушчаныя прыкладанні, падмяняючы існуючыя прыкладанні, каб збiраць вашы асабістыя дадзеныя."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"змена глабальных параметраў сістэмы"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Усталяваць дату"</string> <string name="date_time_set" msgid="5777075614321087758">"Задаць"</string> <string name="default_permission_group" msgid="2690160991405646128">"Па змаўчанні"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Дазволу не патрабуецца"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Не паказваць"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Паказаць усе"</b></string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 66516b961900..06a2577b435b 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"активиране или деактивиране на компоненти на приложенията"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Разрешава на приложението да активира или деактивира компонент на друго приложение. Злонамерените приложения могат да използват това, за да деактивират важни възможности на таблета. С това разрешение трябва да се внимава, тъй като компонентите на приложенията може да бъдат приведени в неизползваемо, несъгласувано или нестабилно състояние."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Разрешава на приложението да активира или деактивира компонент на друго приложение. Злонамерените приложения могат да използват това, за да деактивират важни възможности на телефона. С това разрешение трябва да се внимава, тъй като компонентите на приложенията може да бъдат приведени в неизползваемо, несъгласувано или нестабилно състояние."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"задаване на предпочитани приложения"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Разрешава на приложението да променя предпочитаните ви приложения. Злонамерените приложения могат скрито да променят приложенията, които се изпълняват, като ги фалшифицират, за да се сдобият с ваши лични данни."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"промяна на глобалните системни настройки"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Задаване на дата"</string> <string name="date_time_set" msgid="5777075614321087758">"Задаване"</string> <string name="default_permission_group" msgid="2690160991405646128">"По подразбиране"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Не се изискват разрешения"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Скриване"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Показване на всички"</b></string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index b848c2cf3dd9..907392a57a35 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"activa o desactiva els components de l\'aplicació"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Permet que l\'aplicació canviï si un component d\'una altra aplicació està activat o no. Les aplicacions malicioses poden utilitzar aquesta funció per desactivar funcions importants de la tauleta. Cal anar amb compte amb aquest permís, ja que és possible que els components de l\'aplicació esdevinguin inutilitzables, incoherents o inestables."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Permet que l\'aplicació canviï si un component d\'una altra aplicació està activat o no. Les aplicacions malicioses poden utilitzar aquesta funció per desactivar funcions importants del telèfon. Cal anar amb compte amb aquest permís, perquè és possible que els components de l\'aplicació esdevinguin inutilitzables, incoherents o inestables."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"defineix les aplicacions preferides"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Permet que l\'aplicació modifiqui les aplicacions preferides. Les aplicacions malicioses poden canviar silenciosament les aplicacions que s\'executen, falsejar les aplicacions existents o recollir dades privades de l\'usuari."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificar la configuració global del sistema"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Establiment de data"</string> <string name="date_time_set" msgid="5777075614321087758">"Defineix"</string> <string name="default_permission_group" msgid="2690160991405646128">"Predeterminat"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"No cal cap permís"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Amaga"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Mostra\'ls tots"</b></string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 544395f7b256..f889c3be166a 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"aktivace či deaktivace komponent aplikací"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Umožňuje aplikaci změnit, zda je komponenta jiné aplikace povolena nebo ne. Škodlivé aplikace mohou toto oprávnění použít k vypnutí důležitých funkcí tabletu. Toto oprávnění je třeba používat opatrně, protože může dojít k nepoužitelnosti, nekonzistenci nebo nestabilitě komponent aplikací."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Umožňuje aplikaci změnit, zda je komponenta jiné aplikace povolena nebo ne. Škodlivé aplikace mohou toto oprávnění použít k vypnutí důležitých funkcí telefonu. Toto oprávnění je třeba používat opatrně, protože může dojít k nepoužitelnosti, nekonzistenci nebo nestabilitě komponent aplikací."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"nastavení upřednostňovaných aplikací"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Umožňuje aplikaci upravit preferované aplikace. Škodlivé aplikace mohou tajně měnit běžící aplikace a přinutit stávající aplikace, aby shromažďovaly vaše soukromé údaje."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"změna globálních nastavení systému"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nastavení data"</string> <string name="date_time_set" msgid="5777075614321087758">"Nastavit"</string> <string name="default_permission_group" msgid="2690160991405646128">"Výchozí"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Nejsou vyžadována žádná oprávnění"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Skrýt"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Zobrazit vše"</b></string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index ceefe1d43d93..61503ebfda0c 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"aktivere eller deaktivere appkomponenter"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Tillader, at appen kan ændre, om en komponent i en anden app er aktiveret eller ej. Ondsindede apps kan bruge dette til at deaktivere vigtige tabletfunktioner. Man skal være forsigtig med denne tilladelse, da det er muligt at bringe appkomponenter ind i en ubrugelig, inkonsekvent eller ustabil tilstand."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Tillader, at appen kan ændre, om en komponent i en anden app er aktiveret eller ej. Ondsindede apps kan bruge dette til at deaktivere vigtige funktioner på telefonen. Denne tilladelse skal anvendes med forsigtighed, da det kan forårsage ubrugelige eller ustabile appkomponenter."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"angive foretrukne apps"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Tillader, at appen kan ændre dine foretrukne apps. Ondsindede apps kan ubemærket ændre kørende apps derved udgive sig for at være dine eksisterende apps og på den måde indsamle private data fra dig."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"rediger globale systemindstillinger"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Angiv dato"</string> <string name="date_time_set" msgid="5777075614321087758">"Angiv"</string> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Der kræves ingen tilladelser"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Skjul"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Vis alle"</b></string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 3b3d08d30e98..1d1748b11f1e 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"App-Komponenten aktivieren oder deaktivieren"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Ermöglicht der App, Komponenten einer anderen App zu aktivieren oder zu deaktivieren. Schädliche Apps können so wichtige Tabletfunktionen deaktivieren. Bei der Erteilung dieser Berechtigung ist Vorsicht geboten, da die App-Komponenten unbrauchbar, inkonsistent oder instabil werden können."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Ermöglicht der App, Komponenten einer anderen App zu aktivieren oder zu deaktivieren. Schädliche Apps können so wichtige Telefonfunktionen deaktivieren. Bei der Erteilung dieser Berechtigung ist Vorsicht geboten, da die App-Komponenten unbrauchbar, inkonsistent oder instabil werden können."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"Bevorzugte Apps festlegen"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Ermöglicht der App, Änderungen an Ihren bevorzugten Apps vorzunehmen. Schädliche Apps können so aktive Apps ohne Ihr Wissen ändern, damit die vorhandenen Apps private Daten von Ihnen erfassen."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"allgemeine Systemeinstellungen ändern"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datum festlegen"</string> <string name="date_time_set" msgid="5777075614321087758">"Speichern"</string> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Keine Berechtigungen erforderlich"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ausblenden"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Alle anzeigen"</b></string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index e2bc244ad4a3..b432d46e3664 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"ενεργοποίηση ή απενεργοποίηση στοιχείων εφαρμογής"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Επιτρέπει στην εφαρμογή την αλλαγή της κατάστασης ενεργοποίησης κάποιου στοιχείου. Τυχόν κακόβουλες εφαρμογές μπορούν να χρησιμοποιήσουν αυτήν τη δυνατότητα για την απενεργοποίηση σημαντικών δυνατοτήτων του tablet. Αυτή η άδεια θα πρέπει να χρησιμοποιείται προσεκτικά, καθώς είναι πιθανό να θέσει τα στοιχεία εφαρμογών σε κατάσταση αχρηστίας, μη συνοχής και αστάθειας."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Επιτρέπει στην εφαρμογή την αλλαγή της κατάστασης ενεργοποίησης κάποιου στοιχείου. Τυχόν κακόβουλες εφαρμογές μπορούν να χρησιμοποιήσουν αυτήν τη δυνατότητα για την απενεργοποίηση σημαντικών δυνατοτήτων του τηλεφώνου. Αυτή η άδεια θα πρέπει να χρησιμοποιείται προσεκτικά, καθώς είναι πιθανό να θέσει τα στοιχεία εφαρμογών σε κατάσταση αχρηστίας, μη συνοχής και αστάθειας."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"ορισμός προτιμώμενων εφαρμογών"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Επιτρέπει στην εφαρμογή την τροποποίηση των εφαρμογών της προτίμησής σας. Τυχόν κακόβουλες εφαρμογές ενδέχεται να να αλλάξουν χωρίς ειδοποίηση τις εφαρμογές που εκτελούνται, \"ξεγελώντας\" τις υπάρχουσες εφαρμογές ώστε να συλλέξουν ιδιωτικά δεδομένα από εσάς."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"τροποποίηση καθολικών ρυθμίσεων συστήματος"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ορισμός ημερομηνίας"</string> <string name="date_time_set" msgid="5777075614321087758">"Ορισμός"</string> <string name="default_permission_group" msgid="2690160991405646128">"Προεπιλεγμένο"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Δεν απαιτούνται άδειες"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Απόκρυψη"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Εμφάνιση όλων"</b></string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index bed4de28c014..1013b11bdf72 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"enable or disable app components"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Allows the app to change whether a component of another app is enabled or not. Malicious apps may use this to disable important tablet capabilities. Care must be taken with this permission, as it is possible to get app components into an unusable, inconsistent or unstable state."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Allows the app to change whether a component of another app is enabled or not. Malicious apps may use this to disable important phone capabilities. Care must be taken with this permission, as it is possible to get app components into an unusable, inconsistent or unstable state."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"set preferred apps"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Allows the app to modify your preferred apps. Malicious apps may silently change the apps that are run, spoofing your existing apps to collect private data from you."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modify global system settings"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Set date"</string> <string name="date_time_set" msgid="5777075614321087758">"Set"</string> <string name="default_permission_group" msgid="2690160991405646128">"Default"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"No permission required"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Hide"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Show all"</b></string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 58df147dbd8e..a019c654bebc 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"activar o desactivar componentes de la aplicación"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Permite que la aplicación determine si un componente de otra aplicación está habilitado o no. Las aplicaciones maliciosas pueden utilizar este permiso para desactivar funciones importantes de la tableta. Es necesario ser precavido con este permiso, ya que es posible que los componentes de la aplicación queden inservibles, incoherentes o inestables."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Permite que la aplicación determine si un componente de otra aplicación está habilitado o no. Las aplicaciones maliciosas pueden utilizar este permiso para desactivar funciones importantes del dispositivo. Es necesario ser precavido con este permiso, ya que es posible que los componentes de la aplicación queden inservibles, incoherentes o inestables."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"establecer aplicaciones preferidas"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Permite que la aplicación modifique tus aplicaciones preferidas. Las aplicaciones maliciosas pueden modificar sin aviso las aplicaciones que se ejecutan y así engañar a tus aplicaciones existentes para que recopilen tu información privada."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificar la configuración global del sistema"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Configurar fecha"</string> <string name="date_time_set" msgid="5777075614321087758">"Establecer"</string> <string name="default_permission_group" msgid="2690160991405646128">"Predeterminado"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"No se requieren permisos"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ocultar"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Mostrar todos"</b></string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 9499214f6bcd..8d2a83661b9a 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"habilitar o inhabilitar componentes de la aplicación"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Permite que la aplicación determine si un componente de otra aplicación está habilitado o inhabilitado. Las aplicaciones malintencionadas pueden usar este permiso para inhabilitar funciones importantes del tablet. Este permiso se debe usar con precaución, ya que los componentes de las aplicaciones se pueden volver inestables, incoherentes o inservibles."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Permite que la aplicación determine si un componente de otra aplicación está habilitado o inhabilitado. Las aplicaciones malintencionadas pueden usar este permiso para inhabilitar funciones importantes del teléfono. Este permiso se debe usar con precaución, ya que los componentes de las aplicaciones se pueden volver inestables, incoherentes o inservibles."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"establecer aplicaciones preferidas"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Permite que la aplicación modifique las aplicaciones preferidas del usuario. De esta forma, las aplicaciones malintencionadas pueden cambiar sin aviso las aplicaciones que se están ejecutando y falsificarlas para obtener datos privados del usuario."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificar la configuración global del sistema"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Establecer fecha"</string> <string name="date_time_set" msgid="5777075614321087758">"Establecer"</string> <string name="default_permission_group" msgid="2690160991405646128">"Predeterminado"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"No es necesario ningún permiso"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ocultar"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Mostrar todos"</b></string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index da06538a88ae..7b1d280cbbc4 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"Rakenduse komponentide lubamine või keelamine"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Võimaldab rakendusel määrata, kas teise rakenduse komponent on lubatud või mitte. Pahatahtlikud rakendused võivad kasutada seda oluliste tahvelarvutirakenduste keelamiseks. Nende õiguste puhul peab olema ettevaatlik, kuna need võimaldavad muuta rakenduse komponente kasutuks, ebaühtlaseks või ebastabiilseks."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Võimaldab rakendusel määrata, kas teise rakenduse komponent on lubatud või mitte. Pahatahtlikud rakendused võivad kasutada seda oluliste telefonirakenduste keelamiseks. Nende õiguste puhul peab olema ettevaatlik, kuna need võimaldavad muuta rakenduse komponente kasutuks, ebaühtlaseks või ebastabiilseks."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"Eelistatud rakenduste määramine"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Võimaldab rakendusel muuta teie eelistatud rakendusi. Pahatahtlikud rakendused võivad salaja muuta töötavaid rakendusi, pettes teie olemasolevad rakendused koguma teilt privaatseid andmeid."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"muuda üldisi süsteemiseadeid"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Kuupäeva määramine"</string> <string name="date_time_set" msgid="5777075614321087758">"Määra"</string> <string name="default_permission_group" msgid="2690160991405646128">"Vaikimisi"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Lube pole vaja"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Peida"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Näita kõiki"</b></string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 68988f242497..084e16deadfa 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"فعال یا غیر فعال کردن اجزای برنامه"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"به برنامه اجازه میدهد تا فعال بودن یا نبودن اجزای برنامه دیگر را تغییر دهد. برنامههای مخرب میتوانند از آن استفاده کنند تا قابلیتهای مهم رایانه لوحی را غیرفعال کنند. باید دقت کرد که با این مجوز ممکن است وضعیت اجزای برنامه ناپایدار، ناهماهنگ یا غیرقابل استفاده شود."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"به برنامه اجازه میدهد تا فعال بودن یا غیرفعال بودن جزئیات برنامه دیگر را تغییر دهد. برنامههای مخرب میتوانند از آن استفاده کنند تا ویژگیهای مهم را غیرفعال کنند. برای این مجوز باید دقت کنید چون ممکن است وضعیت جزئیات برنامه ناپایدار، بیثبات یا غیرقابل استفاده شود."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"تنظیم برنامههای ترجیحی"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"به برنامه اجازه میدهد تا برنامههای ترجیحی شما را تغییر دهد. برنامههای مخرب میتوانند بدون اعلان برنامههایی را که اجرا میشوند، تغییر دهند خود را به جای برنامههای کنونی قلمداد کنند تا دادههای شخصی را از شما جمع آوری کنند."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"اصلاح کردن تنظیمات سیستم کلی"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"تاریخ تنظیم"</string> <string name="date_time_set" msgid="5777075614321087758">"تنظیم"</string> <string name="default_permission_group" msgid="2690160991405646128">"پیش فرض"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"مجوزی لازم نیست"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"پنهان کردن"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"نمایش همه"</b></string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 2fe9b4eaa9fa..a159eb65cb0a 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"sovelluskomponenttien ottaminen käyttöön tai pois käytöstä"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Antaa sovelluksen muuttaa, onko toisen sovelluksen komponentti käytössä vai ei. Haitalliset sovellukset voivat käyttää tätä tablet-laitteen tärkeiden ominaisuuksien poistamiseen käytöstä. Tämän luvan käyttöönotto edellyttää varovaisuutta, sillä sen avulla sovelluskomponentit on mahdollista saada epäkäytettävään, epäyhtenäiseen tai epävakaaseen tilaan."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Antaa sovelluksen muuttaa sitä, onko toisen sovelluksen komponentti käytössä vai ei. Haitalliset sovellukset voivat käyttää tätä puhelimen tärkeiden ominaisuuksien poistamiseen käytöstä. Tämän luvan käyttöönotto edellyttää varovaisuutta, sillä sen avulla sovelluskomponentit on mahdollista saada epäkäytettävään, epäyhtenäiseen tai epävakaaseen tilaan."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"ensisijaisten sovellusten asettaminen"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Antaa sovelluksen muokata ensisijaisia sovelluksia. Haitalliset sovellukset voivat muuttaa käynnistettäviä sovelluksia huomaamattomasti ja kerätä henkilökohtaisia tietoja matkimalla nykyisiä sovelluksia."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"muokkaa yleisiä järjestelmän asetuksia"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Aseta päivämäärä"</string> <string name="date_time_set" msgid="5777075614321087758">"Aseta"</string> <string name="default_permission_group" msgid="2690160991405646128">"Oletus"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Lupia ei tarvita"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Piilota"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Näytä kaikki"</b></string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index d6e8f301a0b9..3fcb3b7ce88c 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"activer ou désactiver les composants de l\'application"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Permet à l\'application d\'activer ou de désactiver un composant d\'une autre application. Des applications malveillantes peuvent exploiter cette fonctionnalité pour désactiver les fonctionnalités principales de votre tablette. Cette autorisation doit être utilisée avec prudence, car elle peut rendre les composants d\'une application instables, voire inutilisables."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Permet à l\'application d\'activer ou de désactiver un composant d\'une autre application. Des applications malveillantes peuvent exploiter cette fonctionnalité pour désactiver les fonctionnalités principales de votre téléphone. Cette autorisation doit être utilisée avec prudence, car elle peut rendre les composants d\'une application instables, voire inutilisables."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"définir les applications préférées"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Permet à l\'application de modifier vos applications préférées. Des applications malveillantes peuvent exploiter cette fonctionnalité pour modifier les applications exécutées en usurpant l\'identité de vos applications existantes dans le but de recueillir des données privées."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"Modification des paramètres généraux du système"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Définir la date"</string> <string name="date_time_set" msgid="5777075614321087758">"Définir"</string> <string name="default_permission_group" msgid="2690160991405646128">"Par défaut"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Aucune autorisation requise"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Masquer"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Tout afficher"</b></string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index f5a3cb76a6b7..f32322ed613a 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"एप्लिकेशन घटकों को सक्षम या अक्षम करें"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"एप्लिकेशन को यह बदलने देता है कि किसी अन्य एप्लिकेशन का घटक सक्षम है या नहीं. दुर्भावनापूर्ण एप्लिकेशन महत्वपूर्ण फ़ोन क्षमताओं को अक्षम करने में इसका उपयोग कर सकते हैं. इस अनुमति का उपयोग सावधानी के साथ करना चाहिए, क्योंकि इससे एप्लिकेशन घटकों के अनुपयोगी, असंगत, या अस्थिर स्थिति में जाने की संभावना है."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"एप्लिकेशन को यह बदलने देता है कि किसी अन्य एप्लिकेशन का घटक सक्षम है या नहीं. दुर्भावनापूर्ण एप्लिकेशन महत्वपूर्ण फ़ोन क्षमताओं को अक्षम करने में इसका उपयोग कर सकते हैं. इस अनुमति का उपयोग सावधानी के साथ करना चाहिए, क्योंकि इससे एप्लिकेशन घटकों के अनुपयोगी, असंगत, या अस्थिर स्थिति में जाने की संभावना है."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"पसंदीदा एप्लिकेशन सेट करें"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"एप्लिकेशन को आपके पसंदीदा एप्लिकेशन को संशोधित करने देता है. दुर्भावनापूर्ण एप्लिकेशन आपसे निजी डेटा एकत्रित करने के लिए आपके मौजूदा एप्लिकेशन को स्पूफ़ करके, चलाए जाने वाले एप्लिकेशन को चुपचाप बदल सकते हैं."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"वैश्विक सिस्टम सेटिंग संशोधित करें"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"दिनांक सेट करें"</string> <string name="date_time_set" msgid="5777075614321087758">"सेट करें"</string> <string name="default_permission_group" msgid="2690160991405646128">"डिफ़ॉल्ट"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"किसी अनुमति की आवश्यकता नहीं है"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"छुपाएं"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"सभी दिखाएं"</b></string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 01378666557e..8b8a51f81113 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"omogućavanje ili onemogućavanje komponenti aplikacije"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Omogućuje aplikaciji da promijeni hoće li komponenta neke druge aplikacije biti omogućena ili neće. Zlonamjerne aplikacije mogu to upotrijebiti da bi onemogućile važne mogućnosti tabletnog računala. Treba biti oprezan s tom dozvolom jer je moguće dovesti komponente aplikacija u neupotrebljivo, nedosljedno ili nestabilno stanje."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Omogućuje aplikaciji da promijeni hoće li komponenta neke druge aplikacije biti omogućena. Zlonamjerne aplikacije mogu to upotrijebiti da bi onemogućile važne mogućnosti telefona. Treba biti oprezan s tom dozvolom jer je moguće dovesti komponente aplikacija u neupotrebljivo, nedosljedno ili nestabilno stanje."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"postavljanje željenih aplikacija"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Omogućuje aplikaciji promjenu vaših željenih aplikacija. Zlonamjerne aplikacije mogu potajno promijeniti aplikacije koje su pokrenute, zavaravajući vaše postojeće aplikacije kako bi prikupljale privatne podatke od vas."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"izmjena postavki globalnog sustava"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Postavi datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Postavi"</string> <string name="default_permission_group" msgid="2690160991405646128">"Zadano"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Nije potrebno dopuštenje"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Sakrij"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Pokaži sve"</b></string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 54e8b06b4e8d..7f8999065bab 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"alkalmazáskomponensek be- és kikapcsolása"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Lehetővé teszi az alkalmazás számára annak módosítását, hogy más alkalmazások komponensei engedélyezve vannak-e vagy sem. A rosszindulatú alkalmazások ezt a táblagép fontos funkcióinak kikapcsolására használhatják. Óvatosan kell eljárni az engedély megadásával, mert lehetséges, hogy a komponensek használhatatlanok, inkonzisztensek vagy instabilak lesznek."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Lehetővé teszi az alkalmazás számára annak módosítását, hogy más alkalmazások komponensei engedélyezve vannak-e vagy sem. A rosszindulatú alkalmazások ezt a telefon fontos funkcióinak kikapcsolására használhatják. Óvatosan kell eljárni az engedély megadásával, mert lehetséges, hogy a komponensek használhatatlanok, inkonzisztensek vagy instabilak lesznek."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"előnyben részesített alkalmazások beállítása"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Lehetővé teszi az alkalmazás számára a preferált alkalmazások módosítását. A rosszindulatú alkalmazások ezáltal észrevétlenül megváltoztathatják a futó alkalmazásokat, személyes adatokat gyűjtve Öntől."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"rendszer globális beállításainak módosítása"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Dátum beállítása"</string> <string name="date_time_set" msgid="5777075614321087758">"Beállítás"</string> <string name="default_permission_group" msgid="2690160991405646128">"Alapértelmezett"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Nincs szükség engedélyre"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Elrejtés"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Az összes megjelenítése"</b></string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index ac5d46310a7a..52453062e930 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"mengaktifkan atau menonaktifkan komponen apl"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Mengizinkan apl mengubah apakah komponen apl lain diaktifkan atau tidak. Apl berbahaya dapat menggunakan ini untuk menonaktifkan kemampuan tablet yang penting. Izin ini harus digunakan dengan hati-hati karena dapat menjadikan komponen apl tidak dapat digunakan, tidak konsisten, atau tidak stabil."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Mengizinkan apl mengubah apakah komponen apl lain diaktifkan atau tidak. Apl berbahaya dapat menggunakan izin ini untuk menonaktifkan kemampuan ponsel yang penting. Izin ini harus digunakan dengan hati-hati, karena mungkin saja menjadikan komponen apl tidak dapat digunakan, tidak konsisten, atau tidak stabil."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"menyetel apl yang disukai"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Mengizinkan apl memodifikasi apl pilihan Anda. Apl berbahaya dapat diam-diam mengubah apl yang berjalan, menipu apl yang ada untuk mengumpulkan data pribadi dari Anda."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"ubah setelan sistem global"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Setel tanggal"</string> <string name="date_time_set" msgid="5777075614321087758">"Setel"</string> <string name="default_permission_group" msgid="2690160991405646128">"Bawaan"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Tidak perlu izin"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Sembunyikan"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Tampilkan semua"</b></string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 77733b313e13..408b3466bb62 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"attivazione/disattivazione componenti applicazioni"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Consente all\'applicazione di cambiare lo stato di attivazione o disattivazione del componente di un\'altra applicazione. Le applicazioni dannose potrebbero farne uso per disattivare importanti funzionalità del tablet. È necessario prestare attenzione con questa autorizzazione perché è possibile rendere inutilizzabili, incoerenti o instabili i componenti delle applicazioni."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Consente all\'applicazione di cambiare lo stato di attivazione o disattivazione del componente di un\'altra applicazione. Le applicazioni dannose potrebbero farne uso per disattivare importanti funzionalità del telefono. È necessario prestare attenzione con questa autorizzazione perché è possibile rendere inutilizzabili, incoerenti o instabili i componenti delle applicazioni."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"impostazione applicazioni preferite"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Consente all\'applicazione di modificare le tue applicazioni preferite. Le applicazioni dannose potrebbero cambiare di nascosto le applicazioni che vengono eseguite, facendo in modo che le applicazioni esistenti raccolgano dati riservati su di te."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modifica impostazioni di sistema globali"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Imposta data"</string> <string name="date_time_set" msgid="5777075614321087758">"Imposta"</string> <string name="default_permission_group" msgid="2690160991405646128">"Predefinito"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Nessuna autorizzazione richiesta"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Nascondi"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Mostra tutto"</b></string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index a232c69c6388..3cef8bb342af 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"הפעלה או השבתה של רכיבי יישומים"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"מאפשר ליישום לשנות את מצב ההפעלה של רכיב ביישום אחר. יישומים זדוניים עלולים להשתמש בכך כדי להשבית יכולות חשובות של הטבלט. יש לנהוג בהרשאה זו בזהירות, מכיוון שהיא יכולה להביא רכיבי יישומים למצב לא שמיש, לא עקבי או לא יציב."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"מאפשר ליישום לשנות את מצב ההפעלה של רכיב ביישום אחר. יישומים זדוניים עלולים להשתמש בכך כדי להשבית יכולות חשובות של הטלפון. יש לנהוג בהרשאה זו בזהירות, מכיוון שהיא יכולה להביא רכיבי יישומים למצב לא שמיש, לא עקבי או לא יציב."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"הגדרת יישומים מועדפים"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"מאפשר ליישום לשנות את היישומים המועדפים עליך. יישומים זדוניים עלולים לשנות בחשאי את היישומים שמופעלים, תוך שידול במרמה של היישומים הקיימים שלך לאסוף ממך נתונים פרטיים."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"שנה את הגדרות המערכת הכלליות"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"הגדר תאריך"</string> <string name="date_time_set" msgid="5777075614321087758">"הגדר"</string> <string name="default_permission_group" msgid="2690160991405646128">"ברירת מחדל"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"לא דרושים אישורים"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"הסתר"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"הצג הכל"</b></string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 66e847ae034b..4e4a1aae7a87 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"アプリのコンポーネントの有効/無効化"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"別のアプリのコンポーネントの有効/無効を変更することをアプリに許可します。この許可を悪意のあるアプリに利用されると、タブレットの重要な機能が無効にされる恐れがあります。アプリのコンポーネントが利用できなくなったり、整合性が取れなくなったり、不安定な状態になったりする恐れがあるので許可には注意が必要です。"</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"別のアプリのコンポーネントの有効/無効を変更することをアプリに許可します。この許可を悪意のあるアプリに利用されると、携帯端末の重要な機能が無効にされる恐れがあります。アプリのコンポーネントが利用できなくなったり、整合性が取れなくなったり、不安定な状態になったりする恐れがあるので許可には注意が必要です。"</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"優先アプリの設定"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"優先アプリを変更することをアプリに許可します。この許可を悪意のあるアプリに利用されると、実行中のアプリが密かに変更され、既存のアプリへのなりすましにより非公開データがだまし取られる恐れがあります。"</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"システムの全般設定の変更"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"日付設定"</string> <string name="date_time_set" msgid="5777075614321087758">"設定"</string> <string name="default_permission_group" msgid="2690160991405646128">"端末既定"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"権限の許可は必要ありません"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"隠す"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"すべて表示"</b></string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 754f79187ff2..f3cc2fe3685a 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"앱 구성요소 사용 또는 사용 안함"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"앱이 다른 앱 구성요소 사용 여부를 변경할 수 있도록 허용합니다. 이 경우 악성 앱이 이 기능을 이용하여 중요한 태블릿 기능을 중지시킬 수 있습니다. 이 권한을 허용할 경우 앱 구성요소가 사용 불가능하게 되거나 일관성이 맞지 않거나 불안정해질 수 있으므로 주의해야 합니다."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"앱이 다른 앱 구성요소 사용 여부를 변경할 수 있도록 허용합니다. 이 경우 악성 앱이 이 기능을 이용하여 중요한 휴대전화 기능을 중지시킬 수 있습니다. 이 권한을 허용할 경우 앱 구성요소가 사용 불가능하게 되거나 일관성이 맞지 않거나 불안정해질 수 있으므로 주의해야 합니다."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"기본 앱 설정"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"앱이 기본 앱을 수정할 수 있도록 허용합니다. 이 경우 악성 앱이 실행되는 앱을 몰래 변경하고 기존 앱으로 위장하여 사용자의 개인 정보를 수집할 수 있습니다."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"전체 시스템 설정 수정"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"날짜 설정"</string> <string name="date_time_set" msgid="5777075614321087758">"설정"</string> <string name="default_permission_group" msgid="2690160991405646128">"기본값"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"권한 필요 없음"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"숨기기"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"모두 표시"</b></string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 43aa1d3359be..c99d9bae2340 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"įgalinti programos komponentus arba jų neleisti"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Leidžiama programai pakeisti, ar įgalintas kitos programos komponentas, ar ne. Kenkėjiškos programos gali tai naudoti, kad neleistų svarbių planšetinio kompiuterio funkcijų. Šį leidimą reikia naudoti atsargiai, nes programos komponentai gali tapti nenaudojami, nenuoseklūs ar nestabilūs."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Leidžiama programai pakeisti nustatymą, ar įgalintas kitos programos komponentas, ar ne. Kenkėjiškos programos gali tai naudoti, kad neleistų svarbių telefono funkcijų. Šį leidimą reikia naudoti atsargiai, nes programos komponentai gali tapti nenaudojami, nenuoseklūs ar nestabilūs."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"nustatyti pageidaujamas programas"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Leidžiama programai keisti jūsų pageidaujamas programas. Kenkėjiškos programos gali nepastebimai pakeisti vykdomas programas, klastodama esamas programas, kad rinktų jūsų privačius duomenis."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"keisti visuotinius sistemos nustatymus"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nustatyti datą"</string> <string name="date_time_set" msgid="5777075614321087758">"Nustatyti"</string> <string name="default_permission_group" msgid="2690160991405646128">"Numatytasis"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Nereikia leidimų"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Slėpti"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Rodyti viską"</b></string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 5f84a4885253..d2233e34fe30 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"iespējot vai atspējot lietotnes komponentus"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Ļauj lietotnei mainīt to, vai tiek iespējots citas lietotnes komponents. Ļaunprātīgas lietotnes to var izmantot, lai atspējotu svarīgas planšetdatora iespējas. Izmantojiet šo atļauju uzmanīgi, jo pastāv iespēja, ka lietotnes komponenti var kļūt neizmantojami, neatbilstīgi vai nestabili."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Ļauj lietotnei mainīt to, vai tiek iespējots citas lietotnes komponents. Ļaunprātīgas lietotnes to var izmantot, lai atspējotu svarīgas tālruņa iespējas. Izmantojiet šo atļauju uzmanīgi, jo pastāv iespēja, ka lietotnes komponenti var kļūt neizmantojami, neatbilstīgi vai nestabili."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"iestatīt vēlamās lietotnes"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Ļauj lietotnei modificēt jūsu vēlamās lietotnes. Ļaunprātīgas lietotnes var nemanāmi mainīt izmantotās lietotnes, atveidojot esošās lietotnes, lai no jums iegūtu privātus datus."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"pārveidot globālos sistēmas iestatījumus"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datuma iestatīšana"</string> <string name="date_time_set" msgid="5777075614321087758">"Iestatīt"</string> <string name="default_permission_group" msgid="2690160991405646128">"Noklusējums"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Atļaujas nav nepieciešamas."</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Slēpt"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Rādīt visu"</b></string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 3f240ab24307..d3c48854fc4b 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"dayakan atau lumpuhkan komponen apl"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Membenarkan apl untuk menukar sama ada komponen apl lain didayakan atau tidak. Apl hasad boleh menggunakannya untuk melumpuhkan keupayaan telefon yang penting. Berhati-hati semasa menggunakan kebenaran ini, kerana hal ini boleh menjadikan komponen apl berada dalam keadaan tidak boleh digunakan, tidak konsisten, atau tidak stabil."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Membenarkan apl untuk menukar sama ada komponen apl lain didayakan atau tidak. Apl hasad boleh menggunakannya untuk melumpuhkan keupayaan telefon yang penting. Berhati-hati semasa menggunakan kebenaran ini, kerana hal ini boleh menjadikan komponen apl berada dalam keadaan tidak boleh digunakan, tidak konsisten, atau tidak stabil."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"tetapkan keutamaan apl"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Membenarkan apl untuk mengubah suai apl pilihan anda. Apl hasad secara diam-diam boleh menukar apl yang dijalankan, menipu apl anda yang sedia ada untuk mengumpul data peribadi daripada anda."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"mengubah suai tetapan sistem global"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Tetapkan tarikh"</string> <string name="date_time_set" msgid="5777075614321087758">"Tetapkan"</string> <string name="default_permission_group" msgid="2690160991405646128">"Lalai"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Tiada kebenaran diperlukan"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Sembunyikan"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Tunjukkan semua"</b></string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 63df5f466a79..bef0b20705ab 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"aktivere eller deaktivere appkomponenter"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Lar appen endre hvorvidt en komponent i en annen app er aktivert eller ikke. Ondsinnede apper kan bruke dette til å deaktivere viktige nettbrettfunksjoner. Denne tillatelsen må brukes med forsiktighet, ettersom det er mulig å få appkomponenter inn i en ubrukelig, inkonsistent eller ustabil tilstand."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Lar appen endre hvorvidt en komponent i en annen app er aktivert eller ikke. Ondsinnede apper kan bruke dette til å deaktivere viktige telefonfunksjoner. Denne tillatelsen må brukes med forsiktighet, ettersom det er mulig å få appkomponenter inn i en ubrukelig, inkonsistent eller ustabil tilstand."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"angi foretrukne apper"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Lar appen endre de foretrukne appene dine. Ondsinnede apper kan ubemerket endre apper som kjøres, og forfalske eksisterende apper til å samle private data fra deg."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"endre globale systeminnstillinger"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Angi dato"</string> <string name="date_time_set" msgid="5777075614321087758">"Lagre"</string> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Trenger ingen rettigheter"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Skjul"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Vis alle"</b></string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 8e5e8bc54e59..3941a3dce190 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"componenten van apps in- of uitschakelen"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Hiermee kan de app wijzigen of een component van een andere app wel of niet is ingeschakeld. Schadelijke apps kunnen dit gebruiken om belangrijke tabletfuncties uit te schakelen. U moet voorzichtig omgaan met deze rechten, aangezien het mogelijk is dat onderdelen van apps onbruikbaar, inconsistent of instabiel worden."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Hiermee kan de app wijzigen of een component van een andere app wel of niet is ingeschakeld. Schadelijke apps kunnen dit gebruiken om belangrijke telefoonfuncties uit te schakelen. U moet voorzichtig omgaan met deze rechten, aangezien het mogelijk is dat onderdelen van apps onbruikbaar, inconsistent of instabiel worden."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"voorkeursapps instellen"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Hiermee kan de app uw voorkeursapps aanpassen. Schadelijke apps kunnen de apps die worden uitgevoerd zonder uw medeweten wijzigen om uw bestaande apps te imiteren en privégegevens van u te verzamelen."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"algemene systeeminstellingen wijzigen"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datum instellen"</string> <string name="date_time_set" msgid="5777075614321087758">"Instellen"</string> <string name="default_permission_group" msgid="2690160991405646128">"Standaard"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Geen machtigingen vereist"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Verbergen"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Alles weergeven"</b></string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index c17da8ff4714..705cfccd426e 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"włączanie lub wyłączanie składników aplikacji"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Pozwala aplikacji na włączenie lub wyłączenie składnika innej aplikacji. Złośliwe aplikacje mogą wykorzystać to uprawnienie do wyłączenia ważnych funkcji tabletu. W przypadku tego uprawnienia należy zachować ostrożność, ponieważ istnieje możliwość wprowadzenia składników aplikacji w stan nieużywalności, niespójności lub niestabilności."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Pozwala aplikacji na włączenie lub wyłączenie składnika innej aplikacji. Złośliwe aplikacje mogą wykorzystać to uprawnienie do wyłączenia ważnych funkcji telefonu. W przypadku tego uprawnienia należy zachować ostrożność, ponieważ istnieje możliwość wprowadzenia składników aplikacji w stan nieużywalności, niespójności lub niestabilności."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"ustawianie preferowanych aplikacji"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Pozwala aplikacji na zmianę Twoich preferowanych aplikacji. Złośliwe aplikacje mogą dyskretnie zmienić uruchamiane aplikacje, podszywając się pod dotychczasowe aplikacje w celu zebrania od Ciebie prywatnych danych."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modyfikowanie ogólnych ustawień systemu"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ustaw datę"</string> <string name="date_time_set" msgid="5777075614321087758">"Ustaw"</string> <string name="default_permission_group" msgid="2690160991405646128">"Domyślne"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Nie są wymagane żadne uprawnienia"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ukryj"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Pokaż wszystko"</b></string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 74870ffa98d1..4865537f9fc6 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"ativar ou desativar componentes da aplicação"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Permite que a aplicação mude a opção de ativar ou não um componente de outra aplicação. As aplicações maliciosas podem utilizar isto para desativar funcionalidades importantes do tablet. É necessário ter cuidado com esta autorização, uma vez que é possível colocar alguns componentes de aplicações num estado inutilizável, inconsistente ou instável."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Permite que a aplicação mude a opção de ativar ou não um componente de outra aplicação. As aplicações maliciosas podem utilizar isto para desativar funcionalidades importantes do telemóvel. É necessário ter cuidado com esta autorização, uma vez que é possível colocar alguns componentes de aplicações num estado inutilizável, inconsistente ou instável."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"definir aplicações preferidas"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Permite ao aplicativo modificar as suas aplicações preferidas. As aplicações maliciosas podem alterar sem aviso as aplicações que são executadas, espiando as aplicações existentes para recolher os seus dados privados."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificar definições globais do sistema"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Definir data"</string> <string name="date_time_set" msgid="5777075614321087758">"Definir"</string> <string name="default_permission_group" msgid="2690160991405646128">"Predefinido"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Não são necessárias permissões"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ocultar"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Mostrar tudo"</b></string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index efe6833ff715..374102c5e35f 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"ativar ou desativar os componentes do aplicativo"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Permite que o aplicativo ative ou desative um componente de outro aplicativo. Aplicativos maliciosos podem usar esse recurso para desativar recursos importantes do tablet. Tenha cuidado com essa permissão, pois é possível fazer com que os componentes do aplicativo fiquem inutilizáveis, inconsistentes ou instáveis."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Permite que o aplicativo altere se um componente de outro aplicativo está ativado ou não. Aplicativos maliciosos podem usar esse recurso para desativar recursos importantes do telefone. Deve-se tomar cuidado com essa permissão, uma vez que isso pode deixar os componentes do aplicativo inutilizáveis, inconsistentes ou instáveis."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"definir aplicativos preferidos"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Permite que o aplicativo modifique seus aplicativos preferidos. Aplicativos maliciosos podem alterar os aplicativos que são executados, falsificando seus aplicativos existentes para coletar seus dados particulares."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificar configurações globais do sistema"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Definir data"</string> <string name="date_time_set" msgid="5777075614321087758">"Definir"</string> <string name="default_permission_group" msgid="2690160991405646128">"Padrão"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Nenhuma permissão necessária"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ocultar"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Mostrar todas"</b></string> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index 5b8efa61ed6c..c7579de10e5a 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -451,6 +451,10 @@ <skip /> <!-- no translation found for permdesc_changeComponentState (1827232484416505615) --> <skip /> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <!-- no translation found for permlab_setPreferredApplications (8463181628695396391) --> <skip /> <!-- no translation found for permdesc_setPreferredApplications (4973986762241783712) --> @@ -1474,6 +1478,8 @@ <skip /> <string name="date_time_set" msgid="5777075614321087758">"Definir"</string> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Naginas permissiuns obligatoricas"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Zuppentar"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Mussar tut"</b></string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 8ffa16e9f5f7..0890cc09c6f8 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"activare sau dezactivare a componentelor aplicaţiei"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Permite aplicaţiei să modifice starea activată sau dezactivată a unei componente a altei aplicaţii. Aplicaţiile rău intenţionate pot să utilizeze această permisiune pentru a dezactiva funcţii importante ale tabletei. Este necesar să utilizaţi cu atenţie această permisiune, deoarece este posibil să aduceţi componentele aplicaţiei într-o stare inutilizabilă, inconsecventă sau instabilă."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Permite aplicaţiei să modifice starea activată sau dezactivată a unei componente a altei aplicaţii. Aplicaţiile rău intenţionate pot să utilizeze această permisiune pentru a dezactiva funcţii importante ale telefonului. Este necesar să utilizaţi cu atenţie această permisiune, deoarece este posibil să aduceţi componentele aplicaţiei într-o stare inutilizabilă, inconsecventă sau instabilă."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"setare aplicaţii preferate"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Permite aplicaţiei să modifice aplicaţiile dvs. preferate. Aplicaţiile rău intenţionate pot să modifice fără a vă înştiinţa aplicaţiile care rulează, păcălind aplicaţiile existente să colecteze date private de la dvs."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificare setări sistem globale"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Setaţi data"</string> <string name="date_time_set" msgid="5777075614321087758">"Setaţi"</string> <string name="default_permission_group" msgid="2690160991405646128">"Prestabilit"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Nu se solicită nicio permisiune"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ascundeţi"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Afişaţi-le pe toate"</b></string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index a6644e5094f4..5dfa64899e04 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"включение и отключение компонентов приложения"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Приложение сможет включать и отключать компоненты других программ. Вредоносные программы смогут таким образом отключать важные функции планшетного ПК. Используйте это разрешение с особой осторожностью, чтобы случайно не нарушить работу компонентов приложения."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Приложение сможет включать и отключать компоненты других программ. Вредоносные программы смогут таким образом отключать важные функции телефона. Используйте это разрешение с особой осторожностью, чтобы случайно не нарушить работу компонентов приложения."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"настройка предпочтительных приложений"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Приложение сможет изменять предпочтительные приложения. Вредоносные программы смогут незаметно изменять запускаемые вами программы и собирать ваши личные данные от имени существующих приложений."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"изменять общие настройки системы"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Настройка даты"</string> <string name="date_time_set" msgid="5777075614321087758">"Установить"</string> <string name="default_permission_group" msgid="2690160991405646128">"По умолчанию"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Не требуется разрешений"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Скрыть"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Показать все"</b></string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index df25ac7a296a..b65f535ed898 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"povoliť alebo zakázať súčasti aplikácie"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Umožňuje aplikácii zmeniť to, či je súčasť inej aplikácie povolená alebo zakázaná. Škodlivé aplikácie môžu pomocou tohto nastavenia zakázať dôležité funkcie tabletu. S týmto povolením musíte zaobchádzať opatrne, pretože súčasti aplikácie môžete dostať do nepoužiteľného, nekonzistentného alebo nestabilného stavu."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Umožňuje aplikácii zmeniť to, či je súčasť inej aplikácie povolená alebo zakázaná. Škodlivé aplikácie môžu pomocou tohto nastavenia zakázať dôležité funkcie telefónu. S týmto povolením musíte zaobchádzať opatrne, pretože súčasti aplikácie môžete dostať do nepoužiteľného, nekonzistentného alebo nestabilného stavu."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"nastaviť preferované aplikácie"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Umožňuje aplikácii zmeniť vaše preferované aplikácie. Škodlivé aplikácie môžu v tichosti zmeniť spustené aplikácie a oklamať existujúce aplikácie, aby zhromažďovali vaše súkromné údaje."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"zmeny globálnych nastavení systému"</string> @@ -1006,6 +1010,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nastaviť dátum"</string> <string name="date_time_set" msgid="5777075614321087758">"Nastaviť"</string> <string name="default_permission_group" msgid="2690160991405646128">"Predvolené"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Nevyžadujú sa žiadne oprávnenia."</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Skryť"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Zobraziť všetky"</b></string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 159d5040bc45..83515ddff351 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"omogočanje ali onemogočanje komponent programa"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Programu omogoča, da spremeni, ali je komponenta drugega programa omogočena ali ne. Zlonamerni programi lahko to uporabijo za onemogočanje pomembnih zmožnosti tabličnega računalnika. Pri dodeljevanju dovoljenja je treba biti previden, saj lahko komponente programa nastavite tako, da jih ni mogoče uporabiti, da niso dosledne ali da niso stabilne."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Programu omogoča, da spremeni, ali je komponenta drugega programa omogočena ali ne. Zlonamerni programi lahko to uporabijo za onemogočanje pomembnih zmožnosti telefona. Pri dodeljevanju dovoljenja je treba biti previden, saj lahko komponente programa nastavite tako, da jih ni mogoče uporabiti, da niso dosledne ali da niso stabilne."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"nastavitev prednostnih programov"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Programu omogoča spreminjanje priljubljenih programov. Zlonamerni programi lahko s tem neopazno spremenijo programe, ki se izvajajo, tako da se izdajajo za obstoječe programe in zbirajo osebne podatke."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"spreminjanje splošnih nastavitev sistema"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nastavi datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Nastavi"</string> <string name="default_permission_group" msgid="2690160991405646128">"Privzeto"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Ni zahtevanih dovoljenj"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Skrij"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Pokaži vse"</b></string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 199d318c0821..2992fbe2a526 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"омогућавање или онемогућавање компоненти апликације"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Дозвољава апликацији да промени да ли је компонента друге апликације омогућена или онемогућена. Злонамерне апликације могу то да искористе да онемогуће важне функције таблета. Треба бити опрезан при додељивању ове дозволе, јер компоненте апликација могу постати неупотребљиве, непоуздане или нестабилне."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Дозвољава апликацији да промени да ли је компонента друге апликације омогућена или онемогућена. Злонамерне апликације могу то да искористе да онемогуће важне функције телефона. Треба бити опрезан при додељивању ове дозволе, јер компоненте апликација могу да постану неупотребљиве, непоуздане или нестабилне."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"подешавање жељених апликација"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Дозвољава апликацији да мења омиљене апликације. Злонамерне апликације могу без обавештења да промене апликације које су покренуте и да преко њих прикупљају ваше приватне податке."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"измена глобалних подешавања система"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Подешавање датума"</string> <string name="date_time_set" msgid="5777075614321087758">"Подеси"</string> <string name="default_permission_group" msgid="2690160991405646128">"Подразумевано"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Није потребна ниједна дозвола"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Сакриј"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Прикажи све"</b></string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index be397b0ebe7d..f780ca455c3f 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"aktivera eller inaktivera appkomponenter"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Tillåter att appen ändrar inställningen för om en komponent i en annan app ska aktiveras eller inte. Skadliga appar kan använda detta för att inaktivera viktiga funktioner i pekdatorn. Var försiktig med behörigheten, eftersom appkomponenter kan bli oanvändbara, inkonsekventa eller instabila."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Tillåter att appen ändrar inställningen för om en komponent i en annan app ska aktiveras eller inte. Skadliga appar kan använda detta för att inaktivera viktiga funktioner i pekdatorn. Var försiktig med behörigheten, eftersom programkomponenter kan bli oanvändbara, inkonsekventa eller instabila."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"ange önskade appar"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Tillåter att appen ändrar dina önskade appar. Skadliga appar kan utan förvarning ändra de appar som körs och kapa dina befintliga appar så att de börjar samla privata uppgifter från dig."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"ändra globala systeminställningar"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ange datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Ställ in"</string> <string name="default_permission_group" msgid="2690160991405646128">"Standardinställning"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Inga behörigheter krävs"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Dölj"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Visa alla"</b></string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 4cb3a3aacf6a..c9e469214145 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"wezesha au lemeza vijenzi vya programu"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Inaruhusu programu kubadilisha kama kijenzi cha programu nyingine kimewezeshwa au la. Programu hasidi zinaweza kutumia hii kulemeza uwezo muhimu wa kompyuta kibao. Lazina uangalifu utumike kwa ruhusa hii, kwani kuna uwezekano kupata vijenzi vya programu katika hali isiyotumika, isiyowiana, au hali isiyo thabiti."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Inaruhusu programu kubadilisha kama kijenzi cha programu nyingine kimewezeshwa au la. Programu hasidi zinaweza kutumia hii kulemeza mambo muhimu ambayo simu inaweza kufanya. Lazima uangalifu utumike kwa ruhusa hii, kwani kuna uwezekano kufanya vijenzi vya programu kuwa katika hali ya kutotumika, kutokuwa na uwiano, au kutokuwa thabiti."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"kuweka programu zinazopendelewa"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Inaruhusu programu kurekebisha programu unazopendelea. Programu hasidi zinaweza, polepole, kubadilisha programu zinazoendeshwa, na kuzifanya programu ulizo nazo kukusanya data ya kibinafsi kutoka kwako."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"rekebisha mipangilio ya mfumo jumla"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Weka tarehe"</string> <string name="date_time_set" msgid="5777075614321087758">"Weka"</string> <string name="default_permission_group" msgid="2690160991405646128">"Chaguo-msingi"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Hakuna vibali vinavyohitajika"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ficha"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Onyesha zote"</b></string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 41c56f473111..329a80788f13 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"เปิดหรือปิดใช้งานคอมโพเนนต์ของแอปพลิเคชัน"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"อนุญาตให้แอปพลิเคชันเปลี่ยนแปลงการเปิดใช้งานส่วนประกอบของแอปพลิเคชันอื่น แอปพลิเคชันที่เป็นอันตรายอาจใช้การอนุญาตนี้ปิดใช้งานความสามารถของแท็บเล็ตที่สำคัญ ต้องใช้ความระมัดระวังสำหรับการอนุญาตนี้ เนื่องจากอาจทำให้ส่วนประกอบต่างๆ ของแอปพลิเคชันไม่สามารถใช้งาน ไม่สอดคล้อง หรือมีสถานะที่ไม่เสถียร"</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"อนุญาตให้แอปพลิเคชันเปลี่ยนแปลงการเปิดใช้งานส่วนประกอบของแอปพลิเคชันอื่น แอปพลิเคชันที่เป็นอันตรายอาจใช้การอนุญาตนี้ปิดใช้งานความสามารถที่สำคัญของโทรศัพท์ ต้องใช้ความระมัดระวังสำหรับการอนุญาตนี้เนื่องจากอาจทำให้ส่วนประกอบต่างๆ ของแอปพลิเคชันไม่สามารถใช้งาน ไม่สอดคล้อง หรือมีสถานะที่ไม่เสถียร"</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"ตั้งค่าแอปพลิเคชันที่ต้องการ"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"อนุญาตให้แอปพลิเคชันแก้ไขแอปพลิเคชันต่างๆ ที่คุณชอบใช้ แอปพลิเคชันที่เป็นอันตรายอาจจะแอบเปลี่ยนแอปพลิเคชันที่กำลังทำงาน ปลอมแปลงเป็นแอปพลิเคชันที่มีอยู่ของคุณเพื่อรวบรวมข้อมูลส่วนบุคคลจากคุณ"</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"แก้ไขการตั้งค่าระบบสากล"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"ตั้งวันที่"</string> <string name="date_time_set" msgid="5777075614321087758">"ตั้งค่า"</string> <string name="default_permission_group" msgid="2690160991405646128">"เริ่มต้น"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"ไม่ต้องการการอนุญาต"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"ซ่อน"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"แสดงทั้งหมด"</b></string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 9548fe90584b..40e8cc527f97 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"paganahin o huwag paganahin ang mga bahagi ng app"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Pinapayagan ang app na baguhin kung ang bahagi ng isa pang app ay pinagana o hindi. Maaari itong gamitin ng nakakahamak na apps upang huwag paganahin ang mahahalagang kakayahan ng tablet. Dapat na mayroong pag-iingat sa pahintulot na ito, dahil posibleng mailagay ng mga bahagi ng app sa isang hindi nagagamit, pabagu-bago, o hindi matatag na katayuan."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Pinapayagan ang app na baguhin kung ang isang bahagi ng isa pang app ay pinapagana o hindi. Maaari itong gamitin ng nakakahamak na apps upang huwag paganahin ang mga mahalagang kakayahan ng telepono. Dapat na mayroong pag-iingat sa pahintulot na ito, dahil posibleng mailagay ang mga bahagi ng app sa isang hindi nagagamit, pabagu-bago, o hindi matatag na katayuan."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"itakda ang gustong apps"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Pinapayagan ang app na baguhin ang iyong gustong apps. Maaaring tahimik na baguhin ng nakakahamak na apps ang apps na tumatakbo, na dinadaya ang iyong umiiral nang apps upang mangolekta ng pribadong data mula sa iyo."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"baguhin ang mga setting ng global system"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Itakda ang petsa"</string> <string name="date_time_set" msgid="5777075614321087758">"Itakda"</string> <string name="default_permission_group" msgid="2690160991405646128">"Default"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Walang mga kinakailangang pahintulot"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Itago"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Ipakita lahat"</b></string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 6da7fcdeea2f..730c69fdd00a 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"uygulama bileşenlerini etkinleştir veya devre dışı bırak"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Uygulamaya, başka bir uygulamanın bir bileşeninin etkin veya devre dışı olma durumunu değiştirme izni verir. Kötü amaçlı uygulamalar tabletin önemli özelliklerini devre dışı bırakmak için bunu kullanabilir. Uygulama bileşenlerini kullanılamaz, tutarsız ya da kararsız hale getirebileceğinden bu izin ayarlanırken dikkat edilmelidir."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Uygulamaya, başka bir uygulamanın bir bileşeninin etkin veya devre dışı olma durumunu değiştirme izni verir. Kötü amaçlı uygulamalar telefonun önemli özelliklerini devre dışı bırakmak için bunu kullanabilir. Uygulama bileşenlerini kullanılamaz, tutarsız ya da kararsız getirebileceğinden bu izin ayarlanırken dikkat edilmelidir."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"tercih edilen uygulamaları ayarla"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Uygulamaya, tercih edilen uygulamalarınızı değiştirme izni verir. Kötü amaçlı uygulamalar çalışmakta olan uygulamaları sessizce değiştirip gizli verilerinizi toplamak için mevcut uygulamalarınızı yanlış yönlendirebilir."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"genel sistem ayarlarını değiştir"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Tarihi ayarla"</string> <string name="date_time_set" msgid="5777075614321087758">"Ayarla"</string> <string name="default_permission_group" msgid="2690160991405646128">"Varsayılan"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"İzin gerektirmez"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Gizle"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Tümünü göster"</b></string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 3fd626476ae0..fd0beafea2ce 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"вмикати чи вимикати компоненти програми"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Дозволяє програмі змінювати статус ввімкнення чи вимкнення компонента іншої програми. Шкідливі програми можуть використовувати це для вимкнення важливих характеристик планшетного ПК. З цим типом дозволу треба поводитися обережно, оскільки компоненти програми можуть стати непридатними, невідповідними чи нестабільними."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Дозволяє програмі змінювати статус ввімкнення чи вимкнення компонента іншої програми. Шкідливі програми можуть використовувати це для вимкнення важливих характеристик телефону. З цим типом дозволу треба поводитися обережно, оскільки компоненти програми можуть стати непридатними, невідповідними чи нестабільними."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"установлювати потрібні програми"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Дозволяє програмі змінювати ваші вибрані програми. Шкідливі програми можуть непомітно змінювати запущені програми, примушуючи існуючі програми оманливим шляхом збирати ваші особисті дані."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"змін. загальні налашт-ня сист."</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Установити дату"</string> <string name="date_time_set" msgid="5777075614321087758">"Застосувати"</string> <string name="default_permission_group" msgid="2690160991405646128">"За умовч."</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Дозвіл не потрібний"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Сховати"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Показ. всі"</b></string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 8503dc56c8fe..37af091ce71f 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"bật hoặc tắt cấu phần ứng dụng"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Cho phép ứng dụng thay đổi việc có bật cấu phần của ứng dụng khác hay không. Ứng dụng độc hại có thể sử dụng quyền này để vô hiệu hóa những tính năng quan trọng của máy tính bảng. Phải cẩn trọng khi sử dụng quyền này vì quyền này có thể khiến các cấu phần rơi vào trạng thái không sử dụng được, không đồng nhất hoặc không ổn định."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Cho phép ứng dụng thay đổi việc có bật cấu phần của một ứng dụng khác hay không. Ứng dụng độc hại có thể sử dụng quyền này để tắt những tính năng quan trọng của điện thoại. Phải sử dụng quyền này thận trọng vì có thể khiến các cấu phần của ứng dụng rơi vào trạng thái không thể sử dụng được, không đồng nhất hoặc không ổn định."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"đặt ứng dụng ưa thích"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Cho phép ứng dụng sửa đổi ứng dụng ưa thích của bạn. Ứng dụng độc hại có thể ngầm thay đổi các ứng dụng đã được chạy, giả mạo các ứng dụng hiện có để thu thập dữ liệu cá nhân của bạn."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"sửa đổi cài đặt hệ thống chung"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Đặt ngày"</string> <string name="date_time_set" msgid="5777075614321087758">"Đặt"</string> <string name="default_permission_group" msgid="2690160991405646128">"Mặc định"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Không yêu cầu quyền"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ẩn"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Hiển thị tất cả"</b></string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index bc74518610bf..6882d7afc954 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"启用或停用应用程序组件"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"允许应用程序启用或停用其他应用程序的组件。恶意应用程序可能借此停用重要的平板电脑功能。请务必谨慎使用此权限，因为这可能导致某些应用程序组件处于无法使用、不一致或不稳定的状态。"</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"允许应用程序启用或停用其他应用程序的组件。恶意应用程序可能借此停用重要的手机功能。请务必谨慎使用此权限，因为这可能导致某些应用程序组件进入无法使用、不一致或不稳定的状态。"</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"设置首选应用程序"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"允许应用程序修改您的首选应用程序。恶意应用程序可能会在后台更改运行的应用程序，欺骗您现有的应用程序，以收集您的私人数据。"</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"修改全局系统设置"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"设置日期"</string> <string name="date_time_set" msgid="5777075614321087758">"设置"</string> <string name="default_permission_group" msgid="2690160991405646128">"默认"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"不需要任何权限"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"隐藏"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"全部显示"</b></string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 5c89004cb660..18d0836bfb15 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"啟用或停用應用程式元件"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"允許應用程式啟用或停用其他應用程式的元件。請注意，惡意應用程式可能利用此功能停用重要的平板電腦功能。這項權限可能導致應用程式元件無法使用、不一致或不穩定，請務必謹慎使用。"</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"允許應用程式啟用或停用其他應用程式的元件。請注意，惡意應用程式可能利用此功能停用重要的手機功能。這項權限可能導致應用程式元件無法使用、不一致或不穩定，請務必謹慎使用。"</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"設定偏好的應用程式"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"允許應用程式修改您偏好的應用程式。請注意，惡意應用程式可能利用此功能擅自竄改執行的應用程式，並冒充現有的程式收集您的私人資料。"</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"編輯全域系統設定"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"日期設定"</string> <string name="date_time_set" msgid="5777075614321087758">"設定"</string> <string name="default_permission_group" msgid="2690160991405646128">"預設值"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"無須許可"</string> <string name="perms_hide" msgid="7283915391320676226"><b>" 隱藏"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"顯示全部"</b></string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 282fb91d7804..096aba7b4c3e 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -70,11 +70,11 @@ <string name="serviceNotProvisioned" msgid="8614830180508686666">"Isevisi ayilungiselelwe."</string> <string name="CLIRPermanent" msgid="3377371145926835671">"Ngeke ukwazi ukuguqul izilungiselelo zemininingwane yoshayayo."</string> <string name="RestrictedChangedTitle" msgid="5592189398956187498">"Ukufinyelela okuvinjelwe kushintshiwe"</string> - <string name="RestrictedOnData" msgid="8653794784690065540">"Insizakalo yedatha ivaliwe."</string> - <string name="RestrictedOnEmergency" msgid="6581163779072833665">"Insizakalo ephuthumayo ivimbelwe."</string> - <string name="RestrictedOnNormal" msgid="4953867011389750673">"Insizakalo yezwi ivimbelwe."</string> + <string name="RestrictedOnData" msgid="8653794784690065540">"Isevisi yedatha ivaliwe."</string> + <string name="RestrictedOnEmergency" msgid="6581163779072833665">"Isevisi ephuthumayo ivimbelwe."</string> + <string name="RestrictedOnNormal" msgid="4953867011389750673">"Isevisi yezwi ivimbelwe."</string> <string name="RestrictedOnAllVoice" msgid="3396963652108151260">"Wonke amasevisi Wezwi avimbelwe."</string> - <string name="RestrictedOnSms" msgid="8314352327461638897">"Insizakalo ye-SMS ivaliwe."</string> + <string name="RestrictedOnSms" msgid="8314352327461638897">"Isevisi ye-SMS ivaliwe."</string> <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Amasevisi Wezwi/Idatha avimbelwe."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Amasevisi Wezwi/SMS avimbelwe."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Wonke amasevisi Wezwi/Idatha/SMS avimbelwe."</string> @@ -276,7 +276,7 @@ <string name="permdesc_bindVpnService" msgid="2067845564581693905">"Ivumela umnini ukuthi abophele kwissekelo esingaphezulu sesevisi ye-Vpm. Ayidingakeli izinsiza ezejwayelekile."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"hlanganisa kwiphephadonga"</string> <string name="permdesc_bindWallpaper" msgid="7108428692595491668">"Ivumela umbambi ukuhlanganisa uxhumano nomsebenzisi kwezinga eliphezulu lwephephadonga. Akusoze kwadingeka kwezinhlelo zokusebenza ezivamile."</string> - <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"bophezela kube insizakalo yesinqunjana"</string> + <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"bophezela kube isevisi yesinqunjana"</string> <string name="permdesc_bindRemoteViews" msgid="4717987810137692572">"Ivumela umbambi ukuhlanganisa uxhumano nomsebenzisi kwezinga eliphezulu lensizakalo yesinqunjwana. Akusoze kwadingeka kwezinhlelo zokusebenza ezivamile."</string> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"xhumana nomphathi wedivaysi"</string> <string name="permdesc_bindDeviceAdmin" msgid="569715419543907930">"Ivumela ummeli ukuthumela okuqukethwe kumphathi wedivaysi. Akusoze kwadingeka kwizinhlelo zokusebenza ezivamile."</string> @@ -313,6 +313,10 @@ <string name="permlab_changeComponentState" msgid="6335576775711095931">"vumela noma vimbela izingxenye zensiza"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="8887435740982237294">"Ivumela ukuthi insiza iguqule ukuthi okuqukethwe kwenye insiza kuyasebenza noma cha. Izinsiza ezinobungozi zingasebenzisa lokhu ukwenza ukuthi izinto ezisemqoka ekhompyutheni yepeni zingasebenzi. Kufanele kuqashelwe uma kukhishwa lemvume njengoba kungenzeka kwenze izinto zensiza zibe sesimweni esingazinzile, nesiguquguqukayo."</string> <string name="permdesc_changeComponentState" product="default" msgid="1827232484416505615">"Ivumela ukuthi insiza iguqule ukuthi okuqukethwe kwenye insiza kuyasebenza noma cha. Izinsiza ezinobungozi zingasebenzisa lokhu ukwenza ukuthi izinto ezisemqoka ocingweni zingasebenzi. Kufanele kuqashelwe uma kukhishwa lemvume njengoba kungenzeka kwenze izinto zensiza zibe sesmweni esingazinzile, nesiguquguqukayo."</string> + <!-- no translation found for permlab_grantRevokePermissions (4627315351093508795) --> + <skip /> + <!-- no translation found for permdesc_grantRevokePermissions (4088642654085850662) --> + <skip /> <string name="permlab_setPreferredApplications" msgid="8463181628695396391">"setha izinsiza ezincamelwayo"</string> <string name="permdesc_setPreferredApplications" msgid="4973986762241783712">"Ivuela insiza ukuthi iguqule izinsiza ezincanyelwayo. Izinsiza ezinobungozi zingashintsha izinsiz buthule ezisebenzyo okwenza ukuthi izinsiza zakho ezikhona zingasebenzi ukuthola ze zithole imininingwane yakho eyimfihlo."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"guqula izilungiselelo zohlelo jikelele"</string> @@ -1004,6 +1008,8 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Setha idethi"</string> <string name="date_time_set" msgid="5777075614321087758">"Hlela"</string> <string name="default_permission_group" msgid="2690160991405646128">"Okuzenzakalelayo"</string> + <!-- no translation found for perms_new_perm_prefix (8257740710754301407) --> + <skip /> <string name="no_permissions" msgid="7283357728219338112">"Ayikho imvume edingekayo"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Fihla "</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Bonisa konke"</b></string> diff --git a/libs/rs/driver/rsdGL.cpp b/libs/rs/driver/rsdGL.cpp index 8033b0881b01..1b12235248c9 100644 --- a/libs/rs/driver/rsdGL.cpp +++ b/libs/rs/driver/rsdGL.cpp @@ -478,3 +478,37 @@ void rsdGLCheckError(const android::renderscript::Context *rsc, } } + +void rsdGLClearColor(const android::renderscript::Context *rsc, + float r, float g, float b, float a) { + RSD_CALL_GL(glClearColor, r, g, b, a); + RSD_CALL_GL(glClear, GL_COLOR_BUFFER_BIT); +} + +void rsdGLClearDepth(const android::renderscript::Context *rsc, float v) { + RSD_CALL_GL(glClearDepthf, v); + RSD_CALL_GL(glClear, GL_DEPTH_BUFFER_BIT); +} + +void rsdGLFinish(const android::renderscript::Context *rsc) { + RSD_CALL_GL(glFinish); +} + +void rsdGLDrawQuadTexCoords(const android::renderscript::Context *rsc, + float x1, float y1, float z1, float u1, float v1, + float x2, float y2, float z2, float u2, float v2, + float x3, float y3, float z3, float u3, float v3, + float x4, float y4, float z4, float u4, float v4) { + + float vtx[] = {x1,y1,z1, x2,y2,z2, x3,y3,z3, x4,y4,z4}; + const float tex[] = {u1,v1, u2,v2, u3,v3, u4,v4}; + + RsdVertexArray::Attrib attribs[2]; + attribs[0].set(GL_FLOAT, 3, 12, false, (uint32_t)vtx, "ATTRIB_position"); + attribs[1].set(GL_FLOAT, 2, 8, false, (uint32_t)tex, "ATTRIB_texture0"); + + RsdVertexArray va(attribs, 2); + va.setup(rsc); + + RSD_CALL_GL(glDrawArrays, GL_TRIANGLE_FAN, 0, 4); +} diff --git a/libs/rs/driver/rsdGL.h b/libs/rs/driver/rsdGL.h index e015cb170246..1e5b40fcafa5 100644 --- a/libs/rs/driver/rsdGL.h +++ b/libs/rs/driver/rsdGL.h @@ -84,6 +84,15 @@ void rsdGLCheckError(const android::renderscript::Context *rsc, const char *msg, bool isFatal = false); void rsdGLSetPriority(const android::renderscript::Context *rsc, int32_t priority); +void rsdGLClearColor(const android::renderscript::Context *rsc, + float r, float g, float b, float a); +void rsdGLClearDepth(const android::renderscript::Context *rsc, float v); +void rsdGLFinish(const android::renderscript::Context *rsc); +void rsdGLDrawQuadTexCoords(const android::renderscript::Context *rsc, + float x1, float y1, float z1, float u1, float v1, + float x2, float y2, float z2, float u2, float v2, + float x3, float y3, float z3, float u3, float v3, + float x4, float y4, float z4, float u4, float v4); #endif diff --git a/libs/rs/driver/rsdRuntimeStubs.cpp b/libs/rs/driver/rsdRuntimeStubs.cpp index 44bfb1c8fe9f..aa9f1594d587 100644 --- a/libs/rs/driver/rsdRuntimeStubs.cpp +++ b/libs/rs/driver/rsdRuntimeStubs.cpp @@ -257,17 +257,19 @@ static void SC_Color(float r, float g, float b, float a) { static void SC_Finish() { GET_TLS(); - rsrFinish(rsc, sc); + rsdGLFinish(rsc); } static void SC_ClearColor(float r, float g, float b, float a) { GET_TLS(); - rsrClearColor(rsc, sc, r, g, b, a); + rsrPrepareClear(rsc, sc); + rsdGLClearColor(rsc, r, g, b, a); } static void SC_ClearDepth(float v) { GET_TLS(); - rsrClearDepth(rsc, sc, v); + rsrPrepareClear(rsc, sc); + rsdGLClearDepth(rsc, v); } static uint32_t SC_GetWidth() { diff --git a/libs/rs/rsRuntime.h b/libs/rs/rsRuntime.h index 3bded620e0d3..64f2de8aed6e 100644 --- a/libs/rs/rsRuntime.h +++ b/libs/rs/rsRuntime.h @@ -86,7 +86,6 @@ void rsrMeshComputeBoundingBox(Context *, Script *, Mesh *, void rsrColor(Context *, Script *, float r, float g, float b, float a); -void rsrFinish(Context *, Script *); void rsrAllocationSyncAll(Context *, Script *, Allocation *); void rsrAllocationCopy1DRange(Context *, Allocation *dstAlloc, @@ -103,8 +102,7 @@ void rsrAllocationCopy2DRange(Context *, Allocation *dstAlloc, uint32_t srcXoff, uint32_t srcYoff, uint32_t srcMip, uint32_t srcFace); -void rsrClearColor(Context *, Script *, float r, float g, float b, float a); -void rsrClearDepth(Context *, Script *, float v); +void rsrPrepareClear(Context *, Script *); uint32_t rsrGetWidth(Context *, Script *); uint32_t rsrGetHeight(Context *, Script *); void rsrDrawTextAlloc(Context *, Script *, Allocation *, int x, int y); diff --git a/libs/rs/rsScriptC_LibGL.cpp b/libs/rs/rsScriptC_LibGL.cpp index 97469d370553..bda18fdfbef1 100644 --- a/libs/rs/rsScriptC_LibGL.cpp +++ b/libs/rs/rsScriptC_LibGL.cpp @@ -269,25 +269,9 @@ void rsrColor(Context *rsc, Script *sc, float r, float g, float b, float a) { pf->setConstantColor(rsc, r, g, b, a); } -void rsrFinish(Context *rsc, Script *sc) { - RSD_CALL_GL(glFinish); -} - - -void rsrClearColor(Context *rsc, Script *sc, float r, float g, float b, float a) { +void rsrPrepareClear(Context *rsc, Script *sc) { rsc->mFBOCache.setup(rsc); rsc->setupProgramStore(); - - RSD_CALL_GL(glClearColor, r, g, b, a); - RSD_CALL_GL(glClear, GL_COLOR_BUFFER_BIT); -} - -void rsrClearDepth(Context *rsc, Script *sc, float v) { - rsc->mFBOCache.setup(rsc); - rsc->setupProgramStore(); - - RSD_CALL_GL(glClearDepthf, v); - RSD_CALL_GL(glClear, GL_DEPTH_BUFFER_BIT); } uint32_t rsrGetWidth(Context *rsc, Script *sc) { diff --git a/media/libeffects/preprocessing/PreProcessing.cpp b/media/libeffects/preprocessing/PreProcessing.cpp index 098a1a29242d..dc27d38246ed 100755 --- a/media/libeffects/preprocessing/PreProcessing.cpp +++ b/media/libeffects/preprocessing/PreProcessing.cpp @@ -845,6 +845,17 @@ int Session_SetConfig(preproc_session_t *session, effect_config_t *config) config->inputCfg.samplingRate, config->inputCfg.channels); int status; + // if at least one process is enabled, do not accept configuration changes + if (session->enabledMsk) { + if (session->samplingRate != config->inputCfg.samplingRate || + session->inChannelCount != inCnl || + session->outChannelCount != outCnl) { + return -ENOSYS; + } else { + return 0; + } + } + // AEC implementation is limited to 16kHz if (config->inputCfg.samplingRate >= 32000 && !(session->createdMsk & (1 << PREPROC_AEC))) { session->apmSamplingRate = 32000; @@ -1287,7 +1298,9 @@ int PreProcessingFx_Command(effect_handle_t self, if (*(int *)pReplyData != 0) { break; } - *(int *)pReplyData = Effect_SetState(effect, PREPROC_EFFECT_STATE_CONFIG); + if (effect->state != PREPROC_EFFECT_STATE_ACTIVE) { + *(int *)pReplyData = Effect_SetState(effect, PREPROC_EFFECT_STATE_CONFIG); + } break; case EFFECT_CMD_GET_CONFIG: diff --git a/services/java/com/android/server/BootReceiver.java b/services/java/com/android/server/BootReceiver.java index 6665614244a0..da654387f435 100644 --- a/services/java/com/android/server/BootReceiver.java +++ b/services/java/com/android/server/BootReceiver.java @@ -39,8 +39,10 @@ import java.io.IOException; public class BootReceiver extends BroadcastReceiver { private static final String TAG = "BootReceiver"; - // Maximum size of a logged event (files get truncated if they're longer) - private static final int LOG_SIZE = 65536; + // Maximum size of a logged event (files get truncated if they're longer). + // Give userdebug builds a larger max to capture extra debug, esp. for last_kmsg. + private static final int LOG_SIZE = + SystemProperties.getInt("ro.debuggable", 0) == 1 ? 98304 : 65536; private static final File TOMBSTONE_DIR = new File("/data/tombstones"); diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 21cb3e8dd975..96142a1bb29e 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -7685,7 +7685,7 @@ public class WindowManagerService extends IWindowManager.Stub } } - final boolean wasAnimating = w.mAnimating; + final boolean wasAnimating = w.mWasAnimating; // If the window has moved due to its containing // content frame changing, then we'd like to animate diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index d7a7cb0d34a3..fc435f71b482 100644 --- a/services/java/com/android/server/wm/WindowState.java +++ b/services/java/com/android/server/wm/WindowState.java @@ -91,6 +91,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { boolean mAttachedHidden; // is our parent window hidden? boolean mLastHidden; // was this window last hidden? boolean mWallpaperVisible; // for wallpaper, what was last vis report? + boolean mWasAnimating; // Were we animating going into the most recent animation step? /** * The window size that was requested by the application. These are in @@ -979,6 +980,9 @@ final class WindowState implements WindowManagerPolicy.WindowState { // This must be called while inside a transaction. Returns true if // there is more animation to run. boolean stepAnimationLocked(long currentTime) { + // Save the animation state as it was before this step so WindowManagerService can tell if + // we just started or just stopped animating by comparing mWasAnimating with isAnimating(). + mWasAnimating = isAnimating(); if (!mService.mDisplayFrozen && mService.mPolicy.isScreenOnFully()) { // We will run animations as long as the display isn't frozen. |