diff options
268 files changed, 1433 insertions, 855 deletions
diff --git a/Android.mk b/Android.mk index 3b44255c4a62..36ed03fcc717 100644 --- a/Android.mk +++ b/Android.mk @@ -1004,7 +1004,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since $(SRC_API_DIR)/23.txt 23 \ -since $(SRC_API_DIR)/24.txt 24 \ -since $(SRC_API_DIR)/25.txt 25 \ - -since ./frameworks/base/api/current.txt O \ + -since $(SRC_API_DIR)/26.txt 26 \ -werror -hide 111 -hide 113 -hide 121 \ -overview $(LOCAL_PATH)/core/java/overview.html \ diff --git a/compiled-classes-phone b/compiled-classes-phone index 5f023bd8f010..d11f0baf067a 100644 --- a/compiled-classes-phone +++ b/compiled-classes-phone @@ -3114,6 +3114,7 @@ android.os.-$Lambda$-dncxFEc2F2bgG2fsIoC6FC6WNE android.os.-$Lambda$-dncxFEc2F2bgG2fsIoC6FC6WNE$1 android.os.-$Lambda$6x30vPJhBKUfNY8tswxuZo3DCe0 android.os.AsyncResult +android.os.AsyncTask android.os.AsyncTask$1 android.os.AsyncTask$2 android.os.AsyncTask$3 diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 35cb2f15a0a3..895b448ae127 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4954,7 +4954,8 @@ public final class ActivityThread { // If the new config is the same as the config this Activity is already running with and // the override config also didn't change, then don't bother calling // onConfigurationChanged. - int diff = activity.mCurrentConfig.diff(newConfig); + final int diff = activity.mCurrentConfig.diffPublicOnly(newConfig); + if (diff != 0 || !mResourcesManager.isSameResourcesOverrideConfig(activityToken, amOverrideConfig)) { // Always send the task-level config changes. For system-level configuration, if @@ -5042,6 +5043,14 @@ public final class ActivityThread { int configDiff = 0; + // This flag tracks whether the new configuration is fundamentally equivalent to the + // existing configuration. This is necessary to determine whether non-activity + // callbacks should receive notice when the only changes are related to non-public fields. + // We do not gate calling {@link #performActivityConfigurationChanged} based on this flag + // as that method uses the same check on the activity config override as well. + final boolean equivalent = config != null && mConfiguration != null + && (0 == mConfiguration.diffPublicOnly(config)); + synchronized (mResourcesManager) { if (mPendingConfiguration != null) { if (!mPendingConfiguration.isOtherSeqNewer(config)) { @@ -5098,7 +5107,7 @@ public final class ActivityThread { Activity a = (Activity) cb; performConfigurationChangedForActivity(mActivities.get(a.getActivityToken()), config); - } else { + } else if (!equivalent) { performConfigurationChanged(cb, config); } } diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index acceed05943c..7fc9a69a1f92 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -285,7 +285,8 @@ public class ApplicationPackageManager extends PackageManager { public PermissionInfo getPermissionInfo(String name, int flags) throws NameNotFoundException { try { - PermissionInfo pi = mPM.getPermissionInfo(name, flags); + PermissionInfo pi = mPM.getPermissionInfo(name, + mContext.getOpPackageName(), flags); if (pi != null) { return pi; } diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index 6f326de76150..636dea7ddaa1 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -44,8 +44,6 @@ import com.android.internal.util.ArrayUtils; import java.lang.ref.WeakReference; import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; import java.util.Objects; import java.util.WeakHashMap; import java.util.function.Predicate; @@ -417,7 +415,12 @@ public class ResourcesManager { if (activityResources == null) { return overrideConfig == null; } else { - return Objects.equals(activityResources.overrideConfig, overrideConfig); + // The two configurations must either be equal or publicly equivalent to be + // considered the same. + return Objects.equals(activityResources.overrideConfig, overrideConfig) + || (overrideConfig != null && activityResources.overrideConfig != null + && 0 == overrideConfig.diffPublicOnly( + activityResources.overrideConfig)); } } } diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java index 1eac395bd06c..e3bc78e5a2bb 100644 --- a/core/java/android/bluetooth/le/BluetoothLeScanner.java +++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java @@ -205,7 +205,8 @@ public final class BluetoothLeScanner { } synchronized (mLeScanClients) { if (callback != null && mLeScanClients.containsKey(callback)) { - postCallbackError(callback, ScanCallback.SCAN_FAILED_ALREADY_STARTED); + return postCallbackErrorOrReturn(callback, + ScanCallback.SCAN_FAILED_ALREADY_STARTED); } IBluetoothGatt gatt; try { diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 16c834d18b9e..18f9e53dc528 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -763,26 +763,6 @@ public class ActivityInfo extends ComponentInfo * constant starts at the high bits. */ public static final int CONFIG_FONT_SCALE = 0x40000000; - /** - * Bit in {@link #configChanges} that indicates that the activity - * can itself handle changes to the rotation. Set from the - * {@link android.R.attr#configChanges} attribute. This is - * not a core resource configuration, but a higher-level value, so its - * constant starts at the high bits. - * @hide We do not want apps to handle this. It will eventually be moved out of - * {@link Configuration}. - */ - public static final int CONFIG_ROTATION = 0x20000000; - /** - * Bit in {@link #configChanges} that indicates that the activity - * can itself handle changes to the app bounds. Set from the - * {@link android.R.attr#configChanges} attribute. This is - * not a core resource configuration, but a higher-level value, so its - * constant starts at the high bits. - * @hide We do not want apps to handle this. It will eventually be moved out of - * {@link Configuration}. - */ - public static final int CONFIG_APP_BOUNDS = 0x10000000; /** @hide * Unfortunately the constants for config changes in native code are diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index e800e8857cb4..4b44a177ec20 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -72,7 +72,7 @@ interface IPackageManager { String[] currentToCanonicalPackageNames(in String[] names); String[] canonicalToCurrentPackageNames(in String[] names); - PermissionInfo getPermissionInfo(String name, int flags); + PermissionInfo getPermissionInfo(String name, String packageName, int flags); ParceledListSlice queryPermissionsByGroup(String group, int flags); diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 7b96c6a3b5f5..f7cccd56f079 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -42,8 +42,6 @@ import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Locale; -import static android.view.Surface.ROTATION_0; -import static android.view.Surface.ROTATION_UNDEFINED; /** * This class describes all device configuration information that can @@ -600,13 +598,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration */ public int orientation; - /** - * The mRotation used at the time orientation was determined. - * TODO(b/36812336): Move mRotation out of {@link Configuration}. - * {@hide} - */ - private int mRotation; - /** Constant for {@link #uiMode}: bits that encode the mode type. */ public static final int UI_MODE_TYPE_MASK = 0x0f; /** Constant for {@link #uiMode}: a {@link #UI_MODE_TYPE_MASK} @@ -894,7 +885,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration navigation = o.navigation; navigationHidden = o.navigationHidden; orientation = o.orientation; - mRotation = o.mRotation; screenLayout = o.screenLayout; colorMode = o.colorMode; uiMode = o.uiMode; @@ -1085,7 +1075,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration navigation = NAVIGATION_UNDEFINED; navigationHidden = NAVIGATIONHIDDEN_UNDEFINED; orientation = ORIENTATION_UNDEFINED; - mRotation = ROTATION_UNDEFINED; screenLayout = SCREENLAYOUT_UNDEFINED; colorMode = COLOR_MODE_UNDEFINED; uiMode = UI_MODE_TYPE_UNDEFINED; @@ -1194,11 +1183,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration changed |= ActivityInfo.CONFIG_ORIENTATION; orientation = delta.orientation; } - if (delta.mRotation != ROTATION_UNDEFINED - && mRotation != delta.mRotation) { - changed |= ActivityInfo.CONFIG_ORIENTATION; - mRotation = delta.mRotation; - } if (((delta.screenLayout & SCREENLAYOUT_SIZE_MASK) != SCREENLAYOUT_SIZE_UNDEFINED) && (delta.screenLayout & SCREENLAYOUT_SIZE_MASK) @@ -1334,7 +1318,19 @@ public final class Configuration implements Parcelable, Comparable<Configuration * PackageManager.ActivityInfo.CONFIG_LAYOUT_DIRECTION}. */ public int diff(Configuration delta) { - return diff(delta, false /* compareUndefined */); + return diff(delta, false /* compareUndefined */, false /* publicOnly */); + } + + /** + * Returns the diff against the provided {@link Configuration} excluding values that would + * publicly be equivalent, such as appBounds. + * @param delta {@link Configuration} to compare to. + * + * TODO(b/36812336): Remove once appBounds has been moved out of Configuration. + * {@hide} + */ + public int diffPublicOnly(Configuration delta) { + return diff(delta, false /* compareUndefined */, true /* publicOnly */); } /** @@ -1342,7 +1338,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration * * @hide */ - public int diff(Configuration delta, boolean compareUndefined) { + public int diff(Configuration delta, boolean compareUndefined, boolean publicOnly) { int changed = 0; if ((compareUndefined || delta.fontScale > 0) && fontScale != delta.fontScale) { changed |= ActivityInfo.CONFIG_FONT_SCALE; @@ -1393,10 +1389,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration && orientation != delta.orientation) { changed |= ActivityInfo.CONFIG_ORIENTATION; } - if ((compareUndefined || delta.mRotation != ROTATION_UNDEFINED) - && mRotation != delta.mRotation) { - changed |= ActivityInfo.CONFIG_ROTATION; - } if ((compareUndefined || getScreenLayoutNoDirection(delta.screenLayout) != (SCREENLAYOUT_SIZE_UNDEFINED | SCREENLAYOUT_LONG_UNDEFINED)) && getScreenLayoutNoDirection(screenLayout) != @@ -1444,8 +1436,10 @@ public final class Configuration implements Parcelable, Comparable<Configuration // Make sure that one of the values is not null and that they are not equal. if ((compareUndefined || delta.appBounds != null) && appBounds != delta.appBounds - && (appBounds == null || !appBounds.equals(delta.appBounds))) { - changed |= ActivityInfo.CONFIG_APP_BOUNDS; + && (appBounds == null || (!publicOnly && !appBounds.equals(delta.appBounds)) + || (publicOnly && (appBounds.width() != delta.appBounds.width() + || appBounds.height() != delta.appBounds.height())))) { + changed |= ActivityInfo.CONFIG_SCREEN_SIZE; } return changed; @@ -1533,7 +1527,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration dest.writeInt(navigation); dest.writeInt(navigationHidden); dest.writeInt(orientation); - dest.writeInt(mRotation); dest.writeInt(screenLayout); dest.writeInt(colorMode); dest.writeInt(uiMode); @@ -1570,7 +1563,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration navigation = source.readInt(); navigationHidden = source.readInt(); orientation = source.readInt(); - mRotation = source.readInt(); screenLayout = source.readInt(); colorMode = source.readInt(); uiMode = source.readInt(); @@ -1655,8 +1647,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration if (n != 0) return n; n = this.orientation - that.orientation; if (n != 0) return n; - n = this.mRotation - that.mRotation; - if (n != 0) return n; n = this.colorMode - that.colorMode; if (n != 0) return n; n = this.screenLayout - that.screenLayout; @@ -1805,24 +1795,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration /** * @hide * - * Setter for orientation converts from {@link Surface} values to internal representation. - */ - public void setRotation(int rotation) { - this.mRotation = rotation; - } - - /** - * @hide - * - * Getter for orientation. Converts from internal representation to {@link Surface} values. - */ - public int getRotation() { - return mRotation != ROTATION_UNDEFINED ? mRotation : ROTATION_0; - } - - /** - * @hide - * * Clears the locale without changing layout direction. */ public void clearLocales() { @@ -2253,10 +2225,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration delta.orientation = change.orientation; } - if (base.mRotation != change.mRotation) { - base.mRotation = change.mRotation; - } - if ((base.screenLayout & SCREENLAYOUT_SIZE_MASK) != (change.screenLayout & SCREENLAYOUT_SIZE_MASK)) { delta.screenLayout |= change.screenLayout & SCREENLAYOUT_SIZE_MASK; @@ -2388,8 +2356,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration DENSITY_DPI_UNDEFINED); configOut.appBounds = Rect.unflattenFromString(XmlUtils.readStringAttribute(parser, XML_ATTR_APP_BOUNDS)); - configOut.mRotation = XmlUtils.readIntAttribute(parser, XML_ATTR_ROTATION, - ROTATION_UNDEFINED); // For persistence, we don't care about assetsSeq, so do not read it out. } @@ -2466,10 +2432,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration config.appBounds.flattenToString()); } - if (config.mRotation != ROTATION_UNDEFINED) { - XmlUtils.writeIntAttribute(xml, XML_ATTR_ROTATION, config.mRotation); - } - // For persistence, we do not care about assetsSeq, so do not write it out. } } diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 2dd7f757aea3..6ce9642d0a89 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -23,6 +23,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.BitUtils; import java.util.Objects; +import java.util.StringJoiner; /** * This class represents the capabilities of a network. This is used both to specify @@ -346,11 +347,6 @@ public final class NetworkCapabilities implements Parcelable { return (nc.mNetworkCapabilities == this.mNetworkCapabilities); } - private boolean equalsNetCapabilitiesImmutable(NetworkCapabilities that) { - return ((this.mNetworkCapabilities & ~MUTABLE_CAPABILITIES) == - (that.mNetworkCapabilities & ~MUTABLE_CAPABILITIES)); - } - private boolean equalsNetCapabilitiesRequestable(NetworkCapabilities that) { return ((this.mNetworkCapabilities & ~NON_REQUESTABLE_CAPABILITIES) == (that.mNetworkCapabilities & ~NON_REQUESTABLE_CAPABILITIES)); @@ -504,10 +500,12 @@ public final class NetworkCapabilities implements Parcelable { private void combineTransportTypes(NetworkCapabilities nc) { this.mTransportTypes |= nc.mTransportTypes; } + private boolean satisfiedByTransportTypes(NetworkCapabilities nc) { return ((this.mTransportTypes == 0) || ((this.mTransportTypes & nc.mTransportTypes) != 0)); } + /** @hide */ public boolean equalsTransportTypes(NetworkCapabilities nc) { return (nc.mTransportTypes == this.mTransportTypes); @@ -762,15 +760,43 @@ public final class NetworkCapabilities implements Parcelable { /** * Checks that our immutable capabilities are the same as those of the given - * {@code NetworkCapabilities}. + * {@code NetworkCapabilities} and return a String describing any difference. + * The returned String is empty if there is no difference. * * @hide */ - public boolean equalImmutableCapabilities(NetworkCapabilities nc) { - if (nc == null) return false; - return (equalsNetCapabilitiesImmutable(nc) && - equalsTransportTypes(nc) && - equalsSpecifier(nc)); + public String describeImmutableDifferences(NetworkCapabilities that) { + if (that == null) { + return "other NetworkCapabilities was null"; + } + + StringJoiner joiner = new StringJoiner(", "); + + // TODO: consider only enforcing that capabilities are not removed, allowing addition. + // Ignore NOT_METERED being added or removed as it is effectively dynamic. http://b/63326103 + // TODO: properly support NOT_METERED as a mutable and requestable capability. + final long mask = ~MUTABLE_CAPABILITIES & ~NET_CAPABILITY_NOT_METERED; + long oldImmutableCapabilities = this.mNetworkCapabilities & mask; + long newImmutableCapabilities = that.mNetworkCapabilities & mask; + if (oldImmutableCapabilities != newImmutableCapabilities) { + String before = capabilityNamesOf(BitUtils.unpackBits(oldImmutableCapabilities)); + String after = capabilityNamesOf(BitUtils.unpackBits(newImmutableCapabilities)); + joiner.add(String.format("immutable capabilities changed: %s -> %s", before, after)); + } + + if (!equalsSpecifier(that)) { + NetworkSpecifier before = this.getNetworkSpecifier(); + NetworkSpecifier after = that.getNetworkSpecifier(); + joiner.add(String.format("specifier changed: %s -> %s", before, after)); + } + + if (!equalsTransportTypes(that)) { + String before = transportNamesOf(this.getTransportTypes()); + String after = transportNamesOf(that.getTransportTypes()); + joiner.add(String.format("transports changed: %s -> %s", before, after)); + } + + return joiner.toString(); } /** @@ -845,33 +871,15 @@ public final class NetworkCapabilities implements Parcelable { @Override public String toString() { + // TODO: enumerate bits for transports and capabilities instead of creating arrays. + // TODO: use a StringBuilder instead of string concatenation. int[] types = getTransportTypes(); String transports = (types.length > 0) ? " Transports: " + transportNamesOf(types) : ""; types = getCapabilities(); String capabilities = (types.length > 0 ? " Capabilities: " : ""); for (int i = 0; i < types.length; ) { - switch (types[i]) { - case NET_CAPABILITY_MMS: capabilities += "MMS"; break; - case NET_CAPABILITY_SUPL: capabilities += "SUPL"; break; - case NET_CAPABILITY_DUN: capabilities += "DUN"; break; - case NET_CAPABILITY_FOTA: capabilities += "FOTA"; break; - case NET_CAPABILITY_IMS: capabilities += "IMS"; break; - case NET_CAPABILITY_CBS: capabilities += "CBS"; break; - case NET_CAPABILITY_WIFI_P2P: capabilities += "WIFI_P2P"; break; - case NET_CAPABILITY_IA: capabilities += "IA"; break; - case NET_CAPABILITY_RCS: capabilities += "RCS"; break; - case NET_CAPABILITY_XCAP: capabilities += "XCAP"; break; - case NET_CAPABILITY_EIMS: capabilities += "EIMS"; break; - case NET_CAPABILITY_NOT_METERED: capabilities += "NOT_METERED"; break; - case NET_CAPABILITY_INTERNET: capabilities += "INTERNET"; break; - case NET_CAPABILITY_NOT_RESTRICTED: capabilities += "NOT_RESTRICTED"; break; - case NET_CAPABILITY_TRUSTED: capabilities += "TRUSTED"; break; - case NET_CAPABILITY_NOT_VPN: capabilities += "NOT_VPN"; break; - case NET_CAPABILITY_VALIDATED: capabilities += "VALIDATED"; break; - case NET_CAPABILITY_CAPTIVE_PORTAL: capabilities += "CAPTIVE_PORTAL"; break; - case NET_CAPABILITY_FOREGROUND: capabilities += "FOREGROUND"; break; - } + capabilities += capabilityNameOf(types[i]); if (++i < types.length) capabilities += "&"; } @@ -891,15 +899,55 @@ public final class NetworkCapabilities implements Parcelable { /** * @hide */ - public static String transportNamesOf(int[] types) { - if (types == null || types.length == 0) { - return ""; + public static String capabilityNamesOf(int[] capabilities) { + StringJoiner joiner = new StringJoiner("|"); + if (capabilities != null) { + for (int c : capabilities) { + joiner.add(capabilityNameOf(c)); + } + } + return joiner.toString(); + } + + /** + * @hide + */ + public static String capabilityNameOf(int capability) { + switch (capability) { + case NET_CAPABILITY_MMS: return "MMS"; + case NET_CAPABILITY_SUPL: return "SUPL"; + case NET_CAPABILITY_DUN: return "DUN"; + case NET_CAPABILITY_FOTA: return "FOTA"; + case NET_CAPABILITY_IMS: return "IMS"; + case NET_CAPABILITY_CBS: return "CBS"; + case NET_CAPABILITY_WIFI_P2P: return "WIFI_P2P"; + case NET_CAPABILITY_IA: return "IA"; + case NET_CAPABILITY_RCS: return "RCS"; + case NET_CAPABILITY_XCAP: return "XCAP"; + case NET_CAPABILITY_EIMS: return "EIMS"; + case NET_CAPABILITY_NOT_METERED: return "NOT_METERED"; + case NET_CAPABILITY_INTERNET: return "INTERNET"; + case NET_CAPABILITY_NOT_RESTRICTED: return "NOT_RESTRICTED"; + case NET_CAPABILITY_TRUSTED: return "TRUSTED"; + case NET_CAPABILITY_NOT_VPN: return "NOT_VPN"; + case NET_CAPABILITY_VALIDATED: return "VALIDATED"; + case NET_CAPABILITY_CAPTIVE_PORTAL: return "CAPTIVE_PORTAL"; + case NET_CAPABILITY_FOREGROUND: return "FOREGROUND"; + default: return Integer.toString(capability); } - StringBuilder transports = new StringBuilder(); - for (int t : types) { - transports.append("|").append(transportNameOf(t)); + } + + /** + * @hide + */ + public static String transportNamesOf(int[] types) { + StringJoiner joiner = new StringJoiner("|"); + if (types != null) { + for (int t : types) { + joiner.add(transportNameOf(t)); + } } - return transports.substring(1); + return joiner.toString(); } /** diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 12013fce2fef..6ec755b61142 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -303,10 +303,12 @@ public class UserManager { public static final String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features"; /** - * Specifies if a user is disallowed from configuring VPN. - * The default value is <code>false</code>. - * This restriction has an effect in a managed profile only from - * {@link android.os.Build.VERSION_CODES#M} + * Specifies if a user is disallowed from configuring a VPN. The default value is + * <code>false</code>. This restriction has an effect when set by device owners and, in Android + * 6.0 ({@linkplain android.os.Build.VERSION_CODES#M API level 23}) or higher, profile owners. + * <p>This restriction also prevents VPNs from starting. However, in Android 7.0 + * ({@linkplain android.os.Build.VERSION_CODES#N API level 24}) or higher, the system does + * start always-on VPNs created by the device or profile owner. * * <p>Key for user restrictions. * <p>Type: Boolean diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 263d3ff423c5..97788931ea93 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -726,17 +726,6 @@ public final class Display { } /** - * Returns the rotation associated with this display as used during layout. This is currently - * derived from the {@link Configuration}. - * - * @hide - */ - @Surface.Rotation - public int getLayoutRotation() { - return mResources.getConfiguration().getRotation(); - } - - /** * @deprecated use {@link #getRotation} * @return orientation of this display. */ diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 1b702326cc28..4f9dbd5ad7a0 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -131,17 +131,11 @@ public class Surface implements Parcelable { public static final int SCALING_MODE_NO_SCALE_CROP = 3; /** @hide */ - @IntDef({ROTATION_UNDEFINED, ROTATION_0, ROTATION_90, ROTATION_180, ROTATION_270}) + @IntDef({ROTATION_0, ROTATION_90, ROTATION_180, ROTATION_270}) @Retention(RetentionPolicy.SOURCE) public @interface Rotation {} /** - * Rotation constant: undefined - * @hide - */ - public static final int ROTATION_UNDEFINED = -1; - - /** * Rotation constant: 0 degree rotation (natural orientation) */ public static final int ROTATION_0 = 0; diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java index 98d8a13d68b5..f9f5901a6651 100644 --- a/core/java/android/widget/EdgeEffect.java +++ b/core/java/android/widget/EdgeEffect.java @@ -59,7 +59,8 @@ public class EdgeEffect { // Time it will take in ms for a pulled glow to decay to partial strength before release private static final int PULL_DECAY_TIME = 2000; - private static final float MAX_ALPHA = 0.5f; + private static final float MAX_ALPHA = 0.15f; + private static final float GLOW_ALPHA_START = .09f; private static final float MAX_GLOW_SCALE = 2.f; @@ -75,6 +76,7 @@ public class EdgeEffect { private static final double ANGLE = Math.PI / 6; private static final float SIN = (float) Math.sin(ANGLE); private static final float COS = (float) Math.cos(ANGLE); + private static final float RADIUS_FACTOR = 0.6f; private float mGlowAlpha; private float mGlowScaleY; @@ -134,10 +136,10 @@ public class EdgeEffect { * @param height Effect height in pixels */ public void setSize(int width, int height) { - final float r = width * 0.75f / SIN; + final float r = width * RADIUS_FACTOR / SIN; final float y = COS * r; final float h = r - y; - final float or = height * 0.75f / SIN; + final float or = height * RADIUS_FACTOR / SIN; final float oy = COS * or; final float oh = or - oy; @@ -272,7 +274,7 @@ public class EdgeEffect { // The glow depends more on the velocity, and therefore starts out // nearly invisible. - mGlowAlphaStart = 0.3f; + mGlowAlphaStart = GLOW_ALPHA_START; mGlowScaleYStart = Math.max(mGlowScaleY, 0.f); diff --git a/core/java/com/android/internal/colorextraction/ColorExtractor.java b/core/java/com/android/internal/colorextraction/ColorExtractor.java index 477285e63f37..727412b03e28 100644 --- a/core/java/com/android/internal/colorextraction/ColorExtractor.java +++ b/core/java/com/android/internal/colorextraction/ColorExtractor.java @@ -45,12 +45,12 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener private static final String TAG = "ColorExtractor"; - private final SparseArray<GradientColors[]> mGradientColors; + protected final SparseArray<GradientColors[]> mGradientColors; private final ArrayList<WeakReference<OnColorsChangedListener>> mOnColorsChangedListeners; private final Context mContext; private final ExtractionType mExtractionType; - private WallpaperColors mSystemColors; - private WallpaperColors mLockColors; + protected WallpaperColors mSystemColors; + protected WallpaperColors mLockColors; public ColorExtractor(Context context) { this(context, new Tonal(context)); diff --git a/core/java/com/android/internal/graphics/ColorUtils.java b/core/java/com/android/internal/graphics/ColorUtils.java index 6c1efa43ac86..8b2a2dc38e95 100644 --- a/core/java/com/android/internal/graphics/ColorUtils.java +++ b/core/java/com/android/internal/graphics/ColorUtils.java @@ -106,6 +106,31 @@ public final class ColorUtils { } /** + * Calculates the minimum alpha value which can be applied to {@code background} so that would + * have a contrast value of at least {@code minContrastRatio} when alpha blended to + * {@code foreground}. + * + * @param foreground the foreground color + * @param background the background color, opacity will be ignored + * @param minContrastRatio the minimum contrast ratio + * @return the alpha value in the range 0-255, or -1 if no value could be calculated + */ + public static int calculateMinimumBackgroundAlpha(@ColorInt int foreground, + @ColorInt int background, float minContrastRatio) { + // Ignore initial alpha that the background might have since this is + // what we're trying to calculate. + background = setAlphaComponent(background, 255); + final int leastContrastyColor = setAlphaComponent(foreground, 255); + return binaryAlphaSearch(foreground, background, minContrastRatio, (fg, bg, alpha) -> { + int testBackground = blendARGB(leastContrastyColor, bg, alpha/255f); + // Float rounding might set this alpha to something other that 255, + // raising an exception in calculateContrast. + testBackground = setAlphaComponent(testBackground, 255); + return calculateContrast(fg, testBackground); + }); + } + + /** * Calculates the minimum alpha value which can be applied to {@code foreground} so that would * have a contrast value of at least {@code minContrastRatio} when compared to * {@code background}. @@ -122,14 +147,33 @@ public final class ColorUtils { + Integer.toHexString(background)); } + ContrastCalculator contrastCalculator = (fg, bg, alpha) -> { + int testForeground = setAlphaComponent(fg, alpha); + return calculateContrast(testForeground, bg); + }; + // First lets check that a fully opaque foreground has sufficient contrast - int testForeground = setAlphaComponent(foreground, 255); - double testRatio = calculateContrast(testForeground, background); + double testRatio = contrastCalculator.calculateContrast(foreground, background, 255); if (testRatio < minContrastRatio) { // Fully opaque foreground does not have sufficient contrast, return error return -1; } + foreground = setAlphaComponent(foreground, 255); + return binaryAlphaSearch(foreground, background, minContrastRatio, contrastCalculator); + } + /** + * Calculates the alpha value using binary search based on a given contrast evaluation function + * and target contrast that needs to be satisfied. + * + * @param foreground the foreground color + * @param background the opaque background color + * @param minContrastRatio the minimum contrast ratio + * @param calculator function that calculates contrast + * @return the alpha value in the range 0-255, or -1 if no value could be calculated + */ + private static int binaryAlphaSearch(@ColorInt int foreground, @ColorInt int background, + float minContrastRatio, ContrastCalculator calculator) { // Binary search to find a value with the minimum value which provides sufficient contrast int numIterations = 0; int minAlpha = 0; @@ -139,9 +183,8 @@ public final class ColorUtils { (maxAlpha - minAlpha) > MIN_ALPHA_SEARCH_PRECISION) { final int testAlpha = (minAlpha + maxAlpha) / 2; - testForeground = setAlphaComponent(foreground, testAlpha); - testRatio = calculateContrast(testForeground, background); - + final double testRatio = calculator.calculateContrast(foreground, background, + testAlpha); if (testRatio < minContrastRatio) { minAlpha = testAlpha; } else { @@ -615,4 +658,8 @@ public final class ColorUtils { return result; } + private interface ContrastCalculator { + double calculateContrast(int foreground, int background, int alpha); + } + }
\ No newline at end of file diff --git a/core/res/res/drawable-hdpi/toast_frame.9.png b/core/res/res/drawable-hdpi/toast_frame.9.png Binary files differdeleted file mode 100644 index a804a8a94564..000000000000 --- a/core/res/res/drawable-hdpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-ldpi/toast_frame.9.png b/core/res/res/drawable-ldpi/toast_frame.9.png Binary files differdeleted file mode 100644 index e64dc7575051..000000000000 --- a/core/res/res/drawable-ldpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/toast_frame.9.png b/core/res/res/drawable-mdpi/toast_frame.9.png Binary files differdeleted file mode 100644 index 778e4e67653d..000000000000 --- a/core/res/res/drawable-mdpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/toast_frame.9.png b/core/res/res/drawable-xhdpi/toast_frame.9.png Binary files differdeleted file mode 100644 index 77e69c72ab9a..000000000000 --- a/core/res/res/drawable-xhdpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-xxhdpi/toast_frame.9.png b/core/res/res/drawable-xxhdpi/toast_frame.9.png Binary files differdeleted file mode 100644 index edecb6320de5..000000000000 --- a/core/res/res/drawable-xxhdpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable/toast_frame.xml b/core/res/res/drawable/toast_frame.xml new file mode 100644 index 000000000000..053b4f4fed5f --- /dev/null +++ b/core/res/res/drawable/toast_frame.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 2017, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <!-- background is material_grey_300 with .9 alpha --> + <solid android:color="#E6E0E0E0" /> + <corners android:radius="22dp" /> +</shape> + diff --git a/core/res/res/layout/transient_notification.xml b/core/res/res/layout/transient_notification.xml index daa9faf70bb2..2c08bf70491e 100644 --- a/core/res/res/layout/transient_notification.xml +++ b/core/res/res/layout/transient_notification.xml @@ -29,9 +29,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_marginHorizontal="24dp" + android:layout_marginVertical="15dp" android:layout_gravity="center_horizontal" android:textAppearance="@style/TextAppearance.Toast" - android:textColor="@color/bright_foreground_dark" + android:textColor="@color/primary_text_default_material_light" android:shadowColor="#BB000000" android:shadowRadius="2.75" /> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 291ccdec36ac..6f0791ed429d 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Stembystand"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Sluit nou"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nuwe kennisgewing"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuele sleutelbord"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fisieke sleutelbord"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sekuriteit"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 6f2db2c6ce0f..f94b2645bed3 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"የድምጽ እርዳታ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"አሁን ቆልፍ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"አዲስ ማሳወቂያ"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ምናባዊ የቁልፍ ሰሌዳ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"አካላዊ ቁልፍ ሰሌዳ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ደህንነት"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index d1e3a54e91d8..618cba5ce952 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -258,8 +258,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"المساعد الصوتي"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"قفل الآن"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"إشعار جديد"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"لوحة المفاتيح الافتراضية"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"لوحة المفاتيح الفعلية"</string> <string name="notification_channel_security" msgid="7345516133431326347">"الأمان"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 857c628df132..21672d92b786 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Səs Yardımçısı"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"İndi kilidləyin"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Yeni bildiriş"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual klaviatura"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fiziki klaviatura"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Təhlükəsizlik"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 5eafdd8f5de9..9f56121f615b 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -249,8 +249,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zaključaj odmah"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Novo obaveštenje"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelna tastatura"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizička tastatura"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Bezbednost"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 1ac84b1dbcfe..15fb30da5d34 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -252,8 +252,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Галас. дапамога"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Заблакір. зараз"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Новае апавяшчэнне"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Віртуальная клавіятура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Фізічная клавіятура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Бяспека"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 01e1aa5eaef1..1389579a7fce 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласова помощ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Заключване сега"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Ново известие"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуална клавиатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Физическа клавиатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Сигурност"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index f97b4f0e18dc..655f501469c2 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ভয়েস সহায়তা"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"এখনই লক করুন"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"৯৯৯+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"নতুন বিজ্ঞপ্তি"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ভার্চুয়াল কীবোর্ড"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ফিজিক্যাল কীবোর্ড"</string> <string name="notification_channel_security" msgid="7345516133431326347">"নিরাপত্তা"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"আরও তথ্যের জন্য ট্যাপ করুন"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB ডিবাগিং সংযুক্ত হয়েছে"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB ডিবাগিং অক্ষম করতে আলতো চাপুন৷"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ডিবাগিং অক্ষম করতে বেছে নিন।"</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"ত্রুটির প্রতিবেদন নেওয়া হচ্ছে..."</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"ত্রুটির প্রতিবেদন শেয়ার করবেন?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"ত্রুটির প্রতিবেদন শেয়ার করা হচ্ছে..."</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index 66f5e21dd9f7..b46bc064ae22 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -249,8 +249,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zaključaj odmah"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Novo obavještenje"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelna tastatura"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizička tastatura"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sigurnost"</string> @@ -1222,8 +1221,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"Dodirnite za više informacija"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Otklanjanje grešaka putem uređaja spojenog na USB je uspostavljeno"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"Dodirnite da onemogućite otklanjanje grešaka putem uređaja spojenog na USB."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Odaberite da onemogućite ispravljanje grešaka koristeći USB"</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Prijem izvještaja o grešci..."</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Podijeliti izvještaj o grešci?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Dijeljenje izvještaja o grešci..."</string> @@ -1440,7 +1438,7 @@ <string name="fingerprints" msgid="4516019619850763049">"Otisci prstiju:"</string> <string name="sha256_fingerprint" msgid="4391271286477279263">"SHA-256 otisak prsta:"</string> <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 otisak prsta:"</string> - <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Vidi sve"</string> + <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Prikaži sve"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Odaberite aktivnost"</string> <string name="share_action_provider_share_with" msgid="5247684435979149216">"Podijeliti sa"</string> <string name="sending" msgid="3245653681008218030">"Slanje..."</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 80b38590e6ed..16344de6a788 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. per veu"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloqueja ara"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"+999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Notificació nova"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclat virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclat físic"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguretat"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 66e660e271d0..33ee2cd93caf 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -252,8 +252,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Hlas. asistence"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zamknout"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nové oznámení"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuální klávesnice"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fyzická klávesnice"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Zabezpečení"</string> @@ -851,7 +850,7 @@ <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"změna oprávnění prohlížeče poskytovat informace o zeměpisné poloze"</string> <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"Umožňuje aplikaci upravit oprávnění funkce geolokace v prohlížeči. Škodlivé aplikace toho mohou využít k odeslání údajů o poloze na libovolné webové stránky."</string> <string name="save_password_message" msgid="767344687139195790">"Chcete, aby si prohlížeč zapamatoval toto heslo?"</string> - <string name="save_password_notnow" msgid="6389675316706699758">"Nyní ne"</string> + <string name="save_password_notnow" msgid="6389675316706699758">"Teď ne"</string> <string name="save_password_remember" msgid="6491879678996749466">"Zapamatovat"</string> <string name="save_password_never" msgid="8274330296785855105">"Nikdy"</string> <string name="open_permission_deny" msgid="7374036708316629800">"Nemáte povolení otevřít tuto stránku."</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 66a1412d2d2f..a9c564ba5835 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Taleassistent"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lås nu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Ny underretning"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelt tastatur"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fysisk tastatur"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sikkerhed"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 91f4c461d4fd..a22e9c136edc 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Sprachassistent"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Jetzt sperren"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Neue Benachrichtigung"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Bildschirmtastatur"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physische Tastatur"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sicherheit"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 28961bc4ba06..fd344b6fbb9a 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Φων.υποβοηθ."</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Κλείδωμα τώρα"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Νέα ειδοποίηση"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Εικονικό πληκτρολόγιο"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Φυσικό πληκτρολόγιο"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Ασφάλεια"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 0fd0ec7299bf..16cc8eb93fc7 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physical keyboard"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Security"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 0fd0ec7299bf..16cc8eb93fc7 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physical keyboard"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Security"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 0fd0ec7299bf..16cc8eb93fc7 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physical keyboard"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Security"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index dd029bf60272..9c925180bcb2 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear ahora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Notificación nueva"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguridad"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index aedb7d11c680..b2e47eefbfbc 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear ahora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"> 999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Notificación nueva"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguridad"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 4de3f1b349b0..3396094e9146 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Häälabi"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lukusta kohe"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Uus märguanne"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuaalne klaviatuur"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Füüsiline klaviatuur"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Turvalisus"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index e46975731f65..fb681f9625c8 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ahots-laguntza"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Blokeatu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Jakinarazpen berria"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teklatu birtuala"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teklatu fisikoa"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Segurtasuna"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"Informazio gehiago lortzeko, sakatu hau"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB arazketa konektatuta"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"Sakatu USB arazketa desgaitzeko."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Hautatu USB arazketa desgaitzeko."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Akatsen txostena sortzen…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Akatsen txostena partekatu nahi duzu?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Akatsen txostena partekatzen…"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 1777e59d4043..800671c2670c 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"دستیار صوتی"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"اکنون قفل شود"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"۹۹۹+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"اعلان جدید"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"صفحهکلید مجازی"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"صفحهکلید فیزیکی"</string> <string name="notification_channel_security" msgid="7345516133431326347">"امنیت"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index f5db45f1450d..725c8eb438cd 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ääniapuri"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lukitse nyt"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Uusi ilmoitus"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuaalinen näppäimistö"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fyysinen näppäimistö"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Tietosuoja"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index e84d629fb6e4..811320b02879 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. vocale"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Verrouiller"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nouvelle notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Clavier virtuel"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Clavier physique"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sécurité"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index a455275fdc31..3baab386d56e 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Assistance vocale"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Verrouiller"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nouvelle notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Clavier virtuel"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Clavier physique"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sécurité"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index 5839348a5d5b..16f71c18c7b4 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Notificación nova"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguranza"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"Toca para obter máis información"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuración USB conectada"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"Toca para desactivar a depuración de erros de USB."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Selecciona a opción para desactivar a depuración de USB."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Creando informe de erros…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Queres compartir o informe de erros?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Compartindo informe de erros..."</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 8ce54f554312..e51520abd6cd 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"વૉઇસ સહાય"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"હવે લૉક કરો"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"નવું નોટિફિકેશન"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"વર્ચ્યુઅલ કીબોર્ડ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ભૌતિક કીબોર્ડ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"સુરક્ષા"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"વધુ માહિતી માટે ટૅપ કરો"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB ડીબગિંગ કનેક્ટ થયું."</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB ડીબગિંગ અક્ષમ કરવા માટે ટૅપ કરો."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ડિબગીંગને અક્ષમ કરવા માટે પસંદ કરો."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"બગ રિપોર્ટ લઈ રહ્યાં છે…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"બગ રિપોર્ટ શેર કરીએ?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"બગ રિપોર્ટ શેર કરી રહ્યાં છે…"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 2b7485293dca..9030cf3e90cb 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"वॉइस सहायक"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"अभी लॉक करें"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"नया नोटिफ़िकेशन"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"वर्चुअल कीबोर्ड"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"भौतिक कीबोर्ड"</string> <string name="notification_channel_security" msgid="7345516133431326347">"सुरक्षा"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 2605c86b5804..7c375229392a 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -249,8 +249,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zaključaj sada"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nova obavijest"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtualna tipkovnica"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizička tipkovnica"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sigurnost"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 99ab8b2291fb..22648ab8d8d3 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Hangsegéd"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zárolás most"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Új értesítés"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuális billentyűzet"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizikai billentyűzet"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Biztonság"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index b08feef8325a..0b6775795e4b 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ձայնային օգնութ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Կողպել հիմա"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Նոր ծանուցում"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Վիրտուալ ստեղնաշար"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Ֆիզիկական ստեղնաշար"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Անվտանգություն"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index c407a074be40..7ed0ae3cb22c 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Kunci sekarang"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Notifikasi baru"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Keyboard virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Keyboard fisik"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Keamanan"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 68402a41b15f..2acd94f4aeca 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Raddaðstoð"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Læsa núna"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Ný tilkynning"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Sýndarlyklaborð"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Vélbúnaðarlyklaborð"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Öryggi"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"Ýttu til að fá frekari upplýsingar"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-villuleit tengd"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"Ýttu til að slökkva á USB-villuleit."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Veldu til að gera USB-villuleit óvirka."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Tekur við villutilkynningu…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Deila villutilkynningu?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Deilir villutilkynningu..."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 363f4c9eae9e..a37d739e2f9f 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Blocca ora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nuova notifica"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastiera virtuale"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Tastiera fisica"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sicurezza"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 9dd60331d2b0..359e2cb18f9e 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -252,8 +252,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"נעל עכשיו"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"הודעה חדשה"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"מקלדת וירטואלית"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"מקלדת פיזית"</string> <string name="notification_channel_security" msgid="7345516133431326347">"אבטחה"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index a5ae39f88b91..ad3afcb659a2 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"音声アシスト"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"今すぐロック"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"新しい通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"仮想キーボード"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"物理キーボード"</string> <string name="notification_channel_security" msgid="7345516133431326347">"セキュリティ"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index ae8825b2a068..272aaeddc7f1 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ხმოვანი ასისტ."</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ახლა ჩაკეტვა"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"ახალი შეტყობინება"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ვირტუალური კლავიატურა"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ფიზიკური კლავიატურა"</string> <string name="notification_channel_security" msgid="7345516133431326347">"უსაფრთხოება"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index d92651179bb1..a7c1e309dd07 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Дауыс көмекшісі"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Қазір бекіту"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Жаңа хабарландыру"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуалды пернетақта"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Қатты пернетақта"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Қауіпсіздік"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"Қосымша ақпарат алу үшін түртіңіз"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB жөндеу қосылған"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB түзетуін өшіру үшін түртіңіз."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB түзетуін өшіру үшін таңдаңыз."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Қате туралы есеп алынуда…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Қате туралы есепті бөлісу керек пе?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Қате туралы есеп бөлісілуде…"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 6a77d99455f3..8725e889272b 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ជំនួយសម្លេង"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ចាក់សោឥឡូវនេះ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"ការជូនដំណឹងថ្មី"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ក្ដារចុចនិម្មិត"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ក្ដារចុចរូបវន្ត"</string> <string name="notification_channel_security" msgid="7345516133431326347">"សុវត្ថិភាព"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index d9be958289d5..20b873ab52b6 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ಧ್ವನಿ ಸಹಾಯಕ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ಈಗ ಲಾಕ್ ಮಾಡಿ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"ಹೊಸ ಅಧಿಸೂಚನೆ"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ವರ್ಚುಯಲ್ ಕೀಬೋರ್ಡ್"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ಭೌತಿಕ ಕೀಬೋರ್ಡ್"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ಭದ್ರತೆ"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB ಡೀಬಗಿಂಗ್ ಸಂಪರ್ಕ"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಆಯ್ಕೆ ಮಾಡಿ."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"ದೋಷದ ವರದಿಯನ್ನು ತೆಗೆದುಕೊಳ್ಳಲಾಗುತ್ತಿದೆ…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"ಬಗ್ ವರದಿಯನ್ನು ಹಂಚುವುದೇ?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"ಬಗ್ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ…"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 902ec1d92ea4..f2afaec5ffa4 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"음성 지원"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"지금 잠그기"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"새 알림"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"가상 키보드"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"물리적 키보드"</string> <string name="notification_channel_security" msgid="7345516133431326347">"보안"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index d084443eb483..b41ad8a3a8d1 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Үн жардамчысы"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Азыр кулпулоо"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Жаңы эскертме"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуалдык баскычтоп"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Аппараттык баскычтоп"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Коопсуздук"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 1653c06604aa..7cff9dd18387 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ຊ່ວຍເຫຼືອທາງສຽງ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ລັອກດຽວນີ້"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"ການແຈ້ງເຕືອນໃໝ່"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ແປ້ນພິມສະເໝືອນ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ແປ້ນພິມພາຍນອກ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ຄວາມປອດໄພ"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 47dc7afc1ca1..0e783d76a76b 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -252,8 +252,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Užrakinti dabar"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Naujas pranešimas"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtualioji klaviatūra"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizinė klaviatūra"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sauga"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 32f2c85dc543..259c5fc38dce 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -249,8 +249,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Balss palīgs"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloķēt tūlīt"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"Pārsniedz"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Jauns paziņojums"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuālā tastatūra"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fiziskā tastatūra"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Drošība"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index db3f88cd0d8b..7d5316fa65bd 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помош"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Заклучи сега"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Ново известување"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуелна тастатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Физичка тастатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Безбедност"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"Допрете за повеќе информации"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Поврзано е отстранување грешки преку USB"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"Допрете за да се оневозможи отстранувањето грешки преку USB."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Изберете за да се оневозможи отстранување грешки на USB."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Се зема извештајот за грешки…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Да се сподели извештајот за грешки?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Се споделува извештај за грешки…"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 7b5f54dfb4ad..4b045a63f828 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"വോയ്സ് സഹായം"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ഇപ്പോൾ ലോക്കുചെയ്യുക"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"പുതിയ അറിയിപ്പ്"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"വെർച്വൽ കീബോർഡ്"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"കീബോർഡ്"</string> <string name="notification_channel_security" msgid="7345516133431326347">"സുരക്ഷ"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"കൂടുതൽ വിവരങ്ങൾക്ക് ടാപ്പുചെയ്യുക"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB ഡീബഗ്ഗിംഗ് കണക്റ്റുചെയ്തു"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB ഡീബഗ്ഗിംഗ് പ്രവർത്തനരഹിതമാക്കാൻ ടാപ്പുചെയ്യുക."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ഡീബഗ്ഗുചെയ്യൽ പ്രവർത്തനരഹിതമാക്കാൻ തിരഞ്ഞെടുക്കുക."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"ബഗ് റിപ്പോർട്ട് എടുക്കുന്നു…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"ബഗ് റിപ്പോർട്ട് പങ്കിടണോ?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"ബഗ് റിപ്പോർട്ട് പങ്കിടുന്നു…"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 61e4039418d0..0fbd1a1edfd0 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Дуут туслах"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Одоо түгжих"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Шинэ мэдэгдэл"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуал гар"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Бодит гар"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Аюулгүй байдал"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 9bfa6d8e4317..099790674cb0 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"व्हॉइस सहाय्य"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"आता लॉक करा"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"नवीन सूचना"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"व्हर्च्युअल कीबोर्ड"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"वास्तविक कीबोर्ड"</string> <string name="notification_channel_security" msgid="7345516133431326347">"सुरक्षितता"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"आणखी माहितीसाठी येथे टॅप करा"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB डीबग करणे कनेक्ट केले"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB डीबग करणे अक्षम करण्यासाठी टॅप करा."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB डीबगिंग बंद करण्यासाठी निवडा."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"दोष अहवाल घेत आहे..."</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"बग अहवाल सामायिक करायचा?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"दोष अहवाल सामायिक करीत आहे..."</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 6fc478613cd7..09c27608ed39 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Kunci sekarang"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Pemberitahuan baharu"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Papan kekunci maya"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Papan kekunci fizikal"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Keselamatan"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index aa1d6ec4f173..cf9ac20330e1 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"အသံ အကူအညီ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ယခု သော့ပိတ်ရန်"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"၉၉၉+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"အကြောင်းကြားချက်အသစ်"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ပကတိအသွင်ကီးဘုတ်"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ကီးဘုတ် ခလုတ်ခုံ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"လုံခြုံရေး"</string> @@ -1173,7 +1172,7 @@ <string name="sim_restart_button" msgid="4722407842815232347">"အစက ပြန်စရန်"</string> <string name="carrier_app_dialog_message" msgid="7066156088266319533">"သင့် SIM အသစ်ပုံမှန် အလုပ်လုပ်ရန်၊ သင်အသုံးပြုသည့် မိုဘိုင်းဝန်ဆောင်မှုမှ အက်ပ်တစ်ခုထည့်သွင်း၍ ဖွင့်ရန်လိုအပ်ပါသည်။"</string> <string name="carrier_app_dialog_button" msgid="7900235513678617329">"အက်ပ်ကို ရယူပါ"</string> - <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"ယခုမဟုတ်သေးပါ"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"ယခုမလုပ်ပါ"</string> <string name="carrier_app_notification_title" msgid="8921767385872554621">"SIM အသစ်ထည့်သွင်းလိုက်ပါသည်"</string> <string name="carrier_app_notification_text" msgid="1132487343346050225">"၎င်းကိုတပ်ဆင်ရန် တို့ပါ"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"အချိန်သတ်မှတ်ရန်"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"နောက်ထပ် အချက်အလက်များအတွက် တို့ပါ"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB အမှားစစ်ခြင်းအား ချိတ်ဆက်ထားသည်"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB ဆက်သွယ်ရေးစနစ်ကို ပိတ်ရန် တို့ပါ။"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ဖြင့် အမှားရှာပြင်ခြင်းကို ပိတ်ရန် ရွေးပါ။"</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"ချွတ်ယွင်းချက် အစီရင်ခံစာပြုစုနေသည်..."</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"ချွတ်ယွင်းချက် အစီရင်ခံစာကို မျှဝေမလား။"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"ချွတ်ယွင်းမှုအစီရင်ခံစာ မျှဝေနေသည်…"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index b5272b20ca3c..4565464aca89 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Talehjelp"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lås nå"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nytt varsel"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelt tastatur"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fysisk tastatur"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sikkerhet"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index cf5cb10bc523..10a197ec8d2a 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"आवाज सहायता"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"अब बन्द गर्नुहोस्"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"९९९+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"नयाँ सूचना"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"भर्चुअल किबोर्ड"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"वास्तविक किबोर्ड"</string> <string name="notification_channel_security" msgid="7345516133431326347">"सुरक्षा"</string> @@ -1202,7 +1201,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"थप जानकारीका लागि ट्याप गर्नुहोस्"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB डिबग गर्ने जडित छ"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB डिबगिङलाई असक्षम गर्न ट्याप गर्नुहोस्।"</string> - <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB डिबगिङ असक्षम पार्न चयन गर्नुहोस्।"</string> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB डिबगिङलाई असक्षम पार्न ट्याप गर्नुहोस्।"</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"बग रिपोर्ट लिँदै..."</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"बग रिपोर्टलाई साझेदारी गर्ने हो?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"बग रिपोर्टलाई साझेदारी गर्दै ..."</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 53c3303dac6b..fbc8f59e6def 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Spraakassistent"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Nu vergrendelen"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nieuwe melding"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtueel toetsenbord"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fysiek toetsenbord"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Beveiliging"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 403955f83bb2..2920a4fc6f13 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ਵੌਇਸ ਅਸਿਸਟ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ਹੁਣ ਲੌਕ ਕਰੋ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"ਨਵੀਂ ਸੂਚਨਾ"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ਆਭਾਸੀ ਕੀ-ਬੋਰਡ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ਸੁਰੱਖਿਆ"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB ਡੀਬਗਿੰਗ ਕਨੈਕਟ ਕੀਤੀ"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB ਡੀਬੱਗਿੰਗ ਨੂੰ ਅਯੋਗ ਬਣਾਉਣ ਲਈ ਟੈਪ ਕਰੋ।"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ਡੀਬੱਗਿੰਗ ਅਯੋਗ ਬਣਾਉਣ ਲਈ ਚੁਣੋ।"</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"ਬੱਗ ਰਿਪਰੋਟ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"ਕੀ ਬੱਗ ਰਿਪੋਰਟ ਸਾਂਝੀ ਕਰਨੀ ਹੈ?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"ਬੱਗ ਰਿਪੋਰਟ ਸਾਂਝੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index c22f89955566..ce691e8d8dbd 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -252,8 +252,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asystent głosowy"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zablokuj teraz"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nowe powiadomienie"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Klawiatura wirtualna"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Klawiatura fizyczna"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Bezpieczeństwo"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 2dd62d3945d2..72c08fef7891 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nova notificação"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Segurança"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 136d7771cdb2..c001a4b92ae4 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. de voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nova notificação"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Segurança"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 2dd62d3945d2..72c08fef7891 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nova notificação"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Segurança"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index a0c0fe705381..ad81d4e17080 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -249,8 +249,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistent vocal"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Blocați acum"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"˃999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Notificare nouă"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastatură virtuală"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Tastatură fizică"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Securitate"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index ae7ce069b60f..84a7f1b30e9a 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -252,8 +252,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Аудиоподсказки"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Заблокировать"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Новое уведомление"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуальная клавиатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Физическая клавиатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Безопасность"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index d519fb629530..401c093d6c6e 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"හඬ සහායක"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"දැන් අගුළු දමන්න"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"නව දැනුම්දීම"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"අතථ්ය යතුරු පුවරුව"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"භෞතික යතුරු පුවරුව"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ආරක්ෂාව"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index a5849ea864e4..fa61a0df4950 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -252,8 +252,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Hlasový asistent"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Uzamknúť"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Nové upozornenie"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuálna klávesnica"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fyzická klávesnica"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Zabezpečenie"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index c5c0df6ba5bd..33f8d900ebec 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -252,8 +252,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Glas. pomočnik"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zakleni zdaj"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Novo obvestilo"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Navidezna tipkovnica"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizična tipkovnica"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Varnost"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 9fe56c951e7c..e4c809f46dd0 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ndihma zanore"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Kyç tani"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Njoftim i ri"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastiera virtuale"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Tastiera fizike"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Siguria"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"Trokit për më shumë informacion"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Korrigjuesi i USB-së i lidhur"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"Trokit për të çaktivizuar korrigjimin e gabimeve të USB-së."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Përzgjidhe për të çaktivizuar korrigjimin e gabimeve të USB-së"</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Po merret raporti i defekteve në kod…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Të ndahet raporti i defektit në kod?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Po ndan raportin e defekteve në kod..."</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index a15737c990d4..31680eb89857 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -249,8 +249,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помоћ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Закључај одмах"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Ново обавештење"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуелна тастатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Физичка тастатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Безбедност"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 980611823bb8..8ca26546b175 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lås nu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Ny avisering"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuellt tangentbord"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fysiskt tangentbord"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Säkerhet"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 2e0946bb48e2..57d17f8d9c81 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -244,8 +244,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Usaidizi wa Sauti"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Funga sasa"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Arifa mpya"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Kibodi pepe"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Kibodi halisi"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Usalama"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index d5cddcbd0eec..29efb1e62ab6 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"குரல் உதவி"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"இப்போது பூட்டு"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"புதிய அறிவிப்பு"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"விர்ச்சுவல் விசைப்பலகை"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"கைமுறை விசைப்பலகை"</string> <string name="notification_channel_security" msgid="7345516133431326347">"பாதுகாப்பு"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"மேலும் தகவலுக்கு, தட்டவும்"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB பிழைதிருத்தம் இணைக்கப்பட்டது"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB பிழை திருத்தத்தை முடக்க, தட்டவும்."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB பிழைத்திருத்தத்தை முடக்க, தேர்ந்தெடுக்கவும்."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"பிழை அறிக்கையை எடுக்கிறது…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"பிழை அறிக்கையைப் பகிரவா?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"பிழை அறிக்கையைப் பகிர்கிறது…"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index a522d6be783b..2d2f6d1d1b20 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"వాయిస్ సహాయకం"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ఇప్పుడు లాక్ చేయండి"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"కొత్త నోటిఫికేషన్"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"వర్చువల్ కీబోర్డ్"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"భౌతిక కీబోర్డ్"</string> <string name="notification_channel_security" msgid="7345516133431326347">"భద్రత"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"మరింత సమాచారం కోసం నొక్కండి"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB డీబగ్గింగ్ కనెక్ట్ చేయబడింది"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB డీబగ్గింగ్ను నిలిపివేయడానికి నొక్కండి."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"డీబగ్గింగ్ని నిలిపివేయడానికి ఎంచుకోండి."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"బగ్ నివేదికను తీస్తోంది…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"బగ్ నివేదికను భాగస్వామ్యం చేయాలా?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"బగ్ నివేదికను భాగస్వామ్యం చేస్తోంది..."</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 9bb55a4df15f..b2473fbb14c0 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ตัวช่วยเสียง"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ล็อกเลย"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"การแจ้งเตือนใหม่"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"แป้นพิมพ์เสมือน"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"แป้นพิมพ์บนเครื่อง"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ความปลอดภัย"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index bd3c53a1bf0d..1db508e51a42 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"I-lock ngayon"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Bagong notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual na keyboard"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Pisikal na keyboard"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguridad"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 877fa1d13c7e..312c7e0386ab 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Sesli Yardım"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Şimdi kilitle"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Yeni bildirim"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Sanal klavye"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fiziksel klavye"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Güvenlik"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 75c984861007..74195ad29e82 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -252,8 +252,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Голос. підказки"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Блокувати зараз"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Нове сповіщення"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Віртуальна клавіатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Фізична клавіатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Безпека"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index b754a5380ff9..e133b9421214 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ابھی مقفل کریں"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"نئی اطلاع"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ورچوئل کی بورڈ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"فزیکل کی بورڈ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"سیکیورٹی"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"مزید معلومات کے لیے تھپتھپائيں"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB ڈیبگ کرنا مربوط ہو گیا"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"USB ڈیبگنگ کو غیر فعال کرنے کیلئے تھپتھپائیں۔"</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ڈیبگ کرنے کو غیر فعال کرنے کیلئے منتخب کریں۔"</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"بگ رپورٹ لی جا رہی ہے…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"بگ رپورٹ کا اشتراک کریں؟"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"بگ رپورٹ کا اشتراک ہو رہا ہے…"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 24a8a9b589c7..90972699c9b9 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ovozli yordam"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Qulflash"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Yangi bildirishnoma"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual klaviatura"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Tashqi klaviatura"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Xavfsizlik"</string> @@ -1196,8 +1195,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="7811865061127547035">"Tafsilotlar uchun bosing"</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB orqali nosozliklarni tuzatish"</string> <string name="adb_active_notification_message" msgid="4948470599328424059">"Faolsizlantirish uchun bu yerga bosing."</string> - <!-- no translation found for adb_active_notification_message (8470296818270110396) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB orqali nosozliklarni tuzatishni o‘chirib qo‘yish uchun bosing."</string> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Xatoliklar hisoboti olinmoqda…"</string> <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Xatoliklar hisoboti yuborilsinmi?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Xatoliklar hisoboti yuborilmoqda…"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 0c081fa55fda..73b124979c4b 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Trợ lý thoại"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Khóa ngay"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Thông báo mới"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Bàn phím ảo"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Bàn phím thực"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Bảo mật"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index fec4827eea67..c0c0271cc145 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"语音助理"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"立即锁定"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"新通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虚拟键盘"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"实体键盘"</string> <string name="notification_channel_security" msgid="7345516133431326347">"安全性"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 2517f688998c..e050db443d27 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"語音助手"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"立即鎖定"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"新通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虛擬鍵盤"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"實體鍵盤"</string> <string name="notification_channel_security" msgid="7345516133431326347">"安全性"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index da7d7112e122..4eaf1be2a4d9 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"語音小幫手"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"立即鎖定"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"超過 999"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"新通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虛擬鍵盤"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"實體鍵盤"</string> <string name="notification_channel_security" msgid="7345516133431326347">"安全性"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index b99689b2cd79..a25f8f2bcfda 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -246,8 +246,7 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Isisekeli sezwi"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Khiya manje"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <!-- no translation found for notification_hidden_text (6351207030447943784) --> - <skip /> + <string name="notification_hidden_text" msgid="6351207030447943784">"Isaziso esisha"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Ikhibhodi ebonakalayo"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Ikhibhodi ephathekayo"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Ukuphepha"</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 7819f3032cb3..6a78c5191819 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -568,10 +568,6 @@ during voice calls --> <bool translatable="false" name="config_wifi_framework_enable_voice_call_sar_tx_power_limit">false</bool> - <!-- Integer indicating the value that framework needs to set the tx power to for meeting SAR requirements - during voice calls --> - <integer translatable="false" name="config_wifi_framework_voice_call_sar_tx_power_limit_in_dbm">0</integer> - <!-- Wifi driver supports batched scan --> <bool translatable="false" name="config_wifi_batched_scan_supported">false</bool> @@ -1854,10 +1850,12 @@ states. --> <bool name="config_dozeAlwaysOnDisplayAvailable">false</bool> - <!-- Whether the display hardware requires we go to the off state before transitioning - out of any doze states. --> - <bool name="config_displayTransitionOffAfterDoze">false</bool> + <!-- Whether the display blanks itself when transitioning from a doze to a non-doze state --> + <bool name="config_displayBlanksAfterDoze">false</bool> + <!-- True if the display hardware only has brightness buckets rather than a full range of + backlight values --> + <bool name="config_displayBrightnessBucketsInDoze">false</bool> <!-- Power Management: Specifies whether to decouple the auto-suspend state of the device from the display on/off state. diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 80d8ab5889bd..b4636a69709c 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -30,7 +30,7 @@ will be displayed in the app launcher and elsewhere. --> <dimen name="app_icon_size">48dip</dimen> - <dimen name="toast_y_offset">64dip</dimen> + <dimen name="toast_y_offset">24dp</dimen> <!-- Height of the status bar --> <dimen name="status_bar_height">24dp</dimen> <!-- Height of the bottom navigation / system bar. --> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 5c6e3df3ac33..4b0fe3f3a04c 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -956,7 +956,8 @@ please see styles_device_defaults.xml. </style> <style name="TextAppearance.Toast"> - <item name="fontFamily">sans-serif-condensed</item> + <item name="fontFamily">sans-serif</item> + <item name="textSize">14sp</item> </style> <style name="TextAppearance.Tooltip"> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index decf42d6d699..e4c6d8f0314b 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -313,7 +313,6 @@ <java-symbol type="bool" name="config_wifi_framework_enable_associated_network_selection" /> <java-symbol type="bool" name="config_wifi_only_link_same_credential_configurations" /> <java-symbol type="bool" name="config_wifi_framework_enable_voice_call_sar_tx_power_limit" /> - <java-symbol type="integer" name="config_wifi_framework_voice_call_sar_tx_power_limit_in_dbm" /> <java-symbol type="bool" name="config_wifi_enable_disconnection_debounce" /> <java-symbol type="bool" name="config_wifi_revert_country_code_on_cellular_loss" /> <java-symbol type="bool" name="config_wifi_enable_wifi_firmware_debugging" /> @@ -3051,7 +3050,8 @@ <java-symbol type="bool" name="config_handleVolumeKeysInWindowManager" /> <java-symbol type="integer" name="config_inCallNotificationVolumeRelative" /> <java-symbol type="bool" name="config_dozeAlwaysOnDisplayAvailable" /> - <java-symbol type="bool" name="config_displayTransitionOffAfterDoze" /> + <java-symbol type="bool" name="config_displayBlanksAfterDoze" /> + <java-symbol type="bool" name="config_displayBrightnessBucketsInDoze" /> <java-symbol type="integer" name="config_storageManagerDaystoRetainDefault" /> <java-symbol type="string" name="config_headlineFontFamily" /> <java-symbol type="string" name="config_headlineFontFamilyLight" /> diff --git a/libs/androidfw/include/androidfw/StringPiece.h b/libs/androidfw/include/androidfw/StringPiece.h index a873d66803e7..99b424568a1f 100644 --- a/libs/androidfw/include/androidfw/StringPiece.h +++ b/libs/androidfw/include/androidfw/StringPiece.h @@ -37,6 +37,7 @@ class BasicStringPiece { public: using const_iterator = const TChar*; using difference_type = size_t; + using size_type = size_t; // End of string marker. constexpr static const size_t npos = static_cast<size_t>(-1); diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml index 0834d0483bcc..28c5276ee6c9 100644 --- a/packages/SettingsLib/res/values-uk/strings.xml +++ b/packages/SettingsLib/res/values-uk/strings.xml @@ -104,11 +104,11 @@ <string name="process_kernel_label" msgid="3916858646836739323">"ОС Android"</string> <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Видалені програми"</string> <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Видалені програми та користувачі"</string> - <string name="tether_settings_title_usb" msgid="6688416425801386511">"Прив\'язка USB"</string> + <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-модем"</string> <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Порт. точка дост."</string> - <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Прив\'язка Bluetooth"</string> + <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-модем"</string> <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Прив\'язка"</string> - <string name="tether_settings_title_all" msgid="8356136101061143841">"Режим модема"</string> + <string name="tether_settings_title_all" msgid="8356136101061143841">"Точка доступу й модем"</string> <string name="managed_user_title" msgid="8109605045406748842">"Усі робочі додатки"</string> <string name="user_guest" msgid="8475274842845401871">"Гість"</string> <string name="unknown" msgid="1592123443519355854">"Невідомо"</string> diff --git a/packages/SystemUI/res-keyguard/values-ja/strings.xml b/packages/SystemUI/res-keyguard/values-ja/strings.xml index c108d1ef8252..ecd27de498cb 100644 --- a/packages/SystemUI/res-keyguard/values-ja/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ja/strings.xml @@ -110,9 +110,9 @@ <string name="kg_prompt_reason_restart_pattern" msgid="7246972020562621506">"端末の再起動後はパターンの入力が必要となります"</string> <string name="kg_prompt_reason_restart_pin" msgid="6303592361322290145">"端末の再起動後は PIN の入力が必要となります"</string> <string name="kg_prompt_reason_restart_password" msgid="6984641181515902406">"端末の再起動後はパスワードの入力が必要となります"</string> - <string name="kg_prompt_reason_timeout_pattern" msgid="5304487696073914063">"セキュリティを強化するにはパターンが必要です"</string> - <string name="kg_prompt_reason_timeout_pin" msgid="8851462864335757813">"セキュリティを強化するには PIN が必要です"</string> - <string name="kg_prompt_reason_timeout_password" msgid="6563904839641583441">"セキュリティを強化するにはパスワードが必要です"</string> + <string name="kg_prompt_reason_timeout_pattern" msgid="5304487696073914063">"追加の確認のためパターンが必要です"</string> + <string name="kg_prompt_reason_timeout_pin" msgid="8851462864335757813">"追加の確認のため PIN が必要です"</string> + <string name="kg_prompt_reason_timeout_password" msgid="6563904839641583441">"追加の確認のためパスワードが必要です"</string> <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3398054847288438444">"プロファイルを切り替えるにはパターンが必要です"</string> <string name="kg_prompt_reason_switch_profiles_pin" msgid="7426368139226961699">"プロファイルを切り替えるには PIN が必要です"</string> <string name="kg_prompt_reason_switch_profiles_password" msgid="8383831046318421845">"プロファイルを切り替えるにはパスワードが必要です"</string> diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml index 4f8214769445..826e3ea1f7e5 100644 --- a/packages/SystemUI/res-keyguard/values/styles.xml +++ b/packages/SystemUI/res-keyguard/values/styles.xml @@ -74,6 +74,8 @@ </style> <style name="keyguard_presentation_theme" parent="@android:style/Theme.Material.NoActionBar.Fullscreen"> + <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item> + <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item> </style> </resources> diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml index acc8531217d4..6821e623f5df 100644 --- a/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml +++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml @@ -45,7 +45,7 @@ android:duration="16" android:propertyName="fillAlpha" android:valueFrom="0.0" - android:valueTo="1.0" + android:valueTo="0.5" android:valueType="floatType" android:interpolator="@android:interpolator/linear" /> </set> diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml index fac1ece2dadd..a8251dc1f6a0 100644 --- a/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml +++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml @@ -45,7 +45,7 @@ android:duration="16" android:propertyName="fillAlpha" android:valueFrom="0.0" - android:valueTo="1.0" + android:valueTo="0.5" android:valueType="floatType" android:interpolator="@android:interpolator/linear" /> </set> diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml index 138c06a73911..547f42e5f5b9 100644 --- a/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml +++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml @@ -37,14 +37,14 @@ <objectAnimator android:duration="183" android:propertyName="fillAlpha" - android:valueFrom="1.0" - android:valueTo="1.0" + android:valueFrom="0.5" + android:valueTo="0.5" android:valueType="floatType" android:interpolator="@android:interpolator/linear" /> <objectAnimator android:duration="16" android:propertyName="fillAlpha" - android:valueFrom="1.0" + android:valueFrom="0.5" android:valueTo="0.0" android:valueType="floatType" android:interpolator="@android:interpolator/linear" /> diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml index c4d38e00dc9e..e5fe4d1409f6 100644 --- a/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml +++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml @@ -37,14 +37,14 @@ <objectAnimator android:duration="183" android:propertyName="fillAlpha" - android:valueFrom="1.0" - android:valueTo="1.0" + android:valueFrom="0.5" + android:valueTo="0.5" android:valueType="floatType" android:interpolator="@android:interpolator/linear" /> <objectAnimator android:duration="16" android:propertyName="fillAlpha" - android:valueFrom="1.0" + android:valueFrom="0.5" android:valueTo="0.0" android:valueType="floatType" android:interpolator="@android:interpolator/linear" /> diff --git a/packages/SystemUI/res/drawable/error_to_trustedstate.xml b/packages/SystemUI/res/drawable/error_to_trustedstate.xml index 8bfe5f4a5bd1..bc196c9565eb 100755 --- a/packages/SystemUI/res/drawable/error_to_trustedstate.xml +++ b/packages/SystemUI/res/drawable/error_to_trustedstate.xml @@ -17,9 +17,9 @@ Copyright (C) 2017 The Android Open Source Project <vector xmlns:android="http://schemas.android.com/apk/res/android" android:name="error_to_trustedstate" - android:width="32dp" + android:width="24dp" android:viewportWidth="24" - android:height="32dp" + android:height="24dp" android:viewportHeight="24" > <group android:name="lock" @@ -30,7 +30,8 @@ Copyright (C) 2017 The Android Open Source Project android:translateY="2.9375" > <path android:name="ellipse_path_1" - android:fillColor="#FFFFFFFF" + android:fillColor="?attr/wallpaperTextColor" + android:fillAlpha="0.5" android:pathData="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" /> </group> <group @@ -38,16 +39,16 @@ Copyright (C) 2017 The Android Open Source Project <path android:name="path_1" android:pathData="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.0118713378906,7.9296875 0.0118713378906,7.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 -0.01123046875,-7.9296875 -0.01123046875,-7.9296875 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z" - android:fillColor="#FFFFFFFF" - android:fillAlpha="0" /> + android:fillColor="?attr/wallpaperTextColor" + android:fillAlpha="0.5" /> </group> <group android:name="lock_left_side" > <path android:name="path_2" android:pathData="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.01123046875,7.9296875 0.01123046875,7.9296875 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 -0.0108337402344,-7.92947387695 -0.0108337402344,-7.92947387695 Z" - android:fillColor="#FFFFFFFF" - android:fillAlpha="0" /> + android:fillColor="?attr/wallpaperTextColor" + android:fillAlpha="0.5" /> </group> <group android:name="lock_top" @@ -56,7 +57,8 @@ Copyright (C) 2017 The Android Open Source Project <path android:name="path_3" android:pathData="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z" - android:fillColor="#FFFFFFFF" /> + android:fillColor="?attr/wallpaperTextColor" + android:fillAlpha="0.5" /> </group> </group> <group @@ -68,7 +70,7 @@ Copyright (C) 2017 The Android Open Source Project android:translateY="4" > <path android:name="bottompath" - android:fillColor="#FFFFFFFF" + android:fillColor="?android:attr/colorError" android:pathData="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z" /> </group> </group> @@ -81,7 +83,7 @@ Copyright (C) 2017 The Android Open Source Project android:translateY="-2" > <path android:name="toppath" - android:fillColor="#FFFFFFFF" + android:fillColor="?android:attr/colorError" android:pathData="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z" /> </group> </group> @@ -94,7 +96,7 @@ Copyright (C) 2017 The Android Open Source Project android:name="circle" > <path android:name="circlepath" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?android:attr/colorError" android:strokeWidth="2" android:strokeLineCap="round" android:pathData="M 0.0,-9.0 c 4.9705627482,0.0 9.0,4.0294372518 9.0,9.0 c 0.0,4.9705627482 -4.0294372518,9.0 -9.0,9.0 c -4.9705627482,0.0 -9.0,-4.0294372518 -9.0,-9.0 c 0.0,-4.9705627482 4.0294372518,-9.0 9.0,-9.0 Z" /> diff --git a/packages/SystemUI/res/drawable/ic_fingerprint.xml b/packages/SystemUI/res/drawable/ic_fingerprint.xml index ee2cf03d22ce..7bbd39d5db0b 100644 --- a/packages/SystemUI/res/drawable/ic_fingerprint.xml +++ b/packages/SystemUI/res/drawable/ic_fingerprint.xml @@ -1,5 +1,5 @@ <!-- - ~ Copyright (C) 2015 The Android Open Source Project + ~ Copyright (C) 2017 The Android Open Source Project ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -13,24 +13,55 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="32.0dp" - android:height="32.0dp" - android:viewportWidth="32.0" - android:viewportHeight="32.0"> - <path - android:fillColor="#80ffffff" - android:pathData="M23.7,5.9c-0.1,0.0 -0.2,0.0 -0.3,-0.1C21.0,4.5 18.6,3.9 16.0,3.9c-2.5,0.0 -4.6,0.6 -6.9,1.9C8.8,6.0 8.3,5.9 8.1,5.5C7.9,5.2 8.0,4.7 8.4,4.5c2.5,-1.4 4.9,-2.1 7.7,-2.1c2.8,0.0 5.4,0.7 8.0,2.1c0.4,0.2 0.5,0.6 0.3,1.0C24.2,5.7 24.0,5.9 23.7,5.9z"/> - <path - android:fillColor="#80ffffff" - android:pathData="M5.3,13.2c-0.1,0.0 -0.3,0.0 -0.4,-0.1c-0.3,-0.2 -0.4,-0.7 -0.2,-1.0c1.3,-1.9 2.9,-3.4 4.9,-4.5c4.1,-2.2 9.3,-2.2 13.4,0.0c1.9,1.1 3.6,2.5 4.9,4.4c0.2,0.3 0.1,0.8 -0.2,1.0c-0.3,0.2 -0.8,0.1 -1.0,-0.2c-1.2,-1.7 -2.6,-3.0 -4.3,-4.0c-3.7,-2.0 -8.3,-2.0 -12.0,0.0c-1.7,0.9 -3.2,2.3 -4.3,4.0C5.7,13.1 5.5,13.2 5.3,13.2z"/> - <path - android:fillColor="#80ffffff" - android:pathData="M13.3,29.6c-0.2,0.0 -0.4,-0.1 -0.5,-0.2c-1.1,-1.2 -1.7,-2.0 -2.6,-3.6c-0.9,-1.7 -1.4,-3.7 -1.4,-5.9c0.0,-4.1 3.3,-7.4 7.4,-7.4c4.1,0.0 7.4,3.3 7.4,7.4c0.0,0.4 -0.3,0.7 -0.7,0.7s-0.7,-0.3 -0.7,-0.7c0.0,-3.3 -2.7,-5.9 -5.9,-5.9c-3.3,0.0 -5.9,2.7 -5.9,5.9c0.0,2.0 0.4,3.8 1.2,5.2c0.8,1.6 1.4,2.2 2.4,3.3c0.3,0.3 0.3,0.8 0.0,1.0C13.7,29.5 13.5,29.6 13.3,29.6z"/> - <path - android:fillColor="#80ffffff" - android:pathData="M22.6,27.1c-1.6,0.0 -2.9,-0.4 -4.1,-1.2c-1.9,-1.4 -3.1,-3.6 -3.1,-6.0c0.0,-0.4 0.3,-0.7 0.7,-0.7s0.7,0.3 0.7,0.7c0.0,1.9 0.9,3.7 2.5,4.8c0.9,0.6 1.9,1.0 3.2,1.0c0.3,0.0 0.8,0.0 1.3,-0.1c0.4,-0.1 0.8,0.2 0.8,0.6c0.1,0.4 -0.2,0.8 -0.6,0.8C23.4,27.1 22.8,27.1 22.6,27.1z"/> - <path - android:fillColor="#80ffffff" - android:pathData="M20.0,29.9c-0.1,0.0 -0.1,0.0 -0.2,0.0c-2.1,-0.6 -3.4,-1.4 -4.8,-2.9c-1.8,-1.9 -2.8,-4.4 -2.8,-7.1c0.0,-2.2 1.8,-4.1 4.1,-4.1c2.2,0.0 4.1,1.8 4.1,4.1c0.0,1.4 1.2,2.6 2.6,2.6c1.4,0.0 2.6,-1.2 2.6,-2.6c0.0,-5.1 -4.2,-9.3 -9.3,-9.3c-3.6,0.0 -6.9,2.1 -8.4,5.4C7.3,17.1 7.0,18.4 7.0,19.8c0.0,1.1 0.1,2.7 0.9,4.9c0.1,0.4 -0.1,0.8 -0.4,0.9c-0.4,0.1 -0.8,-0.1 -0.9,-0.4c-0.6,-1.8 -0.9,-3.6 -0.9,-5.4c0.0,-1.6 0.3,-3.1 0.9,-4.4c1.7,-3.8 5.6,-6.3 9.8,-6.3c5.9,0.0 10.7,4.8 10.7,10.7c0.0,2.2 -1.8,4.1 -4.1,4.1s-4.0,-1.8 -4.0,-4.1c0.0,-1.4 -1.2,-2.6 -2.6,-2.6c-1.4,0.0 -2.6,1.2 -2.6,2.6c0.0,2.3 0.9,4.5 2.4,6.1c1.2,1.3 2.4,2.0 4.2,2.5c0.4,0.1 0.6,0.5 0.5,0.9C20.6,29.7 20.3,29.9 20.0,29.9z"/> +<vector + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="32dp" + android:viewportWidth="24" + android:height="32dp" + android:viewportHeight="24" > + <group + android:translateX="12" + android:translateY="12.4" + android:scaleX="0.738" + android:scaleY="0.738" > + <group + android:translateX="33" + android:translateY="34" > + <path + android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" + android:strokeWidth="1.45" + android:strokeLineCap="round" /> + <path + android:name="ridge_7_path" + android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" + android:strokeWidth="1.45" + android:strokeLineCap="round" /> + <path + android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" + android:strokeWidth="1.45" + android:strokeLineCap="round" /> + <path + android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" + android:strokeWidth="1.45" + android:strokeLineCap="round" /> + <group + android:translateX="-97.5" + android:translateY="-142.5" > + <path + android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" + android:strokeWidth="1.45" + android:strokeLineCap="round" /> + </group> + </group> + </group> </vector> diff --git a/packages/SystemUI/res/drawable/ic_lock_24dp.xml b/packages/SystemUI/res/drawable/ic_lock_24dp.xml index 204af7e81f4c..bf0dc95a8e56 100644 --- a/packages/SystemUI/res/drawable/ic_lock_24dp.xml +++ b/packages/SystemUI/res/drawable/ic_lock_24dp.xml @@ -1,5 +1,5 @@ <!-- -Copyright (C) 2014 The Android Open Source Project +Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +20,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"> <path - android:fillColor="@color/keyguard_affordance" + android:fillColor="?attr/wallpaperTextColor" android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.8 -2.2,-5.0 -5.0,-5.0C9.2,1.0 7.0,3.2 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM12.0,17.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0c1.1,0.0 2.0,0.9 2.0,2.0S13.1,17.0 12.0,17.0zM15.1,8.0L8.9,8.0L8.9,6.0c0.0,-1.7 1.4,-3.1 3.1,-3.1c1.7,0.0 3.1,1.4 3.1,3.1L15.1,8.0z"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml b/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml index c877f063b7a8..232cf70abdf2 100644 --- a/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml +++ b/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml @@ -1,5 +1,5 @@ <!-- -Copyright (C) 2014 The Android Open Source Project +Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +20,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"> <path - android:fillColor="@color/keyguard_affordance" + android:fillColor="?attr/wallpaperTextColor" android:pathData="M12.0,17.0c1.1,0.0 2.0,-0.9 2.0,-2.0s-0.9,-2.0 -2.0,-2.0c-1.1,0.0 -2.0,0.9 -2.0,2.0S10.9,17.0 12.0,17.0zM18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.8 -2.2,-5.0 -5.0,-5.0C9.2,1.0 7.0,3.2 7.0,6.0l1.9,0.0c0.0,-1.7 1.4,-3.1 3.1,-3.1c1.7,0.0 3.1,1.4 3.1,3.1l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM18.0,20.0L6.0,20.0L6.0,10.0l12.0,0.0L18.0,20.0z"/> </vector> diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off.xml index 81da26d36844..8d382a303dff 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (C) 2015 The Android Open Source Project + ~ Copyright (C) 2017 The Android Open Source Project ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ <path android:name="ridge_5_path" android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> @@ -44,7 +44,7 @@ <path android:name="ridge_7_path" android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> @@ -54,7 +54,7 @@ <path android:name="ridge_6_path" android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> @@ -64,7 +64,7 @@ <path android:name="ridge_2_path" android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> @@ -76,7 +76,7 @@ <path android:name="ridge_1_path" android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on.xml index 8b517b69c8c4..4fe160d997b5 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (C) 2015 The Android Open Source Project + ~ Copyright (C) 2017 The Android Open Source Project ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ <path android:name="ridge_5_path" android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" @@ -45,7 +45,7 @@ <path android:name="ridge_7_path" android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" @@ -56,7 +56,7 @@ <path android:name="ridge_6_path" android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" @@ -67,7 +67,7 @@ <path android:name="ridge_2_path" android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" @@ -80,7 +80,7 @@ <path android:name="ridge_1_path" android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml index f2eca8ced896..832716afd623 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml @@ -37,7 +37,8 @@ <path android:name="ridge_5_path" android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathEnd="0" /> @@ -47,7 +48,8 @@ <path android:name="ridge_7_path" android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathEnd="0" /> @@ -57,7 +59,8 @@ <path android:name="ridge_6_path" android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathStart="1" /> @@ -67,7 +70,8 @@ <path android:name="ridge_2_path" android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathStart="1" /> @@ -79,7 +83,8 @@ <path android:name="ridge_1_path" android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" + android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathEnd="0" /> diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml index 218dd06dc178..7cc2e5cd040f 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml @@ -36,7 +36,7 @@ Copyright (C) 2017 The Android Open Source Project <path android:name="ridge_5_path" android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> @@ -46,7 +46,7 @@ Copyright (C) 2017 The Android Open Source Project <path android:name="ridge_7_path" android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> @@ -56,7 +56,7 @@ Copyright (C) 2017 The Android Open Source Project <path android:name="ridge_6_path" android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> @@ -66,7 +66,7 @@ Copyright (C) 2017 The Android Open Source Project <path android:name="ridge_2_path" android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> @@ -78,7 +78,7 @@ Copyright (C) 2017 The Android Open Source Project <path android:name="ridge_1_path" android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?attr/wallpaperTextColor" android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" /> diff --git a/packages/SystemUI/res/drawable/trusted_state_to_error.xml b/packages/SystemUI/res/drawable/trusted_state_to_error.xml index 260940f4fe65..4a8e452c2db6 100755 --- a/packages/SystemUI/res/drawable/trusted_state_to_error.xml +++ b/packages/SystemUI/res/drawable/trusted_state_to_error.xml @@ -17,9 +17,9 @@ Copyright (C) 2017 The Android Open Source Project <vector xmlns:android="http://schemas.android.com/apk/res/android" android:name="trusted_state_to_error" - android:width="32dp" + android:width="24dp" android:viewportWidth="24" - android:height="32dp" + android:height="24dp" android:viewportHeight="24" > <group android:name="lock" @@ -30,7 +30,8 @@ Copyright (C) 2017 The Android Open Source Project android:translateY="2.9375" > <path android:name="ellipse_path_1" - android:fillColor="#FFFFFFFF" + android:fillColor="?attr/wallpaperTextColor" + android:fillAlpha="0.5" android:pathData="M 0.0,-1.988645 c 1.09829830627,0.0 1.988645,0.890346693734 1.988645,1.988645 c 0.0,1.09829830627 -0.890346693734,1.988645 -1.988645,1.988645 c -1.09829830627,0.0 -1.988645,-0.890346693734 -1.988645,-1.988645 c 0.0,-1.09829830627 0.890346693734,-1.988645 1.988645,-1.988645 Z" /> </group> <group @@ -38,21 +39,24 @@ Copyright (C) 2017 The Android Open Source Project <path android:name="path_1" android:pathData="M 6.00561523438,-4.046875 c 0.0,0.0 -5.98999023438,0.0 -5.98999023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 5.98812866211,0.0 5.98812866211,0.0 c 0.0,0.0 0.00064086914062,10.0 0.00064086914062,10.0 c 0.0,0.0 -5.98840332031,0.0 -5.98840332031,0.0 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 5.99487304688,0.0 5.99487304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.0 0.0,-10.0 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z" - android:fillColor="#FFFFFFFF" /> + android:fillColor="?attr/wallpaperTextColor" + android:fillAlpha="0.5" /> </group> <group android:name="lock_left_side" > <path android:name="path_2" android:pathData="M -5.9959564209,-2.04727172852 c 0.0,0.0 6.01173400879,0.00039672851562 6.01173400879,0.00039672851562 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -6.01000976562,0.0 -6.01000976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.0 0.0,10.0 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 6.01000976562,0.0 6.01000976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 -6.01171875,0.0003662109375 -6.01171875,0.0003662109375 c 0.0,0.0 0.00038146972656,-9.99978637695 0.00038146972656,-9.99978637695 Z" - android:fillColor="#FFFFFFFF" /> + android:fillColor="?attr/wallpaperTextColor" + android:fillAlpha="0.5" /> </group> <group android:name="lock_top" > <path android:name="path_3" android:pathData="M 5.00619506836,-6.046875 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z" - android:fillColor="#FFFFFFFF" /> + android:fillColor="?attr/wallpaperTextColor" + android:fillAlpha="0.5" /> </group> </group> <group @@ -64,7 +68,7 @@ Copyright (C) 2017 The Android Open Source Project android:translateY="4" > <path android:name="bottompath" - android:fillColor="#FFFFFFFF" + android:fillColor="?android:attr/colorError" android:pathData="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" /> </group> </group> @@ -77,8 +81,7 @@ Copyright (C) 2017 The Android Open Source Project android:translateY="2.5" > <path android:name="toppath" - android:fillColor="#FFFFFFFF" - android:fillAlpha="0" + android:fillColor="?android:attr/colorError" android:pathData="M 0.0,-7.0 l 0.0,0.0 c 1.9329966243,0.0 3.5,1.5670033757 3.5,3.5 l 0.0,7.0 c 0.0,1.9329966243 -1.5670033757,3.5 -3.5,3.5 l 0.0,0.0 c -1.9329966243,0.0 -3.5,-1.5670033757 -3.5,-3.5 l 0.0,-7.0 c 0.0,-1.9329966243 1.5670033757,-3.5 3.5,-3.5 Z" /> </group> </group> @@ -91,7 +94,7 @@ Copyright (C) 2017 The Android Open Source Project android:name="circle" > <path android:name="circlepath" - android:strokeColor="#FFFFFFFF" + android:strokeColor="?android:attr/colorError" android:strokeWidth="2" android:strokeLineCap="round" android:trimPathStart="1" diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index ddd8ef8eb9fc..2fd4df4d1cc7 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -88,8 +88,7 @@ android:layout_gravity="bottom|center_horizontal" android:src="@drawable/ic_lock_24dp" android:contentDescription="@string/accessibility_unlock_button" - android:scaleType="center" - android:tint="?attr/wallpaperTextColor" /> + android:scaleType="center" /> <FrameLayout android:id="@+id/overlay_container" diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml index 63f80ae3d413..1fd239b15b30 100644 --- a/packages/SystemUI/res/layout/qs_detail.xml +++ b/packages/SystemUI/res/layout/qs_detail.xml @@ -40,7 +40,6 @@ android:background="@color/qs_detail_progress_track" android:src="@drawable/indeterminate_anim" android:scaleType="fitXY" - android:translationY="16dp" /> <com.android.systemui.qs.NonInterceptingScrollView diff --git a/packages/SystemUI/res/layout/zen_mode_condition.xml b/packages/SystemUI/res/layout/zen_mode_condition.xml index 2b4a0f59195e..ab52465be63c 100644 --- a/packages/SystemUI/res/layout/zen_mode_condition.xml +++ b/packages/SystemUI/res/layout/zen_mode_condition.xml @@ -27,6 +27,8 @@ android:id="@android:id/content" android:layout_width="match_parent" android:layout_height="wrap_content" + android:minHeight="48dp" + android:gravity="center_vertical" android:layout_centerVertical="true" android:orientation="vertical" android:layout_toEndOf="@android:id/checkbox" @@ -79,4 +81,4 @@ android:tint="?android:attr/textColorPrimary" android:src="@drawable/ic_qs_plus" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 426164186aba..55169837ec55 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -93,7 +93,7 @@ </RelativeLayout> - <LinearLayout + <com.android.systemui.volume.ZenRadioLayout android:id="@+id/zen_conditions" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -111,7 +111,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical"/> - </LinearLayout> + </com.android.systemui.volume.ZenRadioLayout> <TextView android:id="@+id/zen_alarm_warning" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index bc8e342c2c90..131214d20750 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Vervang"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Programme wat op die agtergrond loop"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tik vir besonderhede oor battery- en datagebruik"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Skakel mobiele data af?"</string> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 7c7d16679ba5..8105b89e87c5 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"ተካ"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"በጀርባ ውስጥ የሚያሄዱ መተግበሪያዎች"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"በባትሪ እና ውሂብ አጠቃቀም ላይ ዝርዝሮችን ለማግኘት መታ ያድርጉ"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"የተንቀሳቃሽ ስልክ ውሂብ ይጥፋ?"</string> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index e0c5ac98360c..29c03657fadc 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -797,4 +797,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"استبدال"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"التطبيقات التي تعمل في الخلفية"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"انقر للحصول على تفاصيل حول البطارية واستخدام البيانات"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"هل تريد إيقاف تشغيل بيانات الجوال؟"</string> </resources> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index cafdc50e7c42..3e3d3317a5e9 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Əvəz edin"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Arxa fonda işləyən tətbiqlər"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Batareya və data istifadəsi haqqında ətraflı məlumat üçün klikləyin"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Mobil data söndürülsün?"</string> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 71cb6bd9f8a1..6d41dab22cf0 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -779,4 +779,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Zameni"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplikacije pokrenute u pozadini"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Dodirnite za detalje o bateriji i potrošnji podataka"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Želite da onemogućite mobilne podatke?"</string> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index fc74dbe8b7b4..f1bf417c7d1a 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -787,4 +787,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Замяніць"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Праграмы, якія працуюць у фонавым рэжыме"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Дакраніцеся, каб даведацца пра выкарыстанне трафіка і акумулятара"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Выключыць мабільную перадачу даных?"</string> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 2b3539ca01f9..974b8752d49e 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Замяна"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Приложения, работещи на заден план"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Докоснете за информация относно използването на батерията и преноса на данни"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Да се изключат ли мобилните данни?"</string> </resources> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 485e5f2eee1f..114758ca5b0d 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"বদলে দিন"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"পটভূমিতে অ্যাপ চালু আছে"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"ব্যাটারি এবং ডেটার ব্যবহারের বিশদ বিবরণের জন্য ট্যাপ করুন"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"মোবাইল ডেটা বন্ধ করবেন?"</string> </resources> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 9a6595e860c3..bf04e2b55d9f 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -781,4 +781,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Zamijeni"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplikacije koje rade u pozadini"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Dodirnite za detalje o potrošnji baterije i prijenosa podataka"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Želite li isključiti prijenos mobilnih podataka?"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 2559bc8913d6..0b59e1d75d1a 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Substitueix"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplicacions que s\'estan executant en segon pla"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Toca per obtenir informació sobre l\'ús de dades i de bateria"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Vols desactivar les dades mòbils?"</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index fe80975489d5..d529a7a2320d 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -787,4 +787,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Nahradit"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplikace běžící na pozadí"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Klepnutím zobrazíte podrobnosti o využití baterie a dat"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Vypnout mobilní data?"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index bbeb3353cc83..a3884acf02d0 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Erstat"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apps, der kører i baggrunden"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tryk for at se oplysninger om batteri- og dataforbrug"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Vil du deaktivere mobildata?"</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 869bca7a8323..b0afce8b8da0 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -777,4 +777,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Ersetzen"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apps, die im Hintergrund ausgeführt werden"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Für Details zur Akku- und Datennutzung tippen"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Mobile Daten deaktivieren?"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index bb44d9904eab..7ac5f69ea40c 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Αντικατάσταση"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Εφαρμογές που εκτελούνται στο παρασκήνιο"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Πατήστε για λεπτομέρειες σχετικά με τη χρήση μπαταρίας και δεδομένων"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Απενεργοποίηση δεδομένων κινητής τηλεφωνίας;"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 3a39a2e229f3..4d90d5b3ba5f 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Replace"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apps running in background"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tap for details on battery and data usage"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Turn off mobile data?"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 3a39a2e229f3..4d90d5b3ba5f 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Replace"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apps running in background"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tap for details on battery and data usage"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Turn off mobile data?"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 3a39a2e229f3..4d90d5b3ba5f 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Replace"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apps running in background"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tap for details on battery and data usage"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Turn off mobile data?"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index f1ca9b088786..d6c97b738e16 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Reemplazar"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apps que se ejecutan en segundo plano"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Presiona para obtener información sobre el uso de datos y de la batería"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"¿Deseas desactivar los datos móviles?"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index f8bd8ff3af62..9b4705a53639 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Reemplazar"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplicaciones que se están ejecutando en segundo plano"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Toca para ver información detallada sobre el uso de datos y de la batería"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"¿Desactivar los datos móviles?"</string> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 1d94e0113289..89041538af6a 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Asenda"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Rakendusi käitatakse taustal"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Aku ja andmekasutuse üksikasjade nägemiseks puudutage"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Kas lülitada mobiilne andmeside välja?"</string> </resources> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 0d5e58f576db..52fc08a960c6 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Ordeztu"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplikazioak exekutatzen ari dira atzeko planoan"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Sakatu bateria eta datuen erabilerari buruzko xehetasunak ikusteko"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Datu-konexioa desaktibatu nahi duzu?"</string> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index f5c5ac82e1c2..75495fee8ffa 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"جایگزین کردن"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"برنامههایی که در پسزمینه اجرا میشوند"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"برای جزئیات مربوط به مصرف باتری و داده، ضربه بزنید"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"داده شبکه تلفن همراه خاموش شود؟"</string> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 9edbc7838123..0223373ea3cb 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Korvaa"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Sovelluksia käynnissä taustalla"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Katso lisätietoja akun ja datan käytöstä napauttamalla"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Poistetaanko mobiilidata käytöstä?"</string> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 951d2afb3c77..e60afb6f030a 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Remplacer"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Applications qui fonctionnent en arrière-plan"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Touchez pour afficher des détails sur l\'utilisation de la pile et des données"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Désactiver les données cellulaires?"</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index fc430becc8b6..1f61c090d2b3 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Remplacer"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Applications en cours d\'exécution en arrière-plan"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Appuyer pour obtenir des informations sur l\'utilisation de la batterie et des données"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Désactiver les données mobiles ?"</string> </resources> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 25563f9ba05c..c7f13bb06faa 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Substituír"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplicacións que se executan en segundo plano"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Toca para obter información sobre o uso de datos e a batería"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Queres desactivar os datos móbiles?"</string> </resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 9bae98a65a8d..c353ad6b42ad 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"બદલો"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"પૃષ્ઠભૂમિમાં ચાલી રહેલ ઍપ્લિકેશનો"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"બૅટરી અને ડેટા વપરાશ વિશેની વિગતો માટે ટૅપ કરો"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"મોબાઇલ ડેટા બંધ કરીએ?"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 4668b802979e..87ea459be597 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"बदलें"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"बैकग्राउंड में चल रहे ऐप्लिकेशन"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"बैटरी और डेटा उपयोग के विवरण देखने के लिए टैप करें"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"मोबाइल डेटा बंद करना चाहते हैं?"</string> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 5a984516fda8..52ab18d364c7 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -779,4 +779,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Zamijeni"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Izvođenje aplikacija u pozadini"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Dodirnite da biste vidjeli pojedinosti o potrošnji baterije i podatkovnom prometu"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Isključiti mobilne podatke?"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index d73448432b0d..2aeaecab89b7 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Csere"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"A háttérben még futnak alkalmazások"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Koppintson az akkumulátor- és adathasználat részleteinek megtekintéséhez"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Kikapcsolja a mobiladatokat?"</string> </resources> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 1359eb0a61ba..a9cac4c0964a 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Փոխարինել"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Ֆոնային ռեժիմում աշխատող հավելվածներ"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Հպեք՝ մարտկոցի և թրաֆիկի մանրամասները տեսնելու համար"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Անջատե՞լ բջջային ինտերնետը։"</string> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 616667163910..a66591a9e9e8 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Ganti"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplikasi yang sedang berjalan di latar belakang"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tap untuk melihat detail penggunaan baterai dan data"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Nonaktifkan data seluler?"</string> </resources> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 74d06d44df8f..b0b77dfecbbe 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Skipta út"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Forrit sem keyra í bakgrunni"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Ýttu til að fá upplýsingar um rafhlöðu- og gagnanotkun"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Slökkva á farsímagögnum?"</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 6ed2c5e50539..92d0cdcf7e1d 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Sostituisci"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"App in esecuzione in background"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tocca per conoscere i dettagli sull\'utilizzo dei dati e della batteria"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Disattivare i dati mobili?"</string> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index f424a30dae2c..8eb05a0b64d6 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -785,4 +785,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"החלף"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"אפליקציות שפועלות ברקע"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"הקש לקבלת פרטים על צריכה של נתונים וסוללה"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"לכבות את חבילת הגלישה?"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 920a96bc9eae..ebf3121a23bc 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"設定を変更"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"バックグラウンドで実行中のアプリ"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"タップして電池やデータの使用量を確認"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"モバイルデータを OFF にしますか？"</string> </resources> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 153b1b27c673..7197ad3e3ac5 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"ჩანაცვლება"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"ფონურ რეჟიმში გაშვებული აპები"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"შეეხეთ ბატარეისა და მონაცემების მოხმარების შესახებ დეტალური ინფორმაციისთვის"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"გსურთ მობილური ინტერნეტის გამორთვა?"</string> </resources> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 5de7f4564175..f8c28d0d420a 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Ауыстыру"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Фонда жұмыс істеп тұрған қолданбалар"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Батарея мен деректер трафигі туралы білу үшін түртіңіз"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Мобильдік деректер өшірілсін бе?"</string> </resources> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index c7603ca9d6ea..d12c619b6836 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"ជំនួស"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"កម្មវិធីដែលកំពុងដំណើរការនៅផ្ទៃខាងក្រោយ"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"ចុចដើម្បីមើលព័ត៌មានលម្អិតអំពីការប្រើប្រាស់ទិន្នន័យ និងថ្ម"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"បិទទិន្នន័យចល័ត?"</string> </resources> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 861a06ec89eb..48efc3b8446f 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"ಬದಲಿಸಿ"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"ಅಪ್ಲಿಕೇಶನ್ಗಳು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗುತ್ತಿವೆ"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"ಬ್ಯಾಟರಿ,ಡೇಟಾ ಬಳಕೆಯ ವಿವರಗಳಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"ಮೊಬೈಲ್ ಡೇಟಾ ಆಫ್ ಮಾಡಬೇಕೆ?"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 7667c5e3bc99..4c532cf0a6e2 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"바꾸기"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"백그라운드에서 실행 중인 앱"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"탭하여 배터리 및 데이터 사용량 확인"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"모바일 데이터를 사용 중지하시겠습니까?"</string> </resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 78de8a9cac9f..93619a35aae2 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Алмаштыруу"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Фондо иштеп жаткан колдонмолор"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Батареянын кубаты жана трафиктин көлөмү жөнүндө билүү үчүн таптап коюңуз"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Мобилдик Интернетти өчүрөсүзбү?"</string> </resources> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index ce5d8622b825..3b792ed2860c 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"ແທນທີ່"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"ແອັບທີ່ກຳລັງເຮັດວຽກໃນພື້ນຫຼັງ"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"ແຕະເພື່ອເບິ່ງລາຍລະອຽດການນຳໃຊ້ແບັດເຕີຣີ ແລະ ອິນເຕີເນັດ"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"ປິດອິນເຕີເນັດມືຖືໄວ້ບໍ?"</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index f550e9d5f7ec..a072976efbbb 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -785,4 +785,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Pakeisti"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Programos, veikiančios fone"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Palieskite ir sužinokite išsamios informacijos apie akumuliatoriaus bei duomenų naudojimą"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Išjungti mobiliojo ryšio duomenis?"</string> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 334583fcf4d3..0fac57f39aa4 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -779,4 +779,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Aizstāt"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Lietotnes, kas darbojas fonā"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Pieskarieties, lai skatītu detalizētu informāciju par akumulatora un datu lietojumu"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Vai izslēgt mobilos datus?"</string> </resources> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 974ad448940e..0d7c27839694 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Замени"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Апликациите се извршуваат во заднина"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Допрете за детали за батеријата и потрошениот сообраќај"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Да се исклучи мобилниот интернет?"</string> </resources> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 2134e9412c1e..438ea85edffd 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"മാറ്റിസ്ഥാപിക്കുക"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"ആപ്പുകൾ പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുന്നു"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"ബാറ്ററി, ഡാറ്റ ഉപയോഗം എന്നിവയുടെ വിശദാംശങ്ങളറിയാൻ ടാപ്പുചെയ്യുക"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"മൊബൈൽ ഡാറ്റ ഓഫാക്കണോ?"</string> </resources> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index ed8a9616c256..f59046ad357f 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Солих"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Цаана ажиллаж буй апп"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Батерей, дата ашиглалтын талаар дэлгэрэнгүйг харахын тулд товшино уу"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Мобайл датаг унтраах уу?"</string> </resources> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 8120b37617b2..6f3a10f72dba 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"पुनर्स्थित करा"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"अॅप्स बॅकग्राउंडमध्ये चालू आहेत"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"बॅटरी आणि डेटा वापराच्या तपशीलांसाठी टॅप करा"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"मोबाइल डेटा बंद करायचा?"</string> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 65791f3fcc3f..b1592d6db2e3 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Gantikan"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apl yang berjalan di latar belakang"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Ketik untuk mendapatkan butiran tentang penggunaan kuasa bateri dan data"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Matikan data mudah alih?"</string> </resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 019f6e5d0a88..cabbb498d7cb 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"အစားထိုးရန်"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"နောက်ခံတွင် ပွင့်နေသော အက်ပ်များ"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"ဘက်ထရီနှင့် ဒေတာအသုံးပြုမှု အသေးစိတ်ကို ကြည့်ရန် တို့ပါ"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"မိုဘိုင်းဒေတာကို ပိတ်လိုပါသလား။"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 983b966f474f..3dc5436c910a 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Erstatt"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apper kjører i bakgrunnen"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Trykk for detaljer om batteri- og databruk"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Vil du slå av mobildata?"</string> </resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 0491f88fa923..e37cde6fffd9 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"प्रतिस्थापन गर्नुहोस्"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"पृष्ठभूमिमा चल्ने अनुप्रयोगहरू"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"ब्याट्री र डेटाका प्रयोग सम्बन्धी विवरणहरूका लागि ट्याप गर्नुहोस्"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"मोबाइल डेटा निष्क्रिय पार्ने हो?"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index c399e5d0c34e..84c534e6e1e5 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Vervangen"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apps uitgevoerd op achtergrond"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tik voor batterij- en datagebruik"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Mobiele data uitschakelen?"</string> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index a235c516647e..06c82f90cdad 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"ਬਦਲੋ"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲ ਰਹੀਆਂ ਐਪਾਂ"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"ਬੈਟਰੀ ਅਤੇ ਡੈਟਾ ਉਪਯੋਗ ਸਬੰਧੀ ਵੇਰਵਿਆਂ ਲਈ ਟੈਪ ਕਰੋ"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"ਮੋਬਾਈਲ ਡੈਟਾ ਬੰਦ ਕਰੀਏ?"</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 136bd434a991..93ee86ac5192 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -785,4 +785,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Zastąp"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplikacje działające w tle"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Kliknij, by wyświetlić szczegóły wykorzystania baterii i transmisji danych"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Wyłączyć mobilną transmisję danych?"</string> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 7d7c9c6752f2..0614849a01a8 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Substituir"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Apps sendo executados em segundo plano"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tocar para ver detalhes sobre a bateria e o uso de dados"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Desativar os dados móveis?"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 0c4d163f73e0..ddbf5a37d04f 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -781,4 +781,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Înlocuiți"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplicațiile rulează în fundal"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Atingeți pentru mai multe detalii privind bateria și utilizarea datelor"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Dezactivați datele mobile?"</string> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 8fac8ad76771..4f5ffdc50425 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -787,4 +787,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Заменить"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Приложения, работающие в фоновом режиме"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Нажмите, чтобы проверить энергопотребление и трафик"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Отключить мобильный Интернет?"</string> </resources> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 60113639b353..2d3ce16eb884 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"ප්රතිස්ථාපනය"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"පසුබිමින් ධාවනය වන යෙදුම්"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"බැටරි හා දත්ත භාවිතය පිළිබඳව විස්තර සඳහා තට්ටු කරන්න"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"ජංගම දත්ත ක්රියාවිරහිත කරන්නද?"</string> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 5ed7823d0ac0..559457cc0335 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -787,4 +787,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Nahradiť"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplikácie sú spustené na pozadí"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Klepnutím zobrazíte podrobnosti o batérii a spotrebe dát"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Vypnúť mobilné dáta?"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index e961093a3428..16f830e06b65 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -787,4 +787,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Zamenjaj"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplikacije, ki se izvajajo v ozadju"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Dotaknite se za prikaz podrobnosti porabe akumulatorja in prenosa podatkov"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Želite izklopiti prenos podatkov v mobilnih omrežjih?"</string> </resources> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 23e8d5efef1a..f0a7e45f9d7b 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Zëvendëso"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Aplikacionet që ekzekutohen në sfond"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Trokit për detaje mbi baterinë dhe përdorimin e të dhënave"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Të çaktivizohen të dhënat celulare?"</string> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index a2a905a66c74..94a59098dd3f 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -779,4 +779,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Замени"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Апликације покренуте у позадини"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Додирните за детаље о батерији и потрошњи података"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Желите да онемогућите мобилне податке?"</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 04088888fe8a..664825b7e020 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Ersätt"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Appar körs i bakgrunden"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tryck för information om batteri- och dataanvändning"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Vill du inaktivera mobildatan?"</string> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index b3fd5e31864f..cbc19805ca98 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Badilisha"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Programu zinatumika chinichini"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Gonga ili upate maelezo kuhusu betri na matumizi ya data"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Ungependa kuzima data ya mtandao wa simu?"</string> </resources> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index a51866d2b565..70547401eb3d 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"மாற்று"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"பின்னணியில் இயங்கும் பயன்பாடுகள்"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"பேட்டரி மற்றும் தரவு உபயோக விவரங்களைக் காண, தட்டவும்"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"மொபைல் தரவை முடக்கவா?"</string> </resources> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index dbee51bf9538..41c8392750ef 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"భర్తీ చేయి"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"నేపథ్యంలో అమలు అవుతున్న ఆప్లు"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"బ్యాటరీ మరియు డేటా వినియోగ వివరాల కోసం నొక్కండి"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"మొబైల్ డేటాని ఆఫ్ చేయాలా?"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 949266574803..5eef29105cf7 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"แทนที่"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"แอปที่กำลังทำงานในเบื้องหลัง"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"แตะเพื่อดูรายละเอียดเกี่ยวกับแบตเตอรี่และปริมาณการใช้อินเทอร์เน็ต"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"ปิดอินเทอร์เน็ตมือถือไหม"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 964b99d5ee91..3a49fc70fa6f 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Palitan"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Tumatakbo ang mga app sa background"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"I-tap para sa mga detalye tungkol sa paggamit ng baterya at data"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"I-off ang mobile data?"</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index b2e56410906a..a451b90c1153 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Değiştir"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Arka planda çalışan uygulamalar"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Pil ve veri kullanımı ile ilgili ayrıntılar için dokunun"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Mobil veri kapatılsın mı?"</string> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index cc523313f53f..cf9698f78943 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -787,4 +787,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Замінити"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Додатки, які працюють у фоновому режимі"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Торкніться, щоб перевірити використання акумулятора й трафік"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Вимкнути мобільний трафік?"</string> </resources> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index fdf89238f7da..475d1634d208 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"بدلیں"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"ایپس پس منظر میں چل رہی ہیں"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"بیٹری اور ڈیٹا استعمال کے بارے میں تفصیلات کے لیے تھپتھپائیں"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"موبائل ڈیٹا آف کریں؟"</string> </resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 07d5b1ae508c..092499d890df 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Almashtirish"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Fonda ishlayotgan ilovalar"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Batareya va trafik sarfi tafsilotlari uchun ustiga bosing"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Mobil internet o‘chirib qo‘yilsinmi?"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index f0385a4af5b5..f7be891c9807 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Thay thế"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Ứng dụng đang chạy trong nền"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Nhấn để biết chi tiết về mức sử dụng dữ liệu và pin"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Tắt dữ liệu di động?"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 906b40f0d316..3c5bc2abd320 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"替换"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"在后台运行的应用"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"点按即可详细了解电量和流量消耗情况"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"要关闭移动数据网络吗？"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 85f7298366ce..beffd2281d41 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -775,4 +775,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"取代"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"正在背景中執行的應用程式"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"輕按即可查看電池和數據用量詳情"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"要關閉流動數據嗎？"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index f64428cbf891..87bc6d3f14ed 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"取代"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"在背景執行的應用程式"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"輕觸即可查看電池和數據用量詳情"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"要關閉行動數據嗎？"</string> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 397f31c317bb..bd54208b1a13 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -773,4 +773,5 @@ <string name="qs_dnd_replace" msgid="8019520786644276623">"Buyisela"</string> <string name="running_foreground_services_title" msgid="381024150898615683">"Izinhlelo zokusebenza zisebenza ngasemuva"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"Thepha ngemininingwane ekusetshenzisweni kwebhethri nedatha"</string> + <string name="data_usage_disable_mobile" msgid="5116269981510015864">"Vala idatha yeselula?"</string> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 34aa6d039850..3c86c873020a 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -267,14 +267,15 @@ <!-- Doze: alpha to apply to small icons when dozing --> <integer name="doze_small_icon_alpha">222</integer><!-- 87% of 0xff --> - <!-- Doze: the brightness value to use for the lower brightness AOD mode --> - <integer name="config_doze_aod_brightness_low">5</integer> - - <!-- Doze: the brightness value to use for the higher brightness AOD mode --> - <integer name="config_doze_aod_brightness_high">27</integer> - - <!-- Doze: the brightness value to use for the sunlight AOD mode --> - <integer name="config_doze_aod_brightness_sunlight">28</integer> + <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor + to brightness values; -1 means keeping the current brightness. --> + <integer-array name="config_doze_brightness_sensor_to_brightness"> + <item>-1</item> <!-- 0: OFF --> + <item>2</item> <!-- 1: NIGHT --> + <item>5</item> <!-- 2: LOW --> + <item>27</item> <!-- 3: HIGH --> + <item>28</item> <!-- 4: SUN --> + </integer-array> <!-- Doze: whether the double tap sensor reports 2D touch coordinates --> <bool name="doze_double_tap_reports_touch_coordinates">false</bool> diff --git a/packages/SystemUI/src/com/android/systemui/DockedStackExistsListener.java b/packages/SystemUI/src/com/android/systemui/DockedStackExistsListener.java index 6296297a81c2..9fe730affbd9 100644 --- a/packages/SystemUI/src/com/android/systemui/DockedStackExistsListener.java +++ b/packages/SystemUI/src/com/android/systemui/DockedStackExistsListener.java @@ -74,8 +74,11 @@ public class DockedStackExistsListener { private static void onDockedStackExistsChanged(boolean exists) { synchronized (sCallbacks) { - sCallbacks.removeIf(wf -> wf.get() == null); - sCallbacks.forEach(wf -> wf.get().accept(exists)); + sCallbacks.removeIf(wf -> { + Consumer<Boolean> l = wf.get(); + if (l != null) l.accept(exists); + return l == null; + }); } } diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java index 523724499d96..0c067ff38295 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java @@ -40,6 +40,8 @@ import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.volume.VolumeDialogControllerImpl; +import java.util.function.Consumer; + /** * Class factory to provide customizable SystemUI components. */ @@ -84,8 +86,10 @@ public class SystemUIFactory { public ScrimController createScrimController(LightBarController lightBarController, ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim, - LockscreenWallpaper lockscreenWallpaper) { - return new ScrimController(lightBarController, scrimBehind, scrimInFront, headsUpScrim); + LockscreenWallpaper lockscreenWallpaper, + Consumer<Boolean> scrimVisibleListener) { + return new ScrimController(lightBarController, scrimBehind, scrimInFront, headsUpScrim, + scrimVisibleListener); } public NotificationIconAreaController createNotificationIconAreaController(Context context, diff --git a/packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java b/packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java index 61cbc98c6085..9ba7be86aa0a 100644 --- a/packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java +++ b/packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java @@ -31,11 +31,16 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.colorextraction.ColorExtractor; import com.android.internal.colorextraction.types.ExtractionType; import com.android.internal.colorextraction.types.Tonal; +import com.android.systemui.Dumpable; + +import java.io.FileDescriptor; +import java.io.PrintWriter; +import java.util.Arrays; /** * ColorExtractor aware of wallpaper visibility */ -public class SysuiColorExtractor extends ColorExtractor { +public class SysuiColorExtractor extends ColorExtractor implements Dumpable { private static final String TAG = "SysuiColorExtractor"; private boolean mWallpaperVisible; // Colors to return when the wallpaper isn't visible @@ -154,4 +159,20 @@ public class SysuiColorExtractor extends ColorExtractor { } } + @Override + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + pw.println("SysuiColorExtractor:"); + + pw.println(" Current wallpaper colors:"); + pw.println(" system: " + mSystemColors); + pw.println(" lock: " + mLockColors); + + GradientColors[] system = mGradientColors.get(WallpaperManager.FLAG_SYSTEM); + GradientColors[] lock = mGradientColors.get(WallpaperManager.FLAG_LOCK); + pw.println(" Gradients:"); + pw.println(" system: " + Arrays.toString(system)); + pw.println(" lock: " + Arrays.toString(lock)); + pw.println(" Default scrim: " + mWpHiddenColors); + + } } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java b/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java index 57fb14e50249..9b97634d7419 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeHost.java @@ -44,6 +44,8 @@ public interface DozeHost { void setDozeScreenBrightness(int value); + void onIgnoreTouchWhilePulsing(boolean ignore); + interface Callback { default void onNotificationHeadsUp() {} default void onPowerSaveChanged(boolean active) {} diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java index 0993ace8cfcc..79de48a17423 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java @@ -164,6 +164,11 @@ public class DozeLog { } } + public static void traceState(DozeMachine.State state) { + if (!ENABLED) return; + log("state " + state); + } + public static void traceProximityResult(Context context, boolean near, long millis, int pulseReason) { if (!ENABLED) return; @@ -233,10 +238,10 @@ public class DozeLog { + state + " blocked=" + blocked); } - public static void tracePulseCanceledByProx(Context context) { + public static void tracePulseTouchDisabledByProx(Context context, boolean disabled) { if (!ENABLED) return; init(context); - log("pulseCanceledByProx"); + log("pulseTouchDisabledByProx " + disabled); } public static void setRegisterKeyguardCallback(boolean registerKeyguardCallback) { diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java index a1dfeb34a670..8ec6afc326e1 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java @@ -17,6 +17,7 @@ package com.android.systemui.doze; import android.annotation.MainThread; +import android.os.Trace; import android.os.UserHandle; import android.util.Log; import android.view.Display; @@ -225,6 +226,9 @@ public class DozeMachine { State oldState = mState; mState = newState; + DozeLog.traceState(newState); + Trace.traceCounter(Trace.TRACE_TAG_APP, "doze_machine_state", newState.ordinal()); + updatePulseReason(newState, oldState, pulseReason); performTransitionOnComponents(oldState, newState); updateWakeLockState(newState); diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java index ed4b131cd83f..32baf9413314 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java @@ -35,12 +35,9 @@ public class DozeScreenBrightness implements DozeMachine.Part, SensorEventListen private final Handler mHandler; private final SensorManager mSensorManager; private final Sensor mLightSensor; + private final int[] mSensorToBrightness; private boolean mRegistered; - private final int mHighBrightness; - private final int mLowBrightness; - private final int mSunlightBrightness; - public DozeScreenBrightness(Context context, DozeMachine.Service service, SensorManager sensorManager, Sensor lightSensor, Handler handler) { mContext = context; @@ -49,12 +46,8 @@ public class DozeScreenBrightness implements DozeMachine.Part, SensorEventListen mLightSensor = lightSensor; mHandler = handler; - mLowBrightness = context.getResources().getInteger( - R.integer.config_doze_aod_brightness_low); - mHighBrightness = context.getResources().getInteger( - R.integer.config_doze_aod_brightness_high); - mSunlightBrightness = context.getResources().getInteger( - R.integer.config_doze_aod_brightness_sunlight); + mSensorToBrightness = context.getResources().getIntArray( + R.array.config_doze_brightness_sensor_to_brightness); } @Override @@ -81,21 +74,18 @@ public class DozeScreenBrightness implements DozeMachine.Part, SensorEventListen @Override public void onSensorChanged(SensorEvent event) { if (mRegistered) { - mDozeService.setDozeScreenBrightness(computeBrightness((int) event.values[0])); + int brightness = computeBrightness((int) event.values[0]); + if (brightness > 0) { + mDozeService.setDozeScreenBrightness(brightness); + } } } private int computeBrightness(int sensorValue) { - // The sensor reports 0 for off, 1 for low brightness, 2 for high brightness, and 3 for - // sunlight. We currently use DozeScreenState for screen off, so we treat off as low - // brightness. - if (sensorValue >= 3) { - return mSunlightBrightness; - } else if (sensorValue == 2) { - return mHighBrightness; - } else { - return mLowBrightness; + if (sensorValue < 0 || sensorValue >= mSensorToBrightness.length) { + return -1; } + return mSensorToBrightness[sensorValue]; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java index ea064797f8f5..15981e573ca1 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java @@ -162,10 +162,10 @@ public class DozeTriggers implements DozeMachine.Part { final boolean pausing = (state == DozeMachine.State.DOZE_AOD_PAUSING); final boolean aod = (state == DozeMachine.State.DOZE_AOD); - if (near && state == DozeMachine.State.DOZE_PULSING) { - if (DEBUG) Log.i(TAG, "Prox NEAR, ending pulse"); - DozeLog.tracePulseCanceledByProx(mContext); - mMachine.requestState(DozeMachine.State.DOZE_PULSE_DONE); + if (state == DozeMachine.State.DOZE_PULSING) { + boolean ignoreTouch = near; + if (DEBUG) Log.i(TAG, "Prox changed, ignore touch = " + ignoreTouch); + mDozeHost.onIgnoreTouchWhilePulsing(ignoreTouch); } if (far && (paused || pausing)) { if (DEBUG) Log.i(TAG, "Prox FAR, unpausing AOD"); diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java index 1dc37cdbca7a..884745213350 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java @@ -100,7 +100,6 @@ public class DozeUi implements DozeMachine.Part { private boolean shouldAnimateWakeup(DozeMachine.State state) { switch (state) { - case DOZE_AOD: case DOZE_REQUEST_PULSE: case DOZE_PULSING: case DOZE_PULSE_DONE: diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ScreenLifecycle.java b/packages/SystemUI/src/com/android/systemui/keyguard/ScreenLifecycle.java index 3f39dfe5d936..b6fce4408bcf 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ScreenLifecycle.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ScreenLifecycle.java @@ -16,6 +16,8 @@ package com.android.systemui.keyguard; +import android.os.Trace; + import com.android.systemui.Dumpable; import java.io.FileDescriptor; @@ -38,22 +40,22 @@ public class ScreenLifecycle extends Lifecycle<ScreenLifecycle.Observer> impleme } public void dispatchScreenTurningOn() { - mScreenState = SCREEN_TURNING_ON; + setScreenState(SCREEN_TURNING_ON); dispatch(Observer::onScreenTurningOn); } public void dispatchScreenTurnedOn() { - mScreenState = SCREEN_ON; + setScreenState(SCREEN_ON); dispatch(Observer::onScreenTurnedOn); } public void dispatchScreenTurningOff() { - mScreenState = SCREEN_TURNING_OFF; + setScreenState(SCREEN_TURNING_OFF); dispatch(Observer::onScreenTurningOff); } public void dispatchScreenTurnedOff() { - mScreenState = SCREEN_OFF; + setScreenState(SCREEN_OFF); dispatch(Observer::onScreenTurnedOff); } @@ -63,6 +65,11 @@ public class ScreenLifecycle extends Lifecycle<ScreenLifecycle.Observer> impleme pw.println(" mScreenState=" + mScreenState); } + private void setScreenState(int screenState) { + mScreenState = screenState; + Trace.traceCounter(Trace.TRACE_TAG_APP, "screenState", screenState); + } + public interface Observer { default void onScreenTurningOn() {} default void onScreenTurnedOn() {} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java index 578e6fb1ab01..951c0ea6a26b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java @@ -16,6 +16,8 @@ package com.android.systemui.keyguard; +import android.os.Trace; + import com.android.systemui.Dumpable; import java.io.FileDescriptor; @@ -39,22 +41,22 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe } public void dispatchStartedWakingUp() { - mWakefulness = WAKEFULNESS_WAKING; + setWakefulness(WAKEFULNESS_WAKING); dispatch(Observer::onStartedWakingUp); } public void dispatchFinishedWakingUp() { - mWakefulness = WAKEFULNESS_AWAKE; + setWakefulness(WAKEFULNESS_AWAKE); dispatch(Observer::onFinishedWakingUp); } public void dispatchStartedGoingToSleep() { - mWakefulness = WAKEFULNESS_GOING_TO_SLEEP; + setWakefulness(WAKEFULNESS_GOING_TO_SLEEP); dispatch(Observer::onStartedGoingToSleep); } public void dispatchFinishedGoingToSleep() { - mWakefulness = WAKEFULNESS_ASLEEP; + setWakefulness(WAKEFULNESS_ASLEEP); dispatch(Observer::onFinishedGoingToSleep); } @@ -64,6 +66,11 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe pw.println(" mWakefulness=" + mWakefulness); } + private void setWakefulness(int wakefulness) { + mWakefulness = wakefulness; + Trace.traceCounter(Trace.TRACE_TAG_APP, "wakefulness", wakefulness); + } + public interface Observer { default void onStartedWakingUp() {} default void onFinishedWakingUp() {} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index 14afbfae29f1..12fccda907ff 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -83,7 +83,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { @Override protected void handleClick() { // Secondary clicks are header clicks, just toggle. - final boolean isEnabled = (Boolean)mState.value; + final boolean isEnabled = mState.value; mController.setBluetoothEnabled(!isEnabled); } @@ -100,6 +100,9 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { return; } showDetail(true); + if (!mState.value) { + mController.setBluetoothEnabled(true); + } } @Override @@ -179,6 +182,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { refreshState(); if (isShowingDetail()) { mDetailAdapter.updateItems(); + fireToggleStateChanged(mDetailAdapter.getToggleState()); } } @@ -269,7 +273,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { item.icon = R.drawable.ic_qs_bluetooth_on; item.line1 = device.getName(); item.tag = device; - int state = mController.getMaxConnectionState(device); + int state = device.getMaxConnectionState(); if (state == BluetoothProfile.STATE_CONNECTED) { item.icon = R.drawable.ic_qs_bluetooth_connected; int batteryLevel = device.getBatteryLevel(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java index 6c31cef4b787..5938749d14d2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -33,6 +33,7 @@ import android.provider.Settings.Global; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; import android.service.quicksettings.Tile; +import android.util.Log; import android.util.Slog; import android.view.LayoutInflater; import android.view.View; @@ -54,6 +55,7 @@ import com.android.systemui.plugins.qs.QSTile.BooleanState; import com.android.systemui.qs.QSHost; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.statusbar.policy.ZenModeController; +import com.android.systemui.statusbar.policy.ZenModeController.Callback; import com.android.systemui.volume.ZenModePanel; /** Quick settings tile: Do not disturb **/ @@ -147,7 +149,22 @@ public class DndTile extends QSTileImpl<BooleanState> { Toast.LENGTH_LONG).show(); return; } - showDetail(true); + if (!mState.value) { + // Because of the complexity of the zen panel, it needs to be shown after + // we turn on zen below. + mController.addCallback(new ZenModeController.Callback() { + @Override + public void onZenChanged(int zen) { + mController.removeCallback(this); + showDetail(true); + } + }); + int zen = Prefs.getInt(mContext, Prefs.Key.DND_FAVORITE_ZEN, + Global.ZEN_MODE_ALARMS); + mController.setZen(zen, null, TAG); + } else { + showDetail(true); + } } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index 73915092e8b4..cb8c39dad30a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -127,6 +127,9 @@ public class WifiTile extends QSTileImpl<SignalState> { return; } showDetail(true); + if (!mState.value) { + mController.setWifiEnabled(true); + } } @Override @@ -311,12 +314,10 @@ public class WifiTile extends QSTileImpl<SignalState> { public View createDetailView(Context context, View convertView, ViewGroup parent) { if (DEBUG) Log.d(TAG, "createDetailView convertView=" + (convertView != null)); mAccessPoints = null; - mWifiController.scanForAccessPoints(); - fireScanStateChanged(true); mItems = QSDetailItems.convertOrInflate(context, convertView, parent); mItems.setTagSuffix("Wifi"); mItems.setCallback(this); - updateItems(); + mWifiController.scanForAccessPoints(); // updates APs and items setItemsVisible(mState.value); return mItems; } @@ -324,12 +325,30 @@ public class WifiTile extends QSTileImpl<SignalState> { @Override public void onAccessPointsChanged(final List<AccessPoint> accessPoints) { mAccessPoints = accessPoints.toArray(new AccessPoint[accessPoints.size()]); + filterUnreachableAPs(); + updateItems(); if (accessPoints != null && accessPoints.size() > 0) { fireScanStateChanged(false); } } + /** Filter unreachable APs from mAccessPoints */ + private void filterUnreachableAPs() { + int numReachable = 0; + for (AccessPoint ap : mAccessPoints) { + if (ap.isReachable()) numReachable++; + } + if (numReachable != mAccessPoints.length) { + AccessPoint[] unfiltered = mAccessPoints; + mAccessPoints = new AccessPoint[numReachable]; + int i = 0; + for (AccessPoint ap : unfiltered) { + if (ap.isReachable()) mAccessPoints[i++] = ap; + } + } + } + @Override public void onSettingsActivityTriggered(Intent settingsIntent) { mActivityStarter.postStartActivityDismissingKeyguard(settingsIntent, 0); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index 05d47ec9af63..f5dc03858a37 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -23,11 +23,12 @@ import android.animation.ValueAnimator; import android.app.Notification; import android.content.Context; import android.content.pm.ApplicationInfo; -import android.content.res.ColorStateList; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.ColorMatrix; +import android.graphics.ColorMatrixColorFilter; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; @@ -54,9 +55,16 @@ import com.android.systemui.statusbar.notification.NotificationIconDozeHelper; import com.android.systemui.statusbar.notification.NotificationUtils; import java.text.NumberFormat; +import java.util.Arrays; public class StatusBarIconView extends AnimatedImageView { public static final int NO_COLOR = 0; + + /** + * Multiply alpha values with (1+DARK_ALPHA_BOOST) when dozing. The chosen value boosts + * everything above 30% to 50%, making it appear on 1bit color depths. + */ + private static final float DARK_ALPHA_BOOST = 0.67f; private final int ANIMATION_DURATION_FAST = 100; public static final int STATE_ICON = 0; @@ -131,6 +139,8 @@ public class StatusBarIconView extends AnimatedImageView { private final NotificationIconDozeHelper mDozer; private int mContrastedDrawableColor; private int mCachedContrastBackgroundColor = NO_COLOR; + private float[] mMatrix; + private ColorMatrixColorFilter mMatrixColorFilter; public StatusBarIconView(Context context, String slot, StatusBarNotification sbn) { this(context, slot, sbn, false); @@ -544,14 +554,33 @@ public class StatusBarIconView extends AnimatedImageView { private void updateIconColor() { if (mCurrentSetColor != NO_COLOR) { - setImageTintList(ColorStateList.valueOf(NotificationUtils.interpolateColors( - mCurrentSetColor, Color.WHITE, mDarkAmount))); + if (mMatrixColorFilter == null) { + mMatrix = new float[4 * 5]; + mMatrixColorFilter = new ColorMatrixColorFilter(mMatrix); + } + int color = NotificationUtils.interpolateColors( + mCurrentSetColor, Color.WHITE, mDarkAmount); + updateTintMatrix(mMatrix, color, DARK_ALPHA_BOOST * mDarkAmount); + mMatrixColorFilter.setColorMatrixArray(mMatrix); + setColorFilter(mMatrixColorFilter); + invalidate(); // setColorFilter only invalidates if the filter instance changed. } else { - setImageTintList(null); mDozer.updateGrayscale(this, mDarkAmount); } } + /** + * Updates {@param array} such that it represents a matrix that changes RGB to {@param color} + * and multiplies A with 1+{@param alphaBoost}. + */ + private static void updateTintMatrix(float[] array, int color, float alphaBoost) { + Arrays.fill(array, 0); + array[4] = Color.red(color); + array[9] = Color.green(color); + array[14] = Color.blue(color); + array[18] = 1 + alphaBoost; + } + public void setIconColor(int iconColor, boolean animate) { if (mIconColor != iconColor) { mIconColor = iconColor; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java index 2dc467f2add1..2283c130190c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java @@ -322,7 +322,7 @@ public class DozeScrimController { mHandler.removeCallbacks(mPulseOutExtended); if (DEBUG) Log.d(TAG, "Pulse out, mDozing=" + mDozing); if (!mDozing) return; - startScrimAnimation(true /* inFront */, mDozeParameters.getAlwaysOn() ? 0 : 1, + startScrimAnimation(true /* inFront */, 1, mDozeParameters.getPulseOutDuration(), Interpolators.ALPHA_IN, mPulseOutFinished); } @@ -336,6 +336,9 @@ public class DozeScrimController { // Signal that the pulse is all finished so we can turn the screen off now. pulseFinished(); + if (mDozeParameters.getAlwaysOn()) { + mScrimController.setDozeInFrontAlpha(0); + } } }; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java index bccc5d5d5fa1..c24129079d4f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java @@ -178,7 +178,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange : 0); setRestingAlpha( anyFingerprintIcon ? 1f : KeyguardAffordanceHelper.SWIPE_RESTING_ALPHA_AMOUNT); - setImageDrawable(icon); + setImageDrawable(icon, false); mHasFingerPrintIcon = anyFingerprintIcon; if (animation != null && isAnim) { animation.forceAnimationOnUI(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 12fa946fad90..d116bbf37eb8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -59,6 +59,7 @@ import com.android.systemui.statusbar.policy.KeyButtonDrawable; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.util.function.Consumer; public class NavigationBarView extends FrameLayout implements PluginListener<NavGesture> { final static boolean DEBUG = false; @@ -564,10 +565,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav getImeSwitchButton().setOnClickListener(mImeSwitcherClickListener); - DockedStackExistsListener.register(exists -> mHandler.post(() -> { - mDockedStackExists = exists; - updateRecentsIcon(); - })); + DockedStackExistsListener.register(mDockedListener); } void updateRotatedViews() { @@ -576,17 +574,15 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav mRotatedViews[Surface.ROTATION_270] = mRotatedViews[Surface.ROTATION_90] = findViewById(R.id.rot90); - mCurrentRotation = -1; - reorient(); + updateCurrentView(); } public boolean needsReorient(int rotation) { return mCurrentRotation != rotation; } - private boolean updateCurrentView() { + private void updateCurrentView() { final int rot = mDisplay.getRotation(); - if (rot == mCurrentRotation) return false; for (int i=0; i<4; i++) { mRotatedViews[i].setVisibility(View.GONE); } @@ -598,7 +594,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav } updateLayoutTransitionsEnabled(); mCurrentRotation = rot; - return true; } private void updateRecentsIcon() { @@ -611,14 +606,10 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav } public void reorient() { - if (!updateCurrentView()) { - return; - } + updateCurrentView(); mDeadZone = (DeadZone) mCurrentView.findViewById(R.id.deadzone); - if (getRootView() instanceof NavigationBarFrame) { - ((NavigationBarFrame) getRootView()).setDeadZone(mDeadZone); - } + ((NavigationBarFrame) getRootView()).setDeadZone(mDeadZone); mDeadZone.setDisplayRotation(mCurrentRotation); // force the low profile & disabled states into compliance @@ -652,7 +643,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav mVertical = newVertical; //Log.v(TAG, String.format("onSizeChanged: h=%d, w=%d, vert=%s", h, w, mVertical?"y":"n")); reorient(); - getHomeButton().setVertical(mVertical); notifyVerticalChangedListener(newVertical); } @@ -841,4 +831,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav void onVerticalChanged(boolean isVertical); } + private final Consumer<Boolean> mDockedListener = exists -> mHandler.post(() -> { + mDockedStackExists = exists; + updateRecentsIcon(); + }); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 0c62096cb931..cca6ae051217 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -232,6 +232,7 @@ public class NotificationPanelView extends PanelView implements private int mAmbientIndicationBottomPadding; private boolean mIsFullWidth; private float mDarkAmount; + private float mDarkAmountTarget; private LockscreenGestureLogger mLockscreenGestureLogger = new LockscreenGestureLogger(); private boolean mNoVisibleNotifications = true; private ValueAnimator mDarkAnimator; @@ -2590,8 +2591,13 @@ public class NotificationPanelView extends PanelView implements return; } if (mDarkAnimator != null && mDarkAnimator.isRunning()) { - mDarkAnimator.cancel(); + if (animate && mDarkAmountTarget == darkAmount) { + return; + } else { + mDarkAnimator.cancel(); + } } + mDarkAmountTarget = darkAmount; if (animate) { mDarkAnimator = ObjectAnimator.ofFloat(this, SET_DARK_AMOUNT_PROPERTY, darkAmount); mDarkAnimator.setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 62d4b736d93a..f9dd8bf5b202 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -25,6 +25,7 @@ import android.content.Context; import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Trace; import android.util.MathUtils; import android.view.View; import android.view.ViewGroup; @@ -36,6 +37,7 @@ import android.view.animation.PathInterpolator; import com.android.internal.colorextraction.ColorExtractor; import com.android.internal.colorextraction.ColorExtractor.GradientColors; import com.android.internal.colorextraction.ColorExtractor.OnColorsChangedListener; +import com.android.internal.graphics.ColorUtils; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.Dependency; import com.android.systemui.R; @@ -46,6 +48,8 @@ import com.android.systemui.statusbar.ScrimView; import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener; import com.android.systemui.statusbar.stack.ViewState; +import java.util.function.Consumer; + /** * Controls both the scrim behind the notifications and in front of the notifications (when a * security method gets shown). @@ -85,6 +89,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, private boolean mNeedsDrawableColorUpdate; protected float mScrimBehindAlpha; + protected float mScrimBehindAlphaResValue; protected float mScrimBehindAlphaKeyguard = SCRIM_BEHIND_ALPHA_KEYGUARD; protected float mScrimBehindAlphaUnlocking = SCRIM_BEHIND_ALPHA_UNLOCKING; @@ -125,17 +130,24 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, private boolean mWakingUpFromAodInProgress; /** Wake up from AOD transition is animating; need to reset when animation finishes */ private boolean mWakingUpFromAodAnimationRunning; + private boolean mScrimsVisble; + private final Consumer<Boolean> mScrimVisibleListener; public ScrimController(LightBarController lightBarController, ScrimView scrimBehind, - ScrimView scrimInFront, View headsUpScrim) { + ScrimView scrimInFront, View headsUpScrim, + Consumer<Boolean> scrimVisibleListener) { mScrimBehind = scrimBehind; mScrimInFront = scrimInFront; mHeadsUpScrim = headsUpScrim; + mScrimVisibleListener = scrimVisibleListener; final Context context = scrimBehind.getContext(); mUnlockMethodCache = UnlockMethodCache.getInstance(context); mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(context); mLightBarController = lightBarController; - mScrimBehindAlpha = context.getResources().getFloat(R.dimen.scrim_behind_alpha); + mScrimBehindAlphaResValue = context.getResources().getFloat(R.dimen.scrim_behind_alpha); + // Scrim alpha is initially set to the value on the resource but might be changed + // to make sure that text on top of it is legible. + mScrimBehindAlpha = mScrimBehindAlphaResValue; mColorExtractor = Dependency.get(SysuiColorExtractor.class); mColorExtractor.addOnColorsChangedListener(this); @@ -192,7 +204,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, scheduleUpdate(); } + /** Prepares the wakeUpFromAod animation (while turning on screen); Forces black scrims. */ public void prepareWakeUpFromAod() { + if (mWakingUpFromAodInProgress) { + return; + } mWakingUpFromAodInProgress = true; mWakingUpFromAodStarting = true; mAnimateChange = false; @@ -200,10 +216,12 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, onPreDraw(); } + /** Starts the wakeUpFromAod animation (once screen is on); animate to transparent scrims. */ public void wakeUpFromAod() { if (mWakeAndUnlocking || mAnimateKeyguardFadingOut) { // Wake and unlocking has a separate transition that must not be interfered with. mWakingUpFromAodStarting = false; + mWakingUpFromAodInProgress = false; return; } if (mWakingUpFromAodStarting) { @@ -218,6 +236,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, mWakeAndUnlocking = true; mAnimatingDozeUnlock = true; mWakingUpFromAodStarting = false; + mWakingUpFromAodInProgress = false; scheduleUpdate(); } @@ -328,21 +347,30 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, } protected void updateScrims() { - - // Make sure we have the right gradients + // Make sure we have the right gradients and their opacities will satisfy GAR. if (mNeedsDrawableColorUpdate) { mNeedsDrawableColorUpdate = false; + final GradientColors currentScrimColors; if (mKeyguardShowing) { // Always animate color changes if we're seeing the keyguard mScrimInFront.setColors(mLockColors, true /* animated */); mScrimBehind.setColors(mLockColors, true /* animated */); + currentScrimColors = mLockColors; } else { // Only animate scrim color if the scrim view is actually visible boolean animateScrimInFront = mScrimInFront.getViewAlpha() != 0; boolean animateScrimBehind = mScrimBehind.getViewAlpha() != 0; mScrimInFront.setColors(mSystemColors, animateScrimInFront); mScrimBehind.setColors(mSystemColors, animateScrimBehind); + currentScrimColors = mSystemColors; } + + // Calculate minimum scrim opacity for white or black text. + int textColor = currentScrimColors.supportsDarkText() ? Color.BLACK : Color.WHITE; + int mainColor = currentScrimColors.getMainColor(); + float minOpacity = ColorUtils.calculateMinimumBackgroundAlpha(textColor, mainColor, + 4.5f /* minimumContrast */) / 255f; + mScrimBehindAlpha = Math.max(mScrimBehindAlphaResValue, minOpacity); mLightBarController.setScrimColor(mScrimInFront.getColors()); } @@ -351,7 +379,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, setScrimBehindAlpha(0f); } else if (mWakeAndUnlocking) { // During wake and unlock, we first hide everything behind a black scrim, which then - // gets faded out from animateKeyguardFadingOut. + // gets faded out from animateKeyguardFadingOut. This must never be animated. + mAnimateChange = false; if (mDozing) { setScrimInFrontAlpha(0f); setScrimBehindAlpha(1f); @@ -359,13 +388,24 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, setScrimInFrontAlpha(1f); setScrimBehindAlpha(0f); } - } else if (!mKeyguardShowing && !mBouncerShowing) { + } else if (!mKeyguardShowing && !mBouncerShowing && !mWakingUpFromAodStarting) { updateScrimNormal(); setScrimInFrontAlpha(0); } else { updateScrimKeyguard(); } mAnimateChange = false; + dispatchScrimsVisible(); + } + + private void dispatchScrimsVisible() { + boolean scrimsVisible = mScrimBehind.getViewAlpha() > 0 || mScrimInFront.getViewAlpha() > 0; + + if (mScrimsVisble != scrimsVisible) { + mScrimsVisble = scrimsVisible; + + mScrimVisibleListener.accept(scrimsVisible); + } } private void updateScrimKeyguard() { @@ -457,6 +497,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, alpha = Math.max(0, Math.min(1.0f, alpha)); scrimView.setViewAlpha(alpha); + Trace.traceCounter(Trace.TRACE_TAG_APP, + scrim == mScrimInFront ? "front_scrim_alpha" : "back_scrim_alpha", + (int) (alpha * 255)); + int dozeTint = Color.TRANSPARENT; boolean dozing = mAnimatingDozeUnlock || mDozing; @@ -464,6 +508,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, if (dozing || frontScrimDozing && scrim == mScrimInFront) { dozeTint = Color.BLACK; } + Trace.traceCounter(Trace.TRACE_TAG_APP, + scrim == mScrimInFront ? "front_scrim_tint" : "back_scrim_tint", + dozeTint == Color.BLACK ? 1 : 0); + scrimView.setTint(dozeTint); } else { scrim.setAlpha(alpha1); @@ -477,6 +525,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, float alpha = (float) animation.getAnimatedValue(); setCurrentScrimAlpha(scrim, alpha); updateScrimColor(scrim); + dispatchScrimsVisible(); }); anim.setInterpolator(getInterpolator()); anim.setStartDelay(mAnimationDelay); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 61f91098f8d0..b08f0565a31a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -1132,7 +1132,12 @@ public class StatusBar extends SystemUI implements DemoMode, ScrimView scrimInFront = (ScrimView) mStatusBarWindow.findViewById(R.id.scrim_in_front); View headsUpScrim = mStatusBarWindow.findViewById(R.id.heads_up_scrim); mScrimController = SystemUIFactory.getInstance().createScrimController(mLightBarController, - scrimBehind, scrimInFront, headsUpScrim, mLockscreenWallpaper); + scrimBehind, scrimInFront, headsUpScrim, mLockscreenWallpaper, + scrimsVisible -> { + if (mStatusBarWindowManager != null) { + mStatusBarWindowManager.setScrimsVisible(scrimsVisible); + } + }); if (mScrimSrcModeEnabled) { Runnable runnable = new Runnable() { @Override @@ -3509,6 +3514,14 @@ public class StatusBar extends SystemUI implements DemoMode, pw.print (" "); mStackScroller.dump(fd, pw, args); } + pw.println(" Theme:"); + if (mOverlayManager == null) { + pw.println(" overlay manager not initialized!"); + } else { + pw.println(" dark overlay on: " + isUsingDarkTheme()); + } + final boolean lightWpTheme = mContext.getThemeResId() == R.style.Theme_SystemUI_Light; + pw.println(" light wallpaper theme: " + lightWpTheme); DozeLog.dump(pw); @@ -3712,7 +3725,6 @@ public class StatusBar extends SystemUI implements DemoMode, } } else if (Intent.ACTION_SCREEN_OFF.equals(action)) { - notifyHeadsUpScreenOff(); finishBarAnimations(); resetUserExpandedStates(); } @@ -4612,6 +4624,7 @@ public class StatusBar extends SystemUI implements DemoMode, } private void updateDozingState() { + Trace.traceCounter(Trace.TRACE_TAG_APP, "dozing", mDozing ? 1 : 0); Trace.beginSection("StatusBar#updateDozingState"); boolean animate = !mDozing && mDozeServiceHost.shouldAnimateWakeup(); mNotificationPanel.setDozing(mDozing, animate); @@ -4715,6 +4728,7 @@ public class StatusBar extends SystemUI implements DemoMode, // Make our window larger and the panel expanded. makeExpandedVisible(true); mNotificationPanel.expand(false /* animate */); + recomputeDisableFlags(false /* animate */); } private void instantCollapseNotificationPanel() { @@ -5152,6 +5166,7 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void onStartedGoingToSleep() { + notifyHeadsUpGoingToSleep(); dismissVolumeDialog(); } @@ -5161,6 +5176,9 @@ public class StatusBar extends SystemUI implements DemoMode, mStackScroller.setAnimationsEnabled(true); mVisualStabilityManager.setScreenOn(true); mNotificationPanel.setTouchDisabled(false); + + maybePrepareWakeUpFromAod(); + mDozeServiceHost.stopDozing(); updateVisibleToUser(); updateIsKeyguard(); @@ -5173,11 +5191,7 @@ public class StatusBar extends SystemUI implements DemoMode, mFalsingManager.onScreenTurningOn(); mNotificationPanel.onScreenTurningOn(); - int wakefulness = mWakefulnessLifecycle.getWakefulness(); - if (mDozing && (wakefulness == WAKEFULNESS_WAKING - || wakefulness == WAKEFULNESS_ASLEEP) && !isPulsing()) { - mScrimController.prepareWakeUpFromAod(); - } + maybePrepareWakeUpFromAod(); if (mLaunchCameraOnScreenTurningOn) { mNotificationPanel.launchCamera(false, mLastCameraLaunchSource); @@ -5206,6 +5220,14 @@ public class StatusBar extends SystemUI implements DemoMode, return mWakefulnessLifecycle.getWakefulness(); } + private void maybePrepareWakeUpFromAod() { + int wakefulness = mWakefulnessLifecycle.getWakefulness(); + if (mDozing && (wakefulness == WAKEFULNESS_WAKING + || wakefulness == WAKEFULNESS_ASLEEP) && !isPulsing()) { + mScrimController.prepareWakeUpFromAod(); + } + } + private void vibrateForCameraGesture() { // Make sure to pass -1 for repeat so VibratorService doesn't stop us when going to sleep. mVibrator.vibrate(mCameraLaunchGestureVibePattern, -1 /* repeat */); @@ -5362,6 +5384,7 @@ public class StatusBar extends SystemUI implements DemoMode, private final class DozeServiceHost implements DozeHost { private final ArrayList<Callback> mCallbacks = new ArrayList<Callback>(); private boolean mAnimateWakeup; + private boolean mIgnoreTouchWhilePulsing; @Override public String toString() { @@ -5432,6 +5455,7 @@ public class StatusBar extends SystemUI implements DemoMode, mStackScroller.setPulsing(pulsing); mNotificationPanel.setPulsing(pulsing != null); mVisualStabilityManager.setPulsing(pulsing != null); + mIgnoreTouchWhilePulsing = false; } }, reason); } @@ -5446,6 +5470,17 @@ public class StatusBar extends SystemUI implements DemoMode, } @Override + public void onIgnoreTouchWhilePulsing(boolean ignore) { + if (ignore != mIgnoreTouchWhilePulsing) { + DozeLog.tracePulseTouchDisabledByProx(mContext, ignore); + } + mIgnoreTouchWhilePulsing = ignore; + if (isDozing() && ignore) { + mStatusBarWindow.cancelCurrentTouch(); + } + } + + @Override public void dozeTimeTick() { mNotificationPanel.refreshTime(); } @@ -5493,6 +5528,11 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void setAnimateWakeup(boolean animateWakeup) { + if (mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_AWAKE + || mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_WAKING) { + // Too late to change the wakeup animation. + return; + } mAnimateWakeup = animateWakeup; } @@ -5537,6 +5577,10 @@ public class StatusBar extends SystemUI implements DemoMode, } } + public boolean shouldIgnoreTouch() { + return isDozing() && mDozeServiceHost.mIgnoreTouchWhilePulsing; + } + // Begin Extra BaseStatusBar methods. protected CommandQueue mCommandQueue; @@ -7239,7 +7283,7 @@ public class StatusBar extends SystemUI implements DemoMode, setAreThereNotifications(); } - protected void notifyHeadsUpScreenOff() { + protected void notifyHeadsUpGoingToSleep() { maybeEscalateHeadsUp(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java index 836b2ef7e149..d886508a7ffd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java @@ -186,7 +186,7 @@ public class StatusBarWindowManager implements RemoteInputController.Callback, D private boolean isExpanded(State state) { return !state.forceCollapsed && (state.isKeyguardShowingAndNotOccluded() || state.panelVisible || state.keyguardFadingAway || state.bouncerShowing - || state.headsUpShowing); + || state.headsUpShowing || state.scrimsVisible); } private void applyFitsSystemWindows(State state) { @@ -325,6 +325,11 @@ public class StatusBarWindowManager implements RemoteInputController.Callback, D apply(mCurrentState); } + public void setScrimsVisible(boolean scrimsVisible) { + mCurrentState.scrimsVisible = scrimsVisible; + apply(mCurrentState); + } + public void setHeadsUpShowing(boolean showing) { mCurrentState.headsUpShowing = showing; apply(mCurrentState); @@ -426,6 +431,7 @@ public class StatusBarWindowManager implements RemoteInputController.Callback, D boolean remoteInputActive; boolean forcePluginOpen; boolean dozing; + boolean scrimsVisible; private boolean isKeyguardShowingAndNotOccluded() { return keyguardShowing && !keyguardOccluded; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index adc33a144689..3d24bd035d34 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -249,6 +249,10 @@ public class StatusBarWindowView extends FrameLayout { @Override public boolean dispatchTouchEvent(MotionEvent ev) { boolean isDown = ev.getActionMasked() == MotionEvent.ACTION_DOWN; + boolean isCancel = ev.getActionMasked() == MotionEvent.ACTION_CANCEL; + if (!isCancel && mService.shouldIgnoreTouch()) { + return false; + } if (isDown && mNotificationPanel.isFullyCollapsed()) { mNotificationPanel.startExpandLatencyTracking(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java index d1e4963f18ec..c0a683734b8b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java @@ -97,8 +97,9 @@ public class AccessPointControllerImpl @Override public void scanForAccessPoints() { - if (DEBUG) Log.d(TAG, "scan!"); - mWifiTracker.forceScan(); + if (DEBUG) Log.d(TAG, "force update APs!"); + mWifiTracker.forceUpdate(); + fireAcccessPointsCallback(mWifiTracker.getAccessPoints()); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java index d652bde4f534..08ea5439f6f3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java @@ -228,7 +228,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface { setPressed(false); // Always send a release ourselves because it doesn't seem to be sent elsewhere // and it feels weird to sometimes get a release haptic and other times not. - if ((SystemClock.uptimeMillis() - mDownTime) > 100) { + if ((SystemClock.uptimeMillis() - mDownTime) > 150 && !mLongClicked) { performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY_RELEASE); } if (mCode != 0) { diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java index 73ec0a47cde5..ad47411554f7 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java @@ -913,11 +913,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa @Override public void onRemoteUpdate(Token token, String name, PlaybackInfo pi) { - if (!mRemoteStreams.containsKey(token)) { - mRemoteStreams.put(token, mNextStream); - if (D.BUG) Log.d(TAG, "onRemoteUpdate: " + name + " is stream " + mNextStream); - mNextStream++; - } + addStream(token, "onRemoteUpdate"); final int stream = mRemoteStreams.get(token); boolean changed = mState.states.indexOfKey(stream) < 0; final StreamState ss = streamStateW(stream); @@ -942,6 +938,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa @Override public void onRemoteVolumeChanged(Token token, int flags) { + addStream(token, "onRemoteVolumeChanged"); final int stream = mRemoteStreams.get(token); final boolean showUI = shouldShowUI(flags); boolean changed = updateActiveStreamW(stream); @@ -958,6 +955,11 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa @Override public void onRemoteRemoved(Token token) { + if (!mRemoteStreams.containsKey(token)) { + if (D.BUG) Log.d(TAG, "onRemoteRemoved: stream doesn't exist, " + + "aborting remote removed for token:" + token.toString()); + return; + } final int stream = mRemoteStreams.get(token); mState.states.remove(stream); if (mState.activeStream == stream) { @@ -983,6 +985,15 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa } return null; } + + private void addStream(Token token, String triggeringMethod) { + if (!mRemoteStreams.containsKey(token)) { + mRemoteStreams.put(token, mNextStream); + if (D.BUG) Log.d(TAG, triggeringMethod + ": added stream " + mNextStream + + " from token + "+ token.toString()); + mNextStream++; + } + } } public interface UserActivityListener { diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenRadioLayout.java b/packages/SystemUI/src/com/android/systemui/volume/ZenRadioLayout.java new file mode 100644 index 000000000000..5dbcd8a73aac --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenRadioLayout.java @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.volume; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; +import android.widget.LinearLayout; + +/** + * Specialized layout for zen mode that allows the radio buttons to reside within + * a RadioGroup, but also makes sure that all the heights off the radio buttons align + * with the corresponding content in the second child of this view. + */ +public class ZenRadioLayout extends LinearLayout { + + public ZenRadioLayout(Context context, AttributeSet attrs) { + super(context, attrs); + } + + /** + * Run 2 measurement passes, 1 that figures out the size of the content, and another + * that sets the size of the radio buttons to the heights of the corresponding content. + */ + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + + ViewGroup radioGroup = (ViewGroup) getChildAt(0); + ViewGroup radioContent = (ViewGroup) getChildAt(1); + int size = radioGroup.getChildCount(); + if (size != radioContent.getChildCount()) { + throw new IllegalStateException("Expected matching children"); + } + boolean hasChanges = false; + for (int i = 0; i < size; i++) { + View radio = radioGroup.getChildAt(i); + View content = radioContent.getChildAt(i); + if (radio.getLayoutParams().height != content.getMeasuredHeight()) { + hasChanges = true; + radio.getLayoutParams().height = content.getMeasuredHeight(); + } + } + // Measure again if any heights changed. + if (hasChanges) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeHostFake.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeHostFake.java index 641f2636c6ae..333e73dc10f4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeHostFake.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeHostFake.java @@ -87,6 +87,10 @@ class DozeHostFake implements DozeHost { } @Override + public void onIgnoreTouchWhilePulsing(boolean ignore) { + } + + @Override public void abortPulsing() { pulseAborted = true; } diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index c4e0e520b17c..5c4826f0d36a 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -4571,10 +4571,12 @@ public class ConnectivityService extends IConnectivityManager.Stub */ private void updateCapabilities( int oldScore, NetworkAgentInfo nai, NetworkCapabilities networkCapabilities) { - if (nai.everConnected && !nai.networkCapabilities.equalImmutableCapabilities( - networkCapabilities)) { - Slog.wtf(TAG, "BUG: " + nai + " changed immutable capabilities: " - + nai.networkCapabilities + " -> " + networkCapabilities); + // Sanity check: a NetworkAgent should not change its static capabilities or parameters. + if (nai.everConnected) { + String diff = nai.networkCapabilities.describeImmutableDifferences(networkCapabilities); + if (!TextUtils.isEmpty(diff)) { + Slog.wtf(TAG, "BUG: " + nai + " changed immutable capabilities:" + diff); + } } // Don't modify caller's NetworkCapabilities. diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index c09947c402fb..66ec520340ae 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -41,9 +41,7 @@ import static android.content.Intent.CATEGORY_HOME; import static android.content.Intent.CATEGORY_LAUNCHER; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static android.content.Intent.FLAG_ACTIVITY_NO_HISTORY; -import static android.content.pm.ActivityInfo.CONFIG_APP_BOUNDS; import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION; -import static android.content.pm.ActivityInfo.CONFIG_ROTATION; import static android.content.pm.ActivityInfo.CONFIG_SCREEN_LAYOUT; import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE; import static android.content.pm.ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE; @@ -2598,15 +2596,6 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo changes &= ~CONFIG_SMALLEST_SCREEN_SIZE; } } - // We don't want rotation to cause relaunches. - if ((changes & CONFIG_ROTATION) != 0) { - changes &= ~CONFIG_ROTATION; - } - - // We don't want app bound changes to cause relaunches. - if ((changes & CONFIG_APP_BOUNDS) != 0) { - changes &= ~CONFIG_APP_BOUNDS; - } return changes; } diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index 064ca58dee96..da196e2c7902 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -802,7 +802,7 @@ public final class BroadcastQueue { IPackageManager pm = AppGlobals.getPackageManager(); for (int i = perms.length-1; i >= 0; i--) { try { - PermissionInfo pi = pm.getPermissionInfo(perms[i], 0); + PermissionInfo pi = pm.getPermissionInfo(perms[i], "android", 0); if ((pi.protectionLevel & (PermissionInfo.PROTECTION_MASK_BASE | PermissionInfo.PROTECTION_FLAG_PRIVILEGED)) != PermissionInfo.PROTECTION_SIGNATURE) { diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java index 703e50a08855..0d935dba22c6 100644 --- a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java +++ b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java @@ -142,6 +142,18 @@ public class NetworkNotificationManager { extraInfo = null; } + // Clear any previous notification with lower priority, otherwise return. http://b/63676954. + // A new SIGN_IN notification with a new intent should override any existing one. + final int previousEventId = mNotificationTypeMap.get(id); + final NotificationType previousNotifyType = NotificationType.getFromId(previousEventId); + if (priority(previousNotifyType) > priority(notifyType)) { + Slog.d(TAG, String.format( + "ignoring notification %s for network %s with existing notification %s", + notifyType, id, previousNotifyType)); + return; + } + clearNotification(id); + if (DBG) { Slog.d(TAG, String.format( "showNotification tag=%s event=%s transport=%s extraInfo=%s highPrioriy=%s", @@ -274,4 +286,22 @@ public class NetworkNotificationManager { NotificationType t = NotificationType.getFromId(eventId); return (t != null) ? t.name() : "UNKNOWN"; } + + private static int priority(NotificationType t) { + if (t == null) { + return 0; + } + switch (t) { + case SIGN_IN: + return 4; + case NO_INTERNET: + return 3; + case NETWORK_SWITCH: + return 2; + case LOST_INTERNET: + return 1; + default: + return 0; + } + } } diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index cbd02acd7d86..6e6e7d112d83 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -165,11 +165,17 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // a stylish color fade animation instead. private boolean mColorFadeFadesConfig; - // True if we need to transition to the off state when coming out of a doze state. - // Some display hardware will show artifacts (flickers, etc) when transitioning from a doze - // to a fully on state. In order to hide these, we first transition to off to let the system - // animate the screen on as it normally would, which is a much smoother experience. - private boolean mTransitionOffAfterDozeConfig; + // True if we need to fake a transition to off when coming out of a doze state. + // Some display hardware will blank itself when coming out of doze in order to hide + // artifacts. For these displays we fake a transition into OFF so that policy can appropriately + // blank itself and begin an appropriate power on animation. + private boolean mDisplayBlanksAfterDozeConfig; + + // True if there are only buckets of brightness values when the display is in the doze state, + // rather than a full range of values. If this is true, then we'll avoid animating the screen + // brightness since it'd likely be multiple jarring brightness transitions instead of just one + // to reach the final state. + private boolean mBrightnessBucketsInDozeConfig; // The pending power request. // Initially null until the first call to requestPowerState. @@ -416,8 +422,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mColorFadeFadesConfig = resources.getBoolean( com.android.internal.R.bool.config_animateScreenLights); - mTransitionOffAfterDozeConfig = resources.getBoolean( - com.android.internal.R.bool.config_displayTransitionOffAfterDoze); + mDisplayBlanksAfterDozeConfig = resources.getBoolean( + com.android.internal.R.bool.config_displayBlanksAfterDoze); + + mBrightnessBucketsInDozeConfig = resources.getBoolean( + com.android.internal.R.bool.config_displayBrightnessBucketsInDoze); if (!DEBUG_PRETEND_PROXIMITY_SENSOR_ABSENT) { mProximitySensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY); @@ -780,7 +789,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call boolean wasOrWillBeInVr = (state == Display.STATE_VR || oldState == Display.STATE_VR); if ((state == Display.STATE_ON && mSkipRampState == RAMP_STATE_SKIP_NONE - || state == Display.STATE_DOZE) + || state == Display.STATE_DOZE && !mBrightnessBucketsInDozeConfig) && !wasOrWillBeInVr) { animateScreenBrightness(brightness, slowChange ? mBrightnessRampRateSlow : mBrightnessRampRateFast); @@ -803,7 +812,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // Notify policy about screen turned on. if (ready && state != Display.STATE_OFF && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) { - mReportedScreenStateToPolicy = REPORTED_TO_POLICY_SCREEN_ON; + setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON); mWindowManagerPolicy.screenTurnedOn(); } @@ -886,10 +895,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call } private boolean setScreenState(int state) { - return setScreenState(state, false /*force*/); + return setScreenState(state, false /*reportOnly*/); } - private boolean setScreenState(int state, boolean force) { + private boolean setScreenState(int state, boolean reportOnly) { final boolean isOff = (state == Display.STATE_OFF); if (mPowerState.getScreenState() != state) { @@ -897,32 +906,24 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // actually turn the screen off. if (isOff && !mScreenOffBecauseOfProximity) { if (mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_ON) { - mReportedScreenStateToPolicy = REPORTED_TO_POLICY_SCREEN_TURNING_OFF; + setReportedScreenState(REPORTED_TO_POLICY_SCREEN_TURNING_OFF); blockScreenOff(); mWindowManagerPolicy.screenTurningOff(mPendingScreenOffUnblocker); - if (force) { - // If we're forcing the power state transition then immediately - // unblock the screen off event. This keeps the lifecycle consistent, - // so WindowManagerPolicy will always see screenTurningOff before - // screenTurnedOff, but we don't actually block on them for the state - // change. - unblockScreenOff(); - } else { - return false; - } + unblockScreenOff(); } else if (mPendingScreenOffUnblocker != null) { // Abort doing the state change until screen off is unblocked. return false; } } - mPowerState.setScreenState(state); - - // Tell battery stats about the transition. - try { - mBatteryStats.noteScreenState(state); - } catch (RemoteException ex) { - // same process + if (!reportOnly) { + mPowerState.setScreenState(state); + // Tell battery stats about the transition. + try { + mBatteryStats.noteScreenState(state); + } catch (RemoteException ex) { + // same process + } } } @@ -934,7 +935,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // finished drawing underneath. if (isOff && mReportedScreenStateToPolicy != REPORTED_TO_POLICY_SCREEN_OFF && !mScreenOffBecauseOfProximity) { - mReportedScreenStateToPolicy = REPORTED_TO_POLICY_SCREEN_OFF; + setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF); unblockScreenOn(); mWindowManagerPolicy.screenTurnedOff(); } else if (!isOff @@ -944,10 +945,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // Complete the full state transition on -> turningOff -> off. unblockScreenOff(); mWindowManagerPolicy.screenTurnedOff(); - mReportedScreenStateToPolicy = REPORTED_TO_POLICY_SCREEN_OFF; + setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF); } if (!isOff && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_OFF) { - mReportedScreenStateToPolicy = REPORTED_TO_POLICY_SCREEN_TURNING_ON; + setReportedScreenState(REPORTED_TO_POLICY_SCREEN_TURNING_ON); if (mPowerState.getColorFadeLevel() == 0.0f) { blockScreenOn(); } else { @@ -960,6 +961,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call return mPendingScreenOnUnblocker == null; } + private void setReportedScreenState(int state) { + Trace.traceCounter(Trace.TRACE_TAG_POWER, "ReportedScreenStateToPolicy", state); + mReportedScreenStateToPolicy = state; + } + private int clampScreenBrightness(int value) { return MathUtils.constrain( value, mScreenBrightnessRangeMinimum, mScreenBrightnessRangeMaximum); @@ -989,15 +995,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mPendingScreenOff = false; } - if (mTransitionOffAfterDozeConfig && - Display.isDozeState(mPowerState.getScreenState()) + if (mDisplayBlanksAfterDozeConfig + && Display.isDozeState(mPowerState.getScreenState()) && !Display.isDozeState(target)) { - setScreenState(Display.STATE_OFF, true /*force*/); // Skip the screen off animation and add a black surface to hide the - // contents of the screen. This will also trigger another power state update so that we - // end up converging on the target state. + // contents of the screen. + mPowerState.prepareColorFade(mContext, + mColorFadeFadesConfig ? ColorFade.MODE_FADE : ColorFade.MODE_WARM_UP); mColorFadeOffAnimator.end(); - return; + // Some display hardware will blank itself on the transition between doze and non-doze + // but still on display states. In this case we want to report to policy that the + // display has turned off so it can prepare the appropriate power on animation, but we + // don't want to actually transition to the fully off state since that takes + // significantly longer to transition from. + setScreenState(Display.STATE_OFF, target != Display.STATE_OFF /*reportOnly*/); } // If we were in the process of turning off the screen but didn't quite @@ -1295,7 +1306,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call pw.println(" mAppliedLowPower=" + mAppliedLowPower); pw.println(" mPendingScreenOnUnblocker=" + mPendingScreenOnUnblocker); pw.println(" mPendingScreenOff=" + mPendingScreenOff); - pw.println(" mReportedToPolicy=" + reportedToPolicyToString(mReportedScreenStateToPolicy)); + pw.println(" mReportedToPolicy=" + + reportedToPolicyToString(mReportedScreenStateToPolicy)); pw.println(" mScreenBrightnessRampAnimator.isAnimating()=" + mScreenBrightnessRampAnimator.isAnimating()); diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java index e2fd0acd3887..efa4a1d4f501 100644 --- a/services/core/java/com/android/server/display/DisplayPowerState.java +++ b/services/core/java/com/android/server/display/DisplayPowerState.java @@ -20,6 +20,7 @@ import android.content.Context; import android.os.Handler; import android.os.Looper; import android.os.PowerManager; +import android.os.Trace; import android.util.FloatProperty; import android.util.IntProperty; import android.util.Slog; @@ -49,6 +50,7 @@ final class DisplayPowerState { private static final String TAG = "DisplayPowerState"; private static boolean DEBUG = false; + private static String COUNTER_COLOR_FADE = "ColorFadeLevel"; private final Handler mHandler; private final Choreographer mChoreographer; @@ -190,6 +192,7 @@ final class DisplayPowerState { * Dismisses the color fade surface. */ public void dismissColorFade() { + Trace.traceCounter(Trace.TRACE_TAG_POWER, COUNTER_COLOR_FADE, 100); mColorFade.dismiss(); mColorFadePrepared = false; mColorFadeReady = true; @@ -328,6 +331,8 @@ final class DisplayPowerState { if (mColorFadePrepared) { mColorFade.draw(mColorFadeLevel); + Trace.traceCounter(Trace.TRACE_TAG_POWER, + COUNTER_COLOR_FADE, Math.round(mColorFadeLevel * 100)); } mColorFadeReady = true; diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index cdc973b079ea..ce5f430c148f 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -515,6 +515,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { try { final int mode = getPowerModeForState(state); SurfaceControl.setDisplayPowerMode(token, mode); + Trace.traceCounter(Trace.TRACE_TAG_POWER, "DisplayPowerMode", mode); } finally { Trace.traceEnd(Trace.TRACE_TAG_POWER); } @@ -530,6 +531,8 @@ final class LocalDisplayAdapter extends DisplayAdapter { + "id=" + displayId + ", brightness=" + brightness + ")"); try { mBacklight.setBrightness(brightness); + Trace.traceCounter(Trace.TRACE_TAG_POWER, + "DisplayBrightness", brightness); } finally { Trace.traceEnd(Trace.TRACE_TAG_POWER); } diff --git a/services/core/java/com/android/server/display/NightDisplayService.java b/services/core/java/com/android/server/display/NightDisplayService.java index b124a392f21c..026921deea55 100644 --- a/services/core/java/com/android/server/display/NightDisplayService.java +++ b/services/core/java/com/android/server/display/NightDisplayService.java @@ -119,9 +119,9 @@ public final class NightDisplayService extends SystemService * </table> */ private static final float[] mColorTempCoefficients = new float[] { - 0.0f, -0.0000000871377221f, -0.0000000753960646f, - 0.0f, 0.000750142586f, .000725567598f, - 1.0f, -.830130222f, -1.15546312f + 0.0f, -0.000000014365268757f, -0.000000000910931179f, + 0.0f, 0.000255092801250106f, 0.000207598323269139f, + 1.0f, -0.064156942434907716f, -0.349361641294833436f }; private int mCurrentUser = UserHandle.USER_NULL; diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 1242daa48bee..1eabac155fbd 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3997,18 +3997,67 @@ public class PackageManagerService extends IPackageManager.Stub } @Override - public PermissionInfo getPermissionInfo(String name, int flags) { - if (getInstantAppPackageName(Binder.getCallingUid()) != null) { + public PermissionInfo getPermissionInfo(String name, String packageName, int flags) { + final int callingUid = Binder.getCallingUid(); + if (getInstantAppPackageName(callingUid) != null) { return null; } // reader synchronized (mPackages) { final BasePermission p = mSettings.mPermissions.get(name); - if (p != null) { - return generatePermissionInfo(p, flags); + if (p == null) { + return null; } - return null; + // If the caller is an app that targets pre 26 SDK drop protection flags. + final PermissionInfo permissionInfo = generatePermissionInfo(p, flags); + if (permissionInfo != null) { + permissionInfo.protectionLevel = adjustPermissionProtectionFlagsLPr( + permissionInfo.protectionLevel, packageName, callingUid); + } + return permissionInfo; + } + } + + private int adjustPermissionProtectionFlagsLPr(int protectionLevel, + String packageName, int uid) { + // Signature permission flags area always reported + final int protectionLevelMasked = protectionLevel + & (PermissionInfo.PROTECTION_NORMAL + | PermissionInfo.PROTECTION_DANGEROUS + | PermissionInfo.PROTECTION_SIGNATURE); + if (protectionLevelMasked == PermissionInfo.PROTECTION_SIGNATURE) { + return protectionLevel; + } + + // System sees all flags. + final int appId = UserHandle.getAppId(uid); + if (appId == Process.SYSTEM_UID || appId == Process.ROOT_UID + || appId == Process.SHELL_UID) { + return protectionLevel; + } + + // Normalize package name to handle renamed packages and static libs + packageName = resolveInternalPackageNameLPr(packageName, + PackageManager.VERSION_CODE_HIGHEST); + + // Apps that target O see flags for all protection levels. + final PackageSetting ps = mSettings.mPackages.get(packageName); + if (ps == null) { + return protectionLevel; } + if (ps.appId != appId) { + return protectionLevel; + } + + final PackageParser.Package pkg = mPackages.get(packageName); + if (pkg == null) { + return protectionLevel; + } + if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.O) { + return protectionLevelMasked; + } + + return protectionLevel; } @Override diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index 63890bf346ef..c4ff455fa3d3 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -1311,7 +1311,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree // going to the bottom. Allowing closing {@link AppWindowToken} to participate can lead to // an Activity in another task being started in the wrong orientation during the transition. if (!(sendingToBottom || mService.mClosingApps.contains(this)) - && (isVisible() || mService.mOpeningApps.contains(this))) { + && (isVisible() || mService.mOpeningApps.contains(this) || isOnTop())) { return mOrientation; } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index a37b2e56b0d0..4d77d40584c1 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -1183,7 +1183,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo final int dh = displayInfo.logicalHeight; config.orientation = (dw <= dh) ? Configuration.ORIENTATION_PORTRAIT : Configuration.ORIENTATION_LANDSCAPE; - config.setRotation(displayInfo.rotation); config.screenWidthDp = (int)(mService.mPolicy.getConfigDisplayWidth(dw, dh, displayInfo.rotation, @@ -3309,6 +3308,13 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo setLayoutNeeded(); } + + @Override + boolean isOnTop() { + // Considered always on top + return true; + } + @Override void positionChildAt(int position, TaskStack child, boolean includingParents) { if (StackId.isAlwaysOnTop(child.mStackId) && position != POSITION_TOP) { diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 600bc5c47062..3df73d7c627a 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -472,6 +472,13 @@ class WindowContainer<E extends WindowContainer> implements Comparable<WindowCon return false; } + /** +a * Returns whether this child is on top of the window hierarchy. + */ + boolean isOnTop() { + return getParent().getTopChild() == this && getParent().isOnTop(); + } + /** Returns the top child container. */ E getTopChild() { return mChildren.peekLast(); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 5bd5e2187018..2caac7a2be3f 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -6003,9 +6003,9 @@ public class WindowManagerService extends IWindowManager.Stub return; } - if (!displayContent.isReady() || !mPolicy.isScreenOn()) { - // No need to freeze the screen before the display is ready, system is ready, or if - // the screen is off. + if (!displayContent.isReady() || !mPolicy.isScreenOn() || !okToAnimate()) { + // No need to freeze the screen before the display is ready, if the screen is off, + // or we can't currently animate. return; } diff --git a/services/tests/servicestests/src/com/android/server/wm/AppBoundsTests.java b/services/tests/servicestests/src/com/android/server/wm/AppBoundsTests.java index f7ea0c47b874..432cfc7a22ee 100644 --- a/services/tests/servicestests/src/com/android/server/wm/AppBoundsTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/AppBoundsTests.java @@ -57,9 +57,10 @@ public class AppBoundsTests extends WindowTestsBase { final Configuration config = new Configuration(); final Configuration config2 = new Configuration(); config.appBounds = new Rect(0, 1, 1, 0); - config2.appBounds = new Rect(0, 2, 2, 0); + config2.appBounds = new Rect(1, 2, 2, 1); - assertEquals(ActivityInfo.CONFIG_APP_BOUNDS, config.diff(config2)); + assertEquals(ActivityInfo.CONFIG_SCREEN_SIZE, config.diff(config2)); + assertEquals(0, config.diffPublicOnly(config2)); } /** diff --git a/services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java b/services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java index 36083bf7a71e..b09601e698f9 100644 --- a/services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java @@ -185,6 +185,11 @@ public class AppWindowTokenTests extends WindowTestsBase { assertEquals(SCREEN_ORIENTATION_UNSET, token.getOrientation()); // Can specify orientation if the current orientation candidate is orientation behind. assertEquals(SCREEN_ORIENTATION_LANDSCAPE, token.getOrientation(SCREEN_ORIENTATION_BEHIND)); + + token.sendingToBottom = false; + token.setIsOnTop(true); + // Allow for token to provide orientation hidden if on top and not being sent to bottom. + assertEquals(SCREEN_ORIENTATION_LANDSCAPE, token.getOrientation()); } @Test diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowTestUtils.java b/services/tests/servicestests/src/com/android/server/wm/WindowTestUtils.java index b83532cfa831..7ff1110e00f7 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowTestUtils.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowTestUtils.java @@ -89,6 +89,7 @@ public class WindowTestUtils { /** Used so we can gain access to some protected members of the {@link AppWindowToken} class. */ public static class TestAppWindowToken extends AppWindowToken { + boolean mOnTop = false; TestAppWindowToken(DisplayContent dc) { super(dc.mService, new IApplicationToken.Stub() {}, false, dc, true /* fillsParent */, @@ -125,6 +126,15 @@ public class WindowTestUtils { int positionInParent() { return getParent().mChildren.indexOf(this); } + + void setIsOnTop(boolean onTop) { + mOnTop = onTop; + } + + @Override + boolean isOnTop() { + return mOnTop; + } } /* Used so we can gain access to some protected members of the {@link WindowToken} class */ diff --git a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl index 831ab12fc3ea..748092d2a3bd 100644 --- a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl @@ -29,7 +29,7 @@ import com.android.ims.ImsSuppServiceNotification; * by having one of the methods called on the {@link IImsCallSessionListener}. * {@hide} */ -interface IImsCallSessionListener { +oneway interface IImsCallSessionListener { /** * Notifies the result of the basic session operation (setup / terminate). */ diff --git a/telephony/java/com/android/ims/internal/IImsEcbmListener.aidl b/telephony/java/com/android/ims/internal/IImsEcbmListener.aidl index d866ecbdd317..6066f4915375 100644 --- a/telephony/java/com/android/ims/internal/IImsEcbmListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsEcbmListener.aidl @@ -35,7 +35,7 @@ package com.android.ims.internal; * * {@hide} */ -interface IImsEcbmListener { +oneway interface IImsEcbmListener { /** * Notifies the application when the device enters Emergency Callback Mode. */ diff --git a/telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl b/telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl index 27b8fa174171..16219671cea5 100644 --- a/telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl @@ -23,7 +23,7 @@ import com.android.ims.ImsExternalCallState; * * {@hide} */ -interface IImsExternalCallStateListener { +oneway interface IImsExternalCallStateListener { /** * Notifies client when Dialog Event Package update is received diff --git a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl index 98f8e0a207c2..15f872603bfb 100644 --- a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl @@ -26,7 +26,7 @@ import android.net.Uri; * * {@hide} */ -interface IImsRegistrationListener { +oneway interface IImsRegistrationListener { /** * Notifies the application when the device is connected to the IMS network. * diff --git a/telephony/java/com/android/ims/internal/IImsUtListener.aidl b/telephony/java/com/android/ims/internal/IImsUtListener.aidl index 641663109fad..300273a7bd38 100644 --- a/telephony/java/com/android/ims/internal/IImsUtListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsUtListener.aidl @@ -26,7 +26,7 @@ import com.android.ims.ImsReasonInfo; /** * {@hide} */ -interface IImsUtListener { +oneway interface IImsUtListener { /** * Notifies the result of the supplementary service configuration udpate. */ diff --git a/tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java b/tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java new file mode 100644 index 000000000000..73df9a09ea75 --- /dev/null +++ b/tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.internal.graphics; + +import android.graphics.Color; +import android.support.test.filters.SmallTest; + +import org.junit.Test; + +import static org.junit.Assert.assertTrue; + +@SmallTest +public class ColorUtilsTest { + + @Test + public void calculateMinimumBackgroundAlpha_satisfiestContrast() { + + int alpha = ColorUtils.calculateMinimumBackgroundAlpha(Color.WHITE, Color.BLACK, 4.5f); + assertTrue("Alpha doesn't need to be 255 to satisfy contrast", alpha < 255); + + int worstCase = ColorUtils.blendARGB(Color.WHITE, Color.BLACK, alpha/255f); + worstCase = ColorUtils.setAlphaComponent(worstCase, 255); + double contrast = ColorUtils.calculateContrast(Color.WHITE, worstCase); + assertTrue("Blended color should satisfy contrast", contrast >= 4.5); + + } +} diff --git a/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java b/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java index f201bc7a7d3c..911347c13478 100644 --- a/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java +++ b/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java @@ -16,6 +16,16 @@ package com.android.server.connectivity; +import static com.android.server.connectivity.NetworkNotificationManager.NotificationType.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.app.Notification; import android.app.NotificationManager; import android.content.Context; @@ -37,15 +47,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import static com.android.server.connectivity.NetworkNotificationManager.NotificationType.*; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - public class NetworkNotificationManagerTest extends TestCase { static final NetworkCapabilities CELL_CAPABILITIES = new NetworkCapabilities(); @@ -140,4 +141,47 @@ public class NetworkNotificationManagerTest extends TestCase { verify(mNotificationManager, never()).notifyAsUser(any(), anyInt(), any(), any()); } + + @SmallTest + public void testDuplicatedNotificationsNoInternetThenSignIn() { + final int id = 101; + final String tag = NetworkNotificationManager.tagFor(id); + + // Show first NO_INTERNET + mManager.showNotification(id, NO_INTERNET, mWifiNai, mCellNai, null, false); + verify(mNotificationManager, times(1)) + .notifyAsUser(eq(tag), eq(NO_INTERNET.eventId), any(), any()); + + // Captive portal detection triggers SIGN_IN a bit later, clearing the previous NO_INTERNET + mManager.showNotification(id, SIGN_IN, mWifiNai, mCellNai, null, false); + verify(mNotificationManager, times(1)) + .cancelAsUser(eq(tag), eq(NO_INTERNET.eventId), any()); + verify(mNotificationManager, times(1)) + .notifyAsUser(eq(tag), eq(SIGN_IN.eventId), any(), any()); + + // Network disconnects + mManager.clearNotification(id); + verify(mNotificationManager, times(1)).cancelAsUser(eq(tag), eq(SIGN_IN.eventId), any()); + } + + @SmallTest + public void testDuplicatedNotificationsSignInThenNoInternet() { + final int id = 101; + final String tag = NetworkNotificationManager.tagFor(id); + + // Show first SIGN_IN + mManager.showNotification(id, SIGN_IN, mWifiNai, mCellNai, null, false); + verify(mNotificationManager, times(1)) + .notifyAsUser(eq(tag), eq(SIGN_IN.eventId), any(), any()); + reset(mNotificationManager); + + // NO_INTERNET arrives after, but is ignored. + mManager.showNotification(id, NO_INTERNET, mWifiNai, mCellNai, null, false); + verify(mNotificationManager, never()).cancelAsUser(any(), anyInt(), any()); + verify(mNotificationManager, never()).notifyAsUser(any(), anyInt(), any(), any()); + + // Network disconnects + mManager.clearNotification(id); + verify(mNotificationManager, times(1)).cancelAsUser(eq(tag), eq(SIGN_IN.eventId), any()); + } } diff --git a/tools/aapt2/flatten/XmlFlattener.cpp b/tools/aapt2/flatten/XmlFlattener.cpp index 0711749d0378..bfebedef2a1e 100644 --- a/tools/aapt2/flatten/XmlFlattener.cpp +++ b/tools/aapt2/flatten/XmlFlattener.cpp @@ -257,9 +257,11 @@ class XmlFlattenerVisitor : public xml::Visitor { // Process plain strings to make sure they get properly escaped. StringPiece raw_value = xml_attr->value; - util::StringBuilder str_builder; + + util::StringBuilder str_builder(true /*preserve_spaces*/); + str_builder.Append(xml_attr->value); + if (!options_.keep_raw_values) { - str_builder.Append(xml_attr->value); raw_value = str_builder.ToString(); } diff --git a/tools/aapt2/flatten/XmlFlattener_test.cpp b/tools/aapt2/flatten/XmlFlattener_test.cpp index f1e903f2151e..a57e3178accd 100644 --- a/tools/aapt2/flatten/XmlFlattener_test.cpp +++ b/tools/aapt2/flatten/XmlFlattener_test.cpp @@ -23,7 +23,13 @@ #include "util/BigBuffer.h" #include "util/Util.h" -using android::StringPiece16; +using ::aapt::test::StrEq; +using ::android::StringPiece16; +using ::testing::Eq; +using ::testing::Ge; +using ::testing::IsNull; +using ::testing::Ne; +using ::testing::NotNull; namespace aapt { @@ -72,163 +78,138 @@ class XmlFlattenerTest : public ::testing::Test { }; TEST_F(XmlFlattenerTest, FlattenXmlWithNoCompiledAttributes) { - std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"EOF( - <View xmlns:test="http://com.test" - attr="hey"> - <Layout test:hello="hi" /> - <Layout>Some text\\</Layout> - </View>)EOF"); + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"( + <View xmlns:test="http://com.test" attr="hey"> + <Layout test:hello="hi" /> + <Layout>Some text\\</Layout> + </View>)"); android::ResXMLTree tree; ASSERT_TRUE(Flatten(doc.get(), &tree)); - - ASSERT_EQ(android::ResXMLTree::START_NAMESPACE, tree.next()); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::START_NAMESPACE)); size_t len; - const char16_t* namespace_prefix = tree.getNamespacePrefix(&len); - EXPECT_EQ(StringPiece16(u"test"), StringPiece16(namespace_prefix, len)); - - const char16_t* namespace_uri = tree.getNamespaceUri(&len); - ASSERT_EQ(StringPiece16(u"http://com.test"), StringPiece16(namespace_uri, len)); - - ASSERT_EQ(android::ResXMLTree::START_TAG, tree.next()); - - ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); - const char16_t* tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(u"View"), StringPiece16(tag_name, len)); - - ASSERT_EQ(1u, tree.getAttributeCount()); - ASSERT_EQ(nullptr, tree.getAttributeNamespace(0, &len)); - const char16_t* attr_name = tree.getAttributeName(0, &len); - EXPECT_EQ(StringPiece16(u"attr"), StringPiece16(attr_name, len)); - - EXPECT_EQ(0, tree.indexOfAttribute(nullptr, 0, u"attr", StringPiece16(u"attr").size())); + EXPECT_THAT(tree.getNamespacePrefix(&len), StrEq(u"test")); + EXPECT_THAT(tree.getNamespaceUri(&len), StrEq(u"http://com.test")); - ASSERT_EQ(android::ResXMLTree::START_TAG, tree.next()); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::START_TAG)); + EXPECT_THAT(tree.getElementNamespace(&len), IsNull()); + EXPECT_THAT(tree.getElementName(&len), StrEq(u"View")); - ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); - tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(u"Layout"), StringPiece16(tag_name, len)); + ASSERT_THAT(tree.getAttributeCount(), Eq(1u)); + EXPECT_THAT(tree.getAttributeNamespace(0, &len), IsNull()); + EXPECT_THAT(tree.getAttributeName(0, &len), StrEq(u"attr")); - ASSERT_EQ(1u, tree.getAttributeCount()); - const char16_t* attr_namespace = tree.getAttributeNamespace(0, &len); - EXPECT_EQ(StringPiece16(u"http://com.test"), StringPiece16(attr_namespace, len)); + const StringPiece16 kAttr(u"attr"); + EXPECT_THAT(tree.indexOfAttribute(nullptr, 0, kAttr.data(), kAttr.size()), Eq(0)); - attr_name = tree.getAttributeName(0, &len); - EXPECT_EQ(StringPiece16(u"hello"), StringPiece16(attr_name, len)); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::START_TAG)); + EXPECT_THAT(tree.getElementNamespace(&len), IsNull()); + EXPECT_THAT(tree.getElementName(&len), StrEq(u"Layout")); - ASSERT_EQ(android::ResXMLTree::END_TAG, tree.next()); - ASSERT_EQ(android::ResXMLTree::START_TAG, tree.next()); + ASSERT_THAT(tree.getAttributeCount(), Eq(1u)); + EXPECT_THAT(tree.getAttributeNamespace(0, &len), StrEq(u"http://com.test")); + EXPECT_THAT(tree.getAttributeName(0, &len), StrEq(u"hello")); - ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); - tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(u"Layout"), StringPiece16(tag_name, len)); - ASSERT_EQ(0u, tree.getAttributeCount()); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::END_TAG)); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::START_TAG)); - ASSERT_EQ(android::ResXMLTree::TEXT, tree.next()); - const char16_t* text = tree.getText(&len); - EXPECT_EQ(StringPiece16(u"Some text\\"), StringPiece16(text, len)); + EXPECT_THAT(tree.getElementNamespace(&len), IsNull()); + EXPECT_THAT(tree.getElementName(&len), StrEq(u"Layout")); + ASSERT_THAT(tree.getAttributeCount(), Eq(0u)); - ASSERT_EQ(android::ResXMLTree::END_TAG, tree.next()); - ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); - tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(u"Layout"), StringPiece16(tag_name, len)); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::TEXT)); + EXPECT_THAT(tree.getText(&len), StrEq(u"Some text\\")); - ASSERT_EQ(android::ResXMLTree::END_TAG, tree.next()); - ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); - tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(u"View"), StringPiece16(tag_name, len)); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::END_TAG)); + EXPECT_THAT(tree.getElementNamespace(&len), IsNull()); + EXPECT_THAT(tree.getElementName(&len), StrEq(u"Layout")); - ASSERT_EQ(android::ResXMLTree::END_NAMESPACE, tree.next()); - namespace_prefix = tree.getNamespacePrefix(&len); - EXPECT_EQ(StringPiece16(u"test"), StringPiece16(namespace_prefix, len)); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::END_TAG)); + EXPECT_THAT(tree.getElementNamespace(&len), IsNull()); + EXPECT_THAT(tree.getElementName(&len), StrEq(u"View")); - namespace_uri = tree.getNamespaceUri(&len); - ASSERT_EQ(StringPiece16(u"http://com.test"), StringPiece16(namespace_uri, len)); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::END_NAMESPACE)); + EXPECT_THAT(tree.getNamespacePrefix(&len), StrEq(u"test")); + EXPECT_THAT(tree.getNamespaceUri(&len), StrEq(u"http://com.test")); - ASSERT_EQ(android::ResXMLTree::END_DOCUMENT, tree.next()); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::END_DOCUMENT)); } TEST_F(XmlFlattenerTest, FlattenCompiledXmlAndStripOnlyTools) { - std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"EOF( - <View xmlns:tools="http://schemas.android.com/tools" - xmlns:foo="http://schemas.android.com/foo" - foo:bar="Foo" - tools:ignore="MissingTranslation"/>)EOF"); + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"( + <View xmlns:tools="http://schemas.android.com/tools" + xmlns:foo="http://schemas.android.com/foo" + foo:bar="Foo" + tools:ignore="MissingTranslation"/>)"); android::ResXMLTree tree; ASSERT_TRUE(Flatten(doc.get(), &tree)); - - ASSERT_EQ(tree.next(), android::ResXMLTree::START_NAMESPACE); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::START_NAMESPACE)); size_t len; - const char16_t* namespace_prefix = tree.getNamespacePrefix(&len); - EXPECT_EQ(StringPiece16(namespace_prefix, len), u"foo"); - - const char16_t* namespace_uri = tree.getNamespaceUri(&len); - ASSERT_EQ(StringPiece16(namespace_uri, len), - u"http://schemas.android.com/foo"); - - ASSERT_EQ(tree.next(), android::ResXMLTree::START_TAG); + EXPECT_THAT(tree.getNamespacePrefix(&len), StrEq(u"foo")); + EXPECT_THAT(tree.getNamespaceUri(&len), StrEq(u"http://schemas.android.com/foo")); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::START_TAG)); - EXPECT_EQ(tree.indexOfAttribute("http://schemas.android.com/tools", "ignore"), - android::NAME_NOT_FOUND); - EXPECT_GE(tree.indexOfAttribute("http://schemas.android.com/foo", "bar"), 0); + EXPECT_THAT(tree.indexOfAttribute("http://schemas.android.com/tools", "ignore"), + Eq(android::NAME_NOT_FOUND)); + EXPECT_THAT(tree.indexOfAttribute("http://schemas.android.com/foo", "bar"), Ge(0)); } TEST_F(XmlFlattenerTest, AssignSpecialAttributeIndices) { - std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"EOF( - <View xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@id/id" - class="str" - style="@id/id"/>)EOF"); + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"( + <View xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@id/id" + class="str" + style="@id/id"/>)"); android::ResXMLTree tree; ASSERT_TRUE(Flatten(doc.get(), &tree)); while (tree.next() != android::ResXMLTree::START_TAG) { - ASSERT_NE(tree.getEventType(), android::ResXMLTree::BAD_DOCUMENT); - ASSERT_NE(tree.getEventType(), android::ResXMLTree::END_DOCUMENT); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::BAD_DOCUMENT)); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::END_DOCUMENT)); } - EXPECT_EQ(tree.indexOfClass(), 0); - EXPECT_EQ(tree.indexOfStyle(), 1); + EXPECT_THAT(tree.indexOfClass(), Eq(0)); + EXPECT_THAT(tree.indexOfStyle(), Eq(1)); } // The device ResXMLParser in libandroidfw differentiates between empty namespace and null // namespace. TEST_F(XmlFlattenerTest, NoNamespaceIsNotTheSameAsEmptyNamespace) { - std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom("<View package=\"android\"/>"); + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"(<View package="android"/>)"); android::ResXMLTree tree; ASSERT_TRUE(Flatten(doc.get(), &tree)); while (tree.next() != android::ResXMLTree::START_TAG) { - ASSERT_NE(tree.getEventType(), android::ResXMLTree::BAD_DOCUMENT); - ASSERT_NE(tree.getEventType(), android::ResXMLTree::END_DOCUMENT); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::BAD_DOCUMENT)); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::END_DOCUMENT)); } const StringPiece16 kPackage = u"package"; - EXPECT_GE(tree.indexOfAttribute(nullptr, 0, kPackage.data(), kPackage.size()), 0); + EXPECT_THAT(tree.indexOfAttribute(nullptr, 0, kPackage.data(), kPackage.size()), Ge(0)); } TEST_F(XmlFlattenerTest, EmptyStringValueInAttributeIsNotNull) { - std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom("<View package=\"\"/>"); + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"(<View package=""/>)"); android::ResXMLTree tree; ASSERT_TRUE(Flatten(doc.get(), &tree)); while (tree.next() != android::ResXMLTree::START_TAG) { - ASSERT_NE(tree.getEventType(), android::ResXMLTree::BAD_DOCUMENT); - ASSERT_NE(tree.getEventType(), android::ResXMLTree::END_DOCUMENT); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::BAD_DOCUMENT)); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::END_DOCUMENT)); } const StringPiece16 kPackage = u"package"; ssize_t idx = tree.indexOfAttribute(nullptr, 0, kPackage.data(), kPackage.size()); - ASSERT_GE(idx, 0); + ASSERT_THAT(idx, Ge(0)); size_t len; - EXPECT_NE(nullptr, tree.getAttributeStringValue(idx, &len)); + EXPECT_THAT(tree.getAttributeStringValue(idx, &len), NotNull()); } TEST_F(XmlFlattenerTest, FlattenNonStandardPackageId) { @@ -236,11 +217,11 @@ TEST_F(XmlFlattenerTest, FlattenNonStandardPackageId) { context_->SetPackageId(0x80); context_->SetNameManglerPolicy({"com.app.test.feature"}); - std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"EOF( + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"( <View xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@id/foo" - app:foo="@id/foo" />)EOF"); + app:foo="@id/foo" />)"); XmlReferenceLinker linker; ASSERT_TRUE(linker.Consume(context_.get(), doc.get())); @@ -253,59 +234,57 @@ TEST_F(XmlFlattenerTest, FlattenNonStandardPackageId) { ASSERT_TRUE(Flatten(doc.get(), &tree)); while (tree.next() != android::ResXMLTree::START_TAG) { - ASSERT_NE(android::ResXMLTree::BAD_DOCUMENT, tree.getEventType()); - ASSERT_NE(android::ResXMLTree::END_DOCUMENT, tree.getEventType()); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::BAD_DOCUMENT)); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::END_DOCUMENT)); } ssize_t idx; idx = tree.indexOfAttribute(xml::kSchemaAndroid, "id"); - ASSERT_GE(idx, 0); - EXPECT_EQ(idx, tree.indexOfID()); - EXPECT_EQ(ResourceId(0x010100d0), ResourceId(tree.getAttributeNameResID(idx))); + ASSERT_THAT(idx, Ge(0)); + EXPECT_THAT(tree.indexOfID(), Eq(idx)); + EXPECT_THAT(tree.getAttributeNameResID(idx), Eq(0x010100d0u)); idx = tree.indexOfAttribute(xml::kSchemaAuto, "foo"); - ASSERT_GE(idx, 0); - EXPECT_EQ(ResourceId(0x80010000), ResourceId(tree.getAttributeNameResID(idx))); - EXPECT_EQ(android::Res_value::TYPE_REFERENCE, tree.getAttributeDataType(idx)); - EXPECT_EQ(ResourceId(0x80020000), tree.getAttributeData(idx)); + ASSERT_THAT(idx, Ge(0)); + EXPECT_THAT(tree.getAttributeNameResID(idx), Eq(0x80010000u)); + EXPECT_THAT(tree.getAttributeDataType(idx), Eq(android::Res_value::TYPE_REFERENCE)); + EXPECT_THAT(tree.getAttributeData(idx), Eq(int32_t(0x80020000))); } TEST_F(XmlFlattenerTest, ProcessEscapedStrings) { std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom( - R"EOF(<element value="\?hello" pattern="\\d{5}">\\d{5}</element>)EOF"); + R"(<element value="\?hello" pattern="\\d{5}" other=""">\\d{5}</element>)"); android::ResXMLTree tree; ASSERT_TRUE(Flatten(doc.get(), &tree)); while (tree.next() != android::ResXMLTree::START_TAG) { - ASSERT_NE(tree.getEventType(), android::ResXMLTree::BAD_DOCUMENT); - ASSERT_NE(tree.getEventType(), android::ResXMLTree::END_DOCUMENT); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::BAD_DOCUMENT)); + ASSERT_THAT(tree.getEventType(), Ne(android::ResXMLTree::END_DOCUMENT)); } const StringPiece16 kValue = u"value"; const StringPiece16 kPattern = u"pattern"; + const StringPiece16 kOther = u"other"; size_t len; ssize_t idx; - const char16_t* str16; idx = tree.indexOfAttribute(nullptr, 0, kValue.data(), kValue.size()); - ASSERT_GE(idx, 0); - str16 = tree.getAttributeStringValue(idx, &len); - ASSERT_NE(nullptr, str16); - EXPECT_EQ(StringPiece16(u"?hello"), StringPiece16(str16, len)); + ASSERT_THAT(idx, Ge(0)); + EXPECT_THAT(tree.getAttributeStringValue(idx, &len), StrEq(u"?hello")); idx = tree.indexOfAttribute(nullptr, 0, kPattern.data(), kPattern.size()); - ASSERT_GE(idx, 0); - str16 = tree.getAttributeStringValue(idx, &len); - ASSERT_NE(nullptr, str16); - EXPECT_EQ(StringPiece16(u"\\d{5}"), StringPiece16(str16, len)); - - ASSERT_EQ(android::ResXMLTree::TEXT, tree.next()); - str16 = tree.getText(&len); - ASSERT_NE(nullptr, str16); - EXPECT_EQ(StringPiece16(u"\\d{5}"), StringPiece16(str16, len)); + ASSERT_THAT(idx, Ge(0)); + EXPECT_THAT(tree.getAttributeStringValue(idx, &len), StrEq(u"\\d{5}")); + + idx = tree.indexOfAttribute(nullptr, 0, kOther.data(), kOther.size()); + ASSERT_THAT(idx, Ge(0)); + EXPECT_THAT(tree.getAttributeStringValue(idx, &len), StrEq(u"\"")); + + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::TEXT)); + EXPECT_THAT(tree.getText(&len), StrEq(u"\\d{5}")); } } // namespace aapt diff --git a/tools/aapt2/test/Common.h b/tools/aapt2/test/Common.h index 05851485e216..01b2d143de50 100644 --- a/tools/aapt2/test/Common.h +++ b/tools/aapt2/test/Common.h @@ -145,6 +145,12 @@ void PrintTo(const Maybe<T>& value, std::ostream* out) { namespace test { +MATCHER_P(StrEq, a, + std::string(negation ? "isn't" : "is") + " equal to " + + ::testing::PrintToString(android::StringPiece16(a))) { + return android::StringPiece16(arg) == a; +} + MATCHER_P(ValueEq, a, std::string(negation ? "isn't" : "is") + " equal to " + ::testing::PrintToString(a)) { return arg.Equals(&a); diff --git a/tools/aapt2/util/Maybe.h b/tools/aapt2/util/Maybe.h index b43f8e87fd68..9a82418e0a5a 100644 --- a/tools/aapt2/util/Maybe.h +++ b/tools/aapt2/util/Maybe.h @@ -281,16 +281,12 @@ inline Maybe<T> make_nothing() { return Maybe<T>(); } -/** - * Define the == operator between Maybe<T> and Maybe<U> only if the operator T - * == U is defined. - * That way the compiler will show an error at the callsite when comparing two - * Maybe<> objects - * whose inner types can't be compared. - */ +// Define the == operator between Maybe<T> and Maybe<U> only if the operator T == U is defined. +// That way the compiler will show an error at the callsite when comparing two Maybe<> objects +// whose inner types can't be compared. template <typename T, typename U> -typename std::enable_if<has_eq_op<T, U>::value, bool>::type operator==( - const Maybe<T>& a, const Maybe<U>& b) { +typename std::enable_if<has_eq_op<T, U>::value, bool>::type operator==(const Maybe<T>& a, + const Maybe<U>& b) { if (a && b) { return a.value() == b.value(); } else if (!a && !b) { @@ -299,18 +295,22 @@ typename std::enable_if<has_eq_op<T, U>::value, bool>::type operator==( return false; } -/** - * Same as operator== but negated. - */ template <typename T, typename U> -typename std::enable_if<has_eq_op<T, U>::value, bool>::type operator!=( - const Maybe<T>& a, const Maybe<U>& b) { +typename std::enable_if<has_eq_op<T, U>::value, bool>::type operator==(const Maybe<T>& a, + const U& b) { + return a ? a.value() == b : false; +} + +// Same as operator== but negated. +template <typename T, typename U> +typename std::enable_if<has_eq_op<T, U>::value, bool>::type operator!=(const Maybe<T>& a, + const Maybe<U>& b) { return !(a == b); } template <typename T, typename U> -typename std::enable_if<has_lt_op<T, U>::value, bool>::type operator<( - const Maybe<T>& a, const Maybe<U>& b) { +typename std::enable_if<has_lt_op<T, U>::value, bool>::type operator<(const Maybe<T>& a, + const Maybe<U>& b) { if (a && b) { return a.value() < b.value(); } else if (!a && !b) { diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp index 28e952e25a67..8a8be858cb4c 100644 --- a/tools/aapt2/util/Util.cpp +++ b/tools/aapt2/util/Util.cpp @@ -312,6 +312,9 @@ static Maybe<std::string> ParseUnicodeCodepoint(const char** start, return result_utf8; } +StringBuilder::StringBuilder(bool preserve_spaces) : preserve_spaces_(preserve_spaces) { +} + StringBuilder& StringBuilder::Append(const StringPiece& str) { if (!error_.empty()) { return *this; @@ -368,14 +371,12 @@ StringBuilder& StringBuilder::Append(const StringPiece& str) { } last_char_was_escape_ = false; start = current + 1; - } else if (*current == '"') { + } else if (!preserve_spaces_ && *current == '"') { if (!quote_ && trailing_space_) { - // We found an opening quote, and we have - // trailing space, so we should append that + // We found an opening quote, and we have trailing space, so we should append that // space now. if (trailing_space_) { - // We had trailing whitespace, so - // replace with a single space. + // We had trailing whitespace, so replace with a single space. if (!str_.empty()) { str_ += ' '; } @@ -385,7 +386,7 @@ StringBuilder& StringBuilder::Append(const StringPiece& str) { quote_ = !quote_; str_.append(start, current - start); start = current + 1; - } else if (*current == '\'' && !quote_) { + } else if (!preserve_spaces_ && *current == '\'' && !quote_) { // This should be escaped. error_ = "unescaped apostrophe"; return *this; @@ -402,7 +403,7 @@ StringBuilder& StringBuilder::Append(const StringPiece& str) { str_.append(start, current - start); start = current + 1; last_char_was_escape_ = true; - } else if (!quote_) { + } else if (!preserve_spaces_ && !quote_) { // This is not quoted text, so look for whitespace. if (isspace(*current)) { // We found whitespace, see if we have seen some diff --git a/tools/aapt2/util/Util.h b/tools/aapt2/util/Util.h index 386f74b0301a..b9ada7704a26 100644 --- a/tools/aapt2/util/Util.h +++ b/tools/aapt2/util/Util.h @@ -166,6 +166,8 @@ bool VerifyJavaStringFormat(const android::StringPiece& str); class StringBuilder { public: + explicit StringBuilder(bool preserve_spaces = false); + StringBuilder& Append(const android::StringPiece& str); const std::string& ToString() const; const std::string& Error() const; @@ -179,6 +181,7 @@ class StringBuilder { explicit operator bool() const; private: + bool preserve_spaces_; std::string str_; size_t utf16_len_ = 0; bool quote_ = false; diff --git a/tools/aapt2/util/Util_test.cpp b/tools/aapt2/util/Util_test.cpp index e49aee5d50ed..5cced3e9acab 100644 --- a/tools/aapt2/util/Util_test.cpp +++ b/tools/aapt2/util/Util_test.cpp @@ -20,16 +20,17 @@ #include "test/Test.h" -using android::StringPiece; +using ::android::StringPiece; +using ::testing::Eq; +using ::testing::Ne; +using ::testing::SizeIs; namespace aapt { TEST(UtilTest, TrimOnlyWhitespace) { - const std::string full = "\n "; - - StringPiece trimmed = util::TrimWhitespace(full); + const StringPiece trimmed = util::TrimWhitespace("\n "); EXPECT_TRUE(trimmed.empty()); - EXPECT_EQ(0u, trimmed.size()); + EXPECT_THAT(trimmed, SizeIs(0u)); } TEST(UtilTest, StringEndsWith) { @@ -41,85 +42,74 @@ TEST(UtilTest, StringStartsWith) { } TEST(UtilTest, StringBuilderSplitEscapeSequence) { - EXPECT_EQ(StringPiece("this is a new\nline."), util::StringBuilder() - .Append("this is a new\\") - .Append("nline.") - .ToString()); + EXPECT_THAT(util::StringBuilder().Append("this is a new\\").Append("nline.").ToString(), + Eq("this is a new\nline.")); } TEST(UtilTest, StringBuilderWhitespaceRemoval) { - EXPECT_EQ(StringPiece("hey guys this is so cool"), - util::StringBuilder() - .Append(" hey guys ") - .Append(" this is so cool ") - .ToString()); - - EXPECT_EQ(StringPiece(" wow, so many \t spaces. what?"), - util::StringBuilder() - .Append(" \" wow, so many \t ") - .Append("spaces. \"what? ") - .ToString()); - - EXPECT_EQ(StringPiece("where is the pie?"), util::StringBuilder() - .Append(" where \t ") - .Append(" \nis the " - " pie?") - .ToString()); + EXPECT_THAT(util::StringBuilder().Append(" hey guys ").Append(" this is so cool ").ToString(), + Eq("hey guys this is so cool")); + EXPECT_THAT( + util::StringBuilder().Append(" \" wow, so many \t ").Append("spaces. \"what? ").ToString(), + Eq(" wow, so many \t spaces. what?")); + EXPECT_THAT(util::StringBuilder().Append(" where \t ").Append(" \nis the pie?").ToString(), + Eq("where is the pie?")); } TEST(UtilTest, StringBuilderEscaping) { - EXPECT_EQ(StringPiece("hey guys\n this \t is so\\ cool"), - util::StringBuilder() - .Append(" hey guys\\n ") - .Append(" this \\t is so\\\\ cool ") - .ToString()); - - EXPECT_EQ(StringPiece("@?#\\\'"), - util::StringBuilder().Append("\\@\\?\\#\\\\\\'").ToString()); + EXPECT_THAT(util::StringBuilder() + .Append(" hey guys\\n ") + .Append(" this \\t is so\\\\ cool ") + .ToString(), + Eq("hey guys\n this \t is so\\ cool")); + EXPECT_THAT(util::StringBuilder().Append("\\@\\?\\#\\\\\\'").ToString(), Eq("@?#\\\'")); } TEST(UtilTest, StringBuilderMisplacedQuote) { - util::StringBuilder builder{}; + util::StringBuilder builder; EXPECT_FALSE(builder.Append("they're coming!")); } TEST(UtilTest, StringBuilderUnicodeCodes) { - EXPECT_EQ(std::string("\u00AF\u0AF0 woah"), - util::StringBuilder().Append("\\u00AF\\u0AF0 woah").ToString()); - + EXPECT_THAT(util::StringBuilder().Append("\\u00AF\\u0AF0 woah").ToString(), + Eq("\u00AF\u0AF0 woah")); EXPECT_FALSE(util::StringBuilder().Append("\\u00 yo")); } +TEST(UtilTest, StringBuilderPreserveSpaces) { + EXPECT_THAT(util::StringBuilder(true /*preserve_spaces*/).Append("\"").ToString(), Eq("\"")); +} + TEST(UtilTest, TokenizeInput) { auto tokenizer = util::Tokenize(StringPiece("this| is|the|end"), '|'); auto iter = tokenizer.begin(); - ASSERT_EQ(*iter, StringPiece("this")); + ASSERT_THAT(*iter, Eq("this")); ++iter; - ASSERT_EQ(*iter, StringPiece(" is")); + ASSERT_THAT(*iter, Eq(" is")); ++iter; - ASSERT_EQ(*iter, StringPiece("the")); + ASSERT_THAT(*iter, Eq("the")); ++iter; - ASSERT_EQ(*iter, StringPiece("end")); + ASSERT_THAT(*iter, Eq("end")); ++iter; - ASSERT_EQ(tokenizer.end(), iter); + ASSERT_THAT(iter, Eq(tokenizer.end())); } TEST(UtilTest, TokenizeEmptyString) { auto tokenizer = util::Tokenize(StringPiece(""), '|'); auto iter = tokenizer.begin(); - ASSERT_NE(tokenizer.end(), iter); - ASSERT_EQ(StringPiece(), *iter); + ASSERT_THAT(iter, Ne(tokenizer.end())); + ASSERT_THAT(*iter, Eq(StringPiece())); ++iter; - ASSERT_EQ(tokenizer.end(), iter); + ASSERT_THAT(iter, Eq(tokenizer.end())); } TEST(UtilTest, TokenizeAtEnd) { auto tokenizer = util::Tokenize(StringPiece("one."), '.'); auto iter = tokenizer.begin(); - ASSERT_EQ(*iter, StringPiece("one")); + ASSERT_THAT(*iter, Eq("one")); ++iter; - ASSERT_NE(iter, tokenizer.end()); - ASSERT_EQ(*iter, StringPiece()); + ASSERT_THAT(iter, Ne(tokenizer.end())); + ASSERT_THAT(*iter, Eq(StringPiece())); } TEST(UtilTest, IsJavaClassName) { diff --git a/tools/aapt2/xml/XmlDom_test.cpp b/tools/aapt2/xml/XmlDom_test.cpp index fb18ea316ca6..031801e1dd2f 100644 --- a/tools/aapt2/xml/XmlDom_test.cpp +++ b/tools/aapt2/xml/XmlDom_test.cpp @@ -28,17 +28,16 @@ constexpr const char* kXmlPreamble = TEST(XmlDomTest, Inflate) { std::stringstream in(kXmlPreamble); - in << R"EOF( - <Layout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <TextView android:id="@+id/id" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </Layout> - )EOF"; - - const Source source = {"test.xml"}; + in << R"( + <Layout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <TextView android:id="@+id/id" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </Layout>)"; + + const Source source("test.xml"); StdErrDiagnostics diag; std::unique_ptr<xml::XmlResource> doc = xml::Inflate(&in, &diag, source); ASSERT_NE(doc, nullptr); @@ -51,8 +50,8 @@ TEST(XmlDomTest, Inflate) { // Escaping is handled after parsing of the values for resource-specific values. TEST(XmlDomTest, ForwardEscapes) { - std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"EOF( - <element value="\?hello" pattern="\\d{5}">\\d{5}</element>)EOF"); + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"( + <element value="\?hello" pattern="\\d{5}">\\d{5}</element>)"); xml::Element* el = xml::FindRootElement(doc->root.get()); ASSERT_NE(nullptr, el); @@ -65,10 +64,20 @@ TEST(XmlDomTest, ForwardEscapes) { ASSERT_NE(nullptr, attr); EXPECT_EQ("\\?hello", attr->value); - ASSERT_EQ(1u, el->children.size()); xml::Text* text = xml::NodeCast<xml::Text>(el->children[0].get()); ASSERT_NE(nullptr, text); EXPECT_EQ("\\\\d{5}", text->text); } +TEST(XmlDomTest, XmlEscapeSequencesAreParsed) { + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"(<element value=""" />)"); + + xml::Element* el = xml::FindRootElement(doc.get()); + ASSERT_NE(nullptr, el); + + xml::Attribute* attr = el->FindAttribute({}, "value"); + ASSERT_NE(nullptr, attr); + EXPECT_EQ("\"", attr->value); +} + } // namespace aapt |
