diff options
95 files changed, 651 insertions, 218 deletions
diff --git a/api/current.txt b/api/current.txt index 59b8fb3c0383..7ddd5af61420 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28864,6 +28864,8 @@ package android.printservice { method public boolean isFailed(); method public boolean isQueued(); method public boolean isStarted(); + method public void setProgress(float); + method public void setStatus(java.lang.CharSequence); method public boolean setTag(java.lang.String); method public boolean start(); } diff --git a/api/system-current.txt b/api/system-current.txt index f02956867093..edc9f18c1046 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30847,6 +30847,8 @@ package android.printservice { method public boolean isFailed(); method public boolean isQueued(); method public boolean isStarted(); + method public void setProgress(float); + method public void setStatus(java.lang.CharSequence); method public boolean setTag(java.lang.String); method public boolean start(); } diff --git a/api/test-current.txt b/api/test-current.txt index 59b8fb3c0383..483870277c52 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -28745,7 +28745,9 @@ package android.print { method public java.lang.String getLabel(); method public android.print.PageRange[] getPages(); method public android.print.PrinterId getPrinterId(); + method public float getProgress(); method public int getState(); + method public java.lang.CharSequence getStatus(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.print.PrintJobInfo> CREATOR; field public static final int STATE_BLOCKED = 4; // 0x4 @@ -28864,6 +28866,8 @@ package android.printservice { method public boolean isFailed(); method public boolean isQueued(); method public boolean isStarted(); + method public void setProgress(float); + method public void setStatus(java.lang.CharSequence); method public boolean setTag(java.lang.String); method public boolean start(); } diff --git a/core/java/android/print/IPrintSpooler.aidl b/core/java/android/print/IPrintSpooler.aidl index db2bf1a65e13..b7cfbea43646 100644 --- a/core/java/android/print/IPrintSpooler.aidl +++ b/core/java/android/print/IPrintSpooler.aidl @@ -41,6 +41,23 @@ oneway interface IPrintSpooler { void createPrintJob(in PrintJobInfo printJob); void setPrintJobState(in PrintJobId printJobId, int status, String stateReason, IPrintSpoolerCallbacks callback, int sequence); + + /** + * Set the progress of this print job + * + * @param printJobId The print job to update + * @param progress The new progress + */ + void setProgress(in PrintJobId printJobId, in float progress); + + /** + * Set the status of this print job + * + * @param printJobId The print job to update + * @param status The new status, can be null + */ + void setStatus(in PrintJobId printJobId, in CharSequence status); + void setPrintJobTag(in PrintJobId printJobId, String tag, IPrintSpoolerCallbacks callback, int sequence); void writePrintJobData(in ParcelFileDescriptor fd, in PrintJobId printJobId); diff --git a/core/java/android/print/PrintJobInfo.java b/core/java/android/print/PrintJobInfo.java index 63f94fe642fb..7148c8757830 100644 --- a/core/java/android/print/PrintJobInfo.java +++ b/core/java/android/print/PrintJobInfo.java @@ -16,10 +16,15 @@ package android.print; +import android.annotation.FloatRange; +import android.annotation.Nullable; +import android.annotation.TestApi; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; +import com.android.internal.util.Preconditions; + import java.util.Arrays; /** @@ -149,9 +154,6 @@ public final class PrintJobInfo implements Parcelable { /** How many copies to print. */ private int mCopies; - /** Reason for the print job being in its current state. */ - private String mStateReason; - /** The pages to print */ private PageRange[] mPageRanges; @@ -161,6 +163,12 @@ public final class PrintJobInfo implements Parcelable { /** Information about the printed document. */ private PrintDocumentInfo mDocumentInfo; + /** The progress made on printing this job or -1 if not set. */ + private float mProgress; + + /** A short string describing the status of this job. */ + private CharSequence mStatus; + /** Advanced printer specific options. */ private Bundle mAdvancedOptions; @@ -169,7 +177,7 @@ public final class PrintJobInfo implements Parcelable { /** @hide*/ public PrintJobInfo() { - /* do nothing */ + mProgress = -1; } /** @hide */ @@ -183,10 +191,11 @@ public final class PrintJobInfo implements Parcelable { mTag = other.mTag; mCreationTime = other.mCreationTime; mCopies = other.mCopies; - mStateReason = other.mStateReason; mPageRanges = other.mPageRanges; mAttributes = other.mAttributes; mDocumentInfo = other.mDocumentInfo; + mProgress = other.mProgress; + mStatus = other.mStatus; mCanceling = other.mCanceling; mAdvancedOptions = other.mAdvancedOptions; } @@ -201,7 +210,6 @@ public final class PrintJobInfo implements Parcelable { mTag = parcel.readString(); mCreationTime = parcel.readLong(); mCopies = parcel.readInt(); - mStateReason = parcel.readString(); Parcelable[] parcelables = parcel.readParcelableArray(null); if (parcelables != null) { mPageRanges = new PageRange[parcelables.length]; @@ -211,6 +219,8 @@ public final class PrintJobInfo implements Parcelable { } mAttributes = (PrintAttributes) parcel.readParcelable(null); mDocumentInfo = (PrintDocumentInfo) parcel.readParcelable(null); + mProgress = parcel.readFloat(); + mStatus = parcel.readCharSequence(); mCanceling = (parcel.readInt() == 1); mAdvancedOptions = parcel.readBundle(); } @@ -227,7 +237,7 @@ public final class PrintJobInfo implements Parcelable { /** * Sets the unique print job id. * - * @param The job id. + * @param id The job id. * * @hide */ @@ -265,7 +275,7 @@ public final class PrintJobInfo implements Parcelable { } /** - * Sets the unique target pritner id. + * Sets the unique target printer id. * * @param printerId The target printer id. * @@ -326,6 +336,30 @@ public final class PrintJobInfo implements Parcelable { } /** + * Sets the progress of the print job. + * + * @param progress the progress of the job + * + * @hide + */ + public void setProgress(@FloatRange(from=0.0, to=1.0) float progress) { + Preconditions.checkArgumentInRange(progress, 0, 1, "progress"); + + mProgress = progress; + } + + /** + * Sets the status of the print job. + * + * @param status the status of the job, can be null + * + * @hide + */ + public void setStatus(@Nullable CharSequence status) { + mStatus = status; + } + + /** * Sets the owning application id. * * @return The owning app id. @@ -416,30 +450,6 @@ public final class PrintJobInfo implements Parcelable { } /** - * Gets the reason for the print job being in the current state. - * - * @return The reason, or null if there is no reason or the - * reason is unknown. - * - * @hide - */ - public String getStateReason() { - return mStateReason; - } - - /** - * Sets the reason for the print job being in the current state. - * - * @param stateReason The reason, or null if there is no reason - * or the reason is unknown. - * - * @hide - */ - public void setStateReason(String stateReason) { - mStateReason = stateReason; - } - - /** * Gets the included pages. * * @return The included pages or <code>null</code> if not set. @@ -604,10 +614,11 @@ public final class PrintJobInfo implements Parcelable { parcel.writeString(mTag); parcel.writeLong(mCreationTime); parcel.writeInt(mCopies); - parcel.writeString(mStateReason); parcel.writeParcelableArray(mPageRanges, flags); parcel.writeParcelable(mAttributes, flags); parcel.writeParcelable(mDocumentInfo, 0); + parcel.writeFloat(mProgress); + parcel.writeCharSequence(mStatus); parcel.writeInt(mCanceling ? 1 : 0); parcel.writeBundle(mAdvancedOptions); } @@ -631,6 +642,9 @@ public final class PrintJobInfo implements Parcelable { builder.append(", pages: " + (mPageRanges != null ? Arrays.toString(mPageRanges) : null)); builder.append(", hasAdvancedOptions: " + (mAdvancedOptions != null)); + builder.append(", progress: " + mProgress); + builder.append(", status: " + (mStatus != null + ? mStatus.toString() : null)); builder.append("}"); return builder.toString(); } @@ -666,6 +680,28 @@ public final class PrintJobInfo implements Parcelable { } /** + * Get the progress that has been made printing this job. + * + * @return the print progress or -1 if not set + * @hide + */ + @TestApi + public float getProgress() { + return mProgress; + } + + /** + * Get the status of this job. + * + * @return the status of this job or null if not set + * @hide + */ + @TestApi + public @Nullable CharSequence getStatus() { + return mStatus; + } + + /** * Builder for creating a {@link PrintJobInfo}. */ public static final class Builder { @@ -711,6 +747,28 @@ public final class PrintJobInfo implements Parcelable { } /** + * Sets the progress of the print job. + * + * @param progress the progress of the job + * @hide + */ + public void setProgress(@FloatRange(from=0.0, to=1.0) float progress) { + Preconditions.checkArgumentInRange(progress, 0, 1, "progress"); + + mPrototype.mProgress = progress; + } + + /** + * Sets the status of the print job. + * + * @param status the status of the job, can be null + * @hide + */ + public void setStatus(@Nullable CharSequence status) { + mPrototype.mStatus = status; + } + + /** * Puts an advanced (printer specific) option. * * @param key The option key. diff --git a/core/java/android/printservice/IPrintServiceClient.aidl b/core/java/android/printservice/IPrintServiceClient.aidl index c2dfc30a4e25..b4baa4851392 100644 --- a/core/java/android/printservice/IPrintServiceClient.aidl +++ b/core/java/android/printservice/IPrintServiceClient.aidl @@ -35,6 +35,22 @@ interface IPrintServiceClient { boolean setPrintJobTag(in PrintJobId printJobId, String tag); oneway void writePrintJobData(in ParcelFileDescriptor fd, in PrintJobId printJobId); + /** + * Set the progress of this print job + * + * @param printJobId The print job to update + * @param progress The new progress + */ + void setProgress(in PrintJobId printJobId, in float progress); + + /** + * Set the status of this print job + * + * @param printJobId The print job to update + * @param status The new status, can be null + */ + void setStatus(in PrintJobId printJobId, in CharSequence status); + void onPrintersAdded(in ParceledListSlice printers); void onPrintersRemoved(in ParceledListSlice printerIds); } diff --git a/core/java/android/printservice/PrintJob.java b/core/java/android/printservice/PrintJob.java index 6fa0bddb43f4..86fc292cb003 100644 --- a/core/java/android/printservice/PrintJob.java +++ b/core/java/android/printservice/PrintJob.java @@ -16,6 +16,10 @@ package android.printservice; +import android.annotation.FloatRange; +import android.annotation.MainThread; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.RemoteException; import android.print.PrintJobId; import android.print.PrintJobInfo; @@ -41,7 +45,7 @@ public final class PrintJob { private PrintJobInfo mCachedInfo; - PrintJob(PrintJobInfo jobInfo, IPrintServiceClient client) { + PrintJob(@NonNull PrintJobInfo jobInfo, @NonNull IPrintServiceClient client) { mCachedInfo = jobInfo; mPrintServiceClient = client; mDocument = new PrintDocument(mCachedInfo.getId(), client, @@ -53,6 +57,7 @@ public final class PrintJob { * * @return The id. */ + @MainThread public PrintJobId getId() { PrintService.throwIfNotCalledOnMainThread(); return mCachedInfo.getId(); @@ -68,7 +73,8 @@ public final class PrintJob { * * @return The print job info. */ - public PrintJobInfo getInfo() { + @MainThread + public @NonNull PrintJobInfo getInfo() { PrintService.throwIfNotCalledOnMainThread(); if (isInImmutableState()) { return mCachedInfo; @@ -90,7 +96,8 @@ public final class PrintJob { * * @return The document. */ - public PrintDocument getDocument() { + @MainThread + public @NonNull PrintDocument getDocument() { PrintService.throwIfNotCalledOnMainThread(); return mDocument; } @@ -104,6 +111,7 @@ public final class PrintJob { * @see #start() * @see #cancel() */ + @MainThread public boolean isQueued() { PrintService.throwIfNotCalledOnMainThread(); return getInfo().getState() == PrintJobInfo.STATE_QUEUED; @@ -117,8 +125,9 @@ public final class PrintJob { * * @see #complete() * @see #cancel() - * @see #fail(CharSequence) + * @see #fail(String) */ + @MainThread public boolean isStarted() { PrintService.throwIfNotCalledOnMainThread(); return getInfo().getState() == PrintJobInfo.STATE_STARTED; @@ -132,8 +141,9 @@ public final class PrintJob { * * @see #start() * @see #cancel() - * @see #fail(CharSequence) + * @see #fail(String) */ + @MainThread public boolean isBlocked() { PrintService.throwIfNotCalledOnMainThread(); return getInfo().getState() == PrintJobInfo.STATE_BLOCKED; @@ -147,6 +157,7 @@ public final class PrintJob { * * @see #complete() */ + @MainThread public boolean isCompleted() { PrintService.throwIfNotCalledOnMainThread(); return getInfo().getState() == PrintJobInfo.STATE_COMPLETED; @@ -158,8 +169,9 @@ public final class PrintJob { * * @return Whether the print job is failed. * - * @see #fail(CharSequence) + * @see #fail(String) */ + @MainThread public boolean isFailed() { PrintService.throwIfNotCalledOnMainThread(); return getInfo().getState() == PrintJobInfo.STATE_FAILED; @@ -173,6 +185,7 @@ public final class PrintJob { * * @see #cancel() */ + @MainThread public boolean isCancelled() { PrintService.throwIfNotCalledOnMainThread(); return getInfo().getState() == PrintJobInfo.STATE_CANCELED; @@ -182,12 +195,16 @@ public final class PrintJob { * Starts the print job. You should call this method if {@link * #isQueued()} or {@link #isBlocked()} returns true and you started * resumed printing. + * <p> + * This resets the print status to null. Set the new status by using {@link #setStatus}. + * </p> * * @return Whether the job was started. * * @see #isQueued() * @see #isBlocked() */ + @MainThread public boolean start() { PrintService.throwIfNotCalledOnMainThread(); final int state = getInfo().getState(); @@ -205,18 +222,20 @@ public final class PrintJob { * paper to continue printing. To resume the print job call {@link * #start()}. * + * @param reason The human readable, short, and translated reason why the print job is blocked. * @return Whether the job was blocked. * * @see #isStarted() * @see #isBlocked() */ - public boolean block(String reason) { + @MainThread + public boolean block(@Nullable String reason) { PrintService.throwIfNotCalledOnMainThread(); PrintJobInfo info = getInfo(); final int state = info.getState(); if (state == PrintJobInfo.STATE_STARTED || (state == PrintJobInfo.STATE_BLOCKED - && !TextUtils.equals(info.getStateReason(), reason))) { + && !TextUtils.equals(info.getStatus(), reason))) { return setState(PrintJobInfo.STATE_BLOCKED, reason); } return false; @@ -230,6 +249,7 @@ public final class PrintJob { * * @see #isStarted() */ + @MainThread public boolean complete() { PrintService.throwIfNotCalledOnMainThread(); if (isStarted()) { @@ -251,7 +271,8 @@ public final class PrintJob { * @see #isStarted() * @see #isBlocked() */ - public boolean fail(String error) { + @MainThread + public boolean fail(@Nullable String error) { PrintService.throwIfNotCalledOnMainThread(); if (!isInImmutableState()) { return setState(PrintJobInfo.STATE_FAILED, error); @@ -271,6 +292,7 @@ public final class PrintJob { * @see #isQueued() * @see #isBlocked() */ + @MainThread public boolean cancel() { PrintService.throwIfNotCalledOnMainThread(); if (!isInImmutableState()) { @@ -280,6 +302,39 @@ public final class PrintJob { } /** + * Sets the progress of this print job as a fraction of 1. + * + * @param progress The new progress + */ + @MainThread + public void setProgress(@FloatRange(from=0.0, to=1.0) float progress) { + PrintService.throwIfNotCalledOnMainThread(); + + try { + mPrintServiceClient.setProgress(mCachedInfo.getId(), progress); + } catch (RemoteException re) { + Log.e(LOG_TAG, "Error setting progress for job: " + mCachedInfo.getId(), re); + } + } + + /** + * Sets the status of this print job. This should be a human readable, short, and translated + * description of the current state of the print job. + * + * @param status The new status. If null the status will be empty. + */ + @MainThread + public void setStatus(@Nullable CharSequence status) { + PrintService.throwIfNotCalledOnMainThread(); + + try { + mPrintServiceClient.setStatus(mCachedInfo.getId(), status); + } catch (RemoteException re) { + Log.e(LOG_TAG, "Error setting status for job: " + mCachedInfo.getId(), re); + } + } + + /** * Sets a tag that is valid in the context of a {@link PrintService} * and is not interpreted by the system. For example, a print service * may set as a tag the key of the print job returned by a remote @@ -288,6 +343,7 @@ public final class PrintJob { * @param tag The tag. * @return True if the tag was set, false otherwise. */ + @MainThread public boolean setTag(String tag) { PrintService.throwIfNotCalledOnMainThread(); if (isInImmutableState()) { @@ -319,6 +375,7 @@ public final class PrintJob { * @param key The option key. * @return The option value. */ + @MainThread public String getAdvancedStringOption(String key) { PrintService.throwIfNotCalledOnMainThread(); return getInfo().getAdvancedStringOption(key); @@ -331,6 +388,7 @@ public final class PrintJob { * @param key The option key. * @return Whether the option is present. */ + @MainThread public boolean hasAdvancedOption(String key) { PrintService.throwIfNotCalledOnMainThread(); return getInfo().hasAdvancedOption(key); @@ -342,6 +400,7 @@ public final class PrintJob { * @param key The option key. * @return The option value. */ + @MainThread public int getAdvancedIntOption(String key) { PrintService.throwIfNotCalledOnMainThread(); return getInfo().getAdvancedIntOption(key); @@ -374,14 +433,14 @@ public final class PrintJob { || state == PrintJobInfo.STATE_FAILED; } - private boolean setState(int state, String error) { + private boolean setState(int state, @Nullable String error) { try { if (mPrintServiceClient.setPrintJobState(mCachedInfo.getId(), state, error)) { // Best effort - update the state of the cached info since // we may not be able to re-fetch it later if the job gets // removed from the spooler as a result of the state change. mCachedInfo.setState(state); - mCachedInfo.setStateReason(error); + mCachedInfo.setStatus(error); return true; } } catch (RemoteException re) { diff --git a/core/tests/coretests/apks/install_complete_package_info/Android.mk b/core/tests/coretests/apks/install_complete_package_info/Android.mk index 1edccb4b288b..19bf3561a706 100644 --- a/core/tests/coretests/apks/install_complete_package_info/Android.mk +++ b/core/tests/coretests/apks/install_complete_package_info/Android.mk @@ -5,7 +5,9 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_complete_package_info +LOCAL_PACKAGE_NAME := install_complete_package_info +#LOCAL_MANIFEST_FILE := api_test/AndroidManifest.xml -include $(BUILD_PACKAGE) +include $(FrameworkCoreTests_BUILD_PACKAGE) +#include $(BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml b/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml index 4c7e968c2722..2897bd5d0b55 100644 --- a/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml @@ -17,4 +17,11 @@ package="com.android.frameworks.coretests.keysets_api"> <application android:hasCode="false"> </application> + <key-sets> + <key-set android:name="A" > + <public-key android:name="keyA" + android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="/> + </key-set> + </key-sets> + </manifest> diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java index 9498f4c81d12..b5f06178aa3c 100644 --- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java +++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java @@ -73,7 +73,6 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -@Suppress // Failing. public class PackageManagerTests extends AndroidTestCase { private static final boolean localLOGV = true; @@ -434,14 +433,6 @@ public class PackageManagerTests extends AndroidTestCase { SECURE_CONTAINERS_PREFIX, publicSrcPath); assertStartsWith("The native library path should point to the ASEC", SECURE_CONTAINERS_PREFIX, info.nativeLibraryDir); - try { - String compatLib = new File(info.dataDir + "/lib").getCanonicalPath(); - assertEquals("The compatibility lib directory should be a symbolic link to " - + info.nativeLibraryDir, - info.nativeLibraryDir, compatLib); - } catch (IOException e) { - fail("compat check: Can't read " + info.dataDir + "/lib"); - } } else { assertFalse( (info.privateFlags & ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK) != 0); @@ -1014,7 +1005,8 @@ public class PackageManagerTests extends AndroidTestCase { private static void assertUninstalled(ApplicationInfo info) throws Exception { File nativeLibraryFile = new File(info.nativeLibraryDir); - assertFalse("Native library directory should be erased", nativeLibraryFile.exists()); + assertFalse("Native library directory " + info.nativeLibraryDir + + " should be erased", nativeLibraryFile.exists()); } public void deleteFromRawResource(int iFlags, int dFlags) throws Exception { @@ -1650,15 +1642,10 @@ public class PackageManagerTests extends AndroidTestCase { (info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0); assertStartsWith("Native library dir should point to ASEC", SECURE_CONTAINERS_PREFIX, info.nativeLibraryDir); - final File nativeLibSymLink = new File(info.dataDir, "lib"); - assertStartsWith("The data directory should have a 'lib' symlink that points to the ASEC container", - SECURE_CONTAINERS_PREFIX, nativeLibSymLink.getCanonicalPath()); } } } catch (NameNotFoundException e) { failStr("Pkg hasnt been installed correctly"); - } catch (Exception e) { - failStr("Failed with exception : " + e); } finally { if (ip != null) { cleanUpInstall(ip); @@ -1689,6 +1676,7 @@ public class PackageManagerTests extends AndroidTestCase { sampleMoveFromRawResource(installFlags, moveFlags, fail, result); } + @Suppress @LargeTest public void testMoveAppInternalToInternal() throws Exception { int installFlags = PackageManager.INSTALL_INTERNAL; @@ -2157,6 +2145,7 @@ public class PackageManagerTests extends AndroidTestCase { -1); } + @Suppress @LargeTest public void testFlagFExistingI() throws Exception { int iFlags = PackageManager.INSTALL_INTERNAL; @@ -3272,14 +3261,15 @@ public class PackageManagerTests extends AndroidTestCase { assertTrue(false); // should have thrown } catch (IllegalArgumentException e) { } - installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api, + final InstallParams ip = installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api, 0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED); try { ks = pm.getSigningKeySet(otherPkgName); assertTrue(false); // should have thrown } catch (SecurityException e) { + } finally { + cleanUpInstall(ip); } - cleanUpInstall(otherPkgName); ks = pm.getSigningKeySet(mContext.getPackageName()); assertNotNull(ks); } @@ -3318,16 +3308,20 @@ public class PackageManagerTests extends AndroidTestCase { assertTrue(false); // should have thrown } catch(IllegalArgumentException e) { } - installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api, + + // make sure we can get a KeySet from our pkg + ks = pm.getKeySetByAlias(mPkgName, "A"); + assertNotNull(ks); + + // and another + final InstallParams ip = installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api, 0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED); try { ks = pm.getKeySetByAlias(otherPkgName, "A"); - assertTrue(false); // should have thrown - } catch (SecurityException e) { + assertNotNull(ks); + } finally { + cleanUpInstall(ip); } - cleanUpInstall(otherPkgName); - ks = pm.getKeySetByAlias(mPkgName, "A"); - assertNotNull(ks); } public void testIsSignedBy() throws Exception { @@ -3360,17 +3354,23 @@ public class PackageManagerTests extends AndroidTestCase { assertFalse(pm.isSignedBy(mPkgName, new KeySet(new Binder()))); assertTrue(pm.isSignedBy(mPkgName, mSigningKS)); - installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api, + final InstallParams ip1 = installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api, 0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED); - assertFalse(pm.isSignedBy(otherPkgName, mDefinedKS)); - assertTrue(pm.isSignedBy(otherPkgName, mSigningKS)); - cleanUpInstall(otherPkgName); + try { + assertFalse(pm.isSignedBy(otherPkgName, mDefinedKS)); + assertTrue(pm.isSignedBy(otherPkgName, mSigningKS)); + } finally { + cleanUpInstall(ip1); + } - installFromRawResource("keysetApi.apk", R.raw.keyset_splata_api, + final InstallParams ip2 = installFromRawResource("keysetApi.apk", R.raw.keyset_splata_api, 0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED); - assertTrue(pm.isSignedBy(otherPkgName, mDefinedKS)); - assertTrue(pm.isSignedBy(otherPkgName, mSigningKS)); - cleanUpInstall(otherPkgName); + try { + assertTrue(pm.isSignedBy(otherPkgName, mDefinedKS)); + assertTrue(pm.isSignedBy(otherPkgName, mSigningKS)); + } finally { + cleanUpInstall(ip2); + } } public void testIsSignedByExactly() throws Exception { @@ -3402,17 +3402,23 @@ public class PackageManagerTests extends AndroidTestCase { assertFalse(pm.isSignedByExactly(mPkgName, new KeySet(new Binder()))); assertTrue(pm.isSignedByExactly(mPkgName, mSigningKS)); - installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api, + final InstallParams ip1 = installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api, 0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED); - assertFalse(pm.isSignedByExactly(otherPkgName, mDefinedKS)); - assertTrue(pm.isSignedByExactly(otherPkgName, mSigningKS)); - cleanUpInstall(otherPkgName); + try { + assertFalse(pm.isSignedByExactly(otherPkgName, mDefinedKS)); + assertTrue(pm.isSignedByExactly(otherPkgName, mSigningKS)); + } finally { + cleanUpInstall(ip1); + } - installFromRawResource("keysetApi.apk", R.raw.keyset_splata_api, + final InstallParams ip2 = installFromRawResource("keysetApi.apk", R.raw.keyset_splata_api, 0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED); - assertFalse(pm.isSignedByExactly(otherPkgName, mDefinedKS)); - assertFalse(pm.isSignedByExactly(otherPkgName, mSigningKS)); - cleanUpInstall(otherPkgName); + try { + assertFalse(pm.isSignedByExactly(otherPkgName, mDefinedKS)); + assertFalse(pm.isSignedByExactly(otherPkgName, mSigningKS)); + } finally { + cleanUpInstall(ip2); + } } @@ -3465,11 +3471,10 @@ public class PackageManagerTests extends AndroidTestCase { int apk2 = APP2_CERT1_CERT2; String apk1Name = "install1.apk"; String apk2Name = "install2.apk"; - InstallParams ip1 = null; + final InstallParams ip = installFromRawResource(apk1Name, apk1, 0, false, + false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED); try { - ip1 = installFromRawResource(apk1Name, apk1, 0, false, - false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED); PackageManager pm = mContext.getPackageManager(); // Delete app2 File filesDir = mContext.getFilesDir(); @@ -3480,12 +3485,10 @@ public class PackageManagerTests extends AndroidTestCase { getPm().deletePackage(pkg.packageName, null, PackageManager.DELETE_ALL_USERS); // Check signatures now int match = mContext.getPackageManager().checkSignatures( - ip1.pkg.packageName, pkg.packageName); + ip.pkg.packageName, pkg.packageName); assertEquals(PackageManager.SIGNATURE_UNKNOWN_PACKAGE, match); } finally { - if (ip1 != null) { - cleanUpInstall(ip1); - } + cleanUpInstall(ip); } } @@ -3493,14 +3496,10 @@ public class PackageManagerTests extends AndroidTestCase { public void testInstallNoCertificates() throws Exception { int apk1 = APP1_UNSIGNED; String apk1Name = "install1.apk"; - InstallParams ip1 = null; - try { - installFromRawResource(apk1Name, apk1, 0, false, - true, PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFICATES, - PackageInfo.INSTALL_LOCATION_UNSPECIFIED); - } finally { - } + installFromRawResource(apk1Name, apk1, 0, false, + true, PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFICATES, + PackageInfo.INSTALL_LOCATION_UNSPECIFIED); } /* @@ -3766,35 +3765,43 @@ public class PackageManagerTests extends AndroidTestCase { * Test that getInstalledPackages returns all the data specified in flags. */ public void testGetInstalledPackagesAll() throws Exception { - int flags = PackageManager.GET_ACTIVITIES | PackageManager.GET_GIDS + final int flags = PackageManager.GET_ACTIVITIES | PackageManager.GET_GIDS | PackageManager.GET_CONFIGURATIONS | PackageManager.GET_INSTRUMENTATION | PackageManager.GET_PERMISSIONS | PackageManager.GET_PROVIDERS | PackageManager.GET_RECEIVERS | PackageManager.GET_SERVICES | PackageManager.GET_SIGNATURES | PackageManager.GET_UNINSTALLED_PACKAGES; - List<PackageInfo> packages = getPm().getInstalledPackages(flags); - assertNotNull("installed packages cannot be null", packages); - assertTrue("installed packages cannot be empty", packages.size() > 0); - - PackageInfo packageInfo = null; - - // Find the package with all components specified in the AndroidManifest - // to ensure no null values - for (PackageInfo pi : packages) { - if ("com.android.frameworks.coretests.install_complete_package_info" - .equals(pi.packageName)) { - packageInfo = pi; - break; + final InstallParams ip = + installFromRawResource("install.apk", R.raw.install_complete_package_info, + 0 /*flags*/, false /*cleanUp*/, false /*fail*/, -1 /*result*/, + PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY); + try { + final List<PackageInfo> packages = getPm().getInstalledPackages(flags); + assertNotNull("installed packages cannot be null", packages); + assertTrue("installed packages cannot be empty", packages.size() > 0); + + PackageInfo packageInfo = null; + + // Find the package with all components specified in the AndroidManifest + // to ensure no null values + for (PackageInfo pi : packages) { + if ("com.android.frameworks.coretests.install_complete_package_info" + .equals(pi.packageName)) { + packageInfo = pi; + break; + } } + assertNotNull("activities should not be null", packageInfo.activities); + assertNotNull("configPreferences should not be null", packageInfo.configPreferences); + assertNotNull("instrumentation should not be null", packageInfo.instrumentation); + assertNotNull("permissions should not be null", packageInfo.permissions); + assertNotNull("providers should not be null", packageInfo.providers); + assertNotNull("receivers should not be null", packageInfo.receivers); + assertNotNull("services should not be null", packageInfo.services); + assertNotNull("signatures should not be null", packageInfo.signatures); + } finally { + cleanUpInstall(ip); } - assertNotNull("activities should not be null", packageInfo.activities); - assertNotNull("configPreferences should not be null", packageInfo.configPreferences); - assertNotNull("instrumentation should not be null", packageInfo.instrumentation); - assertNotNull("permissions should not be null", packageInfo.permissions); - assertNotNull("providers should not be null", packageInfo.providers); - assertNotNull("receivers should not be null", packageInfo.receivers); - assertNotNull("services should not be null", packageInfo.services); - assertNotNull("signatures should not be null", packageInfo.signatures); } /** @@ -3802,38 +3809,52 @@ public class PackageManagerTests extends AndroidTestCase { * flags when the GET_UNINSTALLED_PACKAGES flag is set. */ public void testGetUnInstalledPackagesAll() throws Exception { - int flags = PackageManager.GET_UNINSTALLED_PACKAGES + final int flags = PackageManager.GET_UNINSTALLED_PACKAGES | PackageManager.GET_ACTIVITIES | PackageManager.GET_GIDS | PackageManager.GET_CONFIGURATIONS | PackageManager.GET_INSTRUMENTATION | PackageManager.GET_PERMISSIONS | PackageManager.GET_PROVIDERS | PackageManager.GET_RECEIVERS | PackageManager.GET_SERVICES | PackageManager.GET_SIGNATURES | PackageManager.GET_UNINSTALLED_PACKAGES; - List<PackageInfo> packages = getPm().getInstalledPackages(flags); - assertNotNull("installed packages cannot be null", packages); - assertTrue("installed packages cannot be empty", packages.size() > 0); + // first, install the package + final InstallParams ip = + installFromRawResource("install.apk", R.raw.install_complete_package_info, + 0 /*flags*/, false /*cleanUp*/, false /*fail*/, -1 /*result*/, + PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY); + try { + // then, remove it, keeping it's data around + final GenericReceiver receiver = new DeleteReceiver(ip.pkg.packageName); + invokeDeletePackage(ip.pkg.packageName, PackageManager.DELETE_KEEP_DATA, receiver); + + final List<PackageInfo> packages = getPm().getInstalledPackages(flags); + assertNotNull("installed packages cannot be null", packages); + assertTrue("installed packages cannot be empty", packages.size() > 0); - PackageInfo packageInfo = null; + PackageInfo packageInfo = null; - // Find the package with all components specified in the AndroidManifest - // to ensure no null values - for (PackageInfo pi : packages) { - if ("com.android.frameworks.coretests.install_complete_package_info" - .equals(pi.packageName)) { - packageInfo = pi; - break; + // Find the package with all components specified in the AndroidManifest + // to ensure no null values + for (PackageInfo pi : packages) { + if ("com.android.frameworks.coretests.install_complete_package_info" + .equals(pi.packageName)) { + packageInfo = pi; + break; + } } + assertNotNull("activities should not be null", packageInfo.activities); + assertNotNull("configPreferences should not be null", packageInfo.configPreferences); + assertNotNull("instrumentation should not be null", packageInfo.instrumentation); + assertNotNull("permissions should not be null", packageInfo.permissions); + assertNotNull("providers should not be null", packageInfo.providers); + assertNotNull("receivers should not be null", packageInfo.receivers); + assertNotNull("services should not be null", packageInfo.services); + assertNotNull("signatures should not be null", packageInfo.signatures); + } finally { + cleanUpInstall(ip); } - assertNotNull("activities should not be null", packageInfo.activities); - assertNotNull("configPreferences should not be null", packageInfo.configPreferences); - assertNotNull("instrumentation should not be null", packageInfo.instrumentation); - assertNotNull("permissions should not be null", packageInfo.permissions); - assertNotNull("providers should not be null", packageInfo.providers); - assertNotNull("receivers should not be null", packageInfo.receivers); - assertNotNull("services should not be null", packageInfo.services); - assertNotNull("signatures should not be null", packageInfo.signatures); } + @Suppress public void testInstall_BadDex_CleanUp() throws Exception { int retCode = PackageManager.INSTALL_FAILED_DEXOPT; installFromRawResource("install.apk", R.raw.install_bad_dex, 0, true, true, retCode, diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java index f006ccb94247..82fd51233ef2 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java +++ b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java @@ -16,6 +16,8 @@ package com.android.printspooler.model; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.Notification; import android.app.Notification.Action; import android.app.Notification.InboxStyle; @@ -129,68 +131,69 @@ final class NotificationController { mContext.getString(R.string.cancel), createCancelIntent(printJob)).build(); } - private void createPrintingNotification(PrintJobInfo printJob) { + /** + * Create a notification for a print job. + * + * @param printJob the job the notification is for + * @param firstAction the first action shown in the notification + * @param secondAction the second action shown in the notification + */ + private void createNotification(@NonNull PrintJobInfo printJob, @Nullable Action firstAction, + @Nullable Action secondAction) { Notification.Builder builder = new Notification.Builder(mContext) .setContentIntent(createContentIntent(printJob.getId())) .setSmallIcon(computeNotificationIcon(printJob)) .setContentTitle(computeNotificationTitle(printJob)) - .addAction(createCancelAction(printJob)) - .setContentText(printJob.getPrinterName()) .setWhen(System.currentTimeMillis()) .setOngoing(true) .setShowWhen(true) .setColor(mContext.getColor( com.android.internal.R.color.system_notification_accent_color)); + + if (firstAction != null) { + builder.addAction(firstAction); + } + + if (secondAction != null) { + builder.addAction(secondAction); + } + + if (printJob.getState() == PrintJobInfo.STATE_STARTED) { + float progress = printJob.getProgress(); + if (progress >= 0) { + builder.setProgress(Integer.MAX_VALUE, (int)(Integer.MAX_VALUE * progress), + false); + } + } + + CharSequence status = printJob.getStatus(); + if (status != null) { + builder.setContentText(status); + } else { + builder.setContentText(printJob.getPrinterName()); + } + mNotificationManager.notify(0, builder.build()); } + private void createPrintingNotification(PrintJobInfo printJob) { + createNotification(printJob, createCancelAction(printJob), null); + } + private void createFailedNotification(PrintJobInfo printJob) { Action.Builder restartActionBuilder = new Action.Builder( Icon.createWithResource(mContext, R.drawable.ic_restart), mContext.getString(R.string.restart), createRestartIntent(printJob.getId())); - Notification.Builder builder = new Notification.Builder(mContext) - .setContentIntent(createContentIntent(printJob.getId())) - .setSmallIcon(computeNotificationIcon(printJob)) - .setContentTitle(computeNotificationTitle(printJob)) - .addAction(createCancelAction(printJob)) - .addAction(restartActionBuilder.build()) - .setContentText(printJob.getPrinterName()) - .setWhen(System.currentTimeMillis()) - .setOngoing(true) - .setShowWhen(true) - .setColor(mContext.getColor( - com.android.internal.R.color.system_notification_accent_color)); - mNotificationManager.notify(0, builder.build()); + createNotification(printJob, createCancelAction(printJob), restartActionBuilder.build()); } private void createBlockedNotification(PrintJobInfo printJob) { - Notification.Builder builder = new Notification.Builder(mContext) - .setContentIntent(createContentIntent(printJob.getId())) - .setSmallIcon(computeNotificationIcon(printJob)) - .setContentTitle(computeNotificationTitle(printJob)) - .addAction(createCancelAction(printJob)) - .setContentText(printJob.getPrinterName()) - .setWhen(System.currentTimeMillis()) - .setOngoing(true) - .setShowWhen(true) - .setColor(mContext.getColor( - com.android.internal.R.color.system_notification_accent_color)); - mNotificationManager.notify(0, builder.build()); + createNotification(printJob, createCancelAction(printJob), null); } private void createCancellingNotification(PrintJobInfo printJob) { - Notification.Builder builder = new Notification.Builder(mContext) - .setContentIntent(createContentIntent(printJob.getId())) - .setSmallIcon(computeNotificationIcon(printJob)) - .setContentTitle(computeNotificationTitle(printJob)) - .setContentText(printJob.getPrinterName()) - .setWhen(System.currentTimeMillis()) - .setOngoing(true) - .setShowWhen(true) - .setColor(mContext.getColor( - com.android.internal.R.color.system_notification_accent_color)); - mNotificationManager.notify(0, builder.build()); + createNotification(printJob, null, null); } private void createStackedNotification(List<PrintJobInfo> printJobs) { diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java b/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java index 7adcfec728e7..b92a389c1679 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java +++ b/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java @@ -16,6 +16,9 @@ package com.android.printspooler.model; +import android.annotation.FloatRange; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.Service; import android.content.ComponentName; import android.content.Context; @@ -497,7 +500,7 @@ public final class PrintSpoolerService extends Service { success = true; printJob.setState(state); - printJob.setStateReason(error); + printJob.setStatus(error); printJob.setCancelling(false); if (DEBUG_PRINT_JOB_LIFECYCLE) { @@ -547,6 +550,35 @@ public final class PrintSpoolerService extends Service { return success; } + /** + * Set the progress for a print job. + * + * @param printJobId ID of the print job to update + * @param progress the new progress + */ + public void setProgress(@NonNull PrintJobId printJobId, + @FloatRange(from=0.0, to=1.0) float progress) { + synchronized (mLock) { + getPrintJobInfo(printJobId, PrintManager.APP_ID_ANY).setProgress(progress); + + mNotificationController.onUpdateNotifications(mPrintJobs); + } + } + + /** + * Set the status for a print job. + * + * @param printJobId ID of the print job to update + * @param status the new status + */ + public void setStatus(@NonNull PrintJobId printJobId, @Nullable CharSequence status) { + synchronized (mLock) { + getPrintJobInfo(printJobId, PrintManager.APP_ID_ANY).setStatus(status); + + mNotificationController.onUpdateNotifications(mPrintJobs); + } + } + public boolean hasActivePrintJobsLocked() { final int printJobCount = mPrintJobs.size(); for (int i = 0; i < printJobCount; i++) { @@ -693,6 +725,8 @@ public final class PrintSpoolerService extends Service { private static final String ATTR_COPIES = "copies"; private static final String ATTR_PRINTER_NAME = "printerName"; private static final String ATTR_STATE_REASON = "stateReason"; + private static final String ATTR_STATUS = "status"; + private static final String ATTR_PROGRESS = "progress"; private static final String ATTR_CANCELLING = "cancelling"; private static final String TAG_ADVANCED_OPTIONS = "advancedOptions"; @@ -801,13 +835,19 @@ public final class PrintSpoolerService extends Service { if (!TextUtils.isEmpty(printerName)) { serializer.attribute(null, ATTR_PRINTER_NAME, printerName); } - String stateReason = printJob.getStateReason(); - if (!TextUtils.isEmpty(stateReason)) { - serializer.attribute(null, ATTR_STATE_REASON, stateReason); - } serializer.attribute(null, ATTR_CANCELLING, String.valueOf( printJob.isCancelling())); + float progress = printJob.getProgress(); + if (progress != Float.NaN) { + serializer.attribute(null, ATTR_PROGRESS, String.valueOf(progress)); + } + + CharSequence status = printJob.getStatus(); + if (!TextUtils.isEmpty(status)) { + serializer.attribute(null, ATTR_STATUS, status.toString()); + } + PrinterId printerId = printJob.getPrinterId(); if (printerId != null) { serializer.startTag(null, TAG_PRINTER_ID); @@ -1025,8 +1065,25 @@ public final class PrintSpoolerService extends Service { printJob.setCopies(Integer.parseInt(copies)); String printerName = parser.getAttributeValue(null, ATTR_PRINTER_NAME); printJob.setPrinterName(printerName); + + String progressString = parser.getAttributeValue(null, ATTR_PROGRESS); + if (progressString != null) { + float progress = Float.parseFloat(progressString); + + if (progress != Float.NaN) { + printJob.setProgress(progress); + } + } + + CharSequence status = parser.getAttributeValue(null, ATTR_STATUS); + printJob.setStatus(status); + + // stateReason is deprecated, but might be used by old print jobs String stateReason = parser.getAttributeValue(null, ATTR_STATE_REASON); - printJob.setStateReason(stateReason); + if (stateReason != null) { + printJob.setStatus(stateReason); + } + String cancelling = parser.getAttributeValue(null, ATTR_CANCELLING); printJob.setCancelling(!TextUtils.isEmpty(cancelling) ? Boolean.parseBoolean(cancelling) : false); @@ -1323,6 +1380,18 @@ public final class PrintSpoolerService extends Service { .removeApprovedService(serviceToRemove); } + @Override + public void setProgress(@NonNull PrintJobId printJobId, + @FloatRange(from=0.0, to=1.0) float progress) throws RemoteException { + PrintSpoolerService.this.setProgress(printJobId, progress); + } + + @Override + public void setStatus(@NonNull PrintJobId printJobId, + @Nullable CharSequence status) throws RemoteException { + PrintSpoolerService.this.setStatus(printJobId, status); + } + public PrintSpoolerService getService() { return PrintSpoolerService.this; } diff --git a/packages/Shell/res/values-af/strings.xml b/packages/Shell/res/values-af/strings.xml index d1998bdd39f4..8430bf0d4e91 100644 --- a/packages/Shell/res/values-af/strings.xml +++ b/packages/Shell/res/values-af/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Tuisskerm"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Besig met foutverslag"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Foutverslag vasgevang"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swiep na links om jou foutverslag te deel"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Raak om jou foutverslag te deel"</string> diff --git a/packages/Shell/res/values-am/strings.xml b/packages/Shell/res/values-am/strings.xml index 6f905a90043b..9400f370139c 100644 --- a/packages/Shell/res/values-am/strings.xml +++ b/packages/Shell/res/values-am/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"ቀፎ"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"የሳንካ ሪፓርት በሂደት ላይ"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"የሳንካ ሪፖርት ተይዟል"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"የሳንካ ሪፖርትዎን ለማጋራት ወደ ግራ ያንሸራትቱ"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"የሳንካ ሪፖርትዎን ለማጋራት ይንክኩ"</string> diff --git a/packages/Shell/res/values-ar/strings.xml b/packages/Shell/res/values-ar/strings.xml index 76100b5684c3..2161a7610420 100644 --- a/packages/Shell/res/values-ar/strings.xml +++ b/packages/Shell/res/values-ar/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"تقرير الخطأ قيد التقدم"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"تم الحصول على تقرير الأخطاء"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"مرر بسرعة لليمين لمشاركة تقرير الخطأ"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"المس لمشاركة تقرير الأخطاء"</string> diff --git a/packages/Shell/res/values-az-rAZ/strings.xml b/packages/Shell/res/values-az-rAZ/strings.xml index d8176f5bcbf4..76ee4bf43cca 100644 --- a/packages/Shell/res/values-az-rAZ/strings.xml +++ b/packages/Shell/res/values-az-rAZ/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Baq hesabatı davam edir"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Baq raport alındı"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Baq raportunu paylaşmaq üçün sola sürüşdürün"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Xətanı şikayətini paylaşmaq üçün toxunun"</string> diff --git a/packages/Shell/res/values-bg/strings.xml b/packages/Shell/res/values-bg/strings.xml index fc2dad03e601..bbfae69ab928 100644 --- a/packages/Shell/res/values-bg/strings.xml +++ b/packages/Shell/res/values-bg/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Команден ред"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"Отчетът за програмни грешки е записан"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Прекарайте пръст наляво, за да споделите сигнала си за програмна грешка"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Докоснете, за да споделите отчета си за програмни грешки"</string> diff --git a/packages/Shell/res/values-bn-rBD/strings.xml b/packages/Shell/res/values-bn-rBD/strings.xml index 5aa3e9d4a0d1..5ca583594c40 100644 --- a/packages/Shell/res/values-bn-rBD/strings.xml +++ b/packages/Shell/res/values-bn-rBD/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"শেল"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ত্রুটির প্রতিবেদন করা হচ্ছে"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"ত্রুটির প্রতিবেদন নেওয়া হয়েছে"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"আপনার বাগ রিপোর্ট শেয়ার করতে বামে সোয়াইপ করুন"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"আপনার ত্রুটির প্রতিবেদন ভাগ করতে স্পর্শ করুন"</string> diff --git a/packages/Shell/res/values-ca/strings.xml b/packages/Shell/res/values-ca/strings.xml index bef1a674b2f0..1e6ec539783b 100644 --- a/packages/Shell/res/values-ca/strings.xml +++ b/packages/Shell/res/values-ca/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Protecció"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Informe d\'errors en curs"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"S\'ha registrat l\'informe d\'error"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Llisca cap a l\'esquerra per compartir l\'informe d\'errors."</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toca aquí per compartir el teu informe d\'error."</string> diff --git a/packages/Shell/res/values-cs/strings.xml b/packages/Shell/res/values-cs/strings.xml index 46c8f4e5c680..336c21f49a17 100644 --- a/packages/Shell/res/values-cs/strings.xml +++ b/packages/Shell/res/values-cs/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Probíhá zpracování zprávy o chybě"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Bylo vytvořeno chybové hlášení"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Chcete-li hlášení chyby sdílet, přejeďte doleva."</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Chybové hlášení můžete sdílet klepnutím."</string> diff --git a/packages/Shell/res/values-da/strings.xml b/packages/Shell/res/values-da/strings.xml index 7a87b9b405c8..6f658944865a 100644 --- a/packages/Shell/res/values-da/strings.xml +++ b/packages/Shell/res/values-da/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Fejlrapporten er under udførelse"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Fejlrapporten er registreret"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Stryg til venstre for at dele din fejlrapport"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Tryk for at dele din fejlrapport"</string> diff --git a/packages/Shell/res/values-de/strings.xml b/packages/Shell/res/values-de/strings.xml index 7a25c4da835d..03c616637bf0 100644 --- a/packages/Shell/res/values-de/strings.xml +++ b/packages/Shell/res/values-de/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Fehlerbericht in Bearbeitung"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Fehlerbericht erfasst"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Wischen Sie nach links, um Ihren Fehlerbericht zu teilen."</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Tippen, um Fehlerbericht zu teilen"</string> diff --git a/packages/Shell/res/values-el/strings.xml b/packages/Shell/res/values-el/strings.xml index 02e37f761e2d..ceec189a3148 100644 --- a/packages/Shell/res/values-el/strings.xml +++ b/packages/Shell/res/values-el/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Κέλυφος"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Αναφορά σφάλματος σε εξέλιξη"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Η λήψη της αναφοράς ήταν επιτυχής"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Σύρετε προς τα αριστερά για κοινή χρήση της αναφοράς σφαλμάτων"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Αγγίξτε για να μοιραστείτε τη αναφορά σφαλμάτων"</string> diff --git a/packages/Shell/res/values-en-rAU/strings.xml b/packages/Shell/res/values-en-rAU/strings.xml index 1b55115bf7c4..99c9f4f654a3 100644 --- a/packages/Shell/res/values-en-rAU/strings.xml +++ b/packages/Shell/res/values-en-rAU/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Bug report in progress"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Bug report captured"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swipe left to share your bug report"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Touch to share your bug report"</string> diff --git a/packages/Shell/res/values-en-rGB/strings.xml b/packages/Shell/res/values-en-rGB/strings.xml index 1b55115bf7c4..99c9f4f654a3 100644 --- a/packages/Shell/res/values-en-rGB/strings.xml +++ b/packages/Shell/res/values-en-rGB/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Bug report in progress"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Bug report captured"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swipe left to share your bug report"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Touch to share your bug report"</string> diff --git a/packages/Shell/res/values-en-rIN/strings.xml b/packages/Shell/res/values-en-rIN/strings.xml index 1b55115bf7c4..99c9f4f654a3 100644 --- a/packages/Shell/res/values-en-rIN/strings.xml +++ b/packages/Shell/res/values-en-rIN/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Bug report in progress"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Bug report captured"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swipe left to share your bug report"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Touch to share your bug report"</string> diff --git a/packages/Shell/res/values-es-rUS/strings.xml b/packages/Shell/res/values-es-rUS/strings.xml index 1937349355cc..263459e3f460 100644 --- a/packages/Shell/res/values-es-rUS/strings.xml +++ b/packages/Shell/res/values-es-rUS/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Informe de errores en progreso"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Informe de errores capturado"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Desliza el dedo hacia la izquierda para compartir el informe de errores."</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toca para compartir tu informe de errores."</string> diff --git a/packages/Shell/res/values-es/strings.xml b/packages/Shell/res/values-es/strings.xml index 002bea9a1d30..3b37d4046321 100644 --- a/packages/Shell/res/values-es/strings.xml +++ b/packages/Shell/res/values-es/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Informe de errores en curso"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Informe de error registrado"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Desliza el dedo hacia la izquierda para compartir el informe de error"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toca para compartir tu informe de error"</string> diff --git a/packages/Shell/res/values-et-rEE/strings.xml b/packages/Shell/res/values-et-rEE/strings.xml index a16875c3afc8..652de64e1254 100644 --- a/packages/Shell/res/values-et-rEE/strings.xml +++ b/packages/Shell/res/values-et-rEE/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Kest"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Veaaruande töötlemine on pooleli"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Veaaruanne jäädvustati"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Veaaruande jagamiseks pühkige vasakule"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Veaaruande jagamiseks puudutage"</string> diff --git a/packages/Shell/res/values-eu-rES/strings.xml b/packages/Shell/res/values-eu-rES/strings.xml index e7f1766a73e4..3234786e91b1 100644 --- a/packages/Shell/res/values-eu-rES/strings.xml +++ b/packages/Shell/res/values-eu-rES/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell-interfazea"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Abian da akatsen txostena egiteko prozesua"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Akatsen txostena jaso da"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Programa-akatsen txostena partekatzeko, pasatu hatza ezkerrera"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Akatsen txostena partekatzeko, ukitu"</string> diff --git a/packages/Shell/res/values-fa/strings.xml b/packages/Shell/res/values-fa/strings.xml index 9138b28c2cc7..ff58c25e9d03 100644 --- a/packages/Shell/res/values-fa/strings.xml +++ b/packages/Shell/res/values-fa/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"گزارش اشکال در حال انجام است"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"گزارش اشکال دریافت شد"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"برای اشتراکگذاری گزارش اشکال، به تندی آن را به چپ بکشید"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"جهت اشتراکگذاری گزارش اشکال خود لمس کنید"</string> diff --git a/packages/Shell/res/values-fi/strings.xml b/packages/Shell/res/values-fi/strings.xml index 079433dbd4c5..df6851c8f470 100644 --- a/packages/Shell/res/values-fi/strings.xml +++ b/packages/Shell/res/values-fi/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Komentotulkki"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Virheraportti käynnissä"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Virheraportti tallennettu"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Jaa virheraportti pyyhkäisemällä vasemmalle"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Jaa virheraportti koskettamalla tätä"</string> diff --git a/packages/Shell/res/values-fr-rCA/strings.xml b/packages/Shell/res/values-fr-rCA/strings.xml index 4ead085ac32d..5f581644c0bf 100644 --- a/packages/Shell/res/values-fr-rCA/strings.xml +++ b/packages/Shell/res/values-fr-rCA/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Création du rapport de bogue en cours..."</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Rapport de bogue enregistré"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Faites glisser le doigt vers la gauche pour partager votre rapport de bogue."</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Appuyer ici pour partager votre rapport de bogue"</string> diff --git a/packages/Shell/res/values-fr/strings.xml b/packages/Shell/res/values-fr/strings.xml index 14c1d3b5f263..9562c6cf3cb7 100644 --- a/packages/Shell/res/values-fr/strings.xml +++ b/packages/Shell/res/values-fr/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Rapport de bug en cours"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Rapport de bug enregistré"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Faites glisser le doigt vers la gauche pour partager votre rapport d\'erreur."</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Appuyez ici pour partager le rapport de bug"</string> diff --git a/packages/Shell/res/values-gl-rES/strings.xml b/packages/Shell/res/values-gl-rES/strings.xml index 61b0335bbfc5..1f8da5d245c1 100644 --- a/packages/Shell/res/values-gl-rES/strings.xml +++ b/packages/Shell/res/values-gl-rES/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Informe de erro en curso"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Informe de erros rexistrado"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Pasa o dedo á esquerda para compartir o teu informe de erros"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toca aquí para compartir o teu informe de erros"</string> diff --git a/packages/Shell/res/values-gu-rIN/strings.xml b/packages/Shell/res/values-gu-rIN/strings.xml index 746ac4560ef9..7a94dd75d10b 100644 --- a/packages/Shell/res/values-gu-rIN/strings.xml +++ b/packages/Shell/res/values-gu-rIN/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"શેલ"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"બગ રિપોર્ટ ચાલુ છે"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"બગ રિપોર્ટ કેપ્ચર કરી"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"તમારી બગ રિપોર્ટ શેર કરવા માટે ડાબે સ્વાઇપ કરો"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"તમારી બગ રિપોર્ટ શેર કરવા માટે ટચ કરો"</string> diff --git a/packages/Shell/res/values-hi/strings.xml b/packages/Shell/res/values-hi/strings.xml index 97db6078c38f..273b4841b5d6 100644 --- a/packages/Shell/res/values-hi/strings.xml +++ b/packages/Shell/res/values-hi/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"शेल"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"बग रिपोर्ट प्रगति में है"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"बग रिपोर्ट कैप्चर कर ली गई"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"अपनी बग रिपोर्ट साझा करने के लिए बाएं स्वाइप करें"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"अपनी बग रिपोर्ट साझा करने के लिए स्पर्श करें"</string> diff --git a/packages/Shell/res/values-hr/strings.xml b/packages/Shell/res/values-hr/strings.xml index b1fad848870c..3836edb70537 100644 --- a/packages/Shell/res/values-hr/strings.xml +++ b/packages/Shell/res/values-hr/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Ljuska"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Izvješće o programskoj pogrešci u tijeku"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Prijava programske pogreške snimljena je"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Prijeđite prstom ulijevo da biste poslali izvješće o programskim pogreškama"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Dodirnite za dijeljenje prijave programske pogreške"</string> diff --git a/packages/Shell/res/values-hu/strings.xml b/packages/Shell/res/values-hu/strings.xml index 7dae6c1c38a0..9191e02bc553 100644 --- a/packages/Shell/res/values-hu/strings.xml +++ b/packages/Shell/res/values-hu/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Héj"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Hibajelentés folyamatban"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Programhiba-jelentés rögzítve"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Húzza ujját balra a hibajelentés megosztásához"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Érintse meg a programhiba-jelentés megosztásához"</string> diff --git a/packages/Shell/res/values-hy-rAM/strings.xml b/packages/Shell/res/values-hy-rAM/strings.xml index 149b677a222b..bfa9b049531a 100644 --- a/packages/Shell/res/values-hy-rAM/strings.xml +++ b/packages/Shell/res/values-hy-rAM/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Խեցի"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"Վրիպակի զեկույց է ստացվել"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Սահեցրեք ձախ՝ սխալի հաշվետվությունը համօգտագործելու համար"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Հպեք` ձեր վրիպակի մասին զեկույցը տարածելու համար"</string> diff --git a/packages/Shell/res/values-in/strings.xml b/packages/Shell/res/values-in/strings.xml index 534badcae0b9..9a13d8bc1968 100644 --- a/packages/Shell/res/values-in/strings.xml +++ b/packages/Shell/res/values-in/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Kerangka"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Laporan bug sedang berlangsung"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Laporan bug tercatat"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Gesek ke kiri untuk membagikan laporan bug Anda"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Sentuh untuk membagikan laporan bug Anda"</string> diff --git a/packages/Shell/res/values-is-rIS/strings.xml b/packages/Shell/res/values-is-rIS/strings.xml index ce742f6ab795..4304c8e47d45 100644 --- a/packages/Shell/res/values-is-rIS/strings.xml +++ b/packages/Shell/res/values-is-rIS/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Skipanalína"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Verið er að útbúa villutilkynningu"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Villutilkynning útbúin"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Strjúktu til vinstri til að deila villuskýrslunni"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Snertu til að deila villutilkynningunni"</string> diff --git a/packages/Shell/res/values-it/strings.xml b/packages/Shell/res/values-it/strings.xml index 38e360f00b83..63d39d0d4bf0 100644 --- a/packages/Shell/res/values-it/strings.xml +++ b/packages/Shell/res/values-it/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Segnalazione di bug in corso"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Segnalazione di bug acquisita"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Scorri verso sinistra per condividere il rapporto sui bug"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Tocca per condividere la segnalazione di bug"</string> diff --git a/packages/Shell/res/values-iw/strings.xml b/packages/Shell/res/values-iw/strings.xml index ab9aecf19045..94a167f236d6 100644 --- a/packages/Shell/res/values-iw/strings.xml +++ b/packages/Shell/res/values-iw/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"מעטפת"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"הדוח על הבאג מתבצע כעת"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"דוח הבאגים צולם"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"החלק שמאלה כדי לשתף את דוח הבאגים"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"גע כדי לשתף את דוח הבאגים שלך"</string> diff --git a/packages/Shell/res/values-ja/strings.xml b/packages/Shell/res/values-ja/strings.xml index 619ee4f3259a..77adb37f548f 100644 --- a/packages/Shell/res/values-ja/strings.xml +++ b/packages/Shell/res/values-ja/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"シェル"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"バグレポートを処理しています"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"バグレポートが記録されました"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"バグレポートを共有するには左にスワイプ"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"バグレポートを共有するにはタップします"</string> diff --git a/packages/Shell/res/values-ka-rGE/strings.xml b/packages/Shell/res/values-ka-rGE/strings.xml index f98045f242a8..2521d3ee365e 100644 --- a/packages/Shell/res/values-ka-rGE/strings.xml +++ b/packages/Shell/res/values-ka-rGE/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"გარეკანი"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"ანგარიში ხარვეზების შესახებ შექმნილია"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"გაასრიალეთ მარცხნივ თქვენი ხარვეზის შეტყობინების გასაზიარებლად"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"შეეხეთ თქვენი ხარვეზების ანგარიშის გასაზიარებლად"</string> diff --git a/packages/Shell/res/values-kk-rKZ/strings.xml b/packages/Shell/res/values-kk-rKZ/strings.xml index a24f2ccf64db..5ce7815a992f 100644 --- a/packages/Shell/res/values-kk-rKZ/strings.xml +++ b/packages/Shell/res/values-kk-rKZ/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Қабыршық"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"Вирус туралы баянат қабылданды"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Қате туралы есепті бөлісу үшін солға жанаңыз"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Бөліс үшін, вирус туралы баянатты түртіңіз."</string> diff --git a/packages/Shell/res/values-km-rKH/strings.xml b/packages/Shell/res/values-km-rKH/strings.xml index 2439248a5a7c..2814a73fdf83 100644 --- a/packages/Shell/res/values-km-rKH/strings.xml +++ b/packages/Shell/res/values-km-rKH/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"សែល"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"កំពុងដំណើរការរបាយការណ៍កំហុស"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"បានចាប់យករបាយការណ៍កំហុស"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"អូសទៅឆ្វេង ដើម្បីចែករំលែករបាយការណ៍កំហុសរបស់អ្នក"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ប៉ះ ដើម្បីចែករំលែករបាយការណ៍កំហុសរបស់អ្នក"</string> diff --git a/packages/Shell/res/values-kn-rIN/strings.xml b/packages/Shell/res/values-kn-rIN/strings.xml index bca9c45db051..be34c8515179 100644 --- a/packages/Shell/res/values-kn-rIN/strings.xml +++ b/packages/Shell/res/values-kn-rIN/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"ಶೆಲ್"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ದೋಷ ವರದಿ ಪ್ರಗತಿಯಲ್ಲಿದೆ"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"ದೋಷದ ವರದಿಯನ್ನು ಸೆರೆಹಿಡಿಯಲಾಗಿದೆ"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ನಿಮ್ಮ ದೋಷ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಎಡಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ನಿಮ್ಮ ದೋಷದ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಸ್ಪರ್ಶಿಸಿ"</string> diff --git a/packages/Shell/res/values-ko/strings.xml b/packages/Shell/res/values-ko/strings.xml index a3a0bf39d16b..46c0daa8367d 100644 --- a/packages/Shell/res/values-ko/strings.xml +++ b/packages/Shell/res/values-ko/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"셸"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"버그 신고서 캡처됨"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"왼쪽으로 스와이프하여 버그 신고서를 공유하세요."</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"버그 신고서를 공유하려면 터치하세요."</string> diff --git a/packages/Shell/res/values-ky-rKG/strings.xml b/packages/Shell/res/values-ky-rKG/strings.xml index 622920afca8e..aa8c5385a4bc 100644 --- a/packages/Shell/res/values-ky-rKG/strings.xml +++ b/packages/Shell/res/values-ky-rKG/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Командалык кабык"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"Ката тууралуу билдирүү түзүлдү"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Ката жөнүндө кабар менен бөлүшүү үчүн солго серпип коюңуз"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Ката тууралуу билдирүүңүздү жөнөтүш үчүн, тийиңиз"</string> diff --git a/packages/Shell/res/values-lo-rLA/strings.xml b/packages/Shell/res/values-lo-rLA/strings.xml index 537f1971ab14..caf11c4ae40c 100644 --- a/packages/Shell/res/values-lo-rLA/strings.xml +++ b/packages/Shell/res/values-lo-rLA/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ລາຍງານບັນຫາພວມດຳເນີນຢູ່"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"ລາຍງານຈຸດບົກພ່ອງຖືກເກັບກຳແລ້ວ"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ປັດໄປຊ້າຍເພື່ອສົ່ງລາຍງານຂໍ້ຜິດພາດຂອງທ່ານ"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ແຕະເພື່ອສົ່ງການລາຍງານປັນຫາຂອງທ່ານ"</string> diff --git a/packages/Shell/res/values-lt/strings.xml b/packages/Shell/res/values-lt/strings.xml index 6965e4c786d9..e70cf9f7fa6f 100644 --- a/packages/Shell/res/values-lt/strings.xml +++ b/packages/Shell/res/values-lt/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Apvalkalas"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"Riktų ataskaita užfiksuota"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Perbraukite kairėn, kad bendrintumėte rikto ataskaitą"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Palieskite, kad bendrintumėte riktų ataskaitą"</string> diff --git a/packages/Shell/res/values-lv/strings.xml b/packages/Shell/res/values-lv/strings.xml index efc40f351bcf..c5d10bba3bc8 100644 --- a/packages/Shell/res/values-lv/strings.xml +++ b/packages/Shell/res/values-lv/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Aizsargs"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"Izveidots kļūdu pārskats"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Velciet pa kreisi, lai kopīgotu savu kļūdu ziņojumu."</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Pieskarieties, lai kopīgotu kļūdu pārskatu."</string> diff --git a/packages/Shell/res/values-mk-rMK/strings.xml b/packages/Shell/res/values-mk-rMK/strings.xml index 7571c2cd5be1..4baa86a5c04b 100644 --- a/packages/Shell/res/values-mk-rMK/strings.xml +++ b/packages/Shell/res/values-mk-rMK/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Обвивка"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Извештајот за грешка е во тек"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Извештајот за грешка е снимен"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Повлечете налево за да споделите пријава за грешка"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Допри да се сподели твојот извештај за грешка"</string> diff --git a/packages/Shell/res/values-ml-rIN/strings.xml b/packages/Shell/res/values-ml-rIN/strings.xml index 4779e4d71952..5dd7763a4cf6 100644 --- a/packages/Shell/res/values-ml-rIN/strings.xml +++ b/packages/Shell/res/values-ml-rIN/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"ഷെൽ"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ബഗ് റിപ്പോർട്ട് പുരോഗതിയിലാണ്"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"ബഗ് റിപ്പോർട്ട് ക്യാപ്ചർ ചെയ്തു"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"നിങ്ങളുടെ ബഗ് റിപ്പോർട്ട് പങ്കിടുന്നതിന് ഇടത്തേയ്ക്ക് സ്വൈപ്പുചെയ്യുക"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"നിങ്ങളുടെ ബഗ് റിപ്പോർട്ട് പങ്കിടാൻ സ്പർശിക്കുക"</string> diff --git a/packages/Shell/res/values-mn-rMN/strings.xml b/packages/Shell/res/values-mn-rMN/strings.xml index 71ad7f6c8dbb..f7a9688fddda 100644 --- a/packages/Shell/res/values-mn-rMN/strings.xml +++ b/packages/Shell/res/values-mn-rMN/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Шел"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Алдааны тайлан үргэлжилж байна"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Алдааны мэдээлэл хүлээн авав"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Өөрийн согог репортыг хуваалцахын тулд зүүн шудрана уу"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Та алдааны мэдэгдлийг хуваалцах бол хүрнэ үү"</string> diff --git a/packages/Shell/res/values-mr-rIN/strings.xml b/packages/Shell/res/values-mr-rIN/strings.xml index c32bb5be7319..e0db42b76082 100644 --- a/packages/Shell/res/values-mr-rIN/strings.xml +++ b/packages/Shell/res/values-mr-rIN/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"शेल"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"दोष अहवाल प्रगतीपथावर आहे"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"दोष अहवाल कॅप्चर केला"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"आपला दोष अहवाल सामायिक करण्यासाठी डावीकडे स्वाइप करा"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"आपला दोष अहवाल सामायिक करण्यासाठी स्पर्श करा"</string> diff --git a/packages/Shell/res/values-ms-rMY/strings.xml b/packages/Shell/res/values-ms-rMY/strings.xml index 852a9e44fad6..bbbb42a5c973 100644 --- a/packages/Shell/res/values-ms-rMY/strings.xml +++ b/packages/Shell/res/values-ms-rMY/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"Laporan pepijat telah ditangkap"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Leret ke kiri untuk berkongsi laporan pepijat anda"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Sentuh untuk berkongsi laporan pepijat anda"</string> diff --git a/packages/Shell/res/values-my-rMM/strings.xml b/packages/Shell/res/values-my-rMM/strings.xml index 4ba9037ce2a2..d49dc1519898 100644 --- a/packages/Shell/res/values-my-rMM/strings.xml +++ b/packages/Shell/res/values-my-rMM/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"အခွံ"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ချွတ်ယွင်းချက် အစီရင်ခံစာ ပြုလုပ်ဆဲ"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"အမှားအယွင်းမှတ်တမ်းကို အောင်မြင်စွာ သိမ်းဆည်းပြီး"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"သင်၏ ဘာဂ် အစီရင်ခံစာကို မျှပေးရန် ဘယ်ဘက်သို့ ပွတ်ဆွဲရန်"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"အမှားအယွင်း မှတ်တမ်းကို မျှဝေရန် ထိလိုက်ပါ"</string> diff --git a/packages/Shell/res/values-nb/strings.xml b/packages/Shell/res/values-nb/strings.xml index c543e49cbb9f..d3aafdd62a61 100644 --- a/packages/Shell/res/values-nb/strings.xml +++ b/packages/Shell/res/values-nb/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Kommandoliste"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Feilrapport pågår"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Feilrapporten er lagret"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Sveip til venstre for å dele feilrapporten din"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Trykk for å dele feilrapporten din"</string> diff --git a/packages/Shell/res/values-ne-rNP/strings.xml b/packages/Shell/res/values-ne-rNP/strings.xml index f57112ac329a..fb81e558f558 100644 --- a/packages/Shell/res/values-ne-rNP/strings.xml +++ b/packages/Shell/res/values-ne-rNP/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"सेल"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"बग प्रतिवेदन समातियो"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"तपाईँको बग रिपोर्ट साझेदारी गर्न बायाँ स्वाइप गर्नुहोस्"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"तपाईंको बग रिपोर्ट साझेदारी गर्न छुनुहोस्"</string> diff --git a/packages/Shell/res/values-nl/strings.xml b/packages/Shell/res/values-nl/strings.xml index 1519454c2b48..a097feabfa70 100644 --- a/packages/Shell/res/values-nl/strings.xml +++ b/packages/Shell/res/values-nl/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Bugrapport wordt uitgevoerd"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Foutenrapport vastgelegd"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Veeg naar links om je bugmelding te delen"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Raak aan om je foutenrapport te delen"</string> diff --git a/packages/Shell/res/values-pa-rIN/strings.xml b/packages/Shell/res/values-pa-rIN/strings.xml index 3f59bb9ea90a..54e30d6f58cb 100644 --- a/packages/Shell/res/values-pa-rIN/strings.xml +++ b/packages/Shell/res/values-pa-rIN/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"ਸ਼ੈਲ"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ਬੱਗ ਰਿਪੋਰਟ \'ਤੇ ਕਾਰਵਾਈ ਹੋ ਰਹੀ ਹੈ"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"ਬਗ ਰਿਪੋਰਟ ਕੈਪਚਰ ਕੀਤੀ"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ਤੁਹਾਡੀ ਬਗ ਰਿਪੋਰਟ ਸ਼ੇਅਰ ਕਰਨ ਲਈ ਖੱਬੇ ਪਾਸੇ ਸਵਾਈਪ ਕਰੋ"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ਆਪਣੀ ਬਗ ਰਿਪੋਰਟ ਸ਼ੇਅਰ ਕਰਨ ਲਈ ਛੋਹਵੋ"</string> diff --git a/packages/Shell/res/values-pl/strings.xml b/packages/Shell/res/values-pl/strings.xml index accc92e83634..599f8c19e3e6 100644 --- a/packages/Shell/res/values-pl/strings.xml +++ b/packages/Shell/res/values-pl/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Powłoka"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Trwa zgłaszanie błędu"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Raport o błędach został zapisany"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Przesuń palcem w lewo, by udostępnić swoje zgłoszenie błędu"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Kliknij, by udostępnić raport o błędach"</string> diff --git a/packages/Shell/res/values-pt-rBR/strings.xml b/packages/Shell/res/values-pt-rBR/strings.xml index 7d4b0d310a9e..a1a9ad1fe690 100644 --- a/packages/Shell/res/values-pt-rBR/strings.xml +++ b/packages/Shell/res/values-pt-rBR/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Relatório de bugs em andamento"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Relatório de bugs capturado"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslize para a esquerda para compartilhar seu relatório de bugs"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toque para compartilhar seu relatório de bugs"</string> diff --git a/packages/Shell/res/values-pt-rPT/strings.xml b/packages/Shell/res/values-pt-rPT/strings.xml index 007d6834f3ce..2e25f8c98ab4 100644 --- a/packages/Shell/res/values-pt-rPT/strings.xml +++ b/packages/Shell/res/values-pt-rPT/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Relatório de erro em curso"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Relatório de erros capturado"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslizar rapidamente para a esquerda para partilhar o seu relatório de erros"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toque para partilhar o relatório de erros"</string> diff --git a/packages/Shell/res/values-pt/strings.xml b/packages/Shell/res/values-pt/strings.xml index 7d4b0d310a9e..a1a9ad1fe690 100644 --- a/packages/Shell/res/values-pt/strings.xml +++ b/packages/Shell/res/values-pt/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Relatório de bugs em andamento"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Relatório de bugs capturado"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslize para a esquerda para compartilhar seu relatório de bugs"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toque para compartilhar seu relatório de bugs"</string> diff --git a/packages/Shell/res/values-ro/strings.xml b/packages/Shell/res/values-ro/strings.xml index e7395e1fc4f1..d8a3b92a2b1d 100644 --- a/packages/Shell/res/values-ro/strings.xml +++ b/packages/Shell/res/values-ro/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Raportul de eroare se creează"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Raportul despre erori a fost creat"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Glisați la stânga pentru a trimite raportul de erori"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Atingeți pentru a permite accesul la raportul despre erori"</string> diff --git a/packages/Shell/res/values-ru/strings.xml b/packages/Shell/res/values-ru/strings.xml index c9276cf10483..436a5905f66e 100644 --- a/packages/Shell/res/values-ru/strings.xml +++ b/packages/Shell/res/values-ru/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Оболочка"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Отправка сообщения об ошибке..."</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Отчет об ошибке сохранен"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Проведите влево, чтобы отправить отчет"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Нажмите, чтобы отправить отчет об ошибках"</string> diff --git a/packages/Shell/res/values-si-rLK/strings.xml b/packages/Shell/res/values-si-rLK/strings.xml index 937c1bc8014b..a0bc5f68bf98 100644 --- a/packages/Shell/res/values-si-rLK/strings.xml +++ b/packages/Shell/res/values-si-rLK/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"ෂෙල්"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"දෝෂය වාර්තා කිරීම සිදු කරමින් පවතී"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"දෝෂ වාර්තාව ලබාගන්නා ලදි"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ඔබගේ දෝෂ වාර්තාව බෙදාගැනීමට වමට ස්වයිප් කරන්න"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ඔබගේ දෝෂ වාර්තාව බෙදා ගැනීමට ස්පර්ශ කරන්න"</string> diff --git a/packages/Shell/res/values-sk/strings.xml b/packages/Shell/res/values-sk/strings.xml index cd52efc0e1ef..e568946b0dc9 100644 --- a/packages/Shell/res/values-sk/strings.xml +++ b/packages/Shell/res/values-sk/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Prostredie"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Prebieha hlásenie chyby"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Hlásenie o chybách bolo vytvorené"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Ak chcete hlásenie o chybe zdieľať, prejdite prstom doľava."</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Hlásenie o chybách môžete zdielať klepnutím"</string> diff --git a/packages/Shell/res/values-sl/strings.xml b/packages/Shell/res/values-sl/strings.xml index 25553f20bab3..6ac5ac8cd8ef 100644 --- a/packages/Shell/res/values-sl/strings.xml +++ b/packages/Shell/res/values-sl/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Lupina"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Poročanje o napakah poteka"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Poročilo o napaki je posneto"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Povlecite v levo, če želite poslati sporočilo o napaki"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Dotaknite se, če želite deliti sporočilo o napaki z drugimi"</string> diff --git a/packages/Shell/res/values-sq-rAL/strings.xml b/packages/Shell/res/values-sq-rAL/strings.xml index add53d85ae02..54f2aad0abe3 100644 --- a/packages/Shell/res/values-sq-rAL/strings.xml +++ b/packages/Shell/res/values-sq-rAL/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Guaska"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Raporti i gabimeve në kod është në progres"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Raporti i defektit në kod u regjistrua"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Rrëshqit majtas për të ndarë raportin e defektit në kod"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Prek për të ndarë raportin e defektit në kod"</string> diff --git a/packages/Shell/res/values-sr/strings.xml b/packages/Shell/res/values-sr/strings.xml index bb60f3f06468..81cde0007c4b 100644 --- a/packages/Shell/res/values-sr/strings.xml +++ b/packages/Shell/res/values-sr/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Прављење извештаја о грешци је у току"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Извештај о грешци је снимљен"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Превуците улево да бисте делили извештај о грешкама"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Додирните да бисте делили извештај о грешци"</string> diff --git a/packages/Shell/res/values-sv/strings.xml b/packages/Shell/res/values-sv/strings.xml index dd23e16e2259..2287319992f6 100644 --- a/packages/Shell/res/values-sv/strings.xml +++ b/packages/Shell/res/values-sv/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Skal"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Felrapportering pågår"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Felrapporten har skapats"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Svep åt vänster om du vill dela felrapporten"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Tryck om du vill dela felrapporten"</string> diff --git a/packages/Shell/res/values-sw/strings.xml b/packages/Shell/res/values-sw/strings.xml index 3773cd70db3a..adb97dde6768 100644 --- a/packages/Shell/res/values-sw/strings.xml +++ b/packages/Shell/res/values-sw/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Ganda"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Mchakato wa kuripoti hitilafu unaendelea"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Ripoti ya hitilafu imenaswa"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Telezesha kidole kushoto ili ushiriki ripoti yako ya hitilafu"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Gusa ili ushiriki ripoti yako ya hitilafu"</string> diff --git a/packages/Shell/res/values-ta-rIN/strings.xml b/packages/Shell/res/values-ta-rIN/strings.xml index 244c92949720..15a6242c4370 100644 --- a/packages/Shell/res/values-ta-rIN/strings.xml +++ b/packages/Shell/res/values-ta-rIN/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"ஷெல்"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"பிழை அறிக்கை செயலிலுள்ளது"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"பிழை அறிக்கைகள் படமெடுக்கப்பட்டன"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"பிழை அறிக்கையைப் பகிர இடது புறமாகத் தேய்க்கவும்"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"உங்கள் பிழை அறிக்கையைப் பகிர, தொடவும்"</string> diff --git a/packages/Shell/res/values-te-rIN/strings.xml b/packages/Shell/res/values-te-rIN/strings.xml index cd9b4b7eaebc..cd951a267ff2 100644 --- a/packages/Shell/res/values-te-rIN/strings.xml +++ b/packages/Shell/res/values-te-rIN/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"షెల్"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"బగ్ నివేదిక ప్రోగ్రెస్లో ఉంది"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"బగ్ నివేదిక క్యాప్చర్ చేయబడింది"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"మీ బగ్ నివేదికను భాగస్వామ్యం చేయడానికి ఎడమవైపుకు స్వైప్ చేయండి"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"మీ బగ్ నివేదికను భాగస్వామ్యం చేయడానికి తాకండి"</string> diff --git a/packages/Shell/res/values-th/strings.xml b/packages/Shell/res/values-th/strings.xml index 35b7ec9a3d8e..c61ffeb251e0 100644 --- a/packages/Shell/res/values-th/strings.xml +++ b/packages/Shell/res/values-th/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"รายงานข้อบกพร่องอยู่ระหว่างดำเนินการ"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"จับภาพรายงานข้อบกพร่องแล้ว"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"กวาดไปทางซ้ายเพื่อแชร์รายงานข้อบกพร่อง"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"แตะเพื่อแชร์รายงานข้อบกพร่องของคุณ"</string> diff --git a/packages/Shell/res/values-tl/strings.xml b/packages/Shell/res/values-tl/strings.xml index 21df2069cd23..3e9a68d2c680 100644 --- a/packages/Shell/res/values-tl/strings.xml +++ b/packages/Shell/res/values-tl/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Kasalukuyang ginagawa ang ulat ng bug"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Na-capture ang ulat ng bug"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Mag-swipe pakaliwa upang ibahagi ang iyong ulat ng bug"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Pindutin upang ibahagi ang iyong ulat ng bug"</string> diff --git a/packages/Shell/res/values-tr/strings.xml b/packages/Shell/res/values-tr/strings.xml index fa8b82b75191..f90dae03cc7a 100644 --- a/packages/Shell/res/values-tr/strings.xml +++ b/packages/Shell/res/values-tr/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Kabuk"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Hata raporu hazırlanıyor"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Hata raporu kaydedildi"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Hata raporunuzu paylaşmak için hızlıca sola kaydırın"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Hata raporunuzu paylaşmak için dokunun"</string> diff --git a/packages/Shell/res/values-uk/strings.xml b/packages/Shell/res/values-uk/strings.xml index ba667f20bf81..dac4fe0fe5c0 100644 --- a/packages/Shell/res/values-uk/strings.xml +++ b/packages/Shell/res/values-uk/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Оболонка"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Генерується повідомлення про помилку"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Звіт про помилки створено"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Проведіть пальцем ліворуч, щоб надіслати звіт про помилки"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Торкніться, щоб надіслати звіт про помилки"</string> diff --git a/packages/Shell/res/values-ur-rPK/strings.xml b/packages/Shell/res/values-ur-rPK/strings.xml index 255aaf8c55ab..206f02a8a9c7 100644 --- a/packages/Shell/res/values-ur-rPK/strings.xml +++ b/packages/Shell/res/values-ur-rPK/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"شیل"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"بگ رپورٹ پر پیشرفت جاری ہے"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"بَگ رپورٹ کیپچر کر لی گئی"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"اپنی بگ رپورٹ کا اشتراک کرنے کیلئے بائیں سوائپ کریں"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"اپنی بَگ رپورٹ کا اشتراک کرنے کیلئے ٹچ کریں"</string> diff --git a/packages/Shell/res/values-uz-rUZ/strings.xml b/packages/Shell/res/values-uz-rUZ/strings.xml index 998387e099a3..0b8c1fb1fc1f 100644 --- a/packages/Shell/res/values-uz-rUZ/strings.xml +++ b/packages/Shell/res/values-uz-rUZ/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Terminal"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Xatoliklar hisoboti yuborilmoqda…"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Xatolik hisobotini yozib olindi"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Xatolik hisobotini yuborish uchun barmog‘ingiz bilan chapga suring"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Xatolik hisobotini bo‘lishish uchun barmog‘ingizni tegizing."</string> diff --git a/packages/Shell/res/values-vi/strings.xml b/packages/Shell/res/values-vi/strings.xml index 5c11b13684dd..9ef7cf966718 100644 --- a/packages/Shell/res/values-vi/strings.xml +++ b/packages/Shell/res/values-vi/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Đang tiến hành báo cáo lỗi"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Báo cáo lỗi đã được chụp"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Vuốt sang trái để chia sẻ báo cáo lỗi của bạn"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Chạm để chia sẻ báo cáo lỗi của bạn"</string> diff --git a/packages/Shell/res/values-zh-rCN/strings.xml b/packages/Shell/res/values-zh-rCN/strings.xml index 0a2f81bcb42a..0928bb3fd3c3 100644 --- a/packages/Shell/res/values-zh-rCN/strings.xml +++ b/packages/Shell/res/values-zh-rCN/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"已抓取错误报告"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"向左滑动即可分享错误报告"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"触摸即可分享您的错误报告"</string> diff --git a/packages/Shell/res/values-zh-rHK/strings.xml b/packages/Shell/res/values-zh-rHK/strings.xml index 227d93785960..26a84c357ffb 100644 --- a/packages/Shell/res/values-zh-rHK/strings.xml +++ b/packages/Shell/res/values-zh-rHK/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"命令介面"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"已擷取錯誤報告"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"向左滑動即可分享錯誤報告"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"輕觸即可分享您的錯誤報告"</string> diff --git a/packages/Shell/res/values-zh-rTW/strings.xml b/packages/Shell/res/values-zh-rTW/strings.xml index b9f8ee8b4944..f79e58e83ee2 100644 --- a/packages/Shell/res/values-zh-rTW/strings.xml +++ b/packages/Shell/res/values-zh-rTW/strings.xml @@ -17,6 +17,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"殼層"</string> + <!-- no translation found for bugreport_in_progress_title (6125357428413919520) --> + <skip /> <string name="bugreport_finished_title" msgid="2293711546892863898">"已擷取錯誤報告"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"向左滑動即可分享錯誤報告"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"輕觸即可分享您的錯誤報告"</string> diff --git a/packages/Shell/res/values-zu/strings.xml b/packages/Shell/res/values-zu/strings.xml index b675858e19f6..2e209e1630ce 100644 --- a/packages/Shell/res/values-zu/strings.xml +++ b/packages/Shell/res/values-zu/strings.xml @@ -17,6 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="3701846017049540910">"I-Shell"</string> + <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Umbiko wesiphazamisi uyaqhubeka"</string> <string name="bugreport_finished_title" msgid="2293711546892863898">"Umbiko wesiphazamisi uthwetshuliwe"</string> <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swayiphela kwesokunxele ukuze wabelane umbiko wesiphazamiso sakho"</string> <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Thinta ukuze wabelane ngombiko wakho wesiphazamisi"</string> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java index f32cfdc7b417..4cc2b8d191ee 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java @@ -222,7 +222,6 @@ public class QSTileView extends QSTileBaseView { final ImageView icon = new ImageView(mContext); icon.setId(android.R.id.icon); icon.setScaleType(ScaleType.CENTER_INSIDE); - icon.setImageTintList(ColorStateList.valueOf(getContext().getColor(android.R.color.white))); return icon; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomTile.java index b0d885a3a49e..d26e8d64dc82 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomTile.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.content.ServiceConnection; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; +import android.graphics.drawable.Drawable; import android.os.IBinder; import android.os.UserHandle; import android.service.quicksettings.IQSTileService; @@ -132,7 +133,9 @@ public class CustomTile extends QSTile<QSTile.State> { @Override protected void handleUpdateState(State state, Object arg) { state.visible = true; - state.icon = new DrawableIcon(mTile.getIcon().loadDrawable(mContext)); + Drawable drawable = mTile.getIcon().loadDrawable(mContext); + drawable.setTint(mContext.getColor(android.R.color.white)); + state.icon = new DrawableIcon(drawable); state.label = mTile.getLabel(); if (mTile.getContentDescription() != null) { state.contentDescription = mTile.getContentDescription(); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index b1371e079ad7..dbfd80d9732c 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -3885,39 +3885,31 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.BIND_DEVICE_ADMIN, null); - DevicePolicyData p = getUserData(userHandle); - validateQualityConstant(quality); - synchronized (this) { - if (p.mActivePasswordQuality != quality || p.mActivePasswordLength != length - || p.mFailedPasswordAttempts != 0 || p.mActivePasswordLetters != letters - || p.mActivePasswordUpperCase != uppercase - || p.mActivePasswordLowerCase != lowercase - || p.mActivePasswordNumeric != numbers - || p.mActivePasswordSymbols != symbols - || p.mActivePasswordNonLetter != nonletter) { - long ident = mInjector.binderClearCallingIdentity(); - try { - p.mActivePasswordQuality = quality; - p.mActivePasswordLength = length; - p.mActivePasswordLetters = letters; - p.mActivePasswordLowerCase = lowercase; - p.mActivePasswordUpperCase = uppercase; - p.mActivePasswordNumeric = numbers; - p.mActivePasswordSymbols = symbols; - p.mActivePasswordNonLetter = nonletter; - p.mFailedPasswordAttempts = 0; - saveSettingsLocked(userHandle); - updatePasswordExpirationsLocked(userHandle); - setExpirationAlarmCheckLocked(mContext, p); - sendAdminCommandToSelfAndProfilesLocked( - DeviceAdminReceiver.ACTION_PASSWORD_CHANGED, - DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, userHandle); - } finally { - mInjector.binderRestoreCallingIdentity(ident); - } + DevicePolicyData policy = getUserData(userHandle); + + long ident = mInjector.binderClearCallingIdentity(); + try { + synchronized (this) { + policy.mActivePasswordQuality = quality; + policy.mActivePasswordLength = length; + policy.mActivePasswordLetters = letters; + policy.mActivePasswordLowerCase = lowercase; + policy.mActivePasswordUpperCase = uppercase; + policy.mActivePasswordNumeric = numbers; + policy.mActivePasswordSymbols = symbols; + policy.mActivePasswordNonLetter = nonletter; + policy.mFailedPasswordAttempts = 0; + saveSettingsLocked(userHandle); + updatePasswordExpirationsLocked(userHandle); + setExpirationAlarmCheckLocked(mContext, policy); + sendAdminCommandToSelfAndProfilesLocked( + DeviceAdminReceiver.ACTION_PASSWORD_CHANGED, + DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, userHandle); } + } finally { + mInjector.binderRestoreCallingIdentity(ident); } } diff --git a/services/print/java/com/android/server/print/RemotePrintService.java b/services/print/java/com/android/server/print/RemotePrintService.java index 0ab1657fcc52..77a47f81e62b 100644 --- a/services/print/java/com/android/server/print/RemotePrintService.java +++ b/services/print/java/com/android/server/print/RemotePrintService.java @@ -16,6 +16,9 @@ package com.android.server.print; +import android.annotation.FloatRange; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -757,6 +760,33 @@ final class RemotePrintService implements DeathRecipient { } @Override + public void setProgress(@NonNull PrintJobId printJobId, + @FloatRange(from=0.0, to=1.0) float progress) { + RemotePrintService service = mWeakService.get(); + if (service != null) { + final long identity = Binder.clearCallingIdentity(); + try { + service.mSpooler.setProgress(printJobId, progress); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + } + + @Override + public void setStatus(@NonNull PrintJobId printJobId, @Nullable CharSequence status) { + RemotePrintService service = mWeakService.get(); + if (service != null) { + final long identity = Binder.clearCallingIdentity(); + try { + service.mSpooler.setStatus(printJobId, status); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + } + + @Override @SuppressWarnings({"rawtypes", "unchecked"}) public void onPrintersAdded(ParceledListSlice printers) { RemotePrintService service = mWeakService.get(); diff --git a/services/print/java/com/android/server/print/RemotePrintSpooler.java b/services/print/java/com/android/server/print/RemotePrintSpooler.java index e5370f489e9b..c506b6f5f495 100644 --- a/services/print/java/com/android/server/print/RemotePrintSpooler.java +++ b/services/print/java/com/android/server/print/RemotePrintSpooler.java @@ -16,6 +16,9 @@ package com.android.server.print; +import android.annotation.FloatRange; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -229,6 +232,61 @@ final class RemotePrintSpooler { return false; } + /** + * Set progress of a print job. + * + * @param printJobId The print job to update + * @param progress The new progress + */ + public final void setProgress(@NonNull PrintJobId printJobId, + @FloatRange(from=0.0, to=1.0) float progress) { + throwIfCalledOnMainThread(); + synchronized (mLock) { + throwIfDestroyedLocked(); + mCanUnbind = false; + } + try { + getRemoteInstanceLazy().setProgress(printJobId, progress); + } catch (RemoteException|TimeoutException re) { + Slog.e(LOG_TAG, "Error setting progress.", re); + } finally { + if (DEBUG) { + Slog.i(LOG_TAG, "[user: " + mUserHandle.getIdentifier() + "] setProgress()"); + } + synchronized (mLock) { + mCanUnbind = true; + mLock.notifyAll(); + } + } + } + + /** + * Set status of a print job. + * + * @param printJobId The print job to update + * @param status The new status + */ + public final void setStatus(@NonNull PrintJobId printJobId, @Nullable CharSequence status) { + throwIfCalledOnMainThread(); + synchronized (mLock) { + throwIfDestroyedLocked(); + mCanUnbind = false; + } + try { + getRemoteInstanceLazy().setStatus(printJobId, status); + } catch (RemoteException|TimeoutException re) { + Slog.e(LOG_TAG, "Error setting status.", re); + } finally { + if (DEBUG) { + Slog.i(LOG_TAG, "[user: " + mUserHandle.getIdentifier() + "] setStatus()"); + } + synchronized (mLock) { + mCanUnbind = true; + mLock.notifyAll(); + } + } + } + public final boolean setPrintJobTag(PrintJobId printJobId, String tag) { throwIfCalledOnMainThread(); synchronized (mLock) { |