diff options
138 files changed, 961 insertions, 606 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 0902fc6daaf1..7256e5cf1cf9 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -6226,11 +6226,28 @@ package android.app { } public class WindowConfiguration implements java.lang.Comparable android.os.Parcelable { + ctor public WindowConfiguration(); method public int compareTo(android.app.WindowConfiguration); method public int describeContents(); + method public int getActivityType(); + method public android.graphics.Rect getAppBounds(); + method public int getWindowingMode(); + method public void setActivityType(int); + method public void setAppBounds(android.graphics.Rect); + method public void setTo(android.app.WindowConfiguration); + method public void setWindowingMode(int); method public void writeToParcel(android.os.Parcel, int); + field public static final int ACTIVITY_TYPE_ASSISTANT = 4; // 0x4 field public static final int ACTIVITY_TYPE_HOME = 2; // 0x2 field public static final int ACTIVITY_TYPE_RECENTS = 3; // 0x3 + field public static final int ACTIVITY_TYPE_STANDARD = 1; // 0x1 + field public static final int ACTIVITY_TYPE_UNDEFINED = 0; // 0x0 + field public static final int WINDOWING_MODE_FREEFORM = 5; // 0x5 + field public static final int WINDOWING_MODE_FULLSCREEN = 1; // 0x1 + field public static final int WINDOWING_MODE_PINNED = 2; // 0x2 + field public static final int WINDOWING_MODE_SPLIT_SCREEN_PRIMARY = 3; // 0x3 + field public static final int WINDOWING_MODE_SPLIT_SCREEN_SECONDARY = 4; // 0x4 + field public static final int WINDOWING_MODE_UNDEFINED = 0; // 0x0 } } @@ -11328,6 +11345,7 @@ package android.content.res { field public int smallestScreenWidthDp; field public int touchscreen; field public int uiMode; + field public final android.app.WindowConfiguration windowConfiguration; } public class ObbInfo implements android.os.Parcelable { diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java index ad989dee7b55..79faa1bf97a2 100644 --- a/cmds/pm/src/com/android/commands/pm/Pm.java +++ b/cmds/pm/src/com/android/commands/pm/Pm.java @@ -636,7 +636,7 @@ public final class Pm { out = session.openWrite(splitName, 0, sizeBytes); int total = 0; - byte[] buffer = new byte[65536]; + byte[] buffer = new byte[1024 * 1024]; int c; while ((c = in.read(buffer)) != -1) { total += c; diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 4a092140ed78..fe7afed8de13 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -14,15 +14,14 @@ * limitations under the License. */ - package android.app; import android.annotation.IntDef; import android.annotation.SystemService; import android.content.Context; import android.os.Binder; -import android.os.RemoteException; import android.os.IBinder; +import android.os.RemoteException; import android.os.ServiceManager; import android.util.Slog; import android.view.View; diff --git a/core/java/android/app/WindowConfiguration.java b/core/java/android/app/WindowConfiguration.java index 5d87e1c2a157..07eb5de15d9f 100644 --- a/core/java/android/app/WindowConfiguration.java +++ b/core/java/android/app/WindowConfiguration.java @@ -17,6 +17,9 @@ package android.app; import static android.app.ActivityThread.isSystem; +import static android.app.WindowConfigurationProto.ACTIVITY_TYPE; +import static android.app.WindowConfigurationProto.APP_BOUNDS; +import static android.app.WindowConfigurationProto.WINDOWING_MODE; import android.annotation.IntDef; import android.annotation.NonNull; @@ -25,6 +28,7 @@ import android.content.res.Configuration; import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; +import android.util.proto.ProtoOutputStream; import android.view.DisplayInfo; /** @@ -48,26 +52,20 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu /** The current windowing mode of the configuration. */ private @WindowingMode int mWindowingMode; - /** Windowing mode is currently not defined. - * @hide */ + /** Windowing mode is currently not defined. */ public static final int WINDOWING_MODE_UNDEFINED = 0; - /** Occupies the full area of the screen or the parent container. - * @hide */ + /** Occupies the full area of the screen or the parent container. */ public static final int WINDOWING_MODE_FULLSCREEN = 1; - /** Always on-top (always visible). of other siblings in its parent container. - * @hide */ + /** Always on-top (always visible). of other siblings in its parent container. */ public static final int WINDOWING_MODE_PINNED = 2; - /** The primary container driving the screen to be in split-screen mode. - * @hide */ + /** The primary container driving the screen to be in split-screen mode. */ public static final int WINDOWING_MODE_SPLIT_SCREEN_PRIMARY = 3; /** * The containers adjacent to the {@link #WINDOWING_MODE_SPLIT_SCREEN_PRIMARY} container in * split-screen mode. - * @hide */ public static final int WINDOWING_MODE_SPLIT_SCREEN_SECONDARY = 4; - /** Can be freely resized within its parent container. - * @hide */ + /** Can be freely resized within its parent container. */ public static final int WINDOWING_MODE_FREEFORM = 5; /** @hide */ @@ -84,18 +82,15 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu /** The current activity type of the configuration. */ private @ActivityType int mActivityType; - /** Activity type is currently not defined. - * @hide */ + /** Activity type is currently not defined. */ public static final int ACTIVITY_TYPE_UNDEFINED = 0; - /** Standard activity type. Nothing special about the activity... - * @hide */ + /** Standard activity type. Nothing special about the activity... */ public static final int ACTIVITY_TYPE_STANDARD = 1; /** Home/Launcher activity type. */ public static final int ACTIVITY_TYPE_HOME = 2; /** Recents/Overview activity type. */ public static final int ACTIVITY_TYPE_RECENTS = 3; - /** Assistant activity type. - * @hide */ + /** Assistant activity type. */ public static final int ACTIVITY_TYPE_ASSISTANT = 4; /** @hide */ @@ -127,7 +122,6 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu }) public @interface WindowConfig {} - /** @hide */ public WindowConfiguration() { unset(); } @@ -176,7 +170,6 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu * Set {@link #mAppBounds} to the input Rect. * @param rect The rect value to set {@link #mAppBounds} to. * @see #getAppBounds() - * @hide */ public void setAppBounds(Rect rect) { if (rect == null) { @@ -200,26 +193,20 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu mAppBounds.set(left, top, right, bottom); } - /** - * @see #setAppBounds(Rect) - * @hide - */ + /** @see #setAppBounds(Rect) */ public Rect getAppBounds() { return mAppBounds; } - /** @hide */ public void setWindowingMode(@WindowingMode int windowingMode) { mWindowingMode = windowingMode; } - /** @hide */ @WindowingMode public int getWindowingMode() { return mWindowingMode; } - /** @hide */ public void setActivityType(@ActivityType int activityType) { if (mActivityType == activityType) { return; @@ -237,13 +224,11 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu mActivityType = activityType; } - /** @hide */ @ActivityType public int getActivityType() { return mActivityType; } - /** @hide */ public void setTo(WindowConfiguration other) { setAppBounds(other.mAppBounds); setWindowingMode(other.mWindowingMode); @@ -382,6 +367,24 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu } /** + * Write to a protocol buffer output stream. + * Protocol buffer message definition at {@link android.app.WindowConfigurationProto} + * + * @param protoOutputStream Stream to write the WindowConfiguration object to. + * @param fieldId Field Id of the WindowConfiguration as defined in the parent message + * @hide + */ + public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) { + final long token = protoOutputStream.start(fieldId); + if (mAppBounds != null) { + mAppBounds.writeToProto(protoOutputStream, APP_BOUNDS); + } + protoOutputStream.write(WINDOWING_MODE, mWindowingMode); + protoOutputStream.write(ACTIVITY_TYPE, mActivityType); + protoOutputStream.end(token); + } + + /** * Returns true if the activities associated with this window configuration display a shadow * around their border. * @hide diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index 5bfc54d267ca..76cb3f5b548e 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -232,7 +232,7 @@ public final class BluetoothUuid { */ public static int getServiceIdentifierFromParcelUuid(ParcelUuid parcelUuid) { UUID uuid = parcelUuid.getUuid(); - long value = (uuid.getMostSignificantBits() & 0x0000FFFF00000000L) >>> 32; + long value = (uuid.getMostSignificantBits() & 0xFFFFFFFF00000000L) >>> 32; return (int) value; } diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 780e6f769290..1310e30300e2 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -16,9 +16,20 @@ package android.content.res; +import static android.content.ConfigurationProto.DENSITY_DPI; +import static android.content.ConfigurationProto.FONT_SCALE; +import static android.content.ConfigurationProto.ORIENTATION; +import static android.content.ConfigurationProto.SCREEN_HEIGHT_DP; +import static android.content.ConfigurationProto.SCREEN_LAYOUT; +import static android.content.ConfigurationProto.SCREEN_WIDTH_DP; +import static android.content.ConfigurationProto.SMALLEST_SCREEN_WIDTH_DP; +import static android.content.ConfigurationProto.UI_MODE; +import static android.content.ConfigurationProto.WINDOW_CONFIGURATION; + import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.TestApi; import android.app.WindowConfiguration; import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo.Config; @@ -27,6 +38,7 @@ import android.os.LocaleList; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; +import android.util.proto.ProtoOutputStream; import android.view.View; import com.android.internal.util.XmlUtils; @@ -295,11 +307,12 @@ public final class Configuration implements Parcelable, Comparable<Configuration public int screenLayout; /** - * @hide * Configuration relating to the windowing state of the object associated with this * Configuration. Contents of this field are not intended to affect resources, but need to be * communicated and propagated at the same time as the rest of Configuration. + * @hide */ + @TestApi public final WindowConfiguration windowConfiguration = new WindowConfiguration(); /** @hide */ @@ -1054,6 +1067,28 @@ public final class Configuration implements Parcelable, Comparable<Configuration } /** + * Write to a protocol buffer output stream. + * Protocol buffer message definition at {@link android.content.ConfigurationProto} + * + * @param protoOutputStream Stream to write the Configuration object to. + * @param fieldId Field Id of the Configuration as defined in the parent message + * @hide + */ + public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) { + final long token = protoOutputStream.start(fieldId); + protoOutputStream.write(FONT_SCALE, fontScale); + protoOutputStream.write(SCREEN_LAYOUT, screenLayout); + protoOutputStream.write(ORIENTATION, orientation); + protoOutputStream.write(UI_MODE, uiMode); + protoOutputStream.write(SCREEN_WIDTH_DP, screenWidthDp); + protoOutputStream.write(SCREEN_HEIGHT_DP, screenHeightDp); + protoOutputStream.write(SMALLEST_SCREEN_WIDTH_DP, smallestScreenWidthDp); + protoOutputStream.write(DENSITY_DPI, densityDpi); + windowConfiguration.writeToProto(protoOutputStream, WINDOW_CONFIGURATION); + protoOutputStream.end(token); + } + + /** * Set this object to the system defaults. */ public void setToDefaults() { diff --git a/core/java/android/hardware/camera2/DngCreator.java b/core/java/android/hardware/camera2/DngCreator.java index 1a51acd6c5ec..cc484eaf265c 100644 --- a/core/java/android/hardware/camera2/DngCreator.java +++ b/core/java/android/hardware/camera2/DngCreator.java @@ -18,7 +18,6 @@ package android.hardware.camera2; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.Nullable; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.ImageFormat; @@ -37,6 +36,7 @@ import java.nio.ByteBuffer; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Locale; import java.util.TimeZone; /** @@ -122,7 +122,7 @@ public final class DngCreator implements AutoCloseable { // Create this fresh each time since the time zone may change while a long-running application // is active. final DateFormat dateTimeStampFormat = - new SimpleDateFormat(TIFF_DATETIME_FORMAT); + new SimpleDateFormat(TIFF_DATETIME_FORMAT, Locale.US); dateTimeStampFormat.setTimeZone(TimeZone.getDefault()); // Format for metadata @@ -472,7 +472,8 @@ public final class DngCreator implements AutoCloseable { private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd"; private static final String TIFF_DATETIME_FORMAT = "yyyy:MM:dd HH:mm:ss"; - private static final DateFormat sExifGPSDateStamp = new SimpleDateFormat(GPS_DATE_FORMAT_STR); + private static final DateFormat sExifGPSDateStamp = + new SimpleDateFormat(GPS_DATE_FORMAT_STR, Locale.US); private final Calendar mGPSTimeStampCalendar = Calendar .getInstance(TimeZone.getTimeZone("UTC")); diff --git a/core/java/android/text/format/Formatter.java b/core/java/android/text/format/Formatter.java index fc56455236a2..2c83fc4d9049 100644 --- a/core/java/android/text/format/Formatter.java +++ b/core/java/android/text/format/Formatter.java @@ -32,6 +32,7 @@ import android.text.BidiFormatter; import android.text.TextUtils; import android.view.View; +import java.lang.reflect.Constructor; import java.math.BigDecimal; import java.util.Locale; @@ -194,13 +195,29 @@ public final class Formatter { /** * ICU doesn't support PETABYTE yet. Fake it so that we can treat all units the same way. - * {@hide} */ - public static final MeasureUnit PETABYTE = MeasureUnit.internalGetInstance( - "digital", "petabyte"); + private static final MeasureUnit PETABYTE = createPetaByte(); - /** {@hide} */ - public static class RoundedBytesResult { + /** + * Create a petabyte MeasureUnit without registering it with ICU. + * ICU doesn't support user-create MeasureUnit and the only public (but hidden) method to do so + * is {@link MeasureUnit#internalGetInstance(String, String)} which also registers the unit as + * an available type and thus leaks it to code that doesn't expect or support it. + * <p>This method uses reflection to create an instance of MeasureUnit to avoid leaking it. This + * instance is <b>only</b> to be used in this class. + */ + private static MeasureUnit createPetaByte() { + try { + Constructor<MeasureUnit> constructor = MeasureUnit.class + .getDeclaredConstructor(String.class, String.class); + constructor.setAccessible(true); + return constructor.newInstance("digital", "petabyte"); + } catch (ReflectiveOperationException e) { + throw new RuntimeException("Failed to create petabyte MeasureUnit", e); + } + } + + private static class RoundedBytesResult { public final float value; public final MeasureUnit units; public final int fractionDigits; @@ -218,7 +235,7 @@ public final class Formatter { * Returns a RoundedBytesResult object based on the input size in bytes and the rounding * flags. The result can be used for formatting. */ - public static RoundedBytesResult roundBytes(long sizeBytes, int flags) { + static RoundedBytesResult roundBytes(long sizeBytes, int flags) { final boolean isNegative = (sizeBytes < 0); float result = isNegative ? -sizeBytes : sizeBytes; MeasureUnit units = MeasureUnit.BYTE; diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 419b7b24fddb..3a4bfd686333 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2718,25 +2718,20 @@ public class WebView extends AbsoluteLayout * {@code IFRAME}, in which case it would be treated the same way as multiple forms described * above, except that the {@link ViewStructure#setWebDomain(String) web domain} of the * {@code FORM} contains the {@code src} attribute from the {@code IFRAME} node. - * <li>If the Android SDK provides a similar View, then should be set with the - * fully-qualified class name of such view. * <li>The W3C autofill field ({@code autocomplete} tag attribute) maps to - * {@link ViewStructure#setAutofillHints(String[])}. - * <li>The {@code type} attribute of {@code INPUT} tags maps to - * {@link ViewStructure#setInputType(int)}. - * <li>The {@code value} attribute of {@code INPUT} tags maps to - * {@link ViewStructure#setText(CharSequence)}. - * <li>If the view is editalbe, the {@link ViewStructure#setAutofillType(int)} and + * {@link ViewStructure#setAutofillHints(String[])}. + * <li>If the view is editable, the {@link ViewStructure#setAutofillType(int)} and * {@link ViewStructure#setAutofillValue(AutofillValue)} must be set. * <li>The {@code placeholder} attribute maps to {@link ViewStructure#setHint(CharSequence)}. * <li>Other HTML attributes can be represented through * {@link ViewStructure#setHtmlInfo(android.view.ViewStructure.HtmlInfo)}. * </ol> * - * <p>It should also call {@code structure.setDataIsSensitive(false)} for fields whose value - * were not dynamically changed (for example, through Javascript). + * <p>If the WebView implementation can determine that the value of a field was set statically + * (for example, not through Javascript), it should also call + * {@code structure.setDataIsSensitive(false)}. * - * <p>Example1: an HTML form with 2 fields for username and password. + * <p>For example, an HTML form with 2 fields for username and password: * * <pre class="prettyprint"> * <input type="text" name="username" id="user" value="Type your username" autocomplete="username" placeholder="Email or username"> @@ -2749,51 +2744,27 @@ public class WebView extends AbsoluteLayout * int index = structure.addChildCount(2); * ViewStructure username = structure.newChild(index); * username.setAutofillId(structure.getAutofillId(), 1); // id 1 - first child - * username.setClassName("input"); - * username.setInputType("android.widget.EditText"); * username.setAutofillHints("username"); * username.setHtmlInfo(username.newHtmlInfoBuilder("input") * .addAttribute("type", "text") * .addAttribute("name", "username") - * .addAttribute("id", "user") * .build()); * username.setHint("Email or username"); * username.setAutofillType(View.AUTOFILL_TYPE_TEXT); * username.setAutofillValue(AutofillValue.forText("Type your username")); - * username.setText("Type your username"); - * // Value of the field is not sensitive because it was not dynamically changed: + * // Value of the field is not sensitive because it was created statically and not changed. * username.setDataIsSensitive(false); * * ViewStructure password = structure.newChild(index + 1); * username.setAutofillId(structure, 2); // id 2 - second child - * password.setInputType("android.widget.EditText"); - * password.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD); * password.setAutofillHints("current-password"); * password.setHtmlInfo(password.newHtmlInfoBuilder("input") * .addAttribute("type", "password") * .addAttribute("name", "password") - * .addAttribute("id", "pass") * .build()); * password.setHint("Password"); * password.setAutofillType(View.AUTOFILL_TYPE_TEXT); * </pre> - * - * <p>Example2: an IFRAME tag. - * - * <pre class="prettyprint"> - * <iframe src="https://example.com/login"/> - * </pre> - * - * <p>Would map to: - * - * <pre class="prettyprint"> - * int index = structure.addChildCount(1); - * ViewStructure iframe = structure.newChildFor(index); - * iframe.setAutofillId(structure.getAutofillId(), 1); - * iframe.setHtmlInfo(iframe.newHtmlInfoBuilder("iframe") - * .addAttribute("src", "https://example.com/login") - * .build()); - * </pre> */ @Override public void onProvideAutofillVirtualStructure(ViewStructure structure, int flags) { diff --git a/core/proto/android/app/window_configuration.proto b/core/proto/android/app/window_configuration.proto new file mode 100644 index 000000000000..03910df09194 --- /dev/null +++ b/core/proto/android/app/window_configuration.proto @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +syntax = "proto3"; + +option java_package = "android.app"; +option java_multiple_files = true; + +package android.app; + +import "frameworks/base/core/proto/android/graphics/rect.proto"; + +/** Proto representation for WindowConfiguration.java class. */ +message WindowConfigurationProto { + .android.graphics.RectProto app_bounds = 1; + int32 windowing_mode = 2; + int32 activity_type = 3; +} diff --git a/core/proto/android/content/configuration.proto b/core/proto/android/content/configuration.proto index f46b73afa750..804e0b489c0d 100644 --- a/core/proto/android/content/configuration.proto +++ b/core/proto/android/content/configuration.proto @@ -21,6 +21,7 @@ option java_multiple_files = true; package android.content; +import "frameworks/base/core/proto/android/app/window_configuration.proto"; import "frameworks/base/core/proto/android/content/locale.proto"; /** @@ -43,5 +44,6 @@ message ConfigurationProto { uint32 screen_height_dp = 14; uint32 smallest_screen_width_dp = 15; uint32 density_dpi = 16; + .android.app.WindowConfigurationProto window_configuration = 17; } diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index ee8a6dc452b7..d177f1ca8104 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -16,6 +16,7 @@ syntax = "proto3"; +import "frameworks/base/core/proto/android/content/configuration.proto"; import "frameworks/base/core/proto/android/graphics/rect.proto"; import "frameworks/base/core/proto/android/view/displayinfo.proto"; import "frameworks/base/core/proto/android/view/windowlayoutparams.proto"; @@ -26,17 +27,23 @@ option java_multiple_files = true; message WindowManagerServiceProto { WindowManagerPolicyProto policy = 1; - /* window manager hierarchy structure */ + /* window hierarchy root */ + RootWindowContainerProto root_window_container = 2; + IdentifierProto focused_window = 3; + string focused_app = 4; + IdentifierProto input_method_window = 5; + bool display_frozen = 6; + int32 rotation = 7; + int32 last_orientation = 8; + AppTransitionProto app_transition = 9; +} + +/* represents DisplayContent */ +message RootWindowContainerProto { + WindowContainerProto window_container = 1; repeated DisplayProto displays = 2; /* window references in top down z order */ repeated IdentifierProto windows = 3; - IdentifierProto focused_window = 4; - string focused_app = 5; - IdentifierProto input_method_window = 6; - bool display_frozen = 7; - int32 rotation = 8; - int32 last_orientation = 9; - AppTransitionProto app_transition = 10; } /* represents PhoneWindowManager */ @@ -81,18 +88,19 @@ message AppTransitionProto { /* represents DisplayContent */ message DisplayProto { - int32 id = 1; - repeated StackProto stacks = 2; - DockedStackDividerControllerProto docked_stack_divider_controller = 3; - PinnedStackControllerProto pinned_stack_controller = 4; + WindowContainerProto window_container = 1; + int32 id = 2; + repeated StackProto stacks = 3; + DockedStackDividerControllerProto docked_stack_divider_controller = 4; + PinnedStackControllerProto pinned_stack_controller = 5; /* non app windows */ - repeated WindowTokenProto above_app_windows = 5; - repeated WindowTokenProto below_app_windows = 6; - repeated WindowTokenProto ime_windows = 7; - int32 dpi = 8; - .android.view.DisplayInfoProto display_info = 9; - int32 rotation = 10; - ScreenRotationAnimationProto screen_rotation_animation = 11; + repeated WindowTokenProto above_app_windows = 6; + repeated WindowTokenProto below_app_windows = 7; + repeated WindowTokenProto ime_windows = 8; + int32 dpi = 9; + .android.view.DisplayInfoProto display_info = 10; + int32 rotation = 11; + ScreenRotationAnimationProto screen_rotation_animation = 12; } @@ -109,20 +117,22 @@ message PinnedStackControllerProto { /* represents TaskStack */ message StackProto { - int32 id = 1; - repeated TaskProto tasks = 2; - bool fills_parent = 3; - .android.graphics.RectProto bounds = 4; - bool animation_background_surface_is_dimming = 5; + WindowContainerProto window_container = 1; + int32 id = 2; + repeated TaskProto tasks = 3; + bool fills_parent = 4; + .android.graphics.RectProto bounds = 5; + bool animation_background_surface_is_dimming = 6; } /* represents Task */ message TaskProto { - int32 id = 1; - repeated AppWindowTokenProto app_window_tokens = 2; - bool fills_parent = 3; - .android.graphics.RectProto bounds = 4; - .android.graphics.RectProto temp_inset_bounds = 5; + WindowContainerProto window_container = 1; + int32 id = 2; + repeated AppWindowTokenProto app_window_tokens = 3; + bool fills_parent = 4; + .android.graphics.RectProto bounds = 5; + .android.graphics.RectProto temp_inset_bounds = 6; } /* represents AppWindowToken */ @@ -134,26 +144,28 @@ message AppWindowTokenProto { /* represents WindowToken */ message WindowTokenProto { - int32 hash_code = 1; - repeated WindowStateProto windows = 2; + WindowContainerProto window_container = 1; + int32 hash_code = 2; + repeated WindowStateProto windows = 3; } /* represents WindowState */ message WindowStateProto { - IdentifierProto identifier = 1; - int32 display_id = 2; - int32 stack_id = 3; - .android.view.WindowLayoutParamsProto attributes = 4; - .android.graphics.RectProto given_content_insets = 5; - .android.graphics.RectProto frame = 6; - .android.graphics.RectProto containing_frame = 7; - .android.graphics.RectProto parent_frame = 8; - .android.graphics.RectProto content_frame = 9; - .android.graphics.RectProto content_insets = 10; - .android.graphics.RectProto surface_insets = 11; - WindowStateAnimatorProto animator = 12; - bool animating_exit = 13; - repeated WindowStateProto child_windows = 14; + WindowContainerProto window_container = 1; + IdentifierProto identifier = 2; + int32 display_id = 3; + int32 stack_id = 4; + .android.view.WindowLayoutParamsProto attributes = 5; + .android.graphics.RectProto given_content_insets = 6; + .android.graphics.RectProto frame = 7; + .android.graphics.RectProto containing_frame = 8; + .android.graphics.RectProto parent_frame = 9; + .android.graphics.RectProto content_frame = 10; + .android.graphics.RectProto content_insets = 11; + .android.graphics.RectProto surface_insets = 12; + WindowStateAnimatorProto animator = 13; + bool animating_exit = 14; + repeated WindowStateProto child_windows = 15; } message IdentifierProto { @@ -178,4 +190,17 @@ message WindowSurfaceControllerProto { message ScreenRotationAnimationProto { bool started = 1; bool animation_running = 2; -}
\ No newline at end of file +} + +/* represents WindowContainer */ +message WindowContainerProto { + ConfigurationContainerProto configuration_container = 1; + int32 orientation = 2; +} + +/* represents ConfigurationContainer */ +message ConfigurationContainerProto { + .android.content.ConfigurationProto override_configuration = 1; + .android.content.ConfigurationProto full_configuration = 2; + .android.content.ConfigurationProto merged_override_configuration = 3; +} diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 28e1fe19f06f..d3ba7ef5e25e 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Instellings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Help"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Stembystand"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Snelsluit"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nuwe kennisgewing"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuele sleutelbord"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index dc5222e8096a..a3c2cab5f78d 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ቅንብሮች"</string> <string name="global_action_assist" msgid="3892832961594295030">"ደግፍ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"የድምጽ እርዳታ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ወደ ቁልፎ ማሰር ይግቡ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"አዲስ ማሳወቂያ"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ምናባዊ የቁልፍ ሰሌዳ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 7c5822ae925b..5ff51f2d1df6 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -242,8 +242,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"الإعدادات"</string> <string name="global_action_assist" msgid="3892832961594295030">"مساعدة"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"المساعد الصوتي"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"تفعيل الإغلاق"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"إشعار جديد"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"لوحة المفاتيح الافتراضية"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index c907446a1ba9..bd63c27c22b3 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ayarlar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Yardım"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Səs Yardımçısı"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kilid əlavə edin"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Yeni bildiriş"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual klaviatura"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 38b7b90410d1..e362a87d959b 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Podešavanja"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoć"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Zaključaj"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Novo obaveštenje"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelna tastatura"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 4db9d4d39a97..fdbe702666d6 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Налады"</string> <string name="global_action_assist" msgid="3892832961594295030">"Дапамога"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Галас. дапамога"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Увесці блакіроўку"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Новае апавяшчэнне"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Віртуальная клавіятура"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 36829048ed6e..ae4cc61488e3 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Настройки"</string> <string name="global_action_assist" msgid="3892832961594295030">"Помощ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласова помощ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Въведете заключване"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ново известие"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуална клавиатура"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index ec15c48b8eed..e3ecfda94c32 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"সেটিংস"</string> <string name="global_action_assist" msgid="3892832961594295030">"সহযোগিতা"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ভয়েস সহায়তা"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"লকডাউন লিখুন"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"৯৯৯+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"নতুন বিজ্ঞপ্তি"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ভার্চুয়াল কীবোর্ড"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index ba0f952fb33e..232a4e17df0b 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Postavke"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoć"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Unesite blokadu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Novo obavještenje"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelna tastatura"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index d79eae1dd75b..d713c1b00731 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configuració"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistència"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. per veu"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Bloqueja"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"+999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificació nova"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclat virtual"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index c907236620f5..31e7487771c9 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Nastavení"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistence"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Hlas. asistence"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Zamknout"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nové oznámení"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuální klávesnice"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index f3a34ef580b8..f1ba1740ca7e 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Indstillinger"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistance"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Taleassistent"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Aktivér lukning"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ny underretning"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelt tastatur"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index d387035645b6..cc510d78f591 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Einstellungen"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistent"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Sprachassistent"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Sperren"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Neue Benachrichtigung"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Bildschirmtastatur"</string> @@ -1095,7 +1094,7 @@ <string name="ringtone_picker_title_notification" msgid="4837740874822788802">"Benachrichtigungstöne"</string> <string name="ringtone_unknown" msgid="3914515995813061520">"Unbekannt"</string> <plurals name="wifi_available" formatted="false" msgid="7900333017752027322"> - <item quantity="other">WLANe verfügbar</item> + <item quantity="other">WLANs verfügbar</item> <item quantity="one">WLAN verfügbar</item> </plurals> <plurals name="wifi_available_detailed" formatted="false" msgid="1140699367193975606"> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index ed81487ed526..ede305cdb7bd 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ρυθμίσεις"</string> <string name="global_action_assist" msgid="3892832961594295030">"Βοήθεια"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Φων.υποβοηθ."</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Εισαγ. κλειδώμ."</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Νέα ειδοποίηση"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Εικονικό πληκτρολόγιο"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index b0ac9df4cfec..fa7f1801a147 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index b0ac9df4cfec..fa7f1801a147 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index b0ac9df4cfec..fa7f1801a147 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index b0ac9df4cfec..fa7f1801a147 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index 03210c93613e..353b437fb2c4 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 3ed9a2a747b2..4a7a191ea870 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configuración"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistencia"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Ingresa bloqueo"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificación nueva"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 06a666901534..425e9884dd12 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ajustes"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistencia"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Activar bloqueo"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"> 999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificación nueva"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 3d703fee28cd..7c57dafdd20e 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Seaded"</string> <string name="global_action_assist" msgid="3892832961594295030">"Abi"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Häälabi"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kasuta lukust."</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Uus märguanne"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuaalne klaviatuur"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 69a8e67f385e..5556a5d44f18 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ezarpenak"</string> <string name="global_action_assist" msgid="3892832961594295030">"Lagundu"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ahots-laguntza"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Sartu blokeo moduan"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Jakinarazpen berria"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teklatu birtuala"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 7a0d81774a10..bb9635a85300 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"تنظیمات"</string> <string name="global_action_assist" msgid="3892832961594295030">"دستیار"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"دستیار صوتی"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"قفل همه را وارد کنید"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"۹۹۹+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"اعلان جدید"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"صفحهکلید مجازی"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index d586760c81c9..a32db2cfcb93 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Asetukset"</string> <string name="global_action_assist" msgid="3892832961594295030">"Auta"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ääniapuri"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Lukitse"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Uusi ilmoitus"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuaalinen näppäimistö"</string> @@ -1427,7 +1426,7 @@ <string name="default_audio_route_category_name" msgid="3722811174003886946">"Järjestelmä"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-ääni"</string> <string name="wireless_display_route_description" msgid="9070346425023979651">"Langaton näyttö"</string> - <string name="media_route_button_content_description" msgid="591703006349356016">"Lähetä"</string> + <string name="media_route_button_content_description" msgid="591703006349356016">"Suoratoisto"</string> <string name="media_route_chooser_title" msgid="1751618554539087622">"Yhdistä laitteeseen"</string> <string name="media_route_chooser_title_for_remote_display" msgid="3395541745872017583">"Lähetä näyttö laitteeseen"</string> <string name="media_route_chooser_searching" msgid="4776236202610828706">"Etsitään laitteita…"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 5ff39ab47b67..8fe60e3fe483 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Paramètres"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistance"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. vocale"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Entrez verrou."</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nouvelle notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Clavier virtuel"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 0482d3ad0606..52d482482625 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Paramètres"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistance"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Assistance vocale"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Verrouiller"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nouvelle notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Clavier virtuel"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index 54f00c5204b4..9a3a83f81fbb 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configuración"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistencia"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Activar bloqueo"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificación nova"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 464f832cddd0..ec8023647fbe 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"સેટિંગ્સ"</string> <string name="global_action_assist" msgid="3892832961594295030">"સહાય"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"વૉઇસ સહાય"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"લોકડાઉન દાખલ કરો"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"નવું નોટિફિકેશન"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"વર્ચ્યુઅલ કીબોર્ડ"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 3fb8cadc63e2..217d106cb028 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"सेटिंग"</string> <string name="global_action_assist" msgid="3892832961594295030">"सहायता"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"आवाज़ से डिवाइस का इस्तेमाल"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"लॉकडाउन डालें"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"नई सूचना"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"वर्चुअल कीबोर्ड"</string> @@ -1163,7 +1162,7 @@ <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"कभी भी अनुमति न दें"</string> <string name="sim_removed_title" msgid="6227712319223226185">"सिमकार्ड निकाला गया"</string> <string name="sim_removed_message" msgid="2333164559970958645">"मान्य सिम कार्ड डालकर पुन: प्रारंभ करने तक मोबाइल नेटवर्क अनुपलब्ध रहेगा."</string> - <string name="sim_done_button" msgid="827949989369963775">"पूर्ण"</string> + <string name="sim_done_button" msgid="827949989369963775">"हो गया"</string> <string name="sim_added_title" msgid="3719670512889674693">"सिम कार्ड जोड़ा गया"</string> <string name="sim_added_message" msgid="6599945301141050216">"मोबाइल नेटवर्क की पहुंच पाने लिए अपना डिवाइस फिर से चालू करें."</string> <string name="sim_restart_button" msgid="4722407842815232347">"फिर से शुरू करें"</string> @@ -1175,7 +1174,7 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"समय सेट करें"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"तारीख सेट करें"</string> <string name="date_time_set" msgid="5777075614321087758">"सेट करें"</string> - <string name="date_time_done" msgid="2507683751759308828">"पूर्ण"</string> + <string name="date_time_done" msgid="2507683751759308828">"हो गया"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"नया: "</font></string> <string name="perms_description_app" msgid="5139836143293299417">"<xliff:g id="APP_NAME">%1$s</xliff:g> द्वारा प्रदत्त."</string> <string name="no_permissions" msgid="7283357728219338112">"किसी अनुमति की आवश्यकता नहीं है"</string> @@ -1187,7 +1186,7 @@ <string name="usb_ptp_notification_title" msgid="1347328437083192112">"फ़ोटो स्थानांतरण के लिए USB"</string> <string name="usb_midi_notification_title" msgid="4850904915889144654">"MIDI के लिए USB"</string> <string name="usb_accessory_notification_title" msgid="7848236974087653666">"USB सहायक सामग्री से कनेक्ट किया गया"</string> - <string name="usb_notification_message" msgid="3370903770828407960">"अधिक विकल्पों के लिए टैप करें."</string> + <string name="usb_notification_message" msgid="3370903770828407960">"ज़्यादा विकल्पों के लिए टैप करें."</string> <string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"एनालॉग ऑडियो एक्सेसरी का पता चला"</string> <string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"अटैच किया गया डिवाइस इस फ़ोन से संगत नहीं है. अधिक जानने के लिए टैप करें."</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB डीबग कनेक्ट किया गया"</string> @@ -1266,7 +1265,7 @@ <string name="ime_action_search" msgid="658110271822807811">"सर्च करें"</string> <string name="ime_action_send" msgid="2316166556349314424">"भेजें"</string> <string name="ime_action_next" msgid="3138843904009813834">"आगे"</string> - <string name="ime_action_done" msgid="8971516117910934605">"पूर्ण"</string> + <string name="ime_action_done" msgid="8971516117910934605">"हो गया"</string> <string name="ime_action_previous" msgid="1443550039250105948">"पीछे जाएं"</string> <string name="ime_action_default" msgid="2840921885558045721">"निष्पादित करें"</string> <string name="dial_number_using" msgid="5789176425167573586">"<xliff:g id="NUMBER">%s</xliff:g> के उपयोग द्वारा \n नंबर डायल करें"</string> @@ -1310,14 +1309,14 @@ <string name="disable_tether_notification_message" msgid="2913366428516852495">"जानकारी के लिए अपने एडमिन से संपर्क करें"</string> <string name="back_button_label" msgid="2300470004503343439">"वापस जाएं"</string> <string name="next_button_label" msgid="1080555104677992408">"आगे"</string> - <string name="skip_button_label" msgid="1275362299471631819">"रद्द करें"</string> + <string name="skip_button_label" msgid="1275362299471631819">"अभी नहीं"</string> <string name="no_matches" msgid="8129421908915840737">"कोई मिलान नहीं"</string> <string name="find_on_page" msgid="1946799233822820384">"पेज पर ढूंढें"</string> <plurals name="matches_found" formatted="false" msgid="1210884353962081884"> <item quantity="one"><xliff:g id="TOTAL">%d</xliff:g> में से <xliff:g id="INDEX">%d</xliff:g></item> <item quantity="other"><xliff:g id="TOTAL">%d</xliff:g> में से <xliff:g id="INDEX">%d</xliff:g></item> </plurals> - <string name="action_mode_done" msgid="7217581640461922289">"पूर्ण"</string> + <string name="action_mode_done" msgid="7217581640461922289">"हो गया"</string> <string name="progress_erasing" product="nosdcard" msgid="4521573321524340058">"USB मेमोरी मिटाया जा रहा है…"</string> <string name="progress_erasing" product="default" msgid="6596988875507043042">"SD कार्ड मिटाया जा रहा है…"</string> <string name="share" msgid="1778686618230011964">"साझा करें"</string> @@ -1359,7 +1358,7 @@ <string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string> <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"रद्द करें"</string> <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"मिटाएं"</string> - <string name="keyboardview_keycode_done" msgid="1992571118466679775">"पूर्ण"</string> + <string name="keyboardview_keycode_done" msgid="1992571118466679775">"हो गया"</string> <string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"Mode change"</string> <string name="keyboardview_keycode_shift" msgid="2270748814315147690">"Shift"</string> <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enter"</string> @@ -1495,7 +1494,7 @@ <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"सुलभता शॉर्टकट ने <xliff:g id="SERVICE_NAME">%1$s</xliff:g> को बंद किया"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"सुलभता बटन पर टैप करते समय इस्तेमाल की जाने वाली सुविधा चुनें:"</string> <string name="accessibility_button_instructional_text" msgid="6942300463612999993">"सुविधाओं में बदलाव करने के लिए, सुलभता बटन को दबाकर रखें."</string> - <string name="accessibility_magnification_chooser_text" msgid="1227146738764986237">"आवर्धन"</string> + <string name="accessibility_magnification_chooser_text" msgid="1227146738764986237">"बड़ा करें"</string> <string name="user_switched" msgid="3768006783166984410">"मौजूदा उपयोगकर्ता <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> पर स्विच किया जा रहा है…"</string> <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> द्वारा प्रस्थान किया जा रहा है…"</string> @@ -1610,7 +1609,7 @@ <string name="immersive_cling_title" msgid="8394201622932303336">"पूरे स्क्रीन पर देखें"</string> <string name="immersive_cling_description" msgid="3482371193207536040">"बाहर निकलने के लिए, ऊपर से नीचे स्वाइप करें."</string> <string name="immersive_cling_positive" msgid="5016839404568297683">"ठीक है"</string> - <string name="done_label" msgid="2093726099505892398">"पूर्ण"</string> + <string name="done_label" msgid="2093726099505892398">"हो गया"</string> <string name="hour_picker_description" msgid="6698199186859736512">"घंटो का चक्राकार स्लाइडर"</string> <string name="minute_picker_description" msgid="8606010966873791190">"मिनटों का चक्राकार स्लाइडर"</string> <string name="select_hours" msgid="6043079511766008245">"घंटे चुनें"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 9029f1fae25c..60a0cc2f5085 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Postavke"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoć"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Zaključaj"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nova obavijest"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtualna tipkovnica"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 2fa26281506f..3c40d569cd0d 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Beállítások"</string> <string name="global_action_assist" msgid="3892832961594295030">"Segítség"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Hangsegéd"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Zár megadása"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Új értesítés"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuális billentyűzet"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 2b78c71e250b..190b2d5ea753 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Կարգավորումներ"</string> <string name="global_action_assist" msgid="3892832961594295030">"Օգնական"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ձայնային օգնութ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Արգելափակել"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Նոր ծանուցում"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Վիրտուալ ստեղնաշար"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 5d41c13fd64a..b6a8aa28fbd9 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Setelan"</string> <string name="global_action_assist" msgid="3892832961594295030">"Bantuan"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kunci total"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notifikasi baru"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Keyboard virtual"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 7add51d1c3f8..8cc5f97ab7c4 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Stillingar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Aðstoð"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Raddaðstoð"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Virkja læsingu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ný tilkynning"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Sýndarlyklaborð"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index fdab6dc2f6e7..611a9a1a6454 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Impostazioni"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistenza"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Inser. blocco"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nuova notifica"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastiera virtuale"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 3d60b4211bff..40aeba43a426 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"הגדרות"</string> <string name="global_action_assist" msgid="3892832961594295030">"סיוע"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"נעילת חירום"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"הודעה חדשה"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"מקלדת וירטואלית"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 83426add9405..aa86db3accac 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"設定"</string> <string name="global_action_assist" msgid="3892832961594295030">"サポート"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"音声アシスト"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ロックダウンを入力"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"新しい通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"仮想キーボード"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 173c16b9c86c..ea993378e5ed 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"პარამეტრები"</string> <string name="global_action_assist" msgid="3892832961594295030">"დახმარება"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ხმოვანი ასისტ."</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"დაბლოკვა"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ახალი შეტყობინება"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ვირტუალური კლავიატურა"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 288b72e4871c..d02dc0e4f69a 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Параметрлер"</string> <string name="global_action_assist" msgid="3892832961594295030">"Көмек"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Дауыс көмекшісі"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Құлыптауды енгізу"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Жаңа хабарландыру"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуалды пернетақта"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index ab23b009e1a8..38ee22f1e248 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ការកំណត់"</string> <string name="global_action_assist" msgid="3892832961594295030">"ជំនួយ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ជំនួយសម្លេង"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"បញ្ជូលការចាក់សោជាប់"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ការជូនដំណឹងថ្មី"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ក្ដារចុចនិម្មិត"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 352f57a87ec8..5116c5d0810d 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="global_action_assist" msgid="3892832961594295030">"ಸಹಾಯ ಮಾಡು"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ಧ್ವನಿ ಸಹಾಯಕ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ಲಾಕ್ಡೌನ್"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ಹೊಸ ಅಧಿಸೂಚನೆ"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ವರ್ಚುಯಲ್ ಕೀಬೋರ್ಡ್"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index c9fdc465952d..722b25156f0c 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"설정"</string> <string name="global_action_assist" msgid="3892832961594295030">"지원"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"음성 지원"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"잠금 설정"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"새 알림"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"가상 키보드"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 681df65e489a..9cf927e1ddc7 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Жөндөөлөр"</string> <string name="global_action_assist" msgid="3892832961594295030">"Жардам"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Үн жардамчысы"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Кулпуну иштетүү"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Жаңы эскертме"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуалдык баскычтоп"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index ade01c27d82f..27601af1f8a6 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ການຕັ້ງຄ່າ"</string> <string name="global_action_assist" msgid="3892832961594295030">"ຕົວຊ່ວຍ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ຊ່ວຍເຫຼືອທາງສຽງ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ລະບຸການລັອກ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ການແຈ້ງເຕືອນໃໝ່"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ແປ້ນພິມສະເໝືອນ"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index e7fc04e7350f..9e807b03ebe5 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Nustatymai"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pagalba"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Užrakinti"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Naujas pranešimas"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtualioji klaviatūra"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 6159e1f27aca..5058d43d6393 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Iestatījumi"</string> <string name="global_action_assist" msgid="3892832961594295030">"Palīdzība"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Balss palīgs"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Iest. bloķēšanu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"Pārsniedz"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Jauns paziņojums"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuālā tastatūra"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index b06f45e258ac..ef5430c3a35d 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Поставки"</string> <string name="global_action_assist" msgid="3892832961594295030">"Асистенција"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помош"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Заклучување"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ново известување"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуелна тастатура"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 2cb564c77fd5..68501191e393 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ക്രമീകരണം"</string> <string name="global_action_assist" msgid="3892832961594295030">"അസിസ്റ്റ്"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"വോയ്സ് സഹായം"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ലോക്ക്ഡൗൺ നൽകൂ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"പുതിയ അറിയിപ്പ്"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"വെർച്വൽ കീബോർഡ്"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 011a2bd394ee..319ea011874f 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Тохиргоо"</string> <string name="global_action_assist" msgid="3892832961594295030">"Туслах"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Дуут туслах"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Хүчтэй түгжээ оруулах"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Шинэ мэдэгдэл"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуал гар"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 2ef0960effff..8436eb454d63 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -172,10 +172,10 @@ <string name="work_profile_deleted_description" msgid="1100529432509639864">"प्रशासक अॅप गहाळ असल्यामुळे कार्य प्रोफाइल हटवले गेले"</string> <string name="work_profile_deleted_details" msgid="6307630639269092360">"कार्य प्रोफाइल प्रशासक अॅप गहाळ आहे किंवा करप्ट आहे. परिणामी, आपले कार्य प्रोफाइल आणि संबंधित डेटा हटवले गेले आहेत. सहाय्यासाठी आपल्या प्रशासकाशी संपर्क साधा."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="8823792115612348820">"आपले कार्य प्रोफाइल आता या डिव्हाइसवर उपलब्ध नाही"</string> - <string name="network_logging_notification_title" msgid="6399790108123704477">"डीव्हाइस व्यवस्थापित केले आहे"</string> - <string name="network_logging_notification_text" msgid="7930089249949354026">"आपली संस्था हे डीव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे निरीक्षण करू शकते. तपशीलांसाठी टॅप करा."</string> - <string name="factory_reset_warning" msgid="5423253125642394387">"तुमचे डीव्हाइस मिटविले जाईल"</string> - <string name="factory_reset_message" msgid="7972496262232832457">"हे प्रशासक अॅप वापरले जाऊ शकत नाही. तुमचे डीव्हाइस आता मिटवले जाईल.\n\nतुम्हाला प्रश्न असल्यास, तुमच्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string> + <string name="network_logging_notification_title" msgid="6399790108123704477">"डिव्हाइस व्यवस्थापित केले आहे"</string> + <string name="network_logging_notification_text" msgid="7930089249949354026">"आपली संस्था हे डिव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे निरीक्षण करू शकते. तपशीलांसाठी टॅप करा."</string> + <string name="factory_reset_warning" msgid="5423253125642394387">"तुमचे डिव्हाइस मिटविले जाईल"</string> + <string name="factory_reset_message" msgid="7972496262232832457">"हे प्रशासक अॅप वापरले जाऊ शकत नाही. तुमचे डिव्हाइस आता मिटवले जाईल.\n\nतुम्हाला प्रश्न असल्यास, तुमच्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string> <string name="me" msgid="6545696007631404292">"मी"</string> <string name="power_dialog" product="tablet" msgid="8545351420865202853">"टॅबलेट पर्याय"</string> <string name="power_dialog" product="tv" msgid="6153888706430556356">"टीव्ही पर्याय"</string> @@ -212,11 +212,11 @@ <string name="global_action_emergency" msgid="7112311161137421166">"आणीबाणी"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"बग रीपोर्ट"</string> <string name="bugreport_title" msgid="2667494803742548533">"बग रीपोर्ट घ्या"</string> - <string name="bugreport_message" msgid="398447048750350456">"ई-मेल संदेश म्हणून पाठविण्यासाठी, हे तुमच्या सद्य डीव्हाइस स्थितीविषयी माहिती संकलित करेल. बग रीपोर्ट सुरू करण्यापासून तो पाठविण्यापर्यंत थोडा वेळ लागेल; कृपया धीर धरा."</string> + <string name="bugreport_message" msgid="398447048750350456">"ई-मेल संदेश म्हणून पाठविण्यासाठी, हे तुमच्या सद्य डिव्हाइस स्थितीविषयी माहिती संकलित करेल. बग रीपोर्ट सुरू करण्यापासून तो पाठविण्यापर्यंत थोडा वेळ लागेल; कृपया धीर धरा."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"परस्परसंवादी अहवाल"</string> <string name="bugreport_option_interactive_summary" msgid="229299488536107968">"बहुतांश प्रसंगांमध्ये याचा वापर करा. ते आपल्याला अहवालाच्या प्रगतीचा मागोवा घेण्याची, समस्येविषयी आणखी तपाशील प्रविष्ट करण्याची आणि स्क्रीनशॉट घेण्याची अनुमती देते. ते कदाचित अहवाल देण्यासाठी बराच वेळ घेणारे कमी-वापरलेले विभाग वगळू शकते."</string> <string name="bugreport_option_full_title" msgid="6354382025840076439">"संपूर्ण अहवाल"</string> - <string name="bugreport_option_full_summary" msgid="7210859858969115745">"तुमचे डीव्हाइस प्रतिसाद देत नाही किंवा खूप धीमे असते किंवा तुम्हाला सर्व अहवाल विभागांची आवश्यकता असते तेव्हा कमीतकमी सिस्टम हस्तक्षेपासाठी या पर्यायाचा वापर करा. तुम्हाला आणखी तपशील एंटर करण्याची किंवा अतिरिक्त स्क्रीनशॉट घेण्याची अनुमती देत नाही."</string> + <string name="bugreport_option_full_summary" msgid="7210859858969115745">"तुमचे डिव्हाइस प्रतिसाद देत नाही किंवा खूप धीमे असते किंवा तुम्हाला सर्व अहवाल विभागांची आवश्यकता असते तेव्हा कमीतकमी सिस्टम हस्तक्षेपासाठी या पर्यायाचा वापर करा. तुम्हाला आणखी तपशील एंटर करण्याची किंवा अतिरिक्त स्क्रीनशॉट घेण्याची अनुमती देत नाही."</string> <plurals name="bugreport_countdown" formatted="false" msgid="6878900193900090368"> <item quantity="one">दोष अहवालासाठी <xliff:g id="NUMBER_1">%d</xliff:g> सेकंदामध्ये स्क्रीनशॉट घेत आहे.</item> <item quantity="other">दोष अहवालासाठी <xliff:g id="NUMBER_1">%d</xliff:g> सेकंदांमध्ये स्क्रीनशॉट घेत आहे.</item> @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"सेटिंग्ज"</string> <string name="global_action_assist" msgid="3892832961594295030">"सहाय्यता"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"व्हॉइस सहाय्य"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"लॉकडाउन टाका"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"नवीन सूचना"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"व्हर्च्युअल कीबोर्ड"</string> @@ -245,7 +244,7 @@ <string name="notification_channel_network_alerts" msgid="2895141221414156525">"नेटवर्क सूचना"</string> <string name="notification_channel_network_available" msgid="4531717914138179517">"नेटवर्क उपलब्ध"</string> <string name="notification_channel_vpn" msgid="8330103431055860618">"VPN स्थिती"</string> - <string name="notification_channel_device_admin" msgid="1568154104368069249">"डीव्हाइस प्रशासन"</string> + <string name="notification_channel_device_admin" msgid="1568154104368069249">"डिव्हाइस प्रशासन"</string> <string name="notification_channel_alerts" msgid="4496839309318519037">"सूचना"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"रीटेल डेमो"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB कनेक्शन"</string> @@ -271,7 +270,7 @@ <string name="permgroupdesc_sms" msgid="4656988620100940350">"SMS संदेश पाठवणे आणि पाहणे हे"</string> <string name="permgrouprequest_sms" msgid="605618939583628306">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ला SMS संदेश पाठवू आणि पाहू द्या"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"संचयन"</string> - <string name="permgroupdesc_storage" msgid="637758554581589203">"तुमच्या डीव्हाइस वरील फोटो, मीडिया आणि फायलींमध्ये अॅक्सेस"</string> + <string name="permgroupdesc_storage" msgid="637758554581589203">"तुमच्या डिव्हाइस वरील फोटो, मीडिया आणि फायलींमध्ये अॅक्सेस"</string> <string name="permgrouprequest_storage" msgid="7429669910547860218">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ला तुमच्या डीव्हाइसवरील फोटो, मीडिया आणि फायली अॅक्सेस करू द्या"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"मायक्रोफोन"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"ऑडिओ रेकॉर्ड"</string> @@ -298,7 +297,7 @@ <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"फिंगरप्रिंट जेश्चर"</string> <string name="capability_desc_canCaptureFingerprintGestures" msgid="7102111919385702482">"डिव्हाइसच्या फिंगरप्रिंट सेंसरवर केलेले जेश्चर कॅप्चर करू शकते."</string> <string name="permlab_statusBar" msgid="7417192629601890791">"स्टेटस बार अक्षम करा किंवा सुधारित करा"</string> - <string name="permdesc_statusBar" msgid="8434669549504290975">"स्टेटस बार अक्षम करण्यासाठी किंवा सिस्टीम चिन्हे जोडण्यासाठी आणि काढण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_statusBar" msgid="8434669549504290975">"स्टेटस बार अक्षम करण्यासाठी किंवा सिस्टम चिन्हे जोडण्यासाठी आणि काढण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_statusBarService" msgid="4826835508226139688">"स्टेटस बार होऊ द्या"</string> <string name="permdesc_statusBarService" msgid="716113660795976060">"स्टेटस बार होण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_expandStatusBar" msgid="1148198785937489264">"स्टेटस बार विस्तृत करा/संकुचित करा"</string> @@ -329,8 +328,8 @@ <string name="permdesc_receiveWapPush" msgid="748232190220583385">"WAP संदेश प्राप्त करण्यास आणि त्यावर प्रक्रिया करण्यासाठी अॅप ला अनुमती देते. ही परवानगी आपल्याला पाठविलेले संदेश आपल्याला न दर्शविता त्यांचे परीक्षण करण्याची आणि ते हटविण्याची क्षमता समाविष्ट करते."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"चालणारे अॅप्स पुनर्प्राप्त करा"</string> <string name="permdesc_getTasks" msgid="7454215995847658102">"सध्या आणि अलीकडे चालणार्या कार्यांविषयी माहिती पुनर्प्राप्त करण्यासाठी अॅप ला अनुमती देते. हे डिव्हाइसवर कोणते अॅप्लिकेशन वापरले जात आहेत त्याविषयी माहिती शोधण्यासाठी अॅप ला अनुमती देऊ शकतात."</string> - <string name="permlab_manageProfileAndDeviceOwners" msgid="7918181259098220004">"प्रोफाईल आणि डीव्हाइस मालक व्यवस्थापित करा"</string> - <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"प्रोफाईल मालक आणि डीव्हाइस मालक सेट करण्याची अॅप्सना अनुमती द्या."</string> + <string name="permlab_manageProfileAndDeviceOwners" msgid="7918181259098220004">"प्रोफाईल आणि डिव्हाइस मालक व्यवस्थापित करा"</string> + <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"प्रोफाईल मालक आणि डिव्हाइस मालक सेट करण्याची अॅप्सना अनुमती द्या."</string> <string name="permlab_reorderTasks" msgid="2018575526934422779">"चालणारे अॅप्स पुनर्क्रमित करा"</string> <string name="permdesc_reorderTasks" msgid="7734217754877439351">"समोर आणि पार्श्वभूमीवर कार्ये हलविण्यासाठी अॅप ला अनुमती देते. अॅप हे आपल्या इनपुटशिवाय करू शकतो."</string> <string name="permlab_enableCarMode" msgid="5684504058192921098">"कार मोड सक्षम करा"</string> @@ -352,9 +351,9 @@ <string name="permlab_writeSettings" msgid="2226195290955224730">"सिस्टम सेटिंग्ज सुधारित करा"</string> <string name="permdesc_writeSettings" msgid="7775723441558907181">"सिस्टीमचा सेटिंग्ज डेटा सुधारित करण्यासाठी अॅप ला अनुमती देते. दुर्भावनापूर्ण अॅप्स आपल्या सिस्टीमचे कॉन्फिगरेशन दूषित करू शकतात."</string> <string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"सुरूवातीस चालवा"</string> - <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"जसे सिस्टीम बूट करणे समाप्त करते तसे अॅप ला स्वतः प्रारंभ करण्यास अनुमती देते. यामुळे टॅबलेट प्रारंभ करण्यास वेळ लागू शकतो आणि नेहमी चालू राहून एकंदर टॅबलेटला धीमे करण्यास अॅप ला अनुमती देते."</string> - <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"सिस्टीम बूट करणे समाप्त करते तसेच अॅपने स्वतः प्रारंभ करण्यास त्याला अनुमती देते. यामुळे टीव्ही प्रारंभ करण्यासाठी त्यास जास्त वेळ लागू शकतो आणि नेहमी चालू ठेवून संपूर्ण टॅबलेट धीमे करण्यासाठी अॅपला अनुमती देते."</string> - <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"जसे सिस्टीम बूट करणे समाप्त करते तसे अॅप ला स्वतः प्रारंभ करण्यास अनुमती देते. यामुळे फोन प्रारंभ करण्यास वेळ लागू शकतो आणि नेहमी चालू राहून एकंदर फोनला धीमे करण्यास अॅप ला अनुमती देते."</string> + <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"जसे सिस्टम बूट करणे समाप्त करते तसे अॅप ला स्वतः प्रारंभ करण्यास अनुमती देते. यामुळे टॅबलेट प्रारंभ करण्यास वेळ लागू शकतो आणि नेहमी चालू राहून एकंदर टॅबलेटला धीमे करण्यास अॅप ला अनुमती देते."</string> + <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"सिस्टम बूट करणे समाप्त करते तसेच अॅपने स्वतः प्रारंभ करण्यास त्याला अनुमती देते. यामुळे टीव्ही प्रारंभ करण्यासाठी त्यास जास्त वेळ लागू शकतो आणि नेहमी चालू ठेवून संपूर्ण टॅबलेट धीमे करण्यासाठी अॅपला अनुमती देते."</string> + <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"जसे सिस्टम बूट करणे समाप्त करते तसे अॅप ला स्वतः प्रारंभ करण्यास अनुमती देते. यामुळे फोन प्रारंभ करण्यास वेळ लागू शकतो आणि नेहमी चालू राहून एकंदर फोनला धीमे करण्यास अॅप ला अनुमती देते."</string> <string name="permlab_broadcastSticky" msgid="7919126372606881614">"रोचक प्रसारण पाठवा"</string> <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"रोचक प्रसारणे पाठविण्यासाठी अॅप ला अनुमती देते, जे प्रसारण समाप्त झाल्यानंतर देखील तसेच राहते. अत्याधिक वापरामुळे बरीच मेमरी वापरली जाऊन तो टॅब्लेटला धीमा किंवा अस्थिर करू शकतो."</string> <string name="permdesc_broadcastSticky" product="tv" msgid="6839285697565389467">"रोचक प्रसारणे पाठविण्यास अॅपला अनुमती देते, जे प्रसारण समाप्त झाल्यानंतर तसेच रहाते. अतिरिक्त वापर टीव्ही धीमा किंवा यासाठी बरीच मेमरी वापरली जात असल्यामुळे तो अस्थिर करू शकतो."</string> @@ -406,7 +405,7 @@ <string name="permlab_accessImsCallService" msgid="3574943847181793918">"IMS कॉल सेवा अॅक्सेस करा"</string> <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"आपल्या हस्तक्षेपाशिवाय अॅपला कॉल करण्यासाठी IMS सेवा वापरण्याची अनुमती देते."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"फोन स्थिती आणि ओळख वाचा"</string> - <string name="permdesc_readPhoneState" msgid="1639212771826125528">"डीव्हाइस च्या फोन वैशिष्ट्यांवर अॅक्सेस करण्यास अॅपला अनुमती देते. ही परवानगी कॉल अॅक्टिव्हेट असला किंवा नसला तरीही, फोन नंबर आणि डीव्हाइस आयडी आणि कॉलद्वारे कनेक्ट केलेला रीमोट नंबर निर्धारित करण्यासाठी अॅपला अनुमती देते."</string> + <string name="permdesc_readPhoneState" msgid="1639212771826125528">"डिव्हाइस च्या फोन वैशिष्ट्यांवर अॅक्सेस करण्यास अॅपला अनुमती देते. ही परवानगी कॉल अॅक्टिव्हेट असला किंवा नसला तरीही, फोन नंबर आणि डिव्हाइस आयडी आणि कॉलद्वारे कनेक्ट केलेला रीमोट नंबर निर्धारित करण्यासाठी अॅपला अनुमती देते."</string> <string name="permlab_manageOwnCalls" msgid="1503034913274622244">"प्रणालीच्या माध्यमातून कॉल रूट करा"</string> <string name="permdesc_manageOwnCalls" msgid="6552974537554717418">"कॉल करण्याचा अनुभव सुधारण्यासाठी अॅपला त्याचे कॉल प्रणालीच्या माध्यमातून रूट करू देते."</string> <string name="permlab_readPhoneNumbers" msgid="6108163940932852440">"फोन नंबर वाचा"</string> @@ -422,9 +421,9 @@ <string name="permdesc_transmitIr" product="tv" msgid="3926790828514867101">"टीव्हीचे इन्फ्रारेड ट्रान्समीटर वापरण्यासाठी अॅपला अनुमती देते."</string> <string name="permdesc_transmitIr" product="default" msgid="7957763745020300725">"अॅप ला फोनच्या इन्फ्रारेड ट्रान्समीटरचा वापर करण्याची अनुमती देते."</string> <string name="permlab_setWallpaper" msgid="6627192333373465143">"वॉलपेपर सेट करा"</string> - <string name="permdesc_setWallpaper" msgid="7373447920977624745">"सिस्टीम वॉलपेपर सेट करण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_setWallpaper" msgid="7373447920977624745">"सिस्टम वॉलपेपर सेट करण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_setWallpaperHints" msgid="3278608165977736538">"आपला वॉलपेपर आकार समायोजित करा"</string> - <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"सिस्टीम वॉलपेपर आकार सूचना सेट करण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"सिस्टम वॉलपेपर आकार सूचना सेट करण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_setTimeZone" msgid="2945079801013077340">"टाइम झोन सेट करा"</string> <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"टॅब्लेटचा टाइम झोन बदलण्यासाठी अॅप ला अनुमती देते."</string> <string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"टीव्हीचा टाईम झोन बदलण्यासाठी अॅपला अनुमती देते."</string> @@ -444,15 +443,15 @@ <string name="permlab_accessWifiState" msgid="5202012949247040011">"वाय-फाय कनेक्शन पहा"</string> <string name="permdesc_accessWifiState" msgid="5002798077387803726">"वाय-फाय सक्षम केले आहे किंवा नाही आणि कनेक्ट केलेल्या वाय-फाय डीव्हाइसचे नाव यासारख्या, वाय-फाय नेटवर्किंग विषयीची माहिती पाहण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_changeWifiState" msgid="6550641188749128035">"वाय-फाय वरून कनेक्ट करा आणि डिस्कनेक्ट करा"</string> - <string name="permdesc_changeWifiState" msgid="7137950297386127533">"वाय-फाय अॅक्सेस बिंदूंवर कनेक्ट करण्यासाठी आणि त्यावरून डिस्कनेक्ट करण्यासाठी आणि वाय-फाय नेटवर्कसाठी डीव्हाइस कॉंफिगरेशनमध्ये बदल करण्यासाठी अॅपला अनुमती देते."</string> + <string name="permdesc_changeWifiState" msgid="7137950297386127533">"वाय-फाय अॅक्सेस बिंदूंवर कनेक्ट करण्यासाठी आणि त्यावरून डिस्कनेक्ट करण्यासाठी आणि वाय-फाय नेटवर्कसाठी डिव्हाइस कॉंफिगरेशनमध्ये बदल करण्यासाठी अॅपला अनुमती देते."</string> <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"वाय-फाय मल्टिकास्ट रिसेप्शनला अनुमती द्या"</string> <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"मल्टिकास्ट पत्ते वापरून फक्त तुमच्या टॅब्लेटवर नाही, तर वाय-फाय नेटवर्कवरील सर्व डीव्हाइसवर पाठविलेले पॅकेट प्राप्त करण्यासाठी अॅप ला अनुमती देते. हे मल्टिकास्टखेरिज इतर मोडसाठी अधिक पॉवर वापरते."</string> <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"केवळ आपला टीव्ही न वापरता, एकाधिक पत्ते वापरून एका वाय-फाय नेटवकवरील सर्व डीव्हाइसवर पाठविलेली पॅकेट प्राप्त करण्यासाठी अॅपला अनुमती देते."</string> <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"मल्टिकास्ट पत्ते वापरून फक्त तुमच्या फोनवर नाही, तर वाय-फाय नेटवर्कवरील सर्व डीव्हाइसवर पाठविलेले पॅकेट प्राप्त करण्यासाठी अॅप ला अनुमती देते. हे मल्टिकास्टखेरिज इतर मोडसाठी अधिक पॉवर वापरते."</string> <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"ब्लूटूथ सेटिंग्ज अॅक्सेस करा"</string> - <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"स्थानिक ब्लूटूथ टॅबलेट कॉंफिगर करण्याकरिता आणि दूरस्थ डीव्हाइस शोधण्यासाठी आणि त्यासह जोडण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"स्थानिक ब्लूटूथ टॅबलेट कॉंफिगर करण्याकरिता आणि दूरस्थ डिव्हाइस शोधण्यासाठी आणि त्यासह जोडण्यासाठी अॅप ला अनुमती देते."</string> <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"स्थानिक ब्लूटूथ टीव्ही कॉंफिगर करण्यासाठी आणि दूरस्थ डीव्हाइससह शोधण्यासाठी आणि जोडण्यासाठी अॅपला अनुमती देते."</string> - <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"स्थानिक ब्लूटूथ फोन कॉंफिगर करण्याकरिता आणि दूरस्थ डीव्हाइस शोधण्यासाठी आणि त्यासह जोडण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"स्थानिक ब्लूटूथ फोन कॉंफिगर करण्याकरिता आणि दूरस्थ डिव्हाइस शोधण्यासाठी आणि त्यासह जोडण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_accessWimaxState" msgid="4195907010610205703">"WiMAX कनेक्ट करा आणि त्यावरून डिस्कनेक्ट करा"</string> <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"WiMAX सक्षम केले आहे किंवा नाही आणि कनेक्ट केलेल्या कोणत्याही WiMAX नेटवर्क विषयीची माहिती निर्धारित करण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_changeWimaxState" msgid="340465839241528618">"WiMAX स्थिती बदला"</string> @@ -535,7 +534,7 @@ <string name="permdesc_invokeCarrierSetup" msgid="4159549152529111920">"होल्डरला वाहकद्वारे-प्रदान केलेल्या कॉन्फिगरेशन अॅपची विनंती करण्याची अनुमती देते. सामान्य अॅप्ससाठी कधीही आवश्यक नसावे."</string> <string name="permlab_accessNetworkConditions" msgid="8206077447838909516">"नेटवर्क स्थितींवरील निरीक्षणांसाठी ऐका"</string> <string name="permdesc_accessNetworkConditions" msgid="6899102075825272211">"अनु्प्रयोगाला नेटवर्क स्थितींवरील निरीक्षणे ऐकण्यासाठी अनुमती देते. सामान्य अॅप्ससाठी कधीही आवश्यक नसावे."</string> - <string name="permlab_setInputCalibration" msgid="4902620118878467615">"इनपुट डीव्हाइस कॅलिब्रेशन बदला"</string> + <string name="permlab_setInputCalibration" msgid="4902620118878467615">"इनपुट डिव्हाइस कॅलिब्रेशन बदला"</string> <string name="permdesc_setInputCalibration" msgid="4527511047549456929">"स्पर्श स्क्रीनची कॅलिब्रेशन प्राचले सुधारित करण्यासाठी अॅप ला अनुमती देते. सामान्य अॅप्स साठी कधीही आवश्यक नसते."</string> <string name="permlab_accessDrmCertificates" msgid="7436886640723203615">"DRM प्रमाणपत्रे अॅक्सेस करा"</string> <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"DRM प्रमाणपत्रांची तरतूद करण्यासाठी आणि वापरण्यासाठी अनुप्रयोगास अनुमती देते. सामान्य अॅप्सकरिता कधीही आवश्यकता नसते."</string> @@ -570,14 +569,14 @@ <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="6336255514635308054">"कोणत्याही चेतावणी शिवाय या वापरकर्त्याचा या टॅब्लेटवरील डेटा मिटवा."</string> <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2086473496848351810">"कोणत्याही चेतावणी शिवाय या वापरकर्त्याचा या टीव्ही वरील डेटा मिटवा."</string> <string name="policydesc_wipeData_secondaryUser" product="default" msgid="6787904546711590238">"कोणत्याही चेतावणी शिवाय या वापरकर्त्याचा या फोनवरील डेटा मिटवा."</string> - <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"डीव्हाइस समग्र प्रॉक्सी सेट करा"</string> - <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"धोरण सक्षम असताना वापरण्यासाठी डीव्हाइस समग्र प्रॉक्सी सेट करा. फक्त डीव्हाइस मालक समग्र प्रॉक्सी सेट करु शकतो."</string> + <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"डिव्हाइस समग्र प्रॉक्सी सेट करा"</string> + <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"धोरण सक्षम असताना वापरण्यासाठी डिव्हाइस समग्र प्रॉक्सी सेट करा. फक्त डिव्हाइस मालक समग्र प्रॉक्सी सेट करु शकतो."</string> <string name="policylab_expirePassword" msgid="5610055012328825874">"स्क्रीन लॉक संकेतशब्द कालबाह्यता सेट करा"</string> <string name="policydesc_expirePassword" msgid="5367525762204416046">"लॉक-स्क्रीन संकेतशब्द किती वारंवार बदलणे आवश्यक आहे ते बदला."</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"स्टोरेज एंक्रिप्शन सेट करा"</string> <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"स्टोअर केलेला अॅप डेटा एंक्रिप्ट केला जाणे आवश्यक आहे."</string> <string name="policylab_disableCamera" msgid="6395301023152297826">"कॅमेरे अक्षम करा"</string> - <string name="policydesc_disableCamera" msgid="2306349042834754597">"सर्व डीव्हाइस कॅमेर्यांचा वापर प्रतिबंधित करा."</string> + <string name="policydesc_disableCamera" msgid="2306349042834754597">"सर्व डिव्हाइस कॅमेर्यांचा वापर प्रतिबंधित करा."</string> <string name="policylab_disableKeyguardFeatures" msgid="8552277871075367771">"काही स्क्रीन लॉक वैशिष्ट्ये अक्षम करा"</string> <string name="policydesc_disableKeyguardFeatures" msgid="2044755691354158439">"काही स्क्रीन लॉक वैशिष्ट्यांचा वापर प्रतिबंधित करा."</string> <string-array name="phoneTypes"> @@ -1017,7 +1016,7 @@ <string name="whichImageCaptureApplicationLabel" msgid="6390303445371527066">"इमेज कॅप्चर करा"</string> <string name="alwaysUse" msgid="4583018368000610438">"या क्रियेसाठी डीफॉल्टनुसार वापरा."</string> <string name="use_a_different_app" msgid="8134926230585710243">"एक भिन्न अॅप वापरा"</string> - <string name="clearDefaultHintMsg" msgid="3252584689512077257">"डाउनलोड केलेल्या सिस्टीम सेटिंग्ज > Apps > मधील डीफॉल्ट साफ करा."</string> + <string name="clearDefaultHintMsg" msgid="3252584689512077257">"डाउनलोड केलेल्या सिस्टम सेटिंग्ज > Apps > मधील डीफॉल्ट साफ करा."</string> <string name="chooseActivity" msgid="7486876147751803333">"क्रिया निवडा"</string> <string name="chooseUsbActivity" msgid="6894748416073583509">"USB डिव्हाइससाठी अॅप निवडा"</string> <string name="noApplications" msgid="2991814273936504689">"कोणतेही अॅप्स ही क्रिया करू शकत नाहीत."</string> @@ -1028,7 +1027,7 @@ <string name="aerr_restart" msgid="7581308074153624475">"अॅप पुन्हा उघडा"</string> <string name="aerr_report" msgid="5371800241488400617">"अभिप्राय पाठवा"</string> <string name="aerr_close" msgid="2991640326563991340">"बंद करा"</string> - <string name="aerr_mute" msgid="1974781923723235953">"डीव्हाइस रीस्टार्ट होईपर्यंत म्युट करा"</string> + <string name="aerr_mute" msgid="1974781923723235953">"डिव्हाइस रीस्टार्ट होईपर्यंत म्युट करा"</string> <string name="aerr_wait" msgid="3199956902437040261">"प्रतीक्षा करा"</string> <string name="aerr_close_app" msgid="3269334853724920302">"अॅप बंद करा"</string> <string name="anr_title" msgid="4351948481459135709"></string> @@ -1045,7 +1044,7 @@ <string name="launch_warning_original" msgid="188102023021668683">"<xliff:g id="APP_NAME">%1$s</xliff:g> मूळतः लाँच केले."</string> <string name="screen_compat_mode_scale" msgid="3202955667675944499">"स्केल"</string> <string name="screen_compat_mode_show" msgid="4013878876486655892">"नेहमी दर्शवा"</string> - <string name="screen_compat_mode_hint" msgid="1064524084543304459">"सिस्टीम सेटिंग्ज > Apps > डाउनलोड केलेले मध्ये हे पुन्हा-सक्षम करा."</string> + <string name="screen_compat_mode_hint" msgid="1064524084543304459">"सिस्टम सेटिंग्ज > Apps > डाउनलोड केलेले मध्ये हे पुन्हा-सक्षम करा."</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> वर्तमान डिस्प्ले आकार सेटिंगला समर्थन देत नाही आणि अनपेक्षित वर्तन करू शकते."</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"नेहमी दर्शवा"</string> <string name="smv_application" msgid="3307209192155442829">"अॅप <xliff:g id="APPLICATION">%1$s</xliff:g> (प्रक्रिया <xliff:g id="PROCESS">%2$s</xliff:g>) ने तिच्या स्वयं-लागू केलेल्या StrictMode धोरणाचे उल्लंघन केले आहे."</string> @@ -1116,7 +1115,7 @@ <string name="wifi_no_internet" msgid="8451173622563841546">"वाय-फायवरून इंटरनेटवर अॅक्सेस नाही"</string> <string name="wifi_no_internet_detailed" msgid="8083079241212301741">"पर्यायांसाठी टॅप करा"</string> <string name="network_switch_metered" msgid="4671730921726992671">"<xliff:g id="NETWORK_TYPE">%1$s</xliff:g> वर स्विच केले"</string> - <string name="network_switch_metered_detail" msgid="5325661434777870353">"<xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> कडे इंटरनेट अॅक्सेस नसताना डीव्हाइस <xliff:g id="NEW_NETWORK">%1$s</xliff:g> वापरते. शुल्क लागू शकेल."</string> + <string name="network_switch_metered_detail" msgid="5325661434777870353">"<xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> कडे इंटरनेट अॅक्सेस नसताना डिव्हाइस <xliff:g id="NEW_NETWORK">%1$s</xliff:g> वापरते. शुल्क लागू शकेल."</string> <string name="network_switch_metered_toast" msgid="5779283181685974304">"<xliff:g id="PREVIOUS_NETWORK">%1$s</xliff:g> वरून <xliff:g id="NEW_NETWORK">%2$s</xliff:g> वर स्विच केले"</string> <string-array name="network_switch_type_name"> <item msgid="3979506840912951943">"मोबाइल डेटा"</item> @@ -1165,7 +1164,7 @@ <string name="sim_removed_message" msgid="2333164559970958645">"आपण एक वैध सिम कार्ड घालून प्रारंभ करेपर्यंत मोबाईल नेटवर्क अनुपलब्ध असेल."</string> <string name="sim_done_button" msgid="827949989369963775">"पूर्ण झाले"</string> <string name="sim_added_title" msgid="3719670512889674693">"सिम कार्ड जोडले"</string> - <string name="sim_added_message" msgid="6599945301141050216">"मोबाईल नेटवर्कवर अॅक्सेस करण्यासाठी तुमचे डीव्हाइस रीस्टार्ट करा."</string> + <string name="sim_added_message" msgid="6599945301141050216">"मोबाईल नेटवर्कवर अॅक्सेस करण्यासाठी तुमचे डिव्हाइस रीस्टार्ट करा."</string> <string name="sim_restart_button" msgid="4722407842815232347">"रीस्टार्ट"</string> <string name="carrier_app_dialog_message" msgid="7066156088266319533">"आपल्या नवीन सिमने योग्यरित्या कार्य करण्यासाठी, आपल्याला अॅप इंस्टॉल करण्याची आणि तो आपल्या वाहकामधून उघडण्याची आवश्यकता असेल."</string> <string name="carrier_app_dialog_button" msgid="7900235513678617329">"अॅप मिळवा"</string> @@ -1181,7 +1180,7 @@ <string name="no_permissions" msgid="7283357728219338112">"परवानग्या आवश्यक नाहीत"</string> <string name="perm_costs_money" msgid="4902470324142151116">"यासाठी आपले पैसे खर्च होऊ शकतात"</string> <string name="dlg_ok" msgid="7376953167039865701">"ठीक"</string> - <string name="usb_charging_notification_title" msgid="6895185153353640787">"USB हे डीव्हाइस चार्ज करत आहे"</string> + <string name="usb_charging_notification_title" msgid="6895185153353640787">"USB हे डिव्हाइस चार्ज करत आहे"</string> <string name="usb_supplying_notification_title" msgid="5310642257296510271">"USB संलग्न केलेल्या डिव्हाइसला पॉवरचा पुरवठा करीत आहे"</string> <string name="usb_mtp_notification_title" msgid="8396264943589760855">"स्थानांतरणासाठी USB"</string> <string name="usb_ptp_notification_title" msgid="1347328437083192112">"फोटो स्थानांतरणासाठी USB"</string> @@ -1219,8 +1218,8 @@ <string name="ext_media_unmountable_notification_message" msgid="2343202057122495773">"<xliff:g id="NAME">%s</xliff:g> दूषित आहे. निराकरण करण्यासाठी टॅप करा."</string> <string name="ext_media_unmountable_notification_message" product="tv" msgid="3941179940297874950">"<xliff:g id="NAME">%s</xliff:g> दूषित आहे. निश्चित करण्यासाठी निवडा."</string> <string name="ext_media_unsupported_notification_title" msgid="3797642322958803257">"<xliff:g id="NAME">%s</xliff:g> असमर्थित"</string> - <string name="ext_media_unsupported_notification_message" msgid="6121601473787888589">"हे डीव्हाइस <xliff:g id="NAME">%s</xliff:g> ला सपोर्ट करत नाही. सपोर्ट असलेल्या फॉरमॅटमध्ये सेट करण्यासाठी टॅप करा."</string> - <string name="ext_media_unsupported_notification_message" product="tv" msgid="3725436899820390906">"हे डीव्हाइस <xliff:g id="NAME">%s</xliff:g> ला सपोर्ट करत नाही. सपोर्ट असलेल्या फॉरमॅटमध्ये सेट करण्यासाठी निवडा."</string> + <string name="ext_media_unsupported_notification_message" msgid="6121601473787888589">"हे डिव्हाइस <xliff:g id="NAME">%s</xliff:g> ला सपोर्ट करत नाही. सपोर्ट असलेल्या फॉरमॅटमध्ये सेट करण्यासाठी टॅप करा."</string> + <string name="ext_media_unsupported_notification_message" product="tv" msgid="3725436899820390906">"हे डिव्हाइस <xliff:g id="NAME">%s</xliff:g> ला सपोर्ट करत नाही. सपोर्ट असलेल्या फॉरमॅटमध्ये सेट करण्यासाठी निवडा."</string> <string name="ext_media_badremoval_notification_title" msgid="3206248947375505416">"<xliff:g id="NAME">%s</xliff:g> अनपेक्षितरित्या काढले"</string> <string name="ext_media_badremoval_notification_message" msgid="380176703346946313">"डेटा गमावणे टाळण्यासाठी काढण्यापूर्वी <xliff:g id="NAME">%s</xliff:g> अनमाउंट करा"</string> <string name="ext_media_nomedia_notification_title" msgid="1704840188641749091">"<xliff:g id="NAME">%s</xliff:g> काढले"</string> @@ -1231,7 +1230,7 @@ <string name="ext_media_unmount_action" msgid="1121883233103278199">"बाहेर काढा"</string> <string name="ext_media_browse_action" msgid="8322172381028546087">"एक्सप्लोर करा"</string> <string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> गहाळ आहे"</string> - <string name="ext_media_missing_message" msgid="5761133583368750174">"हे डीव्हाइस पुन्हा घाला"</string> + <string name="ext_media_missing_message" msgid="5761133583368750174">"हे डिव्हाइस पुन्हा घाला"</string> <string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> हलवित आहे"</string> <string name="ext_media_move_title" msgid="1022809140035962662">"डेटा हलवित आहे"</string> <string name="ext_media_move_success_title" msgid="8575300932957954671">"हलविणे पूर्ण"</string> @@ -1631,7 +1630,7 @@ <string name="package_installed_device_owner" msgid="6875717669960212648">"आपल्या प्रशासकाने इंस्टॉल केले"</string> <string name="package_updated_device_owner" msgid="1847154566357862089">"आपल्या प्रशासकाने अपडेट केले"</string> <string name="package_deleted_device_owner" msgid="2307122077550236438">"आपल्या प्रशासकाने हटवले"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"बॅटरी लाइफ सुधारित करण्यासाठी, बॅटरी सेव्हर तुमच्या डीव्हाइस ची कामगिरी कमी करतो आणि कंपन, स्थान सेवा आणि बराच पार्श्वभूमी डेटा मर्यादित करतो. सिंकवर अवलंबून असणारे ईमेल, मेसेजिंग आणि इतर अॅप्स तुम्ही उघडल्याशिवाय अपडेट होऊ शकत नाहीत.\n\nतुमचे डीव्हाइस चार्ज होत असते तेव्हा बॅटरी सेव्हर आपोआप बंद होतो."</string> + <string name="battery_saver_description" msgid="1960431123816253034">"बॅटरी लाइफ सुधारित करण्यासाठी, बॅटरी सेव्हर तुमच्या डिव्हाइस ची कामगिरी कमी करतो आणि कंपन, स्थान सेवा आणि बराच पार्श्वभूमी डेटा मर्यादित करतो. सिंकवर अवलंबून असणारे ईमेल, मेसेजिंग आणि इतर अॅप्स तुम्ही उघडल्याशिवाय अपडेट होऊ शकत नाहीत.\n\nतुमचे डिव्हाइस चार्ज होत असते तेव्हा बॅटरी सेव्हर आपोआप बंद होतो."</string> <string name="data_saver_description" msgid="6015391409098303235">"डेटा वापर कमी करण्यात मदत करण्यासाठी, डेटा सर्व्हर काही अॅप्सना पार्श्वभूमीमध्ये डेटा पाठविण्यास किंवा प्राप्त करण्यास प्रतिबंधित करतो. आपण सध्या वापरत असलेला अॅप डेटामध्ये प्रवेश करू शकतो परंतु तसे तो खूप कमी वेळा करू शकतो. याचा अर्थ, उदाहरणार्थ, आपण इमेज टॅप करेपर्यंत त्या प्रदर्शित करणार नाहीत असा असू शकतो."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"डेटा बचतकर्ता चालू करायचा?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"चालू करा"</string> @@ -1732,7 +1731,7 @@ <string name="app_info" msgid="6856026610594615344">"अॅप माहिती"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="demo_starting_message" msgid="5268556852031489931">"डेमो प्रारंभ करत आहे..."</string> - <string name="demo_restarting_message" msgid="952118052531642451">"डीव्हाइस रीसेट करत आहे..."</string> + <string name="demo_restarting_message" msgid="952118052531642451">"डिव्हाइस रीसेट करत आहे..."</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> अक्षम केले"</string> <string name="conference_call" msgid="3751093130790472426">"परिषद कॉल"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"टूलटिप"</string> @@ -1744,7 +1743,7 @@ <string name="app_category_news" msgid="7496506240743986873">"बातम्या आणि मासिके"</string> <string name="app_category_maps" msgid="5878491404538024367">"नकाशे आणि नेव्हिगेशन"</string> <string name="app_category_productivity" msgid="3742083261781538852">"उत्पादनक्षमता"</string> - <string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"डीव्हाइस स्टोरेज"</string> + <string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"डिव्हाइस स्टोरेज"</string> <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB डीबगिंग"</string> <string name="time_picker_hour_label" msgid="2979075098868106450">"तास"</string> <string name="time_picker_minute_label" msgid="5168864173796598399">"मिनिट"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index b17abd709e28..67d81d439318 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Tetapan"</string> <string name="global_action_assist" msgid="3892832961594295030">"Bantu"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kunci semua"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Pemberitahuan baharu"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Papan kekunci maya"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 79bdc566291c..d4325057468d 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ဆက်တင်များ"</string> <string name="global_action_assist" msgid="3892832961594295030">"အကူအညီ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"အသံ အကူအညီ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ချိပ်ပိတ်ရန်"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"၉၉၉+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"အကြောင်းကြားချက်အသစ်"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ပကတိအသွင်ကီးဘုတ်"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index de6a9a820933..07a622cddeb3 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Innstillinger"</string> <string name="global_action_assist" msgid="3892832961594295030">"Hjelp"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Talehjelp"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Start låsing"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nytt varsel"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelt tastatur"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index ce3683f281f3..581f34410cda 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"सेटिङ्हरू"</string> <string name="global_action_assist" msgid="3892832961594295030">"सहायता दिनुहोस्"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"आवाज सहायता"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"लकडाउन प्रविष्ट गर्नुहोस्"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"९९९+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"नयाँ सूचना"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"भर्चुअल किबोर्ड"</string> @@ -353,7 +352,7 @@ <string name="permdesc_writeSettings" msgid="7775723441558907181">"प्रणालीका सेटिङ डेटालाई परिवर्तन गर्नको लागि अनुप्रयोगलाई अनुमति दिन्छ। खराब अनुप्रयोगहरूले सायद तपाईँको प्रणालीको कन्फिगरेसनलाई क्षति पुर्याउन सक्छन्।"</string> <string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"स्टार्टअपमा चलाउनुहोस्"</string> <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"आनुप्रयोगलाई प्रणाली बुट प्रक्रिया पूर्ण हुने बितिकै आफैलाई सुरु गर्ने अनुमति दिन्छ। यसले ट्याब्लेट सुरु गर्नमा ढिला गर्न सक्दछ र अनुप्रयोगलाई समग्रमा ट्याब्लेट सधैँ चालु गरेर ढिला बनाउँदछ।"</string> - <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"अनुप्रयोगलाई अनुमति दिन्छ प्रणालीले बुटिङ सकेपछि आफै सुरूवात हुन। यसले TV सुरू गर्न लामो समय लिन सक्छ र अनुप्रयोगहरूलाई अनुमति दिन सक्छ सँधै सञ्चालन भई समग्र रूपमा ट्याब्लेटलाई ढिलो गराएर।"</string> + <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"अनुप्रयोगलाई अनुमति दिन्छ प्रणालीले बुटिङ सकेपछि आफै सुरुवात हुन। यसले TV सुरु गर्न लामो समय लिन सक्छ र अनुप्रयोगहरूलाई अनुमति दिन सक्छ सँधै सञ्चालन भई समग्र रूपमा ट्याब्लेटलाई ढिलो गराएर।"</string> <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"अनुप्रयोगलाई प्रणाली बुट गरी सकेपछि जति सक्दो चाँडो आफैंमा सुरु गर्न अनुमति दिन्छ। यसले फोन सुरु गर्नमा ढिला गर्न सक्दछ र अनप्रयोगलाई समग्रमा फोन सधैँ चालु गरेर ढिला बनाउँदछ।"</string> <string name="permlab_broadcastSticky" msgid="7919126372606881614">"स्टिकि प्रसारण पठाउनुहोस्"</string> <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"औपचारिक प्रसारणलाई पठाउनको लागि एउटा अनुप्रयोगलाई अनुमति दिन्छ, जुन प्रसारण समाप्त भएपछि बाँकी रहन्छ। अत्यधिक प्रयोगले धेरै मेमोरी प्रयोग गरेको कारणले ट्याब्लेटलाई ढिलो र अस्थिर बनाउन सक्छ।"</string> @@ -1172,7 +1171,7 @@ <string name="sim_done_button" msgid="827949989369963775">"भयो"</string> <string name="sim_added_title" msgid="3719670512889674693">"SIM कार्ड थप गरियो"</string> <string name="sim_added_message" msgid="6599945301141050216">"मोबाइल नेटवर्क पहुँच गर्न तपाईँको उपकरण पुनःस्टार्ट गर्नुहोस्।"</string> - <string name="sim_restart_button" msgid="4722407842815232347">"पुनः सुरू गर्नुहोस्"</string> + <string name="sim_restart_button" msgid="4722407842815232347">"पुनः सुरु गर्नुहोस्"</string> <string name="carrier_app_dialog_message" msgid="7066156088266319533">"तपाईंको नयाँ SIM ले राम्रोसँग काम गर्न, तपाईंले आफ्नो वाहक मार्फत अनुप्रयोग स्थापना र खोल्न आवश्यक हुनेछ।"</string> <string name="carrier_app_dialog_button" msgid="7900235513678617329">"अनुप्रयोग प्राप्त गर्नुहोस्"</string> <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"अहिले होइन"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 123d2917d2ed..45dd701bb24c 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Instellingen"</string> <string name="global_action_assist" msgid="3892832961594295030">"Helpen"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Spraakassistent"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Afschermen activeren"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nieuwe melding"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtueel toetsenbord"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 8c428088fd67..bc09332a3e38 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ਸੈਟਿੰਗਾਂ"</string> <string name="global_action_assist" msgid="3892832961594295030">"ਸਹਾਇਤਾ ਕਰੋ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ਅਵਾਜ਼ੀ ਸਹਾਇਕ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ਲਾਕਡਾਊਨ ਦਾਖਲ ਕਰੋ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ਨਵੀਂ ਸੂਚਨਾ"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ਆਭਾਸੀ ਕੀ-ਬੋਰਡ"</string> @@ -294,14 +293,14 @@ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"ਡਿਸਪਲੇ ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨਾ"</string> <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ਡਿਸਪਲੇ ਦੇ ਜ਼ੂਮ ਪੱਧਰ ਅਤੇ ਸਥਿਤੀ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ।"</string> <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"ਸੰਕੇਤ ਕਰਦੀ ਹੈ"</string> - <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"ਟੈਪ ਕਰ ਸਕਦੀ ਹੈ, ਸਵਾਈਪ ਕਰ ਸਕਦੀ ਹੈ, ਪਿੰਚ ਕਰ ਸਕਦੀ ਹੈ, ਅਤੇ ਹੋਰ ਸੰਕੇਤ ਕਰ ਸਕਦੀ ਹੈ।"</string> + <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"ਟੈਪ ਕਰ ਸਕਦੀ ਹੈ, ਸਵਾਈਪ ਕਰ ਸਕਦੀ ਹੈ, ਚੂੰਢੀ ਭਰ ਸਕਦੀ ਹੈ, ਅਤੇ ਹੋਰ ਸੰਕੇਤ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਕੇਤ"</string> <string name="capability_desc_canCaptureFingerprintGestures" msgid="7102111919385702482">"ਡੀਵਾਈਸਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਕੀਤੇ ਗਏ ਸੰਕੇਤਾਂ ਨੂੰ ਕੈਪਚਰ ਕਰ ਸਕਦੀ ਹੈ।"</string> - <string name="permlab_statusBar" msgid="7417192629601890791">"ਸਥਿਤੀ ਬਾਰ ਅਸਮਰੱਥ ਬਣਾਓ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string> - <string name="permdesc_statusBar" msgid="8434669549504290975">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਪੱਟੀ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਜਾਂ ਸਿਸਟਮ ਆਈਕਨਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਅਤੇ ਹਟਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> + <string name="permlab_statusBar" msgid="7417192629601890791">"ਸਥਿਤੀ ਪੱਟੀ ਬੰਦ ਕਰੋ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string> + <string name="permdesc_statusBar" msgid="8434669549504290975">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਪੱਟੀ ਨੂੰ ਚਾਲੂ ਕਰਨ ਜਾਂ ਸਿਸਟਮ ਪ੍ਰਤੀਕਾਂ ਨੂੰ ਜੋੜਨ ਅਤੇ ਹਟਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> <string name="permlab_statusBarService" msgid="4826835508226139688">"ਸਥਿਤੀ ਪੱਟੀ ਬਣਨ ਦਿਓ"</string> - <string name="permdesc_statusBarService" msgid="716113660795976060">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਬਾਰ ਹੋਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> - <string name="permlab_expandStatusBar" msgid="1148198785937489264">"ਸਥਿਤੀ ਪੱਟੀ ਦਾ ਵਿਸਤਾਰ/ਸੰਖਿਪਤ ਕਰੋ"</string> + <string name="permdesc_statusBarService" msgid="716113660795976060">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਪੱਟੀ ਹੋਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> + <string name="permlab_expandStatusBar" msgid="1148198785937489264">"ਸਥਿਤੀ ਪੱਟੀ ਦਾ ਵਿਸਤਾਰ/ਨਸ਼ਟ ਕਰੋ"</string> <string name="permdesc_expandStatusBar" msgid="6917549437129401132">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਪੱਟੀ ਦਾ ਵਿਸਤਾਰ ਕਰਨ ਜਾਂ ਨਸ਼ਟ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> <string name="permlab_install_shortcut" msgid="4279070216371564234">"ਸ਼ਾਰਟਕੱਟ ਸਥਾਪਤ ਕਰੋ"</string> <string name="permdesc_install_shortcut" msgid="8341295916286736996">"ਇੱਕ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਵਰਤੋਂਕਾਰ ਦੇ ਦਖ਼ਲ ਤੋਂ ਬਿਨਾਂ ਹੋਮਸਕ੍ਰੀਨ ਸ਼ਾਰਟਕੱਟ ਸ਼ਾਮਲ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> @@ -371,7 +370,7 @@ <string name="permdesc_readCallLog" msgid="3204122446463552146">"ਇਹ ਐਪ ਤੁਹਾਡਾ ਕਾਲ ਇਤਿਹਾਸ ਪੜ੍ਹ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"ਕਾਲ ਲੌਗ ਲਿਖੋ"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡਾਟਾ ਸਮੇਤ। ਖਰਾਬ ਐਪਾਂ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> - <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ TV ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡਾਟਾ ਸਮੇਤ। ਖਰਾਬ ਐਪਾਂ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> + <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਟੀਵੀ ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡਾਟਾ ਸਮੇਤ। ਖਰਾਬ ਐਪਾਂ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡਾਟਾ ਸਮੇਤ। ਖਰਾਬ ਐਪਾਂ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"ਸਰੀਰ ਸੰਵੇਦਕਾਂ \'ਤੇ ਪਹੁੰਚ ਕਰੋ (ਜਿਵੇਂ ਦਿਲ ਦੀ ਧੜਕਣ ਦੇ ਨਿਰੀਖਕ)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"ਐਪ ਨੂੰ ਉਹਨਾਂ ਸੰਵੇਦਕਾਂ ਦੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜੋ ਤੁਹਾਡੀ ਸਰੀਰਕ ਸਥਿਤੀ ਦਾ ਨਿਰੀਖਣ ਕਰ ਸਕਦੇ ਹਨ, ਜਿਵੇਂ ਤੁਹਾਡੇ ਦਿਲ ਦੀ ਧੜਕਣ।"</string> @@ -491,7 +490,7 @@ <string name="fingerprint_icon_content_description" msgid="2340202869968465936">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਪ੍ਰਤੀਕ"</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"ਸਿੰਕ ਸੈਟਿੰਗਾਂ ਪੜ੍ਹੋ"</string> <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"ਐਪ ਨੂੰ ਕਿਸੇ ਖਾਤੇ ਲਈ ਸਮਕਾਲੀਕਰਨ ਸੈਟਿੰਗਾਂ ਪੜ੍ਹਨ ਦੇ ਯੋਗ ਬਣਾਉਂਦਾ ਹੈ। ਉਦਾਹਰਨ ਲਈ, ਇਹ ਪਤਾ ਕਰ ਸਕਦਾ ਹੈ ਕਿ People ਐਪ ਦਾ ਕਿਸੇ ਖਾਤੇ ਨਾਲ ਸਮਕਾਲੀਕਿਰਤ ਕੀਤਾ ਗਿਆ ਹੈ ਜਾਂ ਨਹੀਂ।"</string> - <string name="permlab_writeSyncSettings" msgid="5408694875793945314">"ਸਿੰਕ ਟੌਗਲ ਚਾਲੂ ਅਤੇ ਬੰਦ"</string> + <string name="permlab_writeSyncSettings" msgid="5408694875793945314">"ਸਮਕਾਲੀਕਰਨ ਚਾਲੂ ਅਤੇ ਬੰਦ ਨੂੰ ਟੌਗਲ ਕਰੋ"</string> <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"ਐਪ ਨੂੰ ਇੱਕ ਖਾਤੇ ਲਈ ਸਮਕਾਲੀਕਰਨ ਸੈਟਿੰਗਾਂ ਸੋਧਣ ਦੇ ਯੋਗ ਬਣਾਉਂਦਾ ਹੈ। ਉਦਾਹਰਨ ਲਈ, ਇਸਦੀ ਵਰਤੋਂ ਕਿਸੇ ਖਾਤੇ ਨਾਲ People ਐਪ ਦਾ ਸਮਕਾਲੀਕਰਨ ਚਾਲੂ ਕਰਨ ਲਈ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"ਸਿੰਕ ਅੰਕੜੇ ਪੜ੍ਹੋ"</string> <string name="permdesc_readSyncStats" msgid="1510143761757606156">"ਐਪ ਨੂੰ ਇੱਕ ਖਾਤੇ ਲਈ ਸਮਕਾਲੀਕਰਨ ਸਥਿਤੀ ਪੜ੍ਹਨ ਦੇ ਯੋਗ ਬਣਾਉਂਦਾ ਹੈ, ਇਸ ਵਿੱਚ ਸਮਕਾਲੀਕਰਨ ਵਰਤਾਰਿਆਂ ਦਾ ਇਤਿਹਾਸ ਅਤੇ ਕਿੰਨੇ ਡਾਟਾ ਦਾ ਸਮਕਾਲੀਕਿਰਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਵੀ ਸ਼ਾਮਲ ਹੈ।"</string> @@ -550,7 +549,7 @@ <string name="permlab_access_notification_policy" msgid="4247510821662059671">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string> <string name="permdesc_access_notification_policy" msgid="3296832375218749580">"ਐਪ ਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਕੌਂਫਿਗਰੇਸ਼ਨ ਨੂੰ ਪੜ੍ਹਨ ਅਤੇ ਲਿਖਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"ਪਾਸਵਰਡ ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</string> - <string name="policydesc_limitPassword" msgid="2502021457917874968">"ਸਕ੍ਰੀਨ ਲੌਕ ਪਾਸਵਰਡਾਂ ਅਤੇ ਪਿੰਨ ਵਿੱਚ ਆਗਿਆ ਦਿੱਤੀ ਲੰਮਾਈ ਅਤੇ ਅੱਖਰਾਂ ਤੇ ਨਿਯੰਤਰਣ ਪਾਓ।"</string> + <string name="policydesc_limitPassword" msgid="2502021457917874968">"ਸਕ੍ਰੀਨ ਲਾਕ ਪਾਸਵਰਡਾਂ ਅਤੇ ਪਿੰਨ ਵਿੱਚ ਆਗਿਆ ਦਿੱਤੀ ਲੰਮਾਈ ਅਤੇ ਅੱਖਰਾਂ ਤੇ ਨਿਯੰਤਰਣ ਪਾਓ।"</string> <string name="policylab_watchLogin" msgid="5091404125971980158">"ਸਕ੍ਰੀਨ ਅਣਲਾਕ ਕਰਨ ਦੀਆਂ ਕੋਸ਼ਿਸ਼ਾਂ \'ਤੇ ਨਿਗਰਾਨੀ ਰੱਖੋ"</string> <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕਰਦੇ ਹੋਏ ਟਾਈਪ ਕੀਤੇ ਗਲਤ ਪਾਸਵਰਡਾਂ ਦੀ ਸੰਖਿਆ ਦਾ ਨਿਰੀਖਣ ਕਰੋ ਅਤੇ ਟੈਬਲੈੱਟ ਨੂੰ ਲਾਕ ਕਰੋ ਜਾਂ ਟੈਬਲੈੱਟ ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ, ਜੇਕਰ ਬਹੁਤ ਜ਼ਿਆਦਾ ਗਲਤ ਪਾਸਵਰਡ ਟਾਈਪ ਕੀਤੇ ਹਨ।"</string> <string name="policydesc_watchLogin" product="TV" msgid="2707817988309890256">"ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਦੇ ਸਮੇਂ ਟਾਈਪ ਕੀਤੇ ਗ਼ਲਤ ਪਾਸਵਰਡਾਂ ਦੀ ਸੰਖਿਆ ਦਾ ਨਿਰੀਖਣ ਕਰੋ ਅਤੇ TV ਨੂੰ ਲੌਕ ਕਰੋ ਜਾਂ TV ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ ਜੇਕਰ ਬਹੁਤ ਜ਼ਿਆਦਾ ਗ਼ਲਤ ਪਾਸਵਰਡ ਟਾਈਪ ਕੀਤੇ ਹਨ।"</string> @@ -730,11 +729,11 @@ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"ਪਲੇ ਕਰੋ"</string> <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"ਰੋਕੋ"</string> <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"ਰੀਵਾਈਂਡ ਕਰੋ"</string> - <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"ਅੱਗੇ ਭੇਜੋ"</string> + <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"ਤੇਜ਼ੀ ਨਾਲ ਅੱਗੇ ਭੇਜੋ"</string> <string name="emergency_calls_only" msgid="6733978304386365407">"ਕੇਵਲ ਐਮਰਜੈਂਸੀ ਕਾਲਾਂ"</string> <string name="lockscreen_network_locked_message" msgid="143389224986028501">"ਨੈੱਟਵਰਕ ਲੌਕ ਕੀਤਾ"</string> <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM ਕਾਰਡ PUK-ਲੌਕਡ ਹੈ।"</string> - <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"ਉਪਭੋਗਤਾ ਗਾਈਡ ਦੇਖੋ ਜਾਂ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਫੋਨ ਕਰੋ।"</string> + <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"ਵਰਤੋਂਕਾਰ ਗਾਈਡ ਦੇਖੋ ਜਾਂ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਫ਼ੋਨ ਕਰੋ।"</string> <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM ਕਾਰਡ ਲੌਕ ਕੀਤਾ ਹੋਇਆ ਹੈ।"</string> <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"SIM ਕਾਰਡ ਅਨਲੌਕ ਕਰ ਰਿਹਾ ਹੈ…"</string> <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"ਤੁਸੀਂ <xliff:g id="NUMBER_0">%1$d</xliff:g> ਵਾਰ ਆਪਣਾ ਅਣਲਾਕ ਪੈਟਰਨ ਗਲਤ ਢੰਗ ਨਾਲ ਉਲੀਕਿਆ ਹੈ। \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string> @@ -853,7 +852,7 @@ <string name="search_go" msgid="8298016669822141719">"ਖੋਜੋ"</string> <string name="search_hint" msgid="1733947260773056054">"ਖੋਜ…"</string> <string name="searchview_description_search" msgid="6749826639098512120">"ਖੋਜੋ"</string> - <string name="searchview_description_query" msgid="5911778593125355124">"ਸਵਾਲ ਖੋਜੋ"</string> + <string name="searchview_description_query" msgid="5911778593125355124">"ਖੋਜ ਪੁੱਛਗਿੱਛ"</string> <string name="searchview_description_clear" msgid="1330281990951833033">"ਸਵਾਲ ਹਟਾਓ"</string> <string name="searchview_description_submit" msgid="2688450133297983542">"ਸਵਾਲ ਪ੍ਰਸਤੁਤ ਕਰੋ"</string> <string name="searchview_description_voice" msgid="2453203695674994440">"ਵੌਇਸ ਖੋਜ"</string> @@ -964,7 +963,7 @@ <string name="copy" msgid="2681946229533511987">"ਕਾਪੀ ਕਰੋ"</string> <string name="failed_to_copy_to_clipboard" msgid="1833662432489814471">"ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string> <string name="paste" msgid="5629880836805036433">"ਪੇਸਟ ਕਰੋ"</string> - <string name="paste_as_plain_text" msgid="5427792741908010675">"ਸਧਾਰਨ ਲਿਖਤ ਦੇ ਤੌਰ \'ਤੇ ਪੇਸਟ ਕਰੋ"</string> + <string name="paste_as_plain_text" msgid="5427792741908010675">"ਸਰਲ ਲਿਖਤ ਦੇ ਤੌਰ \'ਤੇ ਪੇਸਟ ਕਰੋ"</string> <string name="replace" msgid="5781686059063148930">"ਬਦਲੋ…"</string> <string name="delete" msgid="6098684844021697789">"ਮਿਟਾਓ"</string> <string name="copyUrl" msgid="2538211579596067402">"URL ਕਾਪੀ ਕਰੋ"</string> @@ -1374,7 +1373,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"ਹੋਰ ਚੋਣਾਂ"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="3570990907910199483">"ਸਾਂਝੀ ਕੀਤੀ ਗਈ ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string> + <string name="storage_internal" msgid="3570990907910199483">"ਅੰਦਰੂਨੀ ਸਾਂਝੀ ਕੀਤੀ ਸਟੋਰੇਜ"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD ਕਾਰਡ"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD ਕਾਰਡ"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ਡ੍ਰਾਇਵ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 0f4e2e87d7c6..5bca5a95dd13 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ustawienia"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoc"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asystent głosowy"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Użyj blokady"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nowe powiadomienie"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Klawiatura wirtualna"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index bb370553763c..43c0bb177f7c 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configurações"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistência"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Bloqueio. total"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nova notificação"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 60d79000b8e9..d130f978c3e6 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Definições"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistência"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. de voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Ativar bloqueio"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nova notificação"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index bb370553763c..43c0bb177f7c 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configurações"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistência"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Bloqueio. total"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nova notificação"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 81ab4dd6a3e3..d49694152cc2 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Setări"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistență"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistent vocal"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Introduceți blocarea"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"˃999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificare nouă"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastatură virtuală"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index b01a6fc23888..564dbbb23dbb 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Настройки"</string> <string name="global_action_assist" msgid="3892832961594295030">"Помощник"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Аудиоподсказки"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Заблокировать"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Новое уведомление"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуальная клавиатура"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 25558253e5b0..39caed3a91bf 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"සැකසීම්"</string> <string name="global_action_assist" msgid="3892832961594295030">"සහාය දීම"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"හඬ සහායක"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"අගුලු දැමීමට යන්න"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"නව දැනුම්දීම"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"අතථ්ය යතුරු පුවරුව"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 4bf240a10f22..11b9c88d3a71 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Nastavenia"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomôcť"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Hlasový asistent"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Uzamknúť"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nové upozornenie"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuálna klávesnica"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 31582d240b6f..71b7126ab8f7 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Nastavitve"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoč"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Glas. pomočnik"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Vklopi zaklep"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Novo obvestilo"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Navidezna tipkovnica"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index d9bbed001ada..3ad574a1bfca 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Cilësimet"</string> <string name="global_action_assist" msgid="3892832961594295030">"Ndihma"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ndihma zanore"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kyç"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Njoftim i ri"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastiera virtuale"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 138df3b8bd69..f9b865d2fff2 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Подешавања"</string> <string name="global_action_assist" msgid="3892832961594295030">"Помоћ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помоћ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Закључај"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ново обавештење"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуелна тастатура"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 0edf2773e2b3..3f7cecb94fc6 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Inställningar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Hjälp"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Ange låsning"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ny avisering"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuellt tangentbord"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 08d930a7456c..8bda7f84f55f 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -228,8 +228,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Mipangilio"</string> <string name="global_action_assist" msgid="3892832961594295030">"Mapendekezo"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Usaidizi wa Sauti"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Weka kipengele cha kufunga"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Arifa mpya"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Kibodi pepe"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index c76f53f3c2b7..9405608cf48a 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"அமைப்பு"</string> <string name="global_action_assist" msgid="3892832961594295030">"உதவி"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"குரல் உதவி"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"பூட்டினை அமை"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"புதிய அறிவிப்பு"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"விர்ச்சுவல் விசைப்பலகை"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 1117cea64ecd..bd984c534cef 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"సెట్టింగ్లు"</string> <string name="global_action_assist" msgid="3892832961594295030">"సహాయం"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"వాయిస్ అసిస్టెంట్"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"లాక్డౌన్ నమోదు చేయండి"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"కొత్త నోటిఫికేషన్"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"వర్చువల్ కీబోర్డ్"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index dd1b62deef45..2653dea7f729 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"การตั้งค่า"</string> <string name="global_action_assist" msgid="3892832961594295030">"ผู้ช่วย"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ตัวช่วยเสียง"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ป้อนการปิดล็อก"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"การแจ้งเตือนใหม่"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"แป้นพิมพ์เสมือน"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 1a8751f544c9..da41b9e87ef3 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Mga Setting"</string> <string name="global_action_assist" msgid="3892832961594295030">"Tulong"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Mag-lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Bagong notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual na keyboard"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 803233850a15..41a3eae12eca 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ayarlar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Sesli Yardım"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Tam kilitlemeye geç"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Yeni bildirim"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Sanal klavye"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index ee06099e54af..f0e2c1dd3bdd 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Налаштування"</string> <string name="global_action_assist" msgid="3892832961594295030">"Підказки"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Голос. підказки"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Введіть код блокування"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Нове сповіщення"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Віртуальна клавіатура"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index df6af2b69e9b..2d9717d4861e 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ترتیبات"</string> <string name="global_action_assist" msgid="3892832961594295030">"اسسٹ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"مقفل درج کریں"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"نئی اطلاع"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ورچوئل کی بورڈ"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index d91b8f43b9ea..f639e800d054 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Sozlamalar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Yordam"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ovozli yordam"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Bloklash"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Yangi bildirishnoma"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual klaviatura"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 08c257d57ee8..58e0e34a24eb 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Cài đặt"</string> <string name="global_action_assist" msgid="3892832961594295030">"Hỗ trợ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Trợ lý thoại"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Nhập khóa"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Thông báo mới"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Bàn phím ảo"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 2f6439aafd7e..e87f76cdc5ac 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"设置"</string> <string name="global_action_assist" msgid="3892832961594295030">"助理"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"语音助理"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"进入锁定模式"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"新通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虚拟键盘"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 69133b82559c..56ea6a05dc16 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"設定"</string> <string name="global_action_assist" msgid="3892832961594295030">"協助"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"語音助手"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"輸入鎖定項目"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"新通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虛擬鍵盤"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index b34d1ef32f70..17c80b5c15f4 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"設定"</string> <string name="global_action_assist" msgid="3892832961594295030">"協助"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"語音小幫手"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"輸入鎖定"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"超過 999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"新通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虛擬鍵盤"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 6ddddfb6a9aa..88fb1d78aa86 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Izilungiselelo"</string> <string name="global_action_assist" msgid="3892832961594295030">"Siza"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Isisekeli sezwi"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Faka iukhiye"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Isaziso esisha"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Ikhibhodi ebonakalayo"</string> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index bd5b7116c435..7416113b4e90 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3785,15 +3785,18 @@ a headphone or other wired audio output jack. [CHAR LIMIT=50] --> <string name="default_audio_route_name" product="default">Phone</string> + <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] --> + <string name="default_audio_route_name_dock_speakers">Dock speakers</string> + + <!-- Name of the default audio route when HDMI is connected. [CHAR LIMIT=50] --> + <string name="default_audio_route_name_hdmi">HDMI</string> + <!-- Name of the default audio route when wired headphones are connected. [CHAR LIMIT=50] --> <string name="default_audio_route_name_headphones">Headphones</string> - <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] --> - <string name="default_audio_route_name_dock_speakers">Dock speakers</string> - - <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] --> - <string name="default_media_route_name_hdmi">HDMI</string> + <!-- Name of the default audio route when USB is connected. [CHAR LIMIT=50] --> + <string name="default_audio_route_name_usb">USB</string> <!-- Name of the default audio route category. [CHAR LIMIT=50] --> <string name="default_audio_route_category_name">System</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 435b122bf744..c4a45ee11098 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1025,9 +1025,10 @@ <java-symbol type="string" name="granularity_label_link" /> <java-symbol type="string" name="granularity_label_line" /> <java-symbol type="string" name="default_audio_route_name" /> - <java-symbol type="string" name="default_audio_route_name_headphones" /> <java-symbol type="string" name="default_audio_route_name_dock_speakers" /> - <java-symbol type="string" name="default_media_route_name_hdmi" /> + <java-symbol type="string" name="default_audio_route_name_hdmi" /> + <java-symbol type="string" name="default_audio_route_name_headphones" /> + <java-symbol type="string" name="default_audio_route_name_usb" /> <java-symbol type="string" name="default_audio_route_category_name" /> <java-symbol type="string" name="stk_cc_ss_to_dial" /> <java-symbol type="string" name="stk_cc_ss_to_ss" /> diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java index 0a89b7409250..b8fa06c6e1c3 100644 --- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java +++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java @@ -871,7 +871,7 @@ public class PackageManagerTests extends AndroidTestCase { receiver = new InstallReceiver(ip.pkg.packageName); } try { - invokeInstallPackage(ip.packageURI, flags, receiver, replace); + invokeInstallPackage(ip.packageURI, flags, receiver, true); if (replace) { assertInstall(ip.pkg, flags, ip.pkg.installLocation); } @@ -881,7 +881,7 @@ public class PackageManagerTests extends AndroidTestCase { } @LargeTest - public void testReplaceFailNormalInternal() throws Exception { + public void testReplaceFlagDoesNotNeedToBeSet() throws Exception { sampleReplaceFromRawResource(0); } diff --git a/core/tests/coretests/src/android/text/format/FormatterTest.java b/core/tests/coretests/src/android/text/format/FormatterTest.java index ff75c29cc112..24e3646e02fc 100644 --- a/core/tests/coretests/src/android/text/format/FormatterTest.java +++ b/core/tests/coretests/src/android/text/format/FormatterTest.java @@ -17,10 +17,12 @@ package android.text.format; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; +import android.icu.util.MeasureUnit; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; @@ -32,6 +34,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.util.Locale; +import java.util.Set; + @SmallTest @RunWith(AndroidJUnit4.class) @@ -205,4 +209,24 @@ public class FormatterTest { Locale.setDefault(locale); } + + /** + * Verifies that Formatter doesn't "leak" the locally defined petabyte unit into ICU via the + * {@link MeasureUnit} registry. This test can fail for two reasons: + * 1. we regressed and started leaking again. In this case the code needs to be fixed. + * 2. ICU started supporting petabyte as a unit, in which case change one needs to revert this + * change (I494fb59a3b3742f35cbdf6b8705817f404a2c6b0), remove Formatter.PETABYTE and replace any + * usages of that field with just MeasureUnit.PETABYTE. + */ + // http://b/65632959 + @Test + public void doesNotLeakPetabyte() { + // Ensure that the Formatter class is loaded when we call .getAvailable(). + Formatter.formatFileSize(mContext, Long.MAX_VALUE); + Set<MeasureUnit> digitalUnits = MeasureUnit.getAvailable("digital"); + for (MeasureUnit unit : digitalUnits) { + // This assert can fail if we don't leak PETABYTE, but ICU has added it, see #2 above. + assertNotEquals("petabyte", unit.getSubtype()); + } + } } diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 2894e8956c1c..fe427a73bf96 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -193,7 +193,9 @@ public class MediaRouter { } else if ((newRoutes.mainType&AudioRoutesInfo.MAIN_DOCK_SPEAKERS) != 0) { name = com.android.internal.R.string.default_audio_route_name_dock_speakers; } else if ((newRoutes.mainType&AudioRoutesInfo.MAIN_HDMI) != 0) { - name = com.android.internal.R.string.default_media_route_name_hdmi; + name = com.android.internal.R.string.default_audio_route_name_hdmi; + } else if ((newRoutes.mainType&AudioRoutesInfo.MAIN_USB) != 0) { + name = com.android.internal.R.string.default_audio_route_name_usb; } else { name = com.android.internal.R.string.default_audio_route_name; } diff --git a/packages/BackupRestoreConfirmation/res/values-mr/strings.xml b/packages/BackupRestoreConfirmation/res/values-mr/strings.xml index ea3b2f05e8f3..3ee60ca84e74 100644 --- a/packages/BackupRestoreConfirmation/res/values-mr/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values-mr/strings.xml @@ -25,11 +25,11 @@ <string name="allow_restore_button_label" msgid="3081286752277127827">"माझा डेटा पुनर्संचयित करा"</string> <string name="deny_restore_button_label" msgid="1724367334453104378">"पुनर्संचयित करू नका"</string> <string name="current_password_text" msgid="8268189555578298067">"कृपया आपला वर्तमान बॅकअप संकेतशब्द खाली प्रविष्ट करा:"</string> - <string name="device_encryption_restore_text" msgid="1570864916855208992">"कृपया तुमचे डीव्हाइस एंक्रिप्शन पासवर्ड खाली एंटर करा."</string> - <string name="device_encryption_backup_text" msgid="5866590762672844664">"कृपया तुमचे डीव्हाइस एंक्रिप्शन पासवर्ड खाली एंटर करा. हा बॅकअप संग्रह एंक्रिप्ट करण्यासाठी देखील वापरला जाईल."</string> + <string name="device_encryption_restore_text" msgid="1570864916855208992">"कृपया तुमचे डिव्हाइस एंक्रिप्शन पासवर्ड खाली एंटर करा."</string> + <string name="device_encryption_backup_text" msgid="5866590762672844664">"कृपया तुमचे डिव्हाइस एंक्रिप्शन पासवर्ड खाली एंटर करा. हा बॅकअप संग्रह एंक्रिप्ट करण्यासाठी देखील वापरला जाईल."</string> <string name="backup_enc_password_text" msgid="4981585714795233099">"कृपया पूर्ण बॅकअप डेटा एंक्रिप्ट करण्यासाठी वापरण्याकरिता पासवर्ड एंटर करा. हे रिक्त सोडल्यास, आपला वर्तमान बॅकअप पासवर्ड वापरला जाईल:"</string> <string name="backup_enc_password_optional" msgid="1350137345907579306">"तुम्ही पूर्ण बॅकअप डेटा एंक्रिप्ट करू इच्छित असल्यास, खालील पासवर्ड एंटर करा:"</string> - <string name="backup_enc_password_required" msgid="7889652203371654149">"तुमचे डीव्हाइस एंक्रिप्ट केले असल्यामुळे, तुम्हाला तुमचा बॅक अप एंक्रिप्ट करणे आवश्यक आहे. कृपया खाली एक पासवर्ड एंटर करा:"</string> + <string name="backup_enc_password_required" msgid="7889652203371654149">"तुमचे डिव्हाइस एंक्रिप्ट केले असल्यामुळे, तुम्हाला तुमचा बॅक अप एंक्रिप्ट करणे आवश्यक आहे. कृपया खाली एक पासवर्ड एंटर करा:"</string> <string name="restore_enc_password_text" msgid="6140898525580710823">"पुनर्स्टोअर केलेला डेटा एंक्रिप्ट केला असल्यास, कृपया पासवर्ड खाली एंटर करा:"</string> <string name="toast_backup_started" msgid="550354281452756121">"बॅकअप सुरू होत आहे..."</string> <string name="toast_backup_ended" msgid="3818080769548726424">"बॅकअप समाप्त झाले"</string> diff --git a/packages/MtpDocumentsProvider/res/values-mr/strings.xml b/packages/MtpDocumentsProvider/res/values-mr/strings.xml index 9b50e93cf11a..89a9d14243d9 100644 --- a/packages/MtpDocumentsProvider/res/values-mr/strings.xml +++ b/packages/MtpDocumentsProvider/res/values-mr/strings.xml @@ -20,6 +20,6 @@ <string name="downloads_app_label" msgid="7120690641874849726">"डाउनलोड"</string> <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string> <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> मधून फायलींंमध्ये प्रवेश करीत आहे"</string> - <string name="error_busy_device" msgid="3997316850357386589">"दुसरे डीव्हाइस व्यस्त आहे. ते उपलब्ध होईपर्यंत तुम्ही फायली ट्रांसफर करू शकत नाही."</string> - <string name="error_locked_device" msgid="7557872102188356147">"कोणत्याही फायली आढळल्या नाहीत. दुसरे डीव्हाइस कदाचित बंद असू शकते. तसे असल्यास, ते अनलॉक करा आणि पुन्हा प्रयत्न करा."</string> + <string name="error_busy_device" msgid="3997316850357386589">"दुसरे डिव्हाइस व्यस्त आहे. ते उपलब्ध होईपर्यंत तुम्ही फायली ट्रांसफर करू शकत नाही."</string> + <string name="error_locked_device" msgid="7557872102188356147">"कोणत्याही फायली आढळल्या नाहीत. दुसरे डिव्हाइस कदाचित बंद असू शकते. तसे असल्यास, ते अनलॉक करा आणि पुन्हा प्रयत्न करा."</string> </resources> diff --git a/packages/PrintSpooler/res/values-ne/strings.xml b/packages/PrintSpooler/res/values-ne/strings.xml index 75991f572aaa..18f96dde9e07 100644 --- a/packages/PrintSpooler/res/values-ne/strings.xml +++ b/packages/PrintSpooler/res/values-ne/strings.xml @@ -84,7 +84,7 @@ <string name="failed_notification_title_template" msgid="2256217208186530973">"प्रिन्टर त्रुटि <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string> <string name="blocked_notification_title_template" msgid="1175435827331588646">"प्रिन्टर ब्लक गरियो <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string> <string name="cancel" msgid="4373674107267141885">"रद्द गर्नुहोस्"</string> - <string name="restart" msgid="2472034227037808749">"पुनः सुरू गर्नुहोस्"</string> + <string name="restart" msgid="2472034227037808749">"पुनः सुरु गर्नुहोस्"</string> <string name="no_connection_to_printer" msgid="2159246915977282728">"प्रिन्टरमा कुनै जडान छैन"</string> <string name="reason_unknown" msgid="5507940196503246139">"अज्ञात"</string> <string name="print_service_security_warning_title" msgid="2160752291246775320">"<xliff:g id="SERVICE">%1$s</xliff:g> प्रयोग गर्ने हो?"</string> diff --git a/packages/PrintSpooler/res/values-pa/strings.xml b/packages/PrintSpooler/res/values-pa/strings.xml index 634ce90b8220..4ce8f97315e3 100644 --- a/packages/PrintSpooler/res/values-pa/strings.xml +++ b/packages/PrintSpooler/res/values-pa/strings.xml @@ -30,8 +30,8 @@ <string name="destination_default_text" msgid="5422708056807065710">"ਇੱਕ ਪ੍ਰਿੰਟਰ ਚੁਣੋ"</string> <string name="template_all_pages" msgid="3322235982020148762">"ਸਾਰੇ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string> <string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ਦੀ ਰੇਂਜ"</string> - <string name="pages_range_example" msgid="8558694453556945172">"ਉਦਾਹਰਨ ਲਈ 1—5,8,11—13"</string> - <string name="print_preview" msgid="8010217796057763343">"ਪ੍ਰਿੰਟ ਪ੍ਰੀਵਿਊ"</string> + <string name="pages_range_example" msgid="8558694453556945172">"ਉਦਾਹਰਨ ਵਜੋਂ 1—5,8,11—13"</string> + <string name="print_preview" msgid="8010217796057763343">"ਪ੍ਰਿੰਟ ਦੀ ਪੂਰਵ-ਝਲਕ"</string> <string name="install_for_print_preview" msgid="6366303997385509332">"ਪੂਰਵ-ਝਲਕ ਲਈ PDF ਵਿਊਅਰ ਸਥਾਪਤ ਕਰੋ"</string> <string name="printing_app_crashed" msgid="854477616686566398">"ਪ੍ਰਿੰਟਿੰਗ ਐਪ ਕ੍ਰੈਸ਼ ਹੋਇਆ"</string> <string name="generating_print_job" msgid="3119608742651698916">"ਪ੍ਰਿੰਟ ਜੌਬ ਬਣਾ ਰਿਹਾ ਹੈ"</string> @@ -106,6 +106,6 @@ <string name="print_error_default_message" msgid="8602678405502922346">"ਮਾਫ਼ ਕਰਨਾ, ਉਸਨੇ ਲਾਭਕਾਰੀ ਨਹੀਂ ਹੋਇਆ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string> <string name="print_error_retry" msgid="1426421728784259538">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string> <string name="print_error_printer_unavailable" msgid="8985614415253203381">"ਇਹ ਪ੍ਰਿੰਟਰ ਇਸ ਵੇਲੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string> - <string name="print_cannot_load_page" msgid="6179560924492912009">"ਪੂਰਵ-ਝਲਕ ਨਹੀਂ ਪ੍ਰਦਰਸ਼ਿਤ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string> - <string name="print_preparing_preview" msgid="3939930735671364712">"ਪ੍ਰੀਵਿਊ ਦੀ ਤਿਆਰੀ ਕਰ ਰਿਹਾ ਹੈ…"</string> + <string name="print_cannot_load_page" msgid="6179560924492912009">"ਪੂਰਵ-ਝਲਕ ਨਹੀਂ ਦਿਖਾਈ ਜਾ ਸਕਦੀ"</string> + <string name="print_preparing_preview" msgid="3939930735671364712">"ਪੂਰਵ-ਝਲਕ ਦੀ ਤਿਆਰੀ ਕਰ ਰਿਹਾ ਹੈ…"</string> </resources> diff --git a/packages/Shell/res/values-pa/strings.xml b/packages/Shell/res/values-pa/strings.xml index de29ff1a4ee6..cdf37695fa21 100644 --- a/packages/Shell/res/values-pa/strings.xml +++ b/packages/Shell/res/values-pa/strings.xml @@ -28,7 +28,7 @@ <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਬਿਨਾਂ ਆਪਣੀ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਚੁਣੋ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਪੂਰੇ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰੋ"</string> <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਬਿਨਾਂ ਆਪਣੀ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਸਾਂਝੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਪੂਰੇ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰੋ"</string> <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਬਿਨਾਂ ਆਪਣੀ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਸਾਂਝੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਪੂਰੇ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰੋ"</string> - <string name="bugreport_confirm" msgid="5917407234515812495">"ਬੱਗ ਰਿਪੋਰਟਾਂ ਵਿੱਚ ਸਿਸਟਮ ਦੀਆਂ ਵੱਖ-ਵੱਖ ਲੌਗ ਫ਼ਾਈਲਾਂ ਦਾ ਡਾਟਾ ਸ਼ਾਮਲ ਹੁੰਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਉਹ ਡਾਟਾ ਸ਼ਾਮਲ ਹੋ ਸਕਦਾ ਹੈ ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਸੰਵੇਦਨਸ਼ੀਲ ਮੰਨਦੇ ਹੋ (ਜਿਵੇਂ ਕਿ ਐਪ-ਵਰਤੋਂ ਅਤੇ ਟਿਕਾਣਾ ਡਾਟਾ )। ਬੱਗ ਰਿਪੋਰਟਾਂ ਨੂੰ ਸਿਰਫ਼ ਆਪਣੇ ਭਰੋਸੇਯੋਗ ਲੋਕਾਂ ਅਤੇ ਐਪਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰੋ।"</string> + <string name="bugreport_confirm" msgid="5917407234515812495">"ਬੱਗ ਰਿਪੋਰਟਾਂ ਵਿੱਚ ਸਿਸਟਮ ਦੀਆਂ ਵੱਖ-ਵੱਖ ਲੌਗ ਫ਼ਾਈਲਾਂ ਦਾ ਡਾਟਾ ਸ਼ਾਮਲ ਹੁੰਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਉਹ ਡਾਟਾ ਸ਼ਾਮਲ ਹੋ ਸਕਦਾ ਹੈ ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਸੰਵੇਦਨਸ਼ੀਲ ਮੰਨਦੇ ਹੋ (ਜਿਵੇਂ ਕਿ ਐਪ-ਵਰਤੋਂ ਅਤੇ ਟਿਕਾਣਾ ਡਾਟਾ)। ਬੱਗ ਰਿਪੋਰਟਾਂ ਨੂੰ ਸਿਰਫ਼ ਆਪਣੇ ਭਰੋਸੇਯੋਗ ਲੋਕਾਂ ਅਤੇ ਐਪਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰੋ।"</string> <string name="bugreport_confirm_dont_repeat" msgid="6179945398364357318">"ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"</string> <string name="bugreport_storage_title" msgid="5332488144740527109">"ਬਗ ਰਿਪੋਰਟਾਂ"</string> <string name="bugreport_unreadable_text" msgid="586517851044535486">"ਬਗ ਰਿਪੋਰਟ ਫ਼ਾਈਲ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"</string> diff --git a/packages/SystemUI/res-keyguard/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml index 160ed6554720..ecee06bc9f44 100644 --- a/packages/SystemUI/res-keyguard/values-mr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mr/strings.xml @@ -64,7 +64,7 @@ <string name="kg_pattern_instructions" msgid="5547646893001491340">"तुमचा पॅटर्न काढा"</string> <string name="kg_sim_pin_instructions" msgid="6389000973113699187">"सिम पिन एंटर करा"</string> <string name="kg_sim_pin_instructions_multi" msgid="1643757228644271861">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" साठी सिम पिन एंटर करा"</string> - <string name="kg_sim_lock_instructions_esim" msgid="4957650659201013804">"मोबाइल सेवांशिवाय डीव्हाइस वापरण्यासाठी eSIM बंद करा."</string> + <string name="kg_sim_lock_instructions_esim" msgid="4957650659201013804">"मोबाइल सेवांशिवाय डिव्हाइस वापरण्यासाठी eSIM बंद करा."</string> <string name="kg_pin_instructions" msgid="4069609316644030034">"पिन प्रविष्ट करा"</string> <string name="kg_password_instructions" msgid="136952397352976538">"संकेतशब्द प्रविष्ट करा"</string> <string name="kg_puk_enter_puk_hint" msgid="2288964170039899277">"सिम आता अक्षम केले आहे. सुरू ठेवण्यासाठी PUK कोड प्रविष्ट करा. तपशीलांसाठी वाहकाशी संपर्क साधा."</string> @@ -94,7 +94,7 @@ <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="8476407539834855">"आपण फोन अनलॉक करण्याचा <xliff:g id="NUMBER">%d</xliff:g> वेळा चुकीच्या पद्धतीने प्रयत्न केला आहे. कार्य प्रोफाइल काढली जाईल, जे सर्व प्रोफाइल डेटा हटवेल."</string> <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="956706236554092172">"तुम्ही आपला अनलॉक पॅटर्न <xliff:g id="NUMBER_0">%1$d</xliff:g> वेळा अयोग्यपणे काढला आहे. आणखी <xliff:g id="NUMBER_1">%2$d</xliff:g> अयशस्वी प्रयत्नांनंतर, तुमच्याला ईमेल खाते वापरून आपला टॅब्लेट अनलॉक करण्यास सांगितले जाईल.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> सेकंदांमध्ये पुन्हा प्रयत्न करा."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="8364140853305528449">"तुम्ही आपला अनलॉक पॅटर्न <xliff:g id="NUMBER_0">%1$d</xliff:g> वेळा अयोग्यपणे काढला आहे. आणखी <xliff:g id="NUMBER_1">%2$d</xliff:g> अयशस्वी प्रयत्नांनंतर, तुमच्याला ईमेल खाते वापरून आपला फोन अनलॉक करण्यास सांगितले जाईल.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> सेकंदांमध्ये पुन्हा प्रयत्न करा."</string> - <string name="kg_password_wrong_pin_code_pukked" msgid="3389829202093674267">"सिम पिन कोड चुकीचा आहे तुम्ही आता तुमचे डीव्हाइस अनलॉक करण्यासाठी तुमच्या वाहकाशी संपर्क साधावा."</string> + <string name="kg_password_wrong_pin_code_pukked" msgid="3389829202093674267">"सिम पिन कोड चुकीचा आहे तुम्ही आता तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमच्या वाहकाशी संपर्क साधावा."</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="4314341367727055967"> <item quantity="one">चुकीचा सिम पिन कोड, तुमच्याकडे <xliff:g id="NUMBER_1">%d</xliff:g> प्रयत्न शिल्लक आहेत.</item> <item quantity="other">चुकीचा सिम पिन कोड, तुमच्याकडे <xliff:g id="NUMBER_1">%d</xliff:g> प्रयत्न शिल्लक आहेत.</item> @@ -110,28 +110,28 @@ <string name="keyguard_carrier_default" msgid="4274828292998453695">"सेवा नाही."</string> <string name="accessibility_ime_switch_button" msgid="2695096475319405612">"इनपुट पद्धत स्विच करा"</string> <string name="airplane_mode" msgid="3807209033737676010">"विमान मोड"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="7246972020562621506">"डीव्हाइस रीस्टार्ट झाल्यावर पॅटर्न आवश्यक आहे"</string> - <string name="kg_prompt_reason_restart_pin" msgid="6303592361322290145">"डीव्हाइस रीस्टार्ट झाल्यावर पिन आवश्यक आहे"</string> - <string name="kg_prompt_reason_restart_password" msgid="6984641181515902406">"डीव्हाइस रीस्टार्ट झाल्यावर पासवर्ड आवश्यक आहे"</string> + <string name="kg_prompt_reason_restart_pattern" msgid="7246972020562621506">"डिव्हाइस रीस्टार्ट झाल्यावर पॅटर्न आवश्यक आहे"</string> + <string name="kg_prompt_reason_restart_pin" msgid="6303592361322290145">"डिव्हाइस रीस्टार्ट झाल्यावर पिन आवश्यक आहे"</string> + <string name="kg_prompt_reason_restart_password" msgid="6984641181515902406">"डिव्हाइस रीस्टार्ट झाल्यावर पासवर्ड आवश्यक आहे"</string> <string name="kg_prompt_reason_timeout_pattern" msgid="5304487696073914063">"अतिरिक्त सुरक्षिततेसाठी पॅटर्न आवश्यक आहे"</string> <string name="kg_prompt_reason_timeout_pin" msgid="8851462864335757813">"अतिरिक्त सुरक्षिततेसाठी पिन आवश्यक आहे"</string> <string name="kg_prompt_reason_timeout_password" msgid="6563904839641583441">"अतिरिक्त सुरक्षिततेसाठी संकेतशब्द आवश्यक आहे"</string> <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3398054847288438444">"तुम्ही प्रोफाईल स्विच करता तेव्हा पॅटर्न आवश्यक आहे"</string> <string name="kg_prompt_reason_switch_profiles_pin" msgid="7426368139226961699">"आपण प्रोफाईल स्विच करता तेव्हा पिन आवश्यक आहे"</string> <string name="kg_prompt_reason_switch_profiles_password" msgid="8383831046318421845">"आपण प्रोफाईल स्विच करता तेव्हा संकेतशब्द आवश्यक आहे"</string> - <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"प्रशासकाद्वारे लॉक केलेले डीव्हाइस"</string> - <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"डीव्हाइस मॅन्युअली लॉक केले होते"</string> + <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"प्रशासकाद्वारे लॉक केलेले डिव्हाइस"</string> + <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"डिव्हाइस मॅन्युअली लॉक केले होते"</string> <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="71299470072448533"> - <item quantity="one">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पॅटर्नची खात्री करा.</item> - <item quantity="other">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पॅटर्नची खात्री करा.</item> + <item quantity="one">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पॅटर्नची खात्री करा.</item> + <item quantity="other">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पॅटर्नची खात्री करा.</item> </plurals> <plurals name="kg_prompt_reason_time_pin" formatted="false" msgid="34586942088144385"> - <item quantity="one">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पिनची खात्री करा.</item> - <item quantity="other">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पिन ची खात्री करा.</item> + <item quantity="one">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पिनची खात्री करा.</item> + <item quantity="other">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पिन ची खात्री करा.</item> </plurals> <plurals name="kg_prompt_reason_time_password" formatted="false" msgid="257297696215346527"> - <item quantity="one">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पासवर्डची खात्री करा.</item> - <item quantity="other">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पासवर्डची खात्री करा.</item> + <item quantity="one">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पासवर्डची खात्री करा.</item> + <item quantity="other">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पासवर्डची खात्री करा.</item> </plurals> <string name="fingerprint_not_recognized" msgid="348813995267914625">"ओळखले नाही"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 25baf2043bda..0a5c7365b1f8 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -308,7 +308,7 @@ <string name="quick_settings_inversion_label" msgid="8790919884718619648">"रंग उलटें"</string> <string name="quick_settings_color_space_label" msgid="853443689745584770">"रंग सुधार मोड"</string> <string name="quick_settings_more_settings" msgid="326112621462813682">"और सेटिंग"</string> - <string name="quick_settings_done" msgid="3402999958839153376">"पूर्ण"</string> + <string name="quick_settings_done" msgid="3402999958839153376">"हो गया"</string> <string name="quick_settings_connected" msgid="1722253542984847487">"कनेक्ट है"</string> <string name="quick_settings_connected_battery_level" msgid="4136051440381328892">"कनेक्ट किया गया, बैटरी <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g> है"</string> <string name="quick_settings_connecting" msgid="47623027419264404">"कनेक्ट हो रहा है..."</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index fe006396cfb3..0503b48eb0c5 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -53,7 +53,7 @@ <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"वास्तविक कीबोर्ड"</string> <string name="usb_device_permission_prompt" msgid="834698001271562057">"USB डिव्हाइसवर प्रवेश करण्यासाठी <xliff:g id="APPLICATION">%1$s</xliff:g> अॅप ला अनुमती द्यायची?"</string> <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"अॅप <xliff:g id="APPLICATION">%1$s</xliff:g> ला USB उपसाधनात प्रवेश करण्याची अनुमती द्यायची?"</string> - <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"हे USB डीव्हाइस कनेक्ट केलेले असते तेव्हा <xliff:g id="ACTIVITY">%1$s</xliff:g> उघडायचे?"</string> + <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"हे USB डिव्हाइस कनेक्ट केलेले असते तेव्हा <xliff:g id="ACTIVITY">%1$s</xliff:g> उघडायचे?"</string> <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"हे USB उपसाधन कनेक्ट केलेले असते तेव्हा <xliff:g id="ACTIVITY">%1$s</xliff:g> उघडायचे?"</string> <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"इंस्टॉल केलेले अॅप्स या USB उपसाधनासह कार्य करत नाहीत. <xliff:g id="URL">%1$s</xliff:g> येथे या उपसाधनाविषयी अधिक जाणून घ्या"</string> <string name="title_usb_accessory" msgid="4966265263465181372">"USB उपसाधन"</string> @@ -271,7 +271,7 @@ <string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"केवळ अलार्म"</string> <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"संपूर्ण शांतता"</string> <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"ब्लूटूथ"</string> - <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"ब्लूटूथ (<xliff:g id="NUMBER">%d</xliff:g> डीव्हाइस)"</string> + <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"ब्लूटूथ (<xliff:g id="NUMBER">%d</xliff:g> डिव्हाइस)"</string> <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"ब्लूटूथ बंद"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="4910015762433302860">"कोणतेही जोडलेले डिव्हाइसेस उपलब्ध नाहीत"</string> <string name="quick_settings_brightness_label" msgid="6968372297018755815">"चमक"</string> @@ -284,7 +284,7 @@ <string name="quick_settings_ime_label" msgid="7073463064369468429">"इनपुट पद्धत"</string> <string name="quick_settings_location_label" msgid="5011327048748762257">"स्थान"</string> <string name="quick_settings_location_off_label" msgid="7464544086507331459">"स्थान बंद"</string> - <string name="quick_settings_media_device_label" msgid="1302906836372603762">"मीडिया डीव्हाइस"</string> + <string name="quick_settings_media_device_label" msgid="1302906836372603762">"मीडिया डिव्हाइस"</string> <string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"फक्त आणीबाणीचे कॉल"</string> <string name="quick_settings_settings_label" msgid="5326556592578065401">"सेटिंग्ज"</string> @@ -300,7 +300,7 @@ <string name="quick_settings_wifi_detail_empty_text" msgid="269990350383909226">"वाय-फाय नेटवर्क उपलब्ध नाहीत"</string> <string name="quick_settings_cast_title" msgid="7709016546426454729">"कास्ट करा"</string> <string name="quick_settings_casting" msgid="6601710681033353316">"कास्ट करत आहे"</string> - <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"निनावी डीव्हाइस"</string> + <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"निनावी डिव्हाइस"</string> <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"कास्ट करण्यास तयार"</string> <string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"कोणतेही डिव्हाइसेस उपलब्ध नाहीत"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"चमक"</string> @@ -362,8 +362,8 @@ <string name="speed_bump_explanation" msgid="1288875699658819755">"खाली कमी तातडीच्या सूचना"</string> <string name="notification_tap_again" msgid="7590196980943943842">"उघडण्यासाठी पुन्हा टॅप करा"</string> <string name="keyguard_unlock" msgid="8043466894212841998">"अनलॉक करण्यासाठी स्वाइप करा"</string> - <string name="do_disclosure_generic" msgid="5615898451805157556">"हे डीव्हाइस तुमची संस्था व्यवस्थापित करते"</string> - <string name="do_disclosure_with_name" msgid="5640615509915445501">"हे डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ने व्यवस्थापित केले आहे"</string> + <string name="do_disclosure_generic" msgid="5615898451805157556">"हे डिव्हाइस तुमची संस्था व्यवस्थापित करते"</string> + <string name="do_disclosure_with_name" msgid="5640615509915445501">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ने व्यवस्थापित केले आहे"</string> <string name="phone_hint" msgid="4872890986869209950">"फोनसाठी चिन्हावरून स्वाइप करा"</string> <string name="voice_hint" msgid="8939888732119726665">"व्हॉइस सहाय्यासाठी चिन्हावरून स्वाइप करा"</string> <string name="camera_hint" msgid="7939688436797157483">"कॅमेर्यासाठी चिन्हावरून स्वाइप करा"</string> @@ -415,22 +415,22 @@ <string name="profile_owned_footer" msgid="8021888108553696069">"प्रोफाईलचे परीक्षण केले जाऊ शकते"</string> <string name="vpn_footer" msgid="2388611096129106812">"नेटवर्कचे परीक्षण केले जाऊ शकते"</string> <string name="branded_vpn_footer" msgid="2168111859226496230">"नेटवर्कचे परीक्षण केले जाऊ शकते"</string> - <string name="quick_settings_disclosure_management_monitoring" msgid="6645176135063957394">"आपली संस्था हे डीव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे परीक्षण करू शकते"</string> - <string name="quick_settings_disclosure_named_management_monitoring" msgid="370622174777570853">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> हे डीव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे परीक्षण करू शकते"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="1085137869053332307">"डीव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित केले जाते आणि ते <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="6290456493852584017">"डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते आणि ते <xliff:g id="VPN_APP">%2$s</xliff:g> शी कनेक्ट केलेले आहे"</string> - <string name="quick_settings_disclosure_management" msgid="3294967280853150271">"डीव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित आहे"</string> - <string name="quick_settings_disclosure_named_management" msgid="1059403025094542908">"डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="3698767349925266482">"डीव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित केले जाते आणि ते VPN शी कनेक्ट केलेले आहे"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="7777821385318891527">"डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते आणि ते VPN शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_management_monitoring" msgid="6645176135063957394">"आपली संस्था हे डिव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे परीक्षण करू शकते"</string> + <string name="quick_settings_disclosure_named_management_monitoring" msgid="370622174777570853">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> हे डिव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे परीक्षण करू शकते"</string> + <string name="quick_settings_disclosure_management_named_vpn" msgid="1085137869053332307">"डिव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित केले जाते आणि ते <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_named_management_named_vpn" msgid="6290456493852584017">"डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते आणि ते <xliff:g id="VPN_APP">%2$s</xliff:g> शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_management" msgid="3294967280853150271">"डिव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित आहे"</string> + <string name="quick_settings_disclosure_named_management" msgid="1059403025094542908">"डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते"</string> + <string name="quick_settings_disclosure_management_vpns" msgid="3698767349925266482">"डिव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित केले जाते आणि ते VPN शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_named_management_vpns" msgid="7777821385318891527">"डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते आणि ते VPN शी कनेक्ट केलेले आहे"</string> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="5125463987558278215">"आपली संस्था आपल्या कार्य प्रोफाइलमधील नेटवर्क रहदारीचे परीक्षण करू शकते"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8973606847896650284">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> आपल्या कार्य प्रोफाइलमधील नेटवर्क रहदारीचे परीक्षण करू शकते"</string> <string name="quick_settings_disclosure_monitoring" msgid="679658227269205728">"नेटवर्कचे परीक्षण केले जाऊ शकते"</string> - <string name="quick_settings_disclosure_vpns" msgid="8170318392053156330">"डीव्हाइस VPN शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_vpns" msgid="8170318392053156330">"डिव्हाइस VPN शी कनेक्ट केलेले आहे"</string> <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="3494535754792751741">"कार्य प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="4467456202486569906">"वैयक्तिक प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="6943724064780847080">"डीव्हाइस <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> - <string name="monitoring_title_device_owned" msgid="1652495295941959815">"डीव्हाइस व्यवस्थापन"</string> + <string name="quick_settings_disclosure_named_vpn" msgid="6943724064780847080">"डिव्हाइस <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> + <string name="monitoring_title_device_owned" msgid="1652495295941959815">"डिव्हाइस व्यवस्थापन"</string> <string name="monitoring_title_profile_owned" msgid="6790109874733501487">"प्रोफाईल परीक्षण"</string> <string name="monitoring_title" msgid="169206259253048106">"नेटवर्क परीक्षण"</string> <string name="monitoring_subtitle_vpn" msgid="876537538087857300">"VPN"</string> @@ -439,8 +439,8 @@ <string name="disable_vpn" msgid="4435534311510272506">"VPN अक्षम करा"</string> <string name="disconnect_vpn" msgid="1324915059568548655">"VPN डिस्कनेक्ट करा"</string> <string name="monitoring_button_view_policies" msgid="100913612638514424">"धोरणे पहा"</string> - <string name="monitoring_description_named_management" msgid="5281789135578986303">"तुमचे डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> व्यवस्थापित करते.\n\nतुमचा प्रशासक सेटिंग्ज, कॉर्पोरेट अॅक्सेस, अॅप्स, तुमच्या डीव्हाइस शी संबंधित डेटा आणि तुमच्या डीव्हाइस च्या ठिकाणाची माहिती मॉनिटर करू शकते आणि ती व्यवस्थापित करू शकतो.\n\nआणखी माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा."</string> - <string name="monitoring_description_management" msgid="4573721970278370790">"तुमचे डीव्हाइस तुमची संस्था व्यवस्थापित करते.\n\nतुमचा प्रशासक सेटिंग्ज, कॉर्पोरेट अॅक्सेस, अॅप्स, तुमच्या डीव्हाइस शी संबंधित डेटा आणि तुमच्या डीव्हाइस च्या ठिकाणाची माहिती मॉनिटर करू शकतो आणि ती व्यवस्थापित करू शकतो.\n\nआणखी माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा."</string> + <string name="monitoring_description_named_management" msgid="5281789135578986303">"तुमचे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> व्यवस्थापित करते.\n\nतुमचा प्रशासक सेटिंग्ज, कॉर्पोरेट अॅक्सेस, अॅप्स, तुमच्या डिव्हाइस शी संबंधित डेटा आणि तुमच्या डिव्हाइस च्या ठिकाणाची माहिती मॉनिटर करू शकते आणि ती व्यवस्थापित करू शकतो.\n\nआणखी माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा."</string> + <string name="monitoring_description_management" msgid="4573721970278370790">"तुमचे डिव्हाइस तुमची संस्था व्यवस्थापित करते.\n\nतुमचा प्रशासक सेटिंग्ज, कॉर्पोरेट अॅक्सेस, अॅप्स, तुमच्या डिव्हाइस शी संबंधित डेटा आणि तुमच्या डिव्हाइस च्या ठिकाणाची माहिती मॉनिटर करू शकतो आणि ती व्यवस्थापित करू शकतो.\n\nआणखी माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा."</string> <string name="monitoring_description_management_ca_certificate" msgid="5202023784131001751">"आपल्या संस्थेने या डिव्हाइसवर प्रमाणपत्र अधिकार इंस्टॉल केला आहे. आपल्या सुरक्षित नेटवर्क रहदारीचे परीक्षण केले जाऊ शकते किंवा ती सुधारली जाऊ शकते."</string> <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"आपल्या संस्थेने आपल्या कार्य प्रोफाइलवर प्रमाणपत्र अधिकार इंस्टॉल केला आहे. आपल्या सुरक्षित नेटवर्क रहदारीचे परीक्षण केले जाऊ शकते किंवा ती सुधारली जाऊ शकते."</string> <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"या डिव्हाइसवर प्रमाणपत्र अधिकार इंस्टॉल केला आहे. आपल्या सुरक्षित नेटवर्क रहदारीचे परीक्षण केले जाऊ शकते किंवा ती सुधारली जाऊ शकते."</string> @@ -449,8 +449,8 @@ <string name="monitoring_description_two_named_vpns" msgid="4198511413729213802">"तुम्ही <xliff:g id="VPN_APP_0">%1$s</xliff:g> आणि <xliff:g id="VPN_APP_1">%2$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसहित आपल्या नेटवर्क क्रिया मॉनिटर करू शकते."</string> <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"आपले कार्य प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"आपले वैयक्तिक प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> - <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"तुमचे डीव्हाइस <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g> ने व्यवस्थापित केले आहे."</string> - <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"तुमचे डीव्हाइस व्यवस्थापित करण्यासाठी <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> वापरते."</string> + <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"तुमचे डिव्हाइस <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g> ने व्यवस्थापित केले आहे."</string> + <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"तुमचे डिव्हाइस व्यवस्थापित करण्यासाठी <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> वापरते."</string> <string name="monitoring_description_do_body" msgid="3639594537660975895">"आपला प्रशासक सेटिंग्ज, कॉर्पोरेट प्रवेश, अॅप्स, आपल्या डिव्हाइशी संबंधित डेटा आणि डिव्हाइसच्या स्थान माहितीचे निरीक्षण आणि व्यवस्थापन करू शकतो."</string> <string name="monitoring_description_do_learn_more_separator" msgid="3785251953067436862">" "</string> <string name="monitoring_description_do_learn_more" msgid="1849514470437907421">"अधिक जाणून घ्या"</string> @@ -460,7 +460,7 @@ <string name="monitoring_description_ca_cert_settings_separator" msgid="4987350385906393626">" "</string> <string name="monitoring_description_ca_cert_settings" msgid="5489969458872997092">"विश्वासू क्रेडेंशियल उघडा"</string> <string name="monitoring_description_network_logging" msgid="7223505523384076027">"आपल्या प्रशासकाने नेटवर्क लॉगिंग चालू केले आहे, जे आपल्या डिव्हाइसवरील रहदारीचे निरीक्षण करते.\n\nअधिक माहितीसाठी आपल्या प्रशासकाशी संपर्क साधा."</string> - <string name="monitoring_description_vpn" msgid="4445150119515393526">"तुम्ही VPN कनेक्शन सेट करण्यासाठी अॅपला परवानगी दिली.\n\nहा अॅप ईमेल, अॅप्स आणि वेबसाइटसह, तुमच्या डीव्हाइस आणि नेटवर्क अॅक्टिव्हिटीचे परीक्षण करू शकतो."</string> + <string name="monitoring_description_vpn" msgid="4445150119515393526">"तुम्ही VPN कनेक्शन सेट करण्यासाठी अॅपला परवानगी दिली.\n\nहा अॅप ईमेल, अॅप्स आणि वेबसाइटसह, तुमच्या डिव्हाइस आणि नेटवर्क अॅक्टिव्हिटीचे परीक्षण करू शकतो."</string> <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"आपले कार्य प्रोफाइल <xliff:g id="ORGANIZATION">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते.\n\nआपला प्रशासक ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क अॅक्टिव्हिटीचे निरीक्षण करण्यास सक्षम आहे.\n\nअधिक माहितीसाठी आपल्या प्रशासकाशी संपर्क साधा.\n\nआपण VPN शी देखील कनेक्ट आहात, जे आपल्या नेटवर्क अॅक्टिव्हिटीचे निरीक्षण करू शकते."</string> <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string> <string name="monitoring_description_app" msgid="1828472472674709532">"आपण <xliff:g id="APPLICATION">%1$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> @@ -470,7 +470,7 @@ <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"आपले कार्य प्रोफाइल <xliff:g id="ORGANIZATION">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते. प्रोफाइल <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या कार्य नेटवर्क क्रियाकलापाचे परीक्षण करू शकते.\n\nआपण <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> शीदेखील कनेक्ट केले आहे, जे आपल्या वैयक्तिक नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> <string name="keyguard_indication_trust_granted" msgid="4985003749105182372">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी अनलॉक केले"</string> <string name="keyguard_indication_trust_managed" msgid="8319646760022357585">"<xliff:g id="TRUST_AGENT">%1$s</xliff:g> चालू आहे"</string> - <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"तुम्ही मॅन्युअली अनलॉक करेपर्यंत डीव्हाइस लॉक राहील"</string> + <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"तुम्ही मॅन्युअली अनलॉक करेपर्यंत डिव्हाइस लॉक राहील"</string> <string name="hidden_notifications_title" msgid="7139628534207443290">"सूचना अधिक जलद मिळवा"</string> <string name="hidden_notifications_text" msgid="2326409389088668981">"आपण अनलॉक करण्यापूर्वी त्यांना पहा"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"नाही, नको"</string> @@ -489,7 +489,7 @@ <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"लपवा"</string> <string name="managed_profile_foreground_toast" msgid="5421487114739245972">"आपण आपले कार्य प्रोफाईल वापरत आहात"</string> <string name="stream_voice_call" msgid="4410002696470423714">"कॉल करा"</string> - <string name="stream_system" msgid="7493299064422163147">"सिस्टीम"</string> + <string name="stream_system" msgid="7493299064422163147">"सिस्टम"</string> <string name="stream_ring" msgid="8213049469184048338">"रिंग करा"</string> <string name="stream_music" msgid="9086982948697544342">"मीडिया"</string> <string name="stream_alarm" msgid="5209444229227197703">"अलार्म"</string> @@ -510,7 +510,7 @@ <string name="quick_settings" msgid="10042998191725428">"द्रुत सेटिंग्ज"</string> <string name="status_bar" msgid="4877645476959324760">"स्टेटस बार"</string> <string name="overview" msgid="4018602013895926956">"अवलोकन"</string> - <string name="demo_mode" msgid="2532177350215638026">"सिस्टीम UI डेमो मोड"</string> + <string name="demo_mode" msgid="2532177350215638026">"सिस्टम UI डेमो मोड"</string> <string name="enable_demo_mode" msgid="4844205668718636518">"डेमो मोड सुरू करा"</string> <string name="show_demo_mode" msgid="2018336697782464029">"डेमो मोड दर्शवा"</string> <string name="status_bar_ethernet" msgid="5044290963549500128">"इथरनेट"</string> @@ -614,7 +614,7 @@ <string name="keyboard_key_insert" msgid="8530501581636082614">"घाला"</string> <string name="keyboard_key_num_lock" msgid="5052537581246772117">"Num Lock"</string> <string name="keyboard_key_numpad_template" msgid="8729216555174634026">"Numpad <xliff:g id="NAME">%1$s</xliff:g>"</string> - <string name="keyboard_shortcut_group_system" msgid="6472647649616541064">"सिस्टीम"</string> + <string name="keyboard_shortcut_group_system" msgid="6472647649616541064">"सिस्टम"</string> <string name="keyboard_shortcut_group_system_home" msgid="3054369431319891965">"होम"</string> <string name="keyboard_shortcut_group_system_recents" msgid="3154851905021926744">"अलीकडील"</string> <string name="keyboard_shortcut_group_system_back" msgid="2207004531216446378">"परत"</string> diff --git a/packages/SystemUI/res/values-ne/strings_car.xml b/packages/SystemUI/res/values-ne/strings_car.xml index d81a488bb2e7..d4d7d0bd5117 100644 --- a/packages/SystemUI/res/values-ne/strings_car.xml +++ b/packages/SystemUI/res/values-ne/strings_car.xml @@ -20,5 +20,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown_user_label" msgid="4323896111737677955">"अज्ञात"</string> - <string name="start_driving" msgid="864023351402918991">"ड्राइभिङ सुरू गर्नुहोस्"</string> + <string name="start_driving" msgid="864023351402918991">"ड्राइभिङ सुरु गर्नुहोस्"</string> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index b746182d6007..166e0cb0a5c8 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -24,7 +24,7 @@ <string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"ਸੂਚੀ ਵਿੱਚੋਂ ਹਟਾਓ"</string> <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"ਐਪ ਜਾਣਕਾਰੀ"</string> <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"ਤੁਹਾਡੀਆਂ ਹਾਲੀਆ ਸਕ੍ਰੀਨਾਂ ਇੱਥੇ ਪ੍ਰਗਟ ਹੋਣਗੀਆਂ"</string> - <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"ਹਾਲੀਆ ਐਪਾਂ ਰੱਦ ਕਰੋ"</string> + <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"ਹਾਲੀਆ ਐਪਾਂ ਨੂੰ ਖਾਰਜ ਕਰੋ"</string> <plurals name="status_bar_accessibility_recent_apps" formatted="false" msgid="9138535907802238759"> <item quantity="one">ਰੂਪ-ਰੇਖਾ ਵਿੱਚ %d ਸਕ੍ਰੀਨਾਂ</item> <item quantity="other">ਰੂਪ-ਰੇਖਾ ਵਿੱਚ %d ਸਕ੍ਰੀਨਾਂ</item> @@ -175,7 +175,7 @@ <!-- no translation found for accessibility_casting (6887382141726543668) --> <skip /> <string name="accessibility_work_mode" msgid="2478631941714607225">"ਕੰਮ ਮੋਡ"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="395770242498031481">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਰੱਦ ਕਰੋ।"</string> + <string name="accessibility_recents_item_will_be_dismissed" msgid="395770242498031481">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਖਾਰਜ ਕਰੋ।"</string> <string name="accessibility_recents_item_dismissed" msgid="6803574935084867070">"<xliff:g id="APP">%s</xliff:g> ਰੱਦ ਕੀਤਾ।"</string> <string name="accessibility_recents_all_items_dismissed" msgid="4464697366179168836">"ਸਾਰੀਆਂ ਹਾਲੀਆ ਐਪਲੀਕੇਸ਼ਨਾਂ ਰੱਦ ਕੀਤੀਆਂ।"</string> <string name="accessibility_recents_item_open_app_info" msgid="5107479759905883540">"<xliff:g id="APP">%s</xliff:g> ਐਪਲੀਕੇਸ਼ਨਾਂ ਜਾਣਕਾਰੀ ਖੋਲ੍ਹੋ।"</string> @@ -502,13 +502,13 @@ <string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s। ਮਿਊਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ। ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਮਿਊਟ ਹੋ ਸਕਦੀਆਂ ਹਨ।"</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="6427727603978431301">"%1$s। ਥਰਥਰਾਹਟ \'ਤੇ ਸੈੱਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="volume_stream_content_description_mute_a11y" msgid="8995013018414535494">"%1$s। ਮਿਊਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> - <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"%s ਵੌਲਿਊਮ ਕੰਟਰੋਲ ਦਿਖਾਏ ਗਏ ਹਨ। ਖਾਰਜ ਕਰਨ ਲਈ ਉੱਪਰ ਸਵਾਈਪ ਕਰੋ।"</string> + <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"%s ਅਵਾਜ਼ ਕੰਟਰੋਲ ਦਿਖਾਏ ਗਏ ਹਨ। ਖਾਰਜ ਕਰਨ ਲਈ ਉੱਪਰ ਸਵਾਈਪ ਕਰੋ।"</string> <string name="volume_dialog_accessibility_dismissed_message" msgid="51543526013711399">"ਵੌਲਿਊਮ ਕੰਟਰੋਲ ਲੁਕਾਏ ਗਏ ਹਨ"</string> <string name="system_ui_tuner" msgid="708224127392452018">"System UI ਟਿਊਨਰ"</string> <string name="show_battery_percentage" msgid="5444136600512968798">"ਜੋਡ਼ੀ ਗਈ ਬੈਟਰੀ ਪ੍ਰਤਿਸ਼ਤਤਾ ਦਿਖਾਓ"</string> <string name="show_battery_percentage_summary" msgid="3215025775576786037">"ਜਦੋਂ ਚਾਰਜ ਨਾ ਹੋ ਰਹੀ ਹੋਵੇ ਤਾਂ ਸਥਿਤੀ ਪੱਟੀ ਪ੍ਰਤੀਕ ਦੇ ਅੰਦਰ ਬੈਟਰੀ ਪੱਧਰ ਪ੍ਰਤਿਸ਼ਤਤਾ ਦਿਖਾਓ"</string> <string name="quick_settings" msgid="10042998191725428">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ"</string> - <string name="status_bar" msgid="4877645476959324760">"ਸਥਿਤੀ ਬਾਰ"</string> + <string name="status_bar" msgid="4877645476959324760">"ਸਥਿਤੀ ਪੱਟੀ"</string> <string name="overview" msgid="4018602013895926956">"ਰੂਪ-ਰੇਖਾ"</string> <string name="demo_mode" msgid="2532177350215638026">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</string> <string name="enable_demo_mode" msgid="4844205668718636518">"ਡੈਮੋ ਮੋਡ ਚਾਲੂ ਕਰੋ"</string> @@ -535,7 +535,7 @@ <string name="remove_from_settings_prompt" msgid="6069085993355887748">"ਕੀ ਸੈਟਿੰਗਾਂ ਤੋਂ ਸਿਸਟਮ UI ਟਿਊਨਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ ਅਤੇ ਇਸਦੀਆਂ ਸਾਰੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣਾ ਹੈ?"</string> <string name="activity_not_found" msgid="348423244327799974">"ਐਪਲੀਕੇਸ਼ਨ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੇ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਗਈ ਹੈ"</string> <string name="clock_seconds" msgid="7689554147579179507">"ਘੜੀ ਸਕਿੰਟ ਦਿਖਾਓ"</string> - <string name="clock_seconds_desc" msgid="6282693067130470675">"ਸਥਿਤੀ ਬਾਰ ਵਿੱਚ ਘੜੀ ਸਕਿੰਟ ਦਿਖਾਓ। ਬੈਟਰੀ ਸਮਰੱਥਾ ਤੇ ਅਸਰ ਪੈ ਸਕਦਾ ਹੈ।"</string> + <string name="clock_seconds_desc" msgid="6282693067130470675">"ਸਥਿਤੀ ਪੱਟੀ ਵਿੱਚ ਘੜੀ ਸਕਿੰਟ ਦਿਖਾਓ। ਬੈਟਰੀ ਸਮਰੱਥਾ ਤੇ ਅਸਰ ਪੈ ਸਕਦਾ ਹੈ।"</string> <string name="qs_rearrange" msgid="8060918697551068765">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਨੂੰ ਦੁਬਾਰਾ ਕ੍ਰਮ ਦਿਓ"</string> <string name="show_brightness" msgid="6613930842805942519">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਚਮਕ ਦਿਖਾਓ"</string> <string name="experimental" msgid="6198182315536726162">"ਪ੍ਰਯੋਗਾਤਮਿਕ"</string> @@ -549,7 +549,7 @@ <string name="tuner_full_importance_settings" msgid="3207312268609236827">"ਪਾਵਰ ਸੂਚਨਾ ਕੰਟਰੋਲ"</string> <string name="tuner_full_importance_settings_on" msgid="7545060756610299966">"ਚਾਲੂ"</string> <string name="tuner_full_importance_settings_off" msgid="8208165412614935229">"ਬੰਦ"</string> - <string name="power_notification_controls_description" msgid="4372459941671353358">"ਪਾਵਰ ਸੂਚਨਾ ਕੰਟਰੋਲਾਂ ਨਾਲ, ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਲਈ ਮਹੱਤਤਾ ਪੱਧਰ ਨੂੰ 0 ਤੋਂ 5 ਤੱਕ ਸੈੱਟ ਕਰ ਸਕਦੇ ਹੋ। \n\n"<b>"ਪੱਧਰ 5"</b>" \n- ਸੂਚਨਾ ਸੂਚੀ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਖਾਓ \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਦੀ ਆਗਿਆ ਦਿਓ \n- ਹਮੇਸ਼ਾਂ ਝਲਕ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 4"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਹਮੇਸ਼ਾਂ ਝਲਕ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 3"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 2"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n- ਕਦੇ ਵੀ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਾ ਕਰੋ \n\n"<b>"ਪੱਧਰ 1"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n- ਕਦੇ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਾ ਕਰੋ \n- ਲੌਕ ਸਕ੍ਰੀਨ ਅਤੇ ਸਥਿਤੀ ਪੱਟੀ ਤੋਂ ਲੁਕਾਓ \n- ਸੂਚਨਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 0"</b>" \n- ਐਪ ਤੋਂ ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬਲਾਕ ਕਰੋ"</string> + <string name="power_notification_controls_description" msgid="4372459941671353358">"ਪਾਵਰ ਸੂਚਨਾ ਕੰਟਰੋਲਾਂ ਨਾਲ, ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਲਈ ਮਹੱਤਤਾ ਪੱਧਰ ਨੂੰ 0 ਤੋਂ 5 ਤੱਕ ਸੈੱਟ ਕਰ ਸਕਦੇ ਹੋ। \n\n"<b>"ਪੱਧਰ 5"</b>" \n- ਸੂਚਨਾ ਸੂਚੀ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਖਾਓ \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਦੀ ਆਗਿਆ ਦਿਓ \n- ਹਮੇਸ਼ਾਂ ਝਲਕ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 4"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਹਮੇਸ਼ਾਂ ਝਲਕ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 3"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 2"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n- ਕਦੇ ਵੀ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਾ ਕਰੋ \n\n"<b>"ਪੱਧਰ 1"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n- ਕਦੇ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਾ ਕਰੋ \n- ਲਾਕ ਸਕ੍ਰੀਨ ਅਤੇ ਸਥਿਤੀ ਪੱਟੀ ਤੋਂ ਲੁਕਾਓ \n- ਸੂਚਨਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 0"</b>" \n- ਐਪ ਤੋਂ ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬਲਾਕ ਕਰੋ"</string> <string name="notification_header_default_channel" msgid="7506845022070889909">"ਸੂਚਨਾਵਾਂ"</string> <string name="notification_channel_disabled" msgid="2139193533791840539">"ਤੁਹਾਨੂੰ ਹੁਣ ਇਹ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਣਗੀਆਂ"</string> <string name="notification_num_channels" msgid="2048144408999179471">"<xliff:g id="NUMBER">%d</xliff:g> ਸੂਚਨਾ ਸ਼੍ਰੇਣੀਆਂ"</string> @@ -605,7 +605,7 @@ <string name="keyboard_key_media_next" msgid="1894394911630345607">"ਅੱਗੇ"</string> <string name="keyboard_key_media_previous" msgid="4256072387192967261">"ਪਿਛਲਾ"</string> <string name="keyboard_key_media_rewind" msgid="2654808213360820186">"Rewind"</string> - <string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"Fast Forward"</string> + <string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"ਤੇਜ਼ੀ ਨਾਲ ਅੱਗੇ ਭੇਜੋ"</string> <string name="keyboard_key_page_up" msgid="5654098530106845603">"Page Up"</string> <string name="keyboard_key_page_down" msgid="8720502083731906136">"Page Down"</string> <string name="keyboard_key_forward_del" msgid="1391451334716490176">"ਮਿਟਾਓ"</string> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index 7fe7f399f123..8fa904e10b4a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -2024,14 +2024,15 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } @Override - public int getMinHeight() { - if (mGuts != null && mGuts.isExposed()) { + public int getMinHeight(boolean ignoreTemporaryStates) { + if (!ignoreTemporaryStates && mGuts != null && mGuts.isExposed()) { return mGuts.getIntrinsicHeight(); - } else if (isHeadsUpAllowed() && mIsHeadsUp && mHeadsUpManager.isTrackingHeadsUp()) { + } else if (!ignoreTemporaryStates && isHeadsUpAllowed() && mIsHeadsUp + && mHeadsUpManager.isTrackingHeadsUp()) { return getPinnedHeadsUpHeight(false /* atLeastMinHeight */); } else if (mIsSummaryWithChildren && !isGroupExpanded() && !mShowingPublic) { return mChildrenContainer.getMinHeight(); - } else if (isHeadsUpAllowed() && mIsHeadsUp) { + } else if (!ignoreTemporaryStates && isHeadsUpAllowed() && mIsHeadsUp) { return mHeadsUpHeight; } NotificationContentView showingLayout = getShowingLayout(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java index efe5e0c2ade4..aac9af8a0234 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java @@ -151,9 +151,21 @@ public abstract class ExpandableView extends FrameLayout { } /** - * @return The minimum content height of this notification. + * @return The minimum content height of this notification. This also respects the temporary + * states of the view. */ public int getMinHeight() { + return getMinHeight(false /* ignoreTemporaryStates */); + } + + /** + * Get the minimum height of this view. + * + * @param ignoreTemporaryStates should temporary states be ignored like the guts or heads-up. + * + * @return The minimum height that this view needs. + */ + public int getMinHeight(boolean ignoreTemporaryStates) { return getHeight(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java index ddc7dd063d4e..d0417b59448d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java @@ -292,8 +292,8 @@ public class NotificationData { if (mRankingMap != null) { // RankingMap as received from NoMan - mRankingMap.getRanking(a.key, mRankingA); - mRankingMap.getRanking(b.key, mRankingB); + getRanking(a.key, mRankingA); + getRanking(b.key, mRankingB); aImportance = mRankingA.getImportance(); bImportance = mRankingB.getImportance(); aRank = mRankingA.getRank(); @@ -381,7 +381,7 @@ public class NotificationData { public boolean isAmbient(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.isAmbient(); } return false; @@ -389,7 +389,7 @@ public class NotificationData { public int getVisibilityOverride(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getVisibilityOverride(); } return Ranking.VISIBILITY_NO_OVERRIDE; @@ -397,7 +397,7 @@ public class NotificationData { public boolean shouldSuppressScreenOff(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return (mTmpRanking.getSuppressedVisualEffects() & NotificationListenerService.SUPPRESSED_EFFECT_SCREEN_OFF) != 0; } @@ -406,7 +406,7 @@ public class NotificationData { public boolean shouldSuppressScreenOn(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return (mTmpRanking.getSuppressedVisualEffects() & NotificationListenerService.SUPPRESSED_EFFECT_SCREEN_ON) != 0; } @@ -415,7 +415,7 @@ public class NotificationData { public int getImportance(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getImportance(); } return NotificationManager.IMPORTANCE_UNSPECIFIED; @@ -423,7 +423,7 @@ public class NotificationData { public String getOverrideGroupKey(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getOverrideGroupKey(); } return null; @@ -431,7 +431,7 @@ public class NotificationData { public List<SnoozeCriterion> getSnoozeCriteria(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getSnoozeCriteria(); } return null; @@ -439,7 +439,7 @@ public class NotificationData { public NotificationChannel getChannel(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getChannel(); } return null; @@ -452,6 +452,9 @@ public class NotificationData { final int N = mEntries.size(); for (int i = 0; i < N; i++) { Entry entry = mEntries.valueAt(i); + if (!getRanking(entry.key, mTmpRanking)) { + continue; + } final StatusBarNotification oldSbn = entry.notification.cloneLight(); final String overrideGroupKey = getOverrideGroupKey(entry.key); if (!Objects.equals(oldSbn.getOverrideGroupKey(), overrideGroupKey)) { @@ -466,6 +469,19 @@ public class NotificationData { filterAndSort(); } + /** + * Get the ranking from the current ranking map. + * + * @param key the key to look up + * @param outRanking the ranking to populate + * + * @return {@code true} if the ranking was properly obtained. + */ + @VisibleForTesting + protected boolean getRanking(String key, Ranking outRanking) { + return mRankingMap.getRanking(key, outRanking); + } + // TODO: This should not be public. Instead the Environment should notify this class when // anything changed, and this class should call back the UI so it updates itself. public void filterAndSort() { @@ -573,7 +589,7 @@ public class NotificationData { } private void dumpEntry(PrintWriter pw, String indent, int i, Entry e) { - mRankingMap.getRanking(e.key, mTmpRanking); + getRanking(e.key, mTmpRanking); pw.print(indent); pw.println(" [" + i + "] key=" + e.key + " icon=" + e.icon); StatusBarNotification n = e.notification; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java index 1f44abea755a..4bca79715422 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java @@ -50,7 +50,7 @@ public class BarTransitions { public static final int MODE_LIGHTS_OUT_TRANSPARENT = 6; public static final int LIGHTS_IN_DURATION = 250; - public static final int LIGHTS_OUT_DURATION = 750; + public static final int LIGHTS_OUT_DURATION = 1500; public static final int BACKGROUND_DURATION = 200; private final String mTag; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 078e8189f5b3..c19161839998 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -509,7 +509,8 @@ public class NotificationPanelView extends PanelView implements if (row.isRemoved()) { continue; } - availableSpace -= child.getMinHeight() + notificationPadding; + availableSpace -= child.getMinHeight(true /* ignoreTemporaryStates */) + + notificationPadding; if (availableSpace >= 0 && count < maximum) { count++; } else if (availableSpace > -shelfSize) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index efc8d8b97114..200cada972a7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -339,7 +339,7 @@ public class StatusBar extends SystemUI implements DemoMode, private static final int STATUS_OR_NAV_TRANSIENT = View.STATUS_BAR_TRANSIENT | View.NAVIGATION_BAR_TRANSIENT; - private static final long AUTOHIDE_TIMEOUT_MS = 3000; + private static final long AUTOHIDE_TIMEOUT_MS = 2250; /** The minimum delay in ms between reports of notification visibility. */ private static final int VISIBILITY_REPORT_MIN_DELAY_MS = 500; @@ -3321,7 +3321,6 @@ public class StatusBar extends SystemUI implements DemoMode, } else { cancelAutohide(); } - touchAutoDim(); } protected int computeStatusBarMode(int oldVal, int newVal) { @@ -3404,10 +3403,10 @@ public class StatusBar extends SystemUI implements DemoMode, } // manually dismiss the volume panel when interacting with the nav bar if (changing && interacting && barWindow == StatusBarManager.WINDOW_NAVIGATION_BAR) { + touchAutoDim(); dismissVolumeDialog(); } checkBarModes(); - touchAutoDim(); } private void dismissVolumeDialog() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java index 18c5756b3fb6..972eddb46901 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java @@ -135,5 +135,11 @@ public class NotificationDataTest extends SysuiTestCase { public NotificationChannel getChannel(String key) { return new NotificationChannel(null, null, 0); } + + @Override + protected boolean getRanking(String key, NotificationListenerService.Ranking outRanking) { + super.getRanking(key, outRanking); + return true; + } } } diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java index 141f9207b314..c203dff07e89 100644 --- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java @@ -77,6 +77,7 @@ import android.os.RemoteException; import android.os.SELinux; import android.os.ServiceManager; import android.os.SystemClock; +import android.os.Trace; import android.os.UserHandle; import android.os.storage.IStorageManager; import android.os.storage.StorageManager; @@ -149,6 +150,7 @@ import java.util.Queue; import java.util.Random; import java.util.Set; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicInteger; public class RefactoredBackupManagerService implements BackupManagerServiceInterface { @@ -546,9 +548,12 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter @Override public void onUnlockUser(int userId) { if (userId == UserHandle.USER_SYSTEM) { + Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "backup init"); sInstance.initialize(userId); + Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); // Migrate legacy setting + Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "backup migrate"); if (!backupSettingMigrated(userId)) { if (DEBUG) { Slog.i(TAG, "Backup enable apparently not migrated"); @@ -569,12 +574,15 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter } } } + Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); + Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "backup enable"); try { sInstance.setBackupEnabled(readBackupEnableState(userId)); } catch (RemoteException e) { // can't happen; it's a local object } + Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); } } } @@ -619,6 +627,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter private final SparseArray<Operation> mCurrentOperations = new SparseArray<>(); private final Object mCurrentOpLock = new Object(); private final Random mTokenGenerator = new Random(); + final AtomicInteger mNextToken = new AtomicInteger(); private final SparseArray<AdbParams> mAdbBackupRestoreConfirmations = new SparseArray<>(); @@ -658,15 +667,15 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter @GuardedBy("mQueueLock") private ArrayList<FullBackupEntry> mFullBackupQueue; - // Utility: build a new random integer token + // Utility: build a new random integer token. The low bits are the ordinal of the + // operation for near-time uniqueness, and the upper bits are random for app- + // side unpredictability. @Override public int generateRandomIntegerToken() { - int token; - do { - synchronized (mTokenGenerator) { - token = mTokenGenerator.nextInt(); - } - } while (token < 0); + int token = mTokenGenerator.nextInt(); + if (token < 0) token = -token; + token &= ~0xFF; + token |= (mNextToken.incrementAndGet() & 0xFF); return token; } @@ -1507,7 +1516,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter long token = mAncestralToken; synchronized (mQueueLock) { - if (mProcessedPackagesJournal.hasBeenProcessed(packageName)) { + if (mCurrentToken != 0 && mProcessedPackagesJournal.hasBeenProcessed(packageName)) { if (MORE_DEBUG) { Slog.i(TAG, "App in ever-stored, so using current token"); } @@ -1759,8 +1768,12 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter // Can't delete op from mCurrentOperations here. waitUntilOperationComplete may be // called after we receive cancel here. We need this op's state there. - // Remove all pending timeout messages for this operation type. - mBackupHandler.removeMessages(getMessageIdForOperationType(op.type)); + // Remove all pending timeout messages of types OP_TYPE_BACKUP_WAIT and + // OP_TYPE_RESTORE_WAIT. On the other hand, OP_TYPE_BACKUP cannot time out and + // doesn't require cancellation. + if (op.type == OP_TYPE_BACKUP_WAIT || op.type == OP_TYPE_RESTORE_WAIT) { + mBackupHandler.removeMessages(getMessageIdForOperationType(op.type)); + } } mCurrentOpLock.notifyAll(); } @@ -2108,14 +2121,26 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter // so tear down any ongoing backup task right away. @Override public void endFullBackup() { - synchronized (mQueueLock) { - if (mRunningFullBackupTask != null) { - if (DEBUG_SCHEDULING) { - Slog.i(TAG, "Telling running backup to stop"); + // offload the mRunningFullBackupTask.handleCancel() call to another thread, + // as we might have to wait for mCancelLock + Runnable endFullBackupRunnable = new Runnable() { + @Override + public void run() { + PerformFullTransportBackupTask pftbt = null; + synchronized (mQueueLock) { + if (mRunningFullBackupTask != null) { + pftbt = mRunningFullBackupTask; + } + } + if (pftbt != null) { + if (DEBUG_SCHEDULING) { + Slog.i(TAG, "Telling running backup to stop"); + } + pftbt.handleCancel(true); } - mRunningFullBackupTask.handleCancel(true); } - } + }; + new Thread(endFullBackupRunnable, "end-full-backup").start(); } // Used by both incremental and full restore @@ -2800,8 +2825,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter final long oldId = Binder.clearCallingIdentity(); try { String prevTransport = mTransportManager.selectTransport(transport); - Settings.Secure.putString(mContext.getContentResolver(), - Settings.Secure.BACKUP_TRANSPORT, transport); + updateStateForTransport(transport); Slog.v(TAG, "selectBackupTransport() set " + mTransportManager.getCurrentTransportName() + " returning " + prevTransport); return prevTransport; @@ -2826,9 +2850,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter @Override public void onSuccess(String transportName) { mTransportManager.selectTransport(transportName); - Settings.Secure.putString(mContext.getContentResolver(), - Settings.Secure.BACKUP_TRANSPORT, - mTransportManager.getCurrentTransportName()); + updateStateForTransport(mTransportManager.getCurrentTransportName()); Slog.v(TAG, "Transport successfully selected: " + transport.flattenToShortString()); try { @@ -2853,6 +2875,28 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter Binder.restoreCallingIdentity(oldId); } + private void updateStateForTransport(String newTransportName) { + // Publish the name change + Settings.Secure.putString(mContext.getContentResolver(), + Settings.Secure.BACKUP_TRANSPORT, newTransportName); + + // And update our current-dataset bookkeeping + IBackupTransport transport = mTransportManager.getTransportBinder(newTransportName); + if (transport != null) { + try { + mCurrentToken = transport.getCurrentRestoreSet(); + } catch (Exception e) { + // Oops. We can't know the current dataset token, so reset and figure it out + // when we do the next k/v backup operation on this transport. + mCurrentToken = 0; + } + } else { + // The named transport isn't bound at this particular moment, so we can't + // know yet what its current dataset token is. Reset as above. + mCurrentToken = 0; + } + } + // Supply the configuration Intent for the given transport. If the name is not one // of the available transports, or if the transport does not supply any configuration // UI, the method returns null. diff --git a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java index ce4f906ecdec..6bbed8cbfdf9 100644 --- a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java +++ b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java @@ -227,9 +227,8 @@ public class PerformBackupTask implements BackupRestoreTask { if (!mFinished) { finalizeBackup(); } else { - Slog.e(TAG, "Duplicate finish"); + Slog.e(TAG, "Duplicate finish of K/V pass"); } - mFinished = true; break; } } @@ -609,6 +608,7 @@ public class PerformBackupTask implements BackupRestoreTask { break; } } + mFinished = true; Slog.i(TAG, "K/V backup pass finished."); // Only once we're entirely finished do we release the wakelock for k/v backup. backupManagerService.getWakelock().release(); diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java index 21d5dc21c196..283a1f0e93dd 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -779,6 +779,9 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // state RESTORE_FINISHED : provide the "no more data" signpost callback at the end private void restoreFinished() { + if (DEBUG) { + Slog.d(TAG, "restoreFinished packageName=" + mCurrentPackage.packageName); + } try { backupManagerService .prepareOperationTimeout(mEphemeralOpToken, diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 02eb3b432dfe..c8e2dc57e0ed 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -682,11 +682,6 @@ public class ActivityManagerService extends IActivityManager.Stub ActivityInfo mLastAddedTaskActivity; /** - * List of packages whitelisted by DevicePolicyManager for locktask. Indexed by userId. - */ - SparseArray<String[]> mLockTaskPackages = new SparseArray<>(); - - /** * The package name of the DeviceOwner. This package is not permitted to have its data cleared. */ String mDeviceOwnerName; @@ -10882,7 +10877,6 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public void updateLockTaskPackages(int userId, String[] packages) { - // TODO: move this into LockTaskController final int callingUid = Binder.getCallingUid(); if (callingUid != 0 && callingUid != SYSTEM_UID) { enforceCallingPermission(android.Manifest.permission.UPDATE_LOCK_TASK_PACKAGES, @@ -10891,8 +10885,7 @@ public class ActivityManagerService extends IActivityManager.Stub synchronized (this) { if (DEBUG_LOCKTASK) Slog.w(TAG_LOCKTASK, "Whitelisting " + userId + ":" + Arrays.toString(packages)); - mLockTaskPackages.put(userId, packages); - mLockTaskController.onLockTaskPackagesUpdated(); + mLockTaskController.updateLockTaskPackages(userId, packages); } } @@ -13982,10 +13975,10 @@ public class ActivityManagerService extends IActivityManager.Stub mContext.getPackageManager().hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT) || Settings.Global.getInt( resolver, DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, 0) != 0; - final boolean supportsPictureInPicture = - mContext.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE); final boolean supportsMultiWindow = ActivityManager.supportsMultiWindow(mContext); + final boolean supportsPictureInPicture = supportsMultiWindow && + mContext.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE); final boolean supportsSplitScreenMultiWindow = ActivityManager.supportsSplitScreenMultiWindow(mContext); final boolean supportsMultiDisplay = mContext.getPackageManager() diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index fe28956d6923..c8a2a230a7e1 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -166,7 +166,6 @@ import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -1639,6 +1638,9 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D return true; } + // Check if caller is already present on display + final boolean uidPresentOnDisplay = activityDisplay.isUidPresent(callingUid); + final int displayOwnerUid = activityDisplay.mDisplay.getOwnerUid(); if (activityDisplay.mDisplay.getType() == TYPE_VIRTUAL && displayOwnerUid != SYSTEM_UID && displayOwnerUid != aInfo.applicationInfo.uid) { @@ -1651,7 +1653,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D } // Check if the caller is allowed to embed activities from other apps. if (mService.checkPermission(ACTIVITY_EMBEDDING, callingPid, callingUid) - == PERMISSION_DENIED) { + == PERMISSION_DENIED && !uidPresentOnDisplay) { if (DEBUG_TASKS) Slog.d(TAG, "Launch on display check:" + " disallow activity embedding without permission."); return false; @@ -1672,8 +1674,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D return true; } - // Check if caller is present on display - if (activityDisplay.isUidPresent(callingUid)) { + if (uidPresentOnDisplay) { if (DEBUG_TASKS) Slog.d(TAG, "Launch on display check:" + " allow launch for caller present on the display"); return true; @@ -3556,15 +3557,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D pw.println("mCurTaskIdForUser=" + mCurTaskIdForUser); pw.print(prefix); pw.println("mUserStackInFront=" + mUserStackInFront); pw.print(prefix); pw.println("mStacks=" + mStacks); - // TODO: move this to LockTaskController - final SparseArray<String[]> packages = mService.mLockTaskPackages; - if (packages.size() > 0) { - pw.print(prefix); pw.println("mLockTaskPackages (userId:packages)="); - for (int i = 0; i < packages.size(); ++i) { - pw.print(prefix); pw.print(prefix); pw.print(packages.keyAt(i)); - pw.print(":"); pw.println(Arrays.toString(packages.valueAt(i))); - } - } if (!mWaitingForActivityVisible.isEmpty()) { pw.print(prefix); pw.println("mWaitingForActivityVisible="); for (int i = 0; i < mWaitingForActivityVisible.size(); ++i) { diff --git a/services/core/java/com/android/server/am/LockTaskController.java b/services/core/java/com/android/server/am/LockTaskController.java index d8706bcc5e35..241e58391144 100644 --- a/services/core/java/com/android/server/am/LockTaskController.java +++ b/services/core/java/com/android/server/am/LockTaskController.java @@ -31,6 +31,7 @@ import static android.os.UserHandle.USER_ALL; import static android.os.UserHandle.USER_CURRENT; import static android.provider.Settings.Secure.LOCK_TO_APP_EXIT_LOCKED; import static android.view.Display.DEFAULT_DISPLAY; + import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKTASK; import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LOCKTASK; import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; @@ -55,7 +56,9 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.provider.Settings; import android.util.Slog; +import android.util.SparseArray; +import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.widget.LockPatternUtils; @@ -65,6 +68,7 @@ import com.android.server.wm.WindowManagerService; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; /** * Helper class that deals with all things related to task locking. This includes the screen pinning @@ -123,6 +127,11 @@ public class LockTaskController { private final ArrayList<TaskRecord> mLockTaskModeTasks = new ArrayList<>(); /** + * Packages that are allowed to be launched into the lock task mode for each user. + */ + private final SparseArray<String[]> mLockTaskPackages = new SparseArray<>(); + + /** * Store the current lock task mode. Possible values: * {@link ActivityManager#LOCK_TASK_MODE_NONE}, {@link ActivityManager#LOCK_TASK_MODE_LOCKED}, * {@link ActivityManager#LOCK_TASK_MODE_PINNED} @@ -159,8 +168,8 @@ public class LockTaskController { } /** - * @return whether the given task can be moved to the back of the stack. Locked tasks cannot be - * moved to the back of the stack. + * @return whether the given task is locked at the moment. Locked tasks cannot be moved to the + * back of the stack. */ boolean checkLockedTask(TaskRecord task) { if (mLockTaskModeTasks.contains(task)) { @@ -452,29 +461,35 @@ public class LockTaskController { } /** - * Called when the list of packages whitelisted for lock task mode is changed. Any currently - * locked tasks that got removed from the whitelist will be finished. + * Update packages that are allowed to be launched in lock task mode. + * @param userId Which user this whitelist is associated with + * @param packages The whitelist of packages allowed in lock task mode + * @see #mLockTaskPackages */ - // TODO: Missing unit tests - void onLockTaskPackagesUpdated() { - boolean didSomething = false; + void updateLockTaskPackages(int userId, String[] packages) { + mLockTaskPackages.put(userId, packages); + + boolean taskChanged = false; for (int taskNdx = mLockTaskModeTasks.size() - 1; taskNdx >= 0; --taskNdx) { final TaskRecord lockedTask = mLockTaskModeTasks.get(taskNdx); - final boolean wasWhitelisted = - (lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE) || - (lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED); + final boolean wasWhitelisted = lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE + || lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED; lockedTask.setLockTaskAuth(); - final boolean isWhitelisted = - (lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE) || - (lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED); - if (wasWhitelisted && !isWhitelisted) { - // Lost whitelisting authorization. End it now. - if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "onLockTaskPackagesUpdated: removing " + - lockedTask + " mLockTaskAuth()=" + lockedTask.lockTaskAuthToString()); - removeLockedTask(lockedTask); - lockedTask.performClearTaskLocked(); - didSomething = true; + final boolean isWhitelisted = lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE + || lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED; + + if (mLockTaskModeState != LOCK_TASK_MODE_LOCKED + || lockedTask.userId != userId + || !wasWhitelisted || isWhitelisted) { + continue; } + + // Terminate locked tasks that have recently lost whitelist authorization. + if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "onLockTaskPackagesUpdated: removing " + + lockedTask + " mLockTaskAuth()=" + lockedTask.lockTaskAuthToString()); + removeLockedTask(lockedTask); + lockedTask.performClearTaskLocked(); + taskChanged = true; } for (int displayNdx = mSupervisor.getChildCount() - 1; displayNdx >= 0; --displayNdx) { @@ -484,22 +499,40 @@ public class LockTaskController { stack.onLockTaskPackagesUpdatedLocked(); } } + final ActivityRecord r = mSupervisor.topRunningActivityLocked(); - final TaskRecord task = r != null ? r.getTask() : null; - if (mLockTaskModeTasks.isEmpty() && task != null + final TaskRecord task = (r != null) ? r.getTask() : null; + if (mLockTaskModeTasks.isEmpty() && task!= null && task.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE) { // This task must have just been authorized. if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "onLockTaskPackagesUpdated: starting new locktask task=" + task); - setLockTaskMode(task, LOCK_TASK_MODE_LOCKED, "package updated", - false); - didSomething = true; + setLockTaskMode(task, LOCK_TASK_MODE_LOCKED, "package updated", false); + taskChanged = true; } - if (didSomething) { + + if (taskChanged) { mSupervisor.resumeFocusedStackTopActivityLocked(); } } + boolean isPackageWhitelisted(int userId, String pkg) { + if (pkg == null) { + return false; + } + String[] whitelist; + whitelist = mLockTaskPackages.get(userId); + if (whitelist == null) { + return false; + } + for (String whitelistedPkg : whitelist) { + if (pkg.equals(whitelistedPkg)) { + return true; + } + } + return false; + } + /** * @return the topmost locked task */ @@ -556,8 +589,18 @@ public class LockTaskController { } public void dump(PrintWriter pw, String prefix) { - pw.print(prefix); pw.print("mLockTaskModeState=" + lockTaskModeToString()); - pw.println(" mLockTaskModeTasks" + mLockTaskModeTasks); + pw.println(prefix + "LockTaskController"); + prefix = prefix + " "; + pw.println(prefix + "mLockTaskModeState=" + lockTaskModeToString()); + pw.println(prefix + "mLockTaskModeTasks="); + for (int i = 0; i < mLockTaskModeTasks.size(); ++i) { + pw.println(prefix + " #" + i + " " + mLockTaskModeTasks.get(i)); + } + pw.println(prefix + "mLockTaskPackages (userId:packages)="); + for (int i = 0; i < mLockTaskPackages.size(); ++i) { + pw.println(prefix + " u" + mLockTaskPackages.keyAt(i) + + ":" + Arrays.toString(mLockTaskPackages.valueAt(i))); + } } private String lockTaskModeToString() { diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 0e651845df8d..48da6555e75c 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -78,7 +78,6 @@ import android.app.ActivityManager.TaskSnapshot; import android.app.ActivityOptions; import android.app.AppGlobals; import android.app.IActivityManager; -import android.app.WindowConfiguration; import android.content.ComponentName; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -857,8 +856,13 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi } mResizeMode = info.resizeMode; mSupportsPictureInPicture = info.supportsPictureInPicture(); - mLockTaskMode = info.lockTaskLaunchMode; mPrivileged = (info.applicationInfo.privateFlags & PRIVATE_FLAG_PRIVILEGED) != 0; + mLockTaskMode = info.lockTaskLaunchMode; + if (!mPrivileged && (mLockTaskMode == LOCK_TASK_LAUNCH_MODE_ALWAYS + || mLockTaskMode == LOCK_TASK_LAUNCH_MODE_NEVER)) { + // Non-priv apps are not allowed to use always or never, fall back to default + mLockTaskMode = LOCK_TASK_LAUNCH_MODE_DEFAULT; + } setLockTaskAuth(); } @@ -1396,16 +1400,11 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi } void setLockTaskAuth() { - if (!mPrivileged && - (mLockTaskMode == LOCK_TASK_LAUNCH_MODE_ALWAYS || - mLockTaskMode == LOCK_TASK_LAUNCH_MODE_NEVER)) { - // Non-priv apps are not allowed to use always or never, fall back to default - mLockTaskMode = LOCK_TASK_LAUNCH_MODE_DEFAULT; - } + final String pkg = (realActivity != null) ? realActivity.getPackageName() : null; switch (mLockTaskMode) { case LOCK_TASK_LAUNCH_MODE_DEFAULT: - mLockTaskAuth = isLockTaskWhitelistedLocked() ? - LOCK_TASK_AUTH_WHITELISTED : LOCK_TASK_AUTH_PINNABLE; + mLockTaskAuth = mService.mLockTaskController.isPackageWhitelisted(userId, pkg) + ? LOCK_TASK_AUTH_WHITELISTED : LOCK_TASK_AUTH_PINNABLE; break; case LOCK_TASK_LAUNCH_MODE_NEVER: @@ -1417,31 +1416,14 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi break; case LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED: - mLockTaskAuth = isLockTaskWhitelistedLocked() ? - LOCK_TASK_AUTH_LAUNCHABLE : LOCK_TASK_AUTH_PINNABLE; + mLockTaskAuth = mService.mLockTaskController.isPackageWhitelisted(userId, pkg) + ? LOCK_TASK_AUTH_LAUNCHABLE : LOCK_TASK_AUTH_PINNABLE; break; } if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "setLockTaskAuth: task=" + this + " mLockTaskAuth=" + lockTaskAuthToString()); } - private boolean isLockTaskWhitelistedLocked() { - String pkg = (realActivity != null) ? realActivity.getPackageName() : null; - if (pkg == null) { - return false; - } - String[] packages = mService.mLockTaskPackages.get(userId); - if (packages == null) { - return false; - } - for (int i = packages.length - 1; i >= 0; --i) { - if (pkg.equals(packages[i])) { - return true; - } - } - return false; - } - boolean isOverHomeStack() { return mTaskToReturnTo == ACTIVITY_TYPE_HOME; } diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 930e4f098f5f..1f03e666d072 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -1441,7 +1441,7 @@ class PackageManagerShellCommand extends ShellCommand { out = session.openWrite(splitName, 0, sizeBytes); int total = 0; - byte[] buffer = new byte[65536]; + byte[] buffer = new byte[1024 * 1024]; int c; while ((c = in.read(buffer)) != -1) { total += c; diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index a806af46d021..1d7f66f54faf 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3627,10 +3627,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { return -1; } - // If the device is in Vr mode, drop the volume keys and don't - // forward it to the application/dispatch the audio event. + // If the device is in VR mode and keys are "internal" (e.g. on the side of the + // device), then drop the volume keys and don't forward it to the application/dispatch + // the audio event. if (mPersistentVrModeEnabled) { - return -1; + final InputDevice d = event.getDevice(); + if (d != null && !d.isExternal()) { + return -1; + } } } else if (keyCode == KeyEvent.KEYCODE_TAB && event.isMetaPressed()) { // Pass through keyboard navigation keys. diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 38dc33fa4dbc..f10bf1a3ffb5 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -97,12 +97,58 @@ public class StatusBarManagerService extends IStatusBarService.Stub { int what2; IBinder token; + public DisableRecord(int userId, IBinder token) { + this.userId = userId; + this.token = token; + try { + token.linkToDeath(this, 0); + } catch (RemoteException re) { + // Give up + } + } + + @Override public void binderDied() { Slog.i(TAG, "binder died for pkg=" + pkg); disableForUser(0, token, pkg, userId); disable2ForUser(0, token, pkg, userId); token.unlinkToDeath(this, 0); } + + public void setFlags(int what, int which, String pkg) { + switch (which) { + case 1: + what1 = what; + return; + case 2: + what2 = what; + return; + default: + Slog.w(TAG, "Can't set unsupported disable flag " + which + + ": 0x" + Integer.toHexString(what)); + } + this.pkg = pkg; + } + + public int getFlags(int which) { + switch (which) { + case 1: return what1; + case 2: return what2; + default: + Slog.w(TAG, "Can't get unsupported disable flag " + which); + return 0; + } + } + + public boolean isEmpty() { + return what1 == 0 && what2 == 0; + } + + @Override + public String toString() { + return String.format("userId=%d what1=0x%08X what2=0x%08X pkg=%s token=%s", + userId, what1, what2, pkg, token); + } } /** @@ -970,42 +1016,42 @@ public class StatusBarManagerService extends IStatusBarService.Stub { Slog.d(TAG, "manageDisableList userId=" + userId + " what=0x" + Integer.toHexString(what) + " pkg=" + pkg); } - // update the list + + // Find matching record, if any final int N = mDisableRecords.size(); - DisableRecord tok = null; + DisableRecord record = null; int i; - for (i=0; i<N; i++) { - DisableRecord t = mDisableRecords.get(i); - if (t.token == token && t.userId == userId) { - tok = t; + for (i = 0; i < N; i++) { + DisableRecord r = mDisableRecords.get(i); + if (r.token == token && r.userId == userId) { + record = r; break; } } - if (what == 0 || !token.isBinderAlive()) { - if (tok != null) { + + // Remove record if binder is already dead + if (!token.isBinderAlive()) { + if (record != null) { mDisableRecords.remove(i); - tok.token.unlinkToDeath(tok, 0); - } - } else { - if (tok == null) { - tok = new DisableRecord(); - tok.userId = userId; - try { - token.linkToDeath(tok, 0); - } - catch (RemoteException ex) { - return; // give up - } - mDisableRecords.add(tok); + record.token.unlinkToDeath(record, 0); } - if (which == 1) { - tok.what1 = what; - } else { - tok.what2 = what; + return; + } + + // Update existing record + if (record != null) { + record.setFlags(what, which, pkg); + if (record.isEmpty()) { + mDisableRecords.remove(i); + record.token.unlinkToDeath(record, 0); } - tok.token = token; - tok.pkg = pkg; + return; } + + // Record doesn't exist, so we create a new one + record = new DisableRecord(userId, token); + record.setFlags(what, which, pkg); + mDisableRecords.add(record); } // lock on mDisableRecords @@ -1016,7 +1062,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub { for (int i=0; i<N; i++) { final DisableRecord rec = mDisableRecords.get(i); if (rec.userId == userId) { - net |= (which == 1) ? rec.what1 : rec.what2; + net |= rec.getFlags(which); } } return net; @@ -1036,11 +1082,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub { pw.println(" mDisableRecords.size=" + N); for (int i=0; i<N; i++) { DisableRecord tok = mDisableRecords.get(i); - pw.println(" [" + i + "] userId=" + tok.userId - + " what1=0x" + Integer.toHexString(tok.what1) - + " what2=0x" + Integer.toHexString(tok.what2) - + " pkg=" + tok.pkg - + " token=" + tok.token); + pw.println(" [" + i + "] " + tok); } pw.println(" mCurrentUserId=" + mCurrentUserId); pw.println(" mIcons="); diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index ea2f305989fe..2d1fc912fcfc 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -53,6 +53,7 @@ import static com.android.server.wm.WindowManagerService.logWithStack; import static com.android.server.wm.proto.AppWindowTokenProto.NAME; import static com.android.server.wm.proto.AppWindowTokenProto.WINDOW_TOKEN; +import android.annotation.CallSuper; import android.annotation.NonNull; import android.app.Activity; import android.content.res.Configuration; @@ -1620,8 +1621,9 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } } + @CallSuper @Override - void writeToProto(ProtoOutputStream proto, long fieldId) { + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); writeNameToProto(proto, NAME); super.writeToProto(proto, WINDOW_TOKEN); diff --git a/services/core/java/com/android/server/wm/ConfigurationContainer.java b/services/core/java/com/android/server/wm/ConfigurationContainer.java index 28ba9b3db777..1da94da1b3b6 100644 --- a/services/core/java/com/android/server/wm/ConfigurationContainer.java +++ b/services/core/java/com/android/server/wm/ConfigurationContainer.java @@ -24,9 +24,14 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import static android.app.WindowConfiguration.activityTypeToString; +import static com.android.server.wm.proto.ConfigurationContainerProto.FULL_CONFIGURATION; +import static com.android.server.wm.proto.ConfigurationContainerProto.MERGED_OVERRIDE_CONFIGURATION; +import static com.android.server.wm.proto.ConfigurationContainerProto.OVERRIDE_CONFIGURATION; +import android.annotation.CallSuper; import android.app.WindowConfiguration; import android.content.res.Configuration; +import android.util.proto.ProtoOutputStream; import java.util.ArrayList; @@ -252,6 +257,24 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { } } + /** + * Write to a protocol buffer output stream. Protocol buffer message definition is at + * {@link com.android.server.wm.proto.ConfigurationContainerProto}. + * + * @param protoOutputStream Stream to write the ConfigurationContainer object to. + * @param fieldId Field Id of the ConfigurationContainer as defined in the parent + * message. + * @hide + */ + @CallSuper + public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) { + final long token = protoOutputStream.start(fieldId); + mOverrideConfiguration.writeToProto(protoOutputStream, OVERRIDE_CONFIGURATION); + mFullConfiguration.writeToProto(protoOutputStream, FULL_CONFIGURATION); + mMergedOverrideConfiguration.writeToProto(protoOutputStream, MERGED_OVERRIDE_CONFIGURATION); + protoOutputStream.end(token); + } + abstract protected int getChildCount(); abstract protected E getChildAt(int index); diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 6cf608ab0591..817a01c5c8d7 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -112,7 +112,9 @@ import static com.android.server.wm.proto.DisplayProto.PINNED_STACK_CONTROLLER; import static com.android.server.wm.proto.DisplayProto.ROTATION; import static com.android.server.wm.proto.DisplayProto.SCREEN_ROTATION_ANIMATION; import static com.android.server.wm.proto.DisplayProto.STACKS; +import static com.android.server.wm.proto.DisplayProto.WINDOW_CONTAINER; +import android.annotation.CallSuper; import android.annotation.NonNull; import android.app.ActivityManager.StackId; import android.app.WindowConfiguration; @@ -2119,8 +2121,11 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); proto.write(ID, mDisplayId); for (int stackNdx = mTaskStackContainers.size() - 1; stackNdx >= 0; --stackNdx) { final TaskStack stack = mTaskStackContainers.get(stackNdx); diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 8a749762f993..227e4b2b59af 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import android.annotation.CallSuper; import android.content.res.Configuration; import android.graphics.Rect; import android.hardware.power.V1_0.PowerHint; @@ -89,8 +90,9 @@ import static com.android.server.wm.WindowSurfacePlacer.SET_TURN_ON_SCREEN; import static com.android.server.wm.WindowSurfacePlacer.SET_UPDATE_ROTATION; import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_ACTION_PENDING; import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_MAY_CHANGE; -import static com.android.server.wm.proto.WindowManagerServiceProto.DISPLAYS; -import static com.android.server.wm.proto.WindowManagerServiceProto.WINDOWS; +import static com.android.server.wm.proto.RootWindowContainerProto.DISPLAYS; +import static com.android.server.wm.proto.RootWindowContainerProto.WINDOWS; +import static com.android.server.wm.proto.RootWindowContainerProto.WINDOW_CONTAINER; /** Root {@link WindowContainer} for the device. */ class RootWindowContainer extends WindowContainer<DisplayContent> { @@ -1077,7 +1079,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { } } - void writeToProto(ProtoOutputStream proto) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { + final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); if (mService.mDisplayReady) { final int count = mChildren.size(); for (int i = 0; i < count; ++i) { @@ -1088,6 +1094,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { forAllWindows((w) -> { w.writeIdentifierToProto(proto, WINDOWS); }, true); + proto.end(token); } @Override diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 55b6c912ef90..7464a9b92d40 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -34,7 +34,9 @@ import static com.android.server.wm.proto.TaskProto.BOUNDS; import static com.android.server.wm.proto.TaskProto.FILLS_PARENT; import static com.android.server.wm.proto.TaskProto.ID; import static com.android.server.wm.proto.TaskProto.TEMP_INSET_BOUNDS; +import static com.android.server.wm.proto.TaskProto.WINDOW_CONTAINER; +import android.annotation.CallSuper; import android.app.ActivityManager.StackId; import android.app.ActivityManager.TaskDescription; import android.content.pm.ActivityInfo; @@ -735,8 +737,11 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU return "Task=" + mTaskId; } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); proto.write(ID, mTaskId); for (int i = mChildren.size() - 1; i >= 0; i--) { final AppWindowToken appWindowToken = mChildren.get(i); diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 4664dcbbfa75..126d820e69b6 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -41,7 +41,9 @@ import static com.android.server.wm.proto.StackProto.BOUNDS; import static com.android.server.wm.proto.StackProto.FILLS_PARENT; import static com.android.server.wm.proto.StackProto.ID; import static com.android.server.wm.proto.StackProto.TASKS; +import static com.android.server.wm.proto.StackProto.WINDOW_CONTAINER; +import android.annotation.CallSuper; import android.app.ActivityManager.StackId; import android.content.res.Configuration; import android.graphics.Rect; @@ -1219,8 +1221,11 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye return mMinimizeAmount != 0f; } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); proto.write(ID, mStackId); for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; taskNdx--) { mChildren.get(taskNdx).writeToProto(proto, TASKS); diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 926719ddf318..40923c8216c0 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -19,12 +19,14 @@ package com.android.server.wm; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; -import static android.content.res.Configuration.EMPTY; +import static com.android.server.wm.proto.WindowContainerProto.CONFIGURATION_CONTAINER; +import static com.android.server.wm.proto.WindowContainerProto.ORIENTATION; import android.annotation.CallSuper; import android.content.res.Configuration; import android.util.Pools; +import android.util.proto.ProtoOutputStream; import com.android.internal.util.ToBooleanFunction; import java.util.Comparator; @@ -685,6 +687,23 @@ a * Returns whether this child is on top of the window hierarchy. } } + /** + * Write to a protocol buffer output stream. Protocol buffer message definition is at + * {@link com.android.server.wm.proto.WindowContainerProto}. + * + * @param protoOutputStream Stream to write the WindowContainer object to. + * @param fieldId Field Id of the WindowContainer as defined in the parent message. + * @hide + */ + @CallSuper + @Override + public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) { + final long token = protoOutputStream.start(fieldId); + super.writeToProto(protoOutputStream, CONFIGURATION_CONTAINER); + protoOutputStream.write(ORIENTATION, mOrientation); + protoOutputStream.end(token); + } + String getName() { return toString(); } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 32ee51c8f751..6f796481cc08 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -109,6 +109,7 @@ import static com.android.server.wm.proto.WindowManagerServiceProto.FOCUSED_WIND import static com.android.server.wm.proto.WindowManagerServiceProto.INPUT_METHOD_WINDOW; import static com.android.server.wm.proto.WindowManagerServiceProto.LAST_ORIENTATION; import static com.android.server.wm.proto.WindowManagerServiceProto.POLICY; +import static com.android.server.wm.proto.WindowManagerServiceProto.ROOT_WINDOW_CONTAINER; import static com.android.server.wm.proto.WindowManagerServiceProto.ROTATION; import android.Manifest; @@ -6505,7 +6506,7 @@ public class WindowManagerService extends IWindowManager.Stub private void writeToProtoLocked(ProtoOutputStream proto) { mPolicy.writeToProto(proto, POLICY); - mRoot.writeToProto(proto); + mRoot.writeToProto(proto, ROOT_WINDOW_CONTAINER); if (mCurrentFocus != null) { mCurrentFocus.writeIdentifierToProto(proto, FOCUSED_WINDOW); } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 1b055664093f..8a2cb5a148d8 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -116,7 +116,9 @@ import static com.android.server.wm.proto.WindowStateProto.IDENTIFIER; import static com.android.server.wm.proto.WindowStateProto.PARENT_FRAME; import static com.android.server.wm.proto.WindowStateProto.STACK_ID; import static com.android.server.wm.proto.WindowStateProto.SURFACE_INSETS; +import static com.android.server.wm.proto.WindowStateProto.WINDOW_CONTAINER; +import android.annotation.CallSuper; import android.app.AppOpsManager; import android.content.Context; import android.content.res.Configuration; @@ -3124,8 +3126,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP || (isChildWindow() && getParentWindow().isDockedResizing()); } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); writeIdentifierToProto(proto, IDENTIFIER); proto.write(DISPLAY_ID, getDisplayId()); proto.write(STACK_ID, getStackId()); diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index 422615b10fc1..943448eea2b0 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import android.annotation.CallSuper; import android.util.proto.ProtoOutputStream; import java.util.Comparator; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; @@ -28,6 +29,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL; import static com.android.server.wm.proto.WindowTokenProto.HASH_CODE; import static com.android.server.wm.proto.WindowTokenProto.WINDOWS; +import static com.android.server.wm.proto.WindowTokenProto.WINDOW_CONTAINER; import android.os.Debug; import android.os.IBinder; @@ -263,8 +265,11 @@ class WindowToken extends WindowContainer<WindowState> { super.onDisplayChanged(dc); } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); proto.write(HASH_CODE, System.identityHashCode(this)); for (int i = 0; i < mChildren.size(); i++) { final WindowState w = mChildren.get(i); diff --git a/services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java b/services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java index e98e5bfb110e..f9d7f9d4904a 100644 --- a/services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java @@ -20,19 +20,13 @@ import static android.app.ActivityManager.LOCK_TASK_MODE_LOCKED; import static android.app.ActivityManager.LOCK_TASK_MODE_NONE; import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED; import static android.os.Process.SYSTEM_UID; + import static com.android.server.am.LockTaskController.STATUS_BAR_MASK_LOCKED; import static com.android.server.am.LockTaskController.STATUS_BAR_MASK_PINNED; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; + +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import android.app.StatusBarManager; import android.app.admin.IDevicePolicyManager; @@ -72,7 +66,8 @@ import org.mockito.verification.VerificationMode; @SmallTest public class LockTaskControllerTest { private static final String TEST_PACKAGE_NAME = "com.test.package"; - private static final String TEST_CLASS_NAME = TEST_PACKAGE_NAME + ".TestClass"; + private static final String TEST_PACKAGE_NAME_2 = "com.test.package2"; + private static final String TEST_CLASS_NAME = ".TestClass"; private static final int TEST_USER_ID = 123; private static final int TEST_UID = 10467; @@ -309,15 +304,111 @@ public class LockTaskControllerTest { verify(mLockPatternUtils).requireCredentialEntry(UserHandle.USER_ALL); } + @Test + public void testUpdateLockTaskPackages() throws Exception { + String[] whitelist1 = {TEST_PACKAGE_NAME, TEST_PACKAGE_NAME_2}; + String[] whitelist2 = {TEST_PACKAGE_NAME}; + + // No package is whitelisted initially + for (String pkg : whitelist1) { + assertFalse("Package shouldn't be whitelisted: " + pkg, + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, pkg)); + assertFalse("Package shouldn't be whitelisted for user 0: " + pkg, + mLockTaskController.isPackageWhitelisted(0, pkg)); + } + + // Apply whitelist + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist1); + + // Assert the whitelist is applied to the correct user + for (String pkg : whitelist1) { + assertTrue("Package should be whitelisted: " + pkg, + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, pkg)); + assertFalse("Package shouldn't be whitelisted for user 0: " + pkg, + mLockTaskController.isPackageWhitelisted(0, pkg)); + } + + // Update whitelist + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist2); + + // Assert the new whitelist is applied + assertTrue("Package should remain whitelisted: " + TEST_PACKAGE_NAME, + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, TEST_PACKAGE_NAME)); + assertFalse("Package should no longer be whitelisted: " + TEST_PACKAGE_NAME_2, + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, TEST_PACKAGE_NAME_2)); + } + + @Test + public void testUpdateLockTaskPackages_taskRemoved() throws Exception { + // GIVEN two tasks which are whitelisted initially + TaskRecord tr1 = getTaskRecordForUpdate(TEST_PACKAGE_NAME, true); + TaskRecord tr2 = getTaskRecordForUpdate(TEST_PACKAGE_NAME_2, false); + String[] whitelist = {TEST_PACKAGE_NAME, TEST_PACKAGE_NAME_2}; + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist); + + // GIVEN the tasks are launched into LockTask mode + mLockTaskController.startLockTaskMode(tr1, false, TEST_UID); + mLockTaskController.startLockTaskMode(tr2, false, TEST_UID); + assertEquals(LOCK_TASK_MODE_LOCKED, mLockTaskController.getLockTaskModeState()); + assertTrue(mLockTaskController.checkLockedTask(tr1)); + assertTrue(mLockTaskController.checkLockedTask(tr2)); + verifyLockTaskStarted(STATUS_BAR_MASK_LOCKED); + + // WHEN removing one package from whitelist + whitelist = new String[] {TEST_PACKAGE_NAME}; + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist); + + // THEN the task running that package should be stopped + verify(tr2).performClearTaskLocked(); + assertFalse(mLockTaskController.checkLockedTask(tr2)); + // THEN the other task should remain locked + assertEquals(LOCK_TASK_MODE_LOCKED, mLockTaskController.getLockTaskModeState()); + assertTrue(mLockTaskController.checkLockedTask(tr1)); + verifyLockTaskStarted(STATUS_BAR_MASK_LOCKED); + + // WHEN removing the last package from whitelist + whitelist = new String[] {}; + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist); + + // THEN the last task should be cleared, and the system should quit LockTask mode + verify(tr1).performClearTaskLocked(); + assertFalse(mLockTaskController.checkLockedTask(tr1)); + assertEquals(LOCK_TASK_MODE_NONE, mLockTaskController.getLockTaskModeState()); + verifyLockTaskStopped(times(1)); + } + private TaskRecord getTaskRecord(int lockTaskAuth) { + return getTaskRecord(TEST_PACKAGE_NAME, lockTaskAuth); + } + + private TaskRecord getTaskRecord(String pkg, int lockTaskAuth) { TaskRecord tr = mock(TaskRecord.class); tr.mLockTaskAuth = lockTaskAuth; tr.intent = new Intent() - .setComponent(new ComponentName(TEST_PACKAGE_NAME, TEST_CLASS_NAME)); + .setComponent(ComponentName.createRelative(pkg, TEST_CLASS_NAME)); tr.userId = TEST_USER_ID; return tr; } + /** + * @param isAppAware {@code true} if the app has marked if_whitelisted in its manifest + */ + private TaskRecord getTaskRecordForUpdate(String pkg, boolean isAppAware) { + final int authIfWhitelisted = isAppAware + ? TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE + : TaskRecord.LOCK_TASK_AUTH_WHITELISTED; + TaskRecord tr = getTaskRecord(pkg, authIfWhitelisted); + doAnswer((invocation) -> { + boolean isWhitelisted = + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, pkg); + tr.mLockTaskAuth = isWhitelisted + ? authIfWhitelisted + : TaskRecord.LOCK_TASK_AUTH_PINNABLE; + return null; + }).when(tr).setLockTaskAuth(); + return tr; + } + private void verifyLockTaskStarted(int statusBarMask) throws Exception { // THEN the keyguard should have been disabled verify(mWindowManager).disableKeyguard(any(IBinder.class), anyString()); |