diff options
694 files changed, 21417 insertions, 6564 deletions
diff --git a/Android.mk b/Android.mk index ad164e207b9b..6ec434cfbf54 100644 --- a/Android.mk +++ b/Android.mk @@ -136,6 +136,7 @@ LOCAL_SRC_FILES += \ core/java/android/content/ISyncStatusObserver.aidl \ core/java/android/content/pm/ILauncherApps.aidl \ core/java/android/content/pm/IOnAppsChangedListener.aidl \ + core/java/android/content/pm/IOtaDexopt.aidl \ core/java/android/content/pm/IPackageDataObserver.aidl \ core/java/android/content/pm/IPackageDeleteObserver.aidl \ core/java/android/content/pm/IPackageDeleteObserver2.aidl \ @@ -335,8 +336,8 @@ LOCAL_SRC_FILES += \ location/java/android/location/IGeofenceProvider.aidl \ location/java/android/location/IGnssStatusListener.aidl \ location/java/android/location/IGnssStatusProvider.aidl \ - location/java/android/location/IGpsMeasurementsListener.aidl \ - location/java/android/location/IGpsNavigationMessageListener.aidl \ + location/java/android/location/IGnssMeasurementsListener.aidl \ + location/java/android/location/IGnssNavigationMessageListener.aidl \ location/java/android/location/ILocationListener.aidl \ location/java/android/location/ILocationManager.aidl \ location/java/android/location/IFusedGeofenceHardware.aidl \ @@ -519,7 +520,7 @@ aidl_files := \ frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl \ frameworks/base/wifi/java/android/net/wifi/WpsInfo.aidl \ frameworks/base/wifi/java/android/net/wifi/ScanResult.aidl \ - frameworks/base/wifi/java/android/net/wifi/ScanInfo.aidl \ + frameworks/base/wifi/java/android/net/wifi/PasspointManagementObjectDefinition.aidl \ frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.aidl \ frameworks/base/wifi/java/android/net/wifi/WifiConfiguration.aidl \ frameworks/base/wifi/java/android/net/wifi/WifiInfo.aidl \ @@ -1192,6 +1193,11 @@ LOCAL_MODULE := ext LOCAL_DX_FLAGS := --core-library +ifneq ($(INCREMENTAL_BUILDS),) + LOCAL_PROGUARD_ENABLED := disabled + LOCAL_JACK_ENABLED := incremental +endif + include $(BUILD_JAVA_LIBRARY) diff --git a/api/current.txt b/api/current.txt index c7f0a75dcc53..5361d0a977b1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -68,7 +68,7 @@ package android { field public static final java.lang.String DUMP = "android.permission.DUMP"; field public static final java.lang.String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR"; field public static final java.lang.String FACTORY_TEST = "android.permission.FACTORY_TEST"; - field public static final deprecated java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; + field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED"; field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE"; field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS"; @@ -198,6 +198,7 @@ package android { public static final class R.attr { ctor public R.attr(); + field public static final int abiOverride = 16844054; // 0x1010516 field public static final int absListViewStyle = 16842858; // 0x101006a field public static final int accessibilityEventTypes = 16843648; // 0x1010380 field public static final int accessibilityFeedbackType = 16843650; // 0x1010382 @@ -305,6 +306,7 @@ package android { field public static final int baselineAlignBottom = 16843042; // 0x1010122 field public static final int baselineAligned = 16843046; // 0x1010126 field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127 + field public static final int bitmap = 16844055; // 0x1010517 field public static final int borderlessButtonStyle = 16843563; // 0x101032b field public static final int bottom = 16843184; // 0x10101b0 field public static final int bottomBright = 16842957; // 0x10100cd @@ -646,6 +648,8 @@ package android { field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353 field public static final int horizontalSpacing = 16843028; // 0x1010114 field public static final int host = 16842792; // 0x1010028 + field public static final int hotSpotX = 16844056; // 0x1010518 + field public static final int hotSpotY = 16844057; // 0x1010519 field public static final int hyphenationFrequency = 16843998; // 0x10104de field public static final int icon = 16842754; // 0x1010002 field public static final int iconPreview = 16843337; // 0x1010249 @@ -4422,9 +4426,11 @@ package android.app { method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle); method public deprecated void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle); method public void onLowMemory(); + method public void onMultiWindowChanged(boolean); method public boolean onOptionsItemSelected(android.view.MenuItem); method public void onOptionsMenuClosed(android.view.Menu); method public void onPause(); + method public void onPictureInPictureChanged(boolean); method public void onPrepareOptionsMenu(android.view.Menu); method public void onRequestPermissionsResult(int, java.lang.String[], int[]); method public void onResume(); @@ -4505,9 +4511,11 @@ package android.app { method public void dispatchDestroy(); method public void dispatchDestroyView(); method public void dispatchLowMemory(); + method public void dispatchMultiWindowChanged(boolean); method public boolean dispatchOptionsItemSelected(android.view.MenuItem); method public void dispatchOptionsMenuClosed(android.view.Menu); method public void dispatchPause(); + method public void dispatchPictureInPictureChanged(boolean); method public boolean dispatchPrepareOptionsMenu(android.view.Menu); method public void dispatchResume(); method public void dispatchStart(); @@ -6315,6 +6323,22 @@ package android.app.usage { field public static final android.os.Parcelable.Creator<android.app.usage.ConfigurationStats> CREATOR; } + public class DataUsagePolicy { + field public final int networkType; + field public final java.lang.String[] subscriberIds; + field public final long thresholdInBytes; + field public final int[] uids; + } + + public static class DataUsagePolicy.Builder { + ctor public DataUsagePolicy.Builder(); + method public android.app.usage.DataUsagePolicy.Builder addSubscriberId(java.lang.String); + method public android.app.usage.DataUsagePolicy.Builder addUid(int); + method public android.app.usage.DataUsagePolicy build(); + method public android.app.usage.DataUsagePolicy.Builder setNetworkType(int); + method public android.app.usage.DataUsagePolicy.Builder setThreshold(long); + } + public final class NetworkStats implements java.lang.AutoCloseable { method public void close(); method public boolean getNextBucket(android.app.usage.NetworkStats.Bucket); @@ -6355,6 +6379,14 @@ package android.app.usage { method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long, boolean) throws android.os.RemoteException, java.lang.SecurityException; + method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.DataUsageCallback); + method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.DataUsageCallback, android.os.Handler); + method public void unregisterDataUsageCallback(android.app.usage.NetworkStatsManager.DataUsageCallback); + } + + public static class NetworkStatsManager.DataUsageCallback { + ctor public NetworkStatsManager.DataUsageCallback(); + method public void onLimitReached(); } public final class UsageEvents implements android.os.Parcelable { @@ -8056,6 +8088,7 @@ package android.content { field public static final int BIND_ALLOW_OOM_MANAGEMENT = 16; // 0x10 field public static final int BIND_AUTO_CREATE = 1; // 0x1 field public static final int BIND_DEBUG_UNBIND = 2; // 0x2 + field public static final int BIND_EXTERNAL_SERVICE = -2147483648; // 0x80000000 field public static final int BIND_IMPORTANT = 64; // 0x40 field public static final int BIND_NOT_FOREGROUND = 4; // 0x4 field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20 @@ -9911,6 +9944,7 @@ package android.content.pm { method public int describeContents(); method public void dump(android.util.Printer, java.lang.String); field public static final android.os.Parcelable.Creator<android.content.pm.ServiceInfo> CREATOR; + field public static final int FLAG_EXTERNAL_SERVICE = 4; // 0x4 field public static final int FLAG_ISOLATED_PROCESS = 2; // 0x2 field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000 field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1 @@ -19111,38 +19145,7 @@ package android.location { method public static boolean isPresent(); } - public abstract interface GnssNmeaListener { - method public abstract void onNmeaReceived(long, java.lang.String); - } - - public final class GnssStatus { - method public float getAzimuth(int); - method public int getConstellationType(int); - method public float getElevation(int); - method public int getNumSatellites(); - method public int getPrn(int); - method public float getSnr(int); - method public boolean hasAlmanac(int); - method public boolean hasEphemeris(int); - method public boolean usedInFix(int); - field public static final int CONSTELLATION_BEIDOU = 5; // 0x5 - field public static final int CONSTELLATION_GALILEO = 6; // 0x6 - field public static final int CONSTELLATION_GLONASS = 3; // 0x3 - field public static final int CONSTELLATION_GPS = 1; // 0x1 - field public static final int CONSTELLATION_QZSS = 4; // 0x4 - field public static final int CONSTELLATION_SBAS = 2; // 0x2 - field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0 - } - - public abstract class GnssStatusCallback { - ctor public GnssStatusCallback(); - method public void onFirstFix(int); - method public void onSatelliteStatusChanged(android.location.GnssStatus); - method public void onStarted(); - method public void onStopped(); - } - - public final class GpsClock implements android.os.Parcelable { + public final class GnssClock implements android.os.Parcelable { method public int describeContents(); method public double getBiasInNs(); method public double getBiasUncertaintyInNs(); @@ -19169,7 +19172,7 @@ package android.location { method public void resetFullBiasInNs(); method public void resetLeapSecond(); method public void resetTimeUncertaintyInNs(); - method public void set(android.location.GpsClock); + method public void set(android.location.GnssClock); method public void setBiasInNs(double); method public void setBiasUncertaintyInNs(double); method public void setDriftInNsPerSec(double); @@ -19184,13 +19187,13 @@ package android.location { field public static final byte CLOCK_TYPE_GPS_TIME = 2; // 0x2 field public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; // 0x1 field public static final byte CLOCK_TYPE_UNKNOWN = 0; // 0x0 - field public static final android.os.Parcelable.Creator<android.location.GpsClock> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssClock> CREATOR; } - public static abstract class GpsClock.GpsClockType implements java.lang.annotation.Annotation { + public static abstract class GnssClock.GnssClockType implements java.lang.annotation.Annotation { } - public final class GpsMeasurement implements android.os.Parcelable { + public final class GnssMeasurement implements android.os.Parcelable { method public int describeContents(); method public double getAccumulatedDeltaRangeInMeters(); method public short getAccumulatedDeltaRangeState(); @@ -19261,7 +19264,7 @@ package android.location { method public void resetPseudorangeUncertaintyInMeters(); method public void resetSnrInDb(); method public void resetTimeFromLastBitInMs(); - method public void set(android.location.GpsMeasurement); + method public void set(android.location.GnssMeasurement); method public void setAccumulatedDeltaRangeInMeters(double); method public void setAccumulatedDeltaRangeState(short); method public void setAccumulatedDeltaRangeUncertaintyInMeters(double); @@ -19300,7 +19303,7 @@ package android.location { field public static final short ADR_STATE_RESET = 2; // 0x2 field public static final short ADR_STATE_UNKNOWN = 0; // 0x0 field public static final short ADR_STATE_VALID = 1; // 0x1 - field public static final android.os.Parcelable.Creator<android.location.GpsMeasurement> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssMeasurement> CREATOR; field public static final byte LOSS_OF_LOCK_CYCLE_SLIP = 2; // 0x2 field public static final byte LOSS_OF_LOCK_OK = 1; // 0x1 field public static final byte LOSS_OF_LOCK_UNKNOWN = 0; // 0x0 @@ -19315,34 +19318,34 @@ package android.location { field public static final short STATE_UNKNOWN = 0; // 0x0 } - public static abstract class GpsMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation { + public static abstract class GnssMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation { } - public static abstract class GpsMeasurement.MultipathIndicator implements java.lang.annotation.Annotation { + public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation { } - public final class GpsMeasurementsEvent implements android.os.Parcelable { - ctor public GpsMeasurementsEvent(android.location.GpsClock, android.location.GpsMeasurement[]); + public final class GnssMeasurementsEvent implements android.os.Parcelable { + ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]); method public int describeContents(); - method public android.location.GpsClock getClock(); - method public java.util.Collection<android.location.GpsMeasurement> getMeasurements(); + method public android.location.GnssClock getClock(); + method public java.util.Collection<android.location.GnssMeasurement> getMeasurements(); method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.location.GpsMeasurementsEvent> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssMeasurementsEvent> CREATOR; field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2 field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 field public static final int STATUS_READY = 1; // 0x1 } - public static abstract class GpsMeasurementsEvent.Callback { - ctor public GpsMeasurementsEvent.Callback(); - method public void onGpsMeasurementsReceived(android.location.GpsMeasurementsEvent); + public static abstract class GnssMeasurementsEvent.Callback { + ctor public GnssMeasurementsEvent.Callback(); + method public void onGnssMeasurementsReceived(android.location.GnssMeasurementsEvent); method public void onStatusChanged(int); } - public static abstract class GpsMeasurementsEvent.GpsMeasurementsStatus implements java.lang.annotation.Annotation { + public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation { } - public final class GpsNavigationMessage implements android.os.Parcelable { + public final class GnssNavigationMessage implements android.os.Parcelable { method public int describeContents(); method public byte[] getData(); method public short getMessageId(); @@ -19351,7 +19354,7 @@ package android.location { method public short getSubmessageId(); method public byte getType(); method public void reset(); - method public void set(android.location.GpsNavigationMessage); + method public void set(android.location.GnssNavigationMessage); method public void setData(byte[]); method public void setMessageId(short); method public void setPrn(byte); @@ -19359,7 +19362,7 @@ package android.location { method public void setSubmessageId(short); method public void setType(byte); method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessage> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessage> CREATOR; field public static final byte MESSAGE_TYPE_CNAV2 = 4; // 0x4 field public static final byte MESSAGE_TYPE_L1CA = 1; // 0x1 field public static final byte MESSAGE_TYPE_L2CNAV = 2; // 0x2 @@ -19370,27 +19373,58 @@ package android.location { field public static final short STATUS_UNKNOWN = 0; // 0x0 } - public static abstract class GpsNavigationMessage.GpsNavigationMessageType implements java.lang.annotation.Annotation { + public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation { } - public final class GpsNavigationMessageEvent implements android.os.Parcelable { - ctor public GpsNavigationMessageEvent(android.location.GpsNavigationMessage); + public final class GnssNavigationMessageEvent implements android.os.Parcelable { + ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage); method public int describeContents(); - method public android.location.GpsNavigationMessage getNavigationMessage(); + method public android.location.GnssNavigationMessage getNavigationMessage(); method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessageEvent> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR; field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2 field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 field public static final int STATUS_READY = 1; // 0x1 } - public static abstract class GpsNavigationMessageEvent.Callback { - ctor public GpsNavigationMessageEvent.Callback(); - method public void onGpsNavigationMessageReceived(android.location.GpsNavigationMessageEvent); + public static abstract class GnssNavigationMessageEvent.Callback { + ctor public GnssNavigationMessageEvent.Callback(); + method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent); method public void onStatusChanged(int); } - public static abstract class GpsNavigationMessageEvent.GpsNavigationMessageStatus implements java.lang.annotation.Annotation { + public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation { + } + + public abstract interface GnssNmeaListener { + method public abstract void onNmeaReceived(long, java.lang.String); + } + + public final class GnssStatus { + method public float getAzimuth(int); + method public int getConstellationType(int); + method public float getElevation(int); + method public int getNumSatellites(); + method public int getPrn(int); + method public float getSnr(int); + method public boolean hasAlmanac(int); + method public boolean hasEphemeris(int); + method public boolean usedInFix(int); + field public static final int CONSTELLATION_BEIDOU = 5; // 0x5 + field public static final int CONSTELLATION_GALILEO = 6; // 0x6 + field public static final int CONSTELLATION_GLONASS = 3; // 0x3 + field public static final int CONSTELLATION_GPS = 1; // 0x1 + field public static final int CONSTELLATION_QZSS = 4; // 0x4 + field public static final int CONSTELLATION_SBAS = 2; // 0x2 + field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0 + } + + public abstract class GnssStatusCallback { + ctor public GnssStatusCallback(); + method public void onFirstFix(int); + method public void onSatelliteStatusChanged(android.location.GnssStatus); + method public void onStarted(); + method public void onStopped(); } public final class GpsSatellite { @@ -19494,12 +19528,12 @@ package android.location { method public java.util.List<java.lang.String> getProviders(boolean); method public java.util.List<java.lang.String> getProviders(android.location.Criteria, boolean); method public boolean isProviderEnabled(java.lang.String); + method public boolean registerGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback); + method public boolean registerGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback, android.os.Handler); + method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); + method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler); method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback); method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler); - method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback); - method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback, android.os.Handler); - method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback); - method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback, android.os.Handler); method public deprecated void removeGpsStatusListener(android.location.GpsStatus.Listener); method public deprecated void removeNmeaListener(android.location.GpsStatus.NmeaListener); method public void removeNmeaListener(android.location.GnssNmeaListener); @@ -19520,9 +19554,9 @@ package android.location { method public void setTestProviderEnabled(java.lang.String, boolean); method public void setTestProviderLocation(java.lang.String, android.location.Location); method public void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long); + method public void unregisterGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback); + method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback); - method public void unregisterGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback); - method public void unregisterGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback); field public static final java.lang.String GPS_PROVIDER = "gps"; field public static final java.lang.String KEY_LOCATION_CHANGED = "location"; field public static final java.lang.String KEY_PROVIDER_ENABLED = "providerEnabled"; @@ -23390,6 +23424,7 @@ package android.net { method public void unregisterNetworkCallback(android.app.PendingIntent); field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED"; field public static final java.lang.String ACTION_CAPTIVE_PORTAL_SIGN_IN = "android.net.conn.CAPTIVE_PORTAL"; + field public static final java.lang.String ACTION_RESTRICT_BACKGROUND_CHANGED = "android.net.conn.RESTRICT_BACKGROUND_CHANGED"; field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE"; field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1 field public static final java.lang.String EXTRA_CAPTIVE_PORTAL = "android.net.extra.CAPTIVE_PORTAL"; @@ -23439,6 +23474,12 @@ package android.net { method public int getUid(); } + public class DataUsageRequest implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.net.DataUsageRequest> CREATOR; + } + public class DhcpInfo implements android.os.Parcelable { ctor public DhcpInfo(); method public int describeContents(); @@ -24305,22 +24346,6 @@ package android.net.sip { package android.net.wifi { - public class ScanInfo implements android.os.Parcelable { - ctor public ScanInfo(android.net.wifi.ScanResult); - ctor public ScanInfo(long, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, byte[], int); - method public int describeContents(); - method public long getBssid(); - method public byte[] getIconData(); - method public java.lang.String getIconType(); - method public java.lang.String getName(); - method public int getOsuIdentity(); - method public int getRssi(); - method public android.net.wifi.ScanResult getScanResult(); - method public java.lang.String getServiceDescription(); - method public java.lang.String getSsid(); - method public void writeToParcel(android.os.Parcel, int); - } - public class ScanResult implements android.os.Parcelable { method public int describeContents(); method public boolean is80211mcResponder(); @@ -24481,6 +24506,7 @@ package android.net.wifi { field public static final int SIM = 4; // 0x4 field public static final int TLS = 1; // 0x1 field public static final int TTLS = 2; // 0x2 + field public static final int UNAUTH_TLS = 7; // 0x7 } public static final class WifiEnterpriseConfig.Phase2 { @@ -24523,7 +24549,6 @@ package android.net.wifi { method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks(); method public android.net.wifi.WifiInfo getConnectionInfo(); method public android.net.DhcpInfo getDhcpInfo(); - method public java.util.List<android.net.wifi.ScanInfo> getScanInfos(); method public java.util.List<android.net.wifi.ScanResult> getScanResults(); method public int getWifiState(); method public boolean is5GHzBandSupported(); @@ -24539,7 +24564,6 @@ package android.net.wifi { method public boolean reconnect(); method public boolean removeNetwork(int); method public boolean saveConfiguration(); - method public void setOsuSelection(int); method public void setTdlsEnabled(java.net.InetAddress, boolean); method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean); method public boolean setWifiEnabled(boolean); @@ -30136,6 +30160,7 @@ package android.provider { } public class BlockedNumberContract { + method public static boolean canCurrentUserBlockNumbers(android.content.Context); method public static boolean isBlocked(android.content.Context, java.lang.String); field public static final java.lang.String AUTHORITY = "com.android.blockednumber"; field public static final android.net.Uri AUTHORITY_URI; @@ -30145,7 +30170,6 @@ package android.provider { field public static final java.lang.String COLUMN_E164_NUMBER = "e164_number"; field public static final java.lang.String COLUMN_ID = "_id"; field public static final java.lang.String COLUMN_ORIGINAL_NUMBER = "original_number"; - field public static final java.lang.String COLUMN_STRIPPED_NUMBER = "stripped_number"; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/blocked_number"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/blocked_numbers"; field public static final android.net.Uri CONTENT_URI; @@ -31656,14 +31680,13 @@ package android.provider { field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type"; field public static final java.lang.String COLUMN_SIZE = "_size"; field public static final java.lang.String COLUMN_SUMMARY = "summary"; - field public static final int FLAG_ARCHIVE = 1024; // 0x400 field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10 field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20 field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8 field public static final int FLAG_SUPPORTS_COPY = 128; // 0x80 field public static final int FLAG_SUPPORTS_DELETE = 4; // 0x4 field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100 - field public static final int FLAG_SUPPORTS_REMOVE = 2048; // 0x800 + field public static final int FLAG_SUPPORTS_REMOVE = 1024; // 0x400 field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40 field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1 field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2 @@ -32089,6 +32112,7 @@ package android.provider { field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS"; field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS"; field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS"; + field public static final java.lang.String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS"; field public static final java.lang.String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS = "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"; @@ -36330,6 +36354,7 @@ package android.telecom { method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle); method public boolean isInCall(); method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String); + method public void launchManageBlockedNumbersActivity(); method public void placeCall(android.net.Uri, android.os.Bundle); method public void registerPhoneAccount(android.telecom.PhoneAccount); method public void showInCallScreen(boolean); @@ -43689,6 +43714,7 @@ package android.view.accessibility { method public boolean isEnabled(); method public boolean isFocusable(); method public boolean isFocused(); + method public boolean isImportantForAccessibility(); method public boolean isLongClickable(); method public boolean isMultiLine(); method public boolean isPassword(); @@ -43727,6 +43753,7 @@ package android.view.accessibility { method public void setError(java.lang.CharSequence); method public void setFocusable(boolean); method public void setFocused(boolean); + method public void setImportantForAccessibility(boolean); method public void setInputType(int); method public void setLabelFor(android.view.View); method public void setLabelFor(android.view.View, int); @@ -50181,13 +50208,16 @@ package java.lang { method public static java.lang.Class<?> forName(java.lang.String, boolean, java.lang.ClassLoader) throws java.lang.ClassNotFoundException; method public A getAnnotation(java.lang.Class<A>); method public java.lang.annotation.Annotation[] getAnnotations(); + method public T[] getAnnotationsByType(java.lang.Class<T>); method public java.lang.String getCanonicalName(); method public java.lang.ClassLoader getClassLoader(); method public java.lang.Class<?>[] getClasses(); method public java.lang.Class<?> getComponentType(); method public java.lang.reflect.Constructor<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException; + method public T getDeclaredAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public java.lang.Class<?>[] getDeclaredClasses(); method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException; @@ -50718,7 +50748,10 @@ package java.lang { public class Package implements java.lang.reflect.AnnotatedElement { method public A getAnnotation(java.lang.Class<A>); method public java.lang.annotation.Annotation[] getAnnotations(); + method public T[] getAnnotationsByType(java.lang.Class<T>); + method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public java.lang.String getImplementationTitle(); method public java.lang.String getImplementationVendor(); method public java.lang.String getImplementationVersion(); @@ -51412,7 +51445,10 @@ package java.lang.reflect { ctor protected AccessibleObject(); method public T getAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getAnnotations(); + method public T[] getAnnotationsByType(java.lang.Class<T>); + method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public boolean isAccessible(); method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>); method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException; @@ -51422,7 +51458,10 @@ package java.lang.reflect { public abstract interface AnnotatedElement { method public abstract T getAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getAnnotations(); + method public abstract T[] getAnnotationsByType(java.lang.Class<T>); + method public abstract java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public abstract T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public abstract boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>); } @@ -52537,7 +52576,6 @@ package java.net { method public static void setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory); method public java.lang.String toExternalForm(); method public java.net.URI toURI() throws java.net.URISyntaxException; - method public java.net.URI toURILenient() throws java.net.URISyntaxException; } public class URLClassLoader extends java.security.SecureClassLoader implements java.io.Closeable { diff --git a/api/system-current.txt b/api/system-current.txt index 3c5e59e6a4c3..a43e3f61c743 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -91,12 +91,13 @@ package android { field public static final java.lang.String DEVICE_POWER = "android.permission.DEVICE_POWER"; field public static final java.lang.String DIAGNOSTIC = "android.permission.DIAGNOSTIC"; field public static final java.lang.String DISABLE_KEYGUARD = "android.permission.DISABLE_KEYGUARD"; + field public static final java.lang.String DISPATCH_PROVISIONING_MESSAGE = "android.permission.DISPATCH_PROVISIONING_MESSAGE"; field public static final java.lang.String DUMP = "android.permission.DUMP"; field public static final java.lang.String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR"; field public static final java.lang.String FACTORY_TEST = "android.permission.FACTORY_TEST"; field public static final java.lang.String FORCE_BACK = "android.permission.FORCE_BACK"; field public static final java.lang.String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES"; - field public static final deprecated java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; + field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED"; field public static final java.lang.String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS"; field public static final java.lang.String GET_PACKAGE_IMPORTANCE = "android.permission.GET_PACKAGE_IMPORTANCE"; @@ -293,6 +294,7 @@ package android { public static final class R.attr { ctor public R.attr(); + field public static final int abiOverride = 16844054; // 0x1010516 field public static final int absListViewStyle = 16842858; // 0x101006a field public static final int accessibilityEventTypes = 16843648; // 0x1010380 field public static final int accessibilityFeedbackType = 16843650; // 0x1010382 @@ -400,6 +402,7 @@ package android { field public static final int baselineAlignBottom = 16843042; // 0x1010122 field public static final int baselineAligned = 16843046; // 0x1010126 field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127 + field public static final int bitmap = 16844055; // 0x1010517 field public static final int borderlessButtonStyle = 16843563; // 0x101032b field public static final int bottom = 16843184; // 0x10101b0 field public static final int bottomBright = 16842957; // 0x10100cd @@ -741,6 +744,8 @@ package android { field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353 field public static final int horizontalSpacing = 16843028; // 0x1010114 field public static final int host = 16842792; // 0x1010028 + field public static final int hotSpotX = 16844056; // 0x1010518 + field public static final int hotSpotY = 16844057; // 0x1010519 field public static final int hyphenationFrequency = 16843998; // 0x10104de field public static final int icon = 16842754; // 0x1010002 field public static final int iconPreview = 16843337; // 0x1010249 @@ -4554,9 +4559,11 @@ package android.app { method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle); method public deprecated void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle); method public void onLowMemory(); + method public void onMultiWindowChanged(boolean); method public boolean onOptionsItemSelected(android.view.MenuItem); method public void onOptionsMenuClosed(android.view.Menu); method public void onPause(); + method public void onPictureInPictureChanged(boolean); method public void onPrepareOptionsMenu(android.view.Menu); method public void onRequestPermissionsResult(int, java.lang.String[], int[]); method public void onResume(); @@ -4637,9 +4644,11 @@ package android.app { method public void dispatchDestroy(); method public void dispatchDestroyView(); method public void dispatchLowMemory(); + method public void dispatchMultiWindowChanged(boolean); method public boolean dispatchOptionsItemSelected(android.view.MenuItem); method public void dispatchOptionsMenuClosed(android.view.Menu); method public void dispatchPause(); + method public void dispatchPictureInPictureChanged(boolean); method public boolean dispatchPrepareOptionsMenu(android.view.Menu); method public void dispatchResume(); method public void dispatchStart(); @@ -6095,6 +6104,7 @@ package android.app.admin { field public static final java.lang.String ACTION_DEVICE_OWNER_CHANGED = "android.app.action.DEVICE_OWNER_CHANGED"; field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED"; field public static final java.lang.String ACTION_PROVISION_MANAGED_DEVICE = "android.app.action.PROVISION_MANAGED_DEVICE"; + field public static final java.lang.String ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE"; field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.action.PROVISION_MANAGED_PROFILE"; field public static final java.lang.String ACTION_SET_NEW_PARENT_PROFILE_PASSWORD = "android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD"; field public static final java.lang.String ACTION_SET_NEW_PASSWORD = "android.app.action.SET_NEW_PASSWORD"; @@ -6572,6 +6582,22 @@ package android.app.usage { field public static final android.os.Parcelable.Creator<android.app.usage.ConfigurationStats> CREATOR; } + public class DataUsagePolicy { + field public final int networkType; + field public final java.lang.String[] subscriberIds; + field public final long thresholdInBytes; + field public final int[] uids; + } + + public static class DataUsagePolicy.Builder { + ctor public DataUsagePolicy.Builder(); + method public android.app.usage.DataUsagePolicy.Builder addSubscriberId(java.lang.String); + method public android.app.usage.DataUsagePolicy.Builder addUid(int); + method public android.app.usage.DataUsagePolicy build(); + method public android.app.usage.DataUsagePolicy.Builder setNetworkType(int); + method public android.app.usage.DataUsagePolicy.Builder setThreshold(long); + } + public final class NetworkStats implements java.lang.AutoCloseable { method public void close(); method public boolean getNextBucket(android.app.usage.NetworkStats.Bucket); @@ -6612,6 +6638,14 @@ package android.app.usage { method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long, boolean) throws android.os.RemoteException, java.lang.SecurityException; + method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.DataUsageCallback); + method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.DataUsageCallback, android.os.Handler); + method public void unregisterDataUsageCallback(android.app.usage.NetworkStatsManager.DataUsageCallback); + } + + public static class NetworkStatsManager.DataUsageCallback { + ctor public NetworkStatsManager.DataUsageCallback(); + method public void onLimitReached(); } public final class UsageEvents implements android.os.Parcelable { @@ -10312,6 +10346,7 @@ package android.content.pm { method public int describeContents(); method public void dump(android.util.Printer, java.lang.String); field public static final android.os.Parcelable.Creator<android.content.pm.ServiceInfo> CREATOR; + field public static final int FLAG_EXTERNAL_SERVICE = 4; // 0x4 field public static final int FLAG_ISOLATED_PROCESS = 2; // 0x2 field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000 field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1 @@ -20291,6 +20326,257 @@ package android.location { method public static boolean isPresent(); } + public final class GnssClock implements android.os.Parcelable { + method public int describeContents(); + method public double getBiasInNs(); + method public double getBiasUncertaintyInNs(); + method public double getDriftInNsPerSec(); + method public double getDriftUncertaintyInNsPerSec(); + method public long getFullBiasInNs(); + method public short getLeapSecond(); + method public long getTimeInNs(); + method public long getTimeOfLastHwClockDiscontinuityInNs(); + method public double getTimeUncertaintyInNs(); + method public byte getType(); + method public boolean hasBiasInNs(); + method public boolean hasBiasUncertaintyInNs(); + method public boolean hasDriftInNsPerSec(); + method public boolean hasDriftUncertaintyInNsPerSec(); + method public boolean hasFullBiasInNs(); + method public boolean hasLeapSecond(); + method public boolean hasTimeUncertaintyInNs(); + method public void reset(); + method public void resetBiasInNs(); + method public void resetBiasUncertaintyInNs(); + method public void resetDriftInNsPerSec(); + method public void resetDriftUncertaintyInNsPerSec(); + method public void resetFullBiasInNs(); + method public void resetLeapSecond(); + method public void resetTimeUncertaintyInNs(); + method public void set(android.location.GnssClock); + method public void setBiasInNs(double); + method public void setBiasUncertaintyInNs(double); + method public void setDriftInNsPerSec(double); + method public void setDriftUncertaintyInNsPerSec(double); + method public void setFullBiasInNs(long); + method public void setLeapSecond(short); + method public void setTimeInNs(long); + method public void setTimeOfLastHwClockDiscontinuityInNs(long); + method public void setTimeUncertaintyInNs(double); + method public void setType(byte); + method public void writeToParcel(android.os.Parcel, int); + field public static final byte CLOCK_TYPE_GPS_TIME = 2; // 0x2 + field public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; // 0x1 + field public static final byte CLOCK_TYPE_UNKNOWN = 0; // 0x0 + field public static final android.os.Parcelable.Creator<android.location.GnssClock> CREATOR; + } + + public static abstract class GnssClock.GnssClockType implements java.lang.annotation.Annotation { + } + + public final class GnssMeasurement implements android.os.Parcelable { + method public int describeContents(); + method public double getAccumulatedDeltaRangeInMeters(); + method public short getAccumulatedDeltaRangeState(); + method public double getAccumulatedDeltaRangeUncertaintyInMeters(); + method public double getAzimuthInDeg(); + method public double getAzimuthUncertaintyInDeg(); + method public int getBitNumber(); + method public long getCarrierCycles(); + method public float getCarrierFrequencyInHz(); + method public double getCarrierPhase(); + method public double getCarrierPhaseUncertainty(); + method public double getCn0InDbHz(); + method public double getCodePhaseInChips(); + method public double getCodePhaseUncertaintyInChips(); + method public double getDopplerShiftInHz(); + method public double getDopplerShiftUncertaintyInHz(); + method public double getElevationInDeg(); + method public double getElevationUncertaintyInDeg(); + method public byte getLossOfLock(); + method public byte getMultipathIndicator(); + method public byte getPrn(); + method public double getPseudorangeInMeters(); + method public double getPseudorangeRateCarrierInMetersPerSec(); + method public double getPseudorangeRateCarrierUncertaintyInMetersPerSec(); + method public double getPseudorangeRateInMetersPerSec(); + method public double getPseudorangeRateUncertaintyInMetersPerSec(); + method public double getPseudorangeUncertaintyInMeters(); + method public long getReceivedGpsTowInNs(); + method public long getReceivedGpsTowUncertaintyInNs(); + method public double getSnrInDb(); + method public short getState(); + method public short getTimeFromLastBitInMs(); + method public double getTimeOffsetInNs(); + method public boolean hasAzimuthInDeg(); + method public boolean hasAzimuthUncertaintyInDeg(); + method public boolean hasBitNumber(); + method public boolean hasCarrierCycles(); + method public boolean hasCarrierFrequencyInHz(); + method public boolean hasCarrierPhase(); + method public boolean hasCarrierPhaseUncertainty(); + method public boolean hasCodePhaseInChips(); + method public boolean hasCodePhaseUncertaintyInChips(); + method public boolean hasDopplerShiftInHz(); + method public boolean hasDopplerShiftUncertaintyInHz(); + method public boolean hasElevationInDeg(); + method public boolean hasElevationUncertaintyInDeg(); + method public boolean hasPseudorangeInMeters(); + method public boolean hasPseudorangeUncertaintyInMeters(); + method public boolean hasSnrInDb(); + method public boolean hasTimeFromLastBitInMs(); + method public boolean isPseudorangeRateCorrected(); + method public boolean isUsedInFix(); + method public void reset(); + method public void resetAzimuthInDeg(); + method public void resetAzimuthUncertaintyInDeg(); + method public void resetBitNumber(); + method public void resetCarrierCycles(); + method public void resetCarrierFrequencyInHz(); + method public void resetCarrierPhase(); + method public void resetCarrierPhaseUncertainty(); + method public void resetCodePhaseInChips(); + method public void resetCodePhaseUncertaintyInChips(); + method public void resetDopplerShiftInHz(); + method public void resetDopplerShiftUncertaintyInHz(); + method public void resetElevationInDeg(); + method public void resetElevationUncertaintyInDeg(); + method public void resetPseudorangeInMeters(); + method public void resetPseudorangeUncertaintyInMeters(); + method public void resetSnrInDb(); + method public void resetTimeFromLastBitInMs(); + method public void set(android.location.GnssMeasurement); + method public void setAccumulatedDeltaRangeInMeters(double); + method public void setAccumulatedDeltaRangeState(short); + method public void setAccumulatedDeltaRangeUncertaintyInMeters(double); + method public void setAzimuthInDeg(double); + method public void setAzimuthUncertaintyInDeg(double); + method public void setBitNumber(int); + method public void setCarrierCycles(long); + method public void setCarrierFrequencyInHz(float); + method public void setCarrierPhase(double); + method public void setCarrierPhaseUncertainty(double); + method public void setCn0InDbHz(double); + method public void setCodePhaseInChips(double); + method public void setCodePhaseUncertaintyInChips(double); + method public void setDopplerShiftInHz(double); + method public void setDopplerShiftUncertaintyInHz(double); + method public void setElevationInDeg(double); + method public void setElevationUncertaintyInDeg(double); + method public void setLossOfLock(byte); + method public void setMultipathIndicator(byte); + method public void setPrn(byte); + method public void setPseudorangeInMeters(double); + method public void setPseudorangeRateCarrierInMetersPerSec(double); + method public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double); + method public void setPseudorangeRateInMetersPerSec(double); + method public void setPseudorangeRateUncertaintyInMetersPerSec(double); + method public void setPseudorangeUncertaintyInMeters(double); + method public void setReceivedGpsTowInNs(long); + method public void setReceivedGpsTowUncertaintyInNs(long); + method public void setSnrInDb(double); + method public void setState(short); + method public void setTimeFromLastBitInMs(short); + method public void setTimeOffsetInNs(double); + method public void setUsedInFix(boolean); + method public void writeToParcel(android.os.Parcel, int); + field public static final short ADR_STATE_CYCLE_SLIP = 4; // 0x4 + field public static final short ADR_STATE_RESET = 2; // 0x2 + field public static final short ADR_STATE_UNKNOWN = 0; // 0x0 + field public static final short ADR_STATE_VALID = 1; // 0x1 + field public static final android.os.Parcelable.Creator<android.location.GnssMeasurement> CREATOR; + field public static final byte LOSS_OF_LOCK_CYCLE_SLIP = 2; // 0x2 + field public static final byte LOSS_OF_LOCK_OK = 1; // 0x1 + field public static final byte LOSS_OF_LOCK_UNKNOWN = 0; // 0x0 + field public static final byte MULTIPATH_INDICATOR_DETECTED = 1; // 0x1 + field public static final byte MULTIPATH_INDICATOR_NOT_USED = 2; // 0x2 + field public static final byte MULTIPATH_INDICATOR_UNKNOWN = 0; // 0x0 + field public static final short STATE_BIT_SYNC = 2; // 0x2 + field public static final short STATE_CODE_LOCK = 1; // 0x1 + field public static final short STATE_MSEC_AMBIGUOUS = 16; // 0x10 + field public static final short STATE_SUBFRAME_SYNC = 4; // 0x4 + field public static final short STATE_TOW_DECODED = 8; // 0x8 + field public static final short STATE_UNKNOWN = 0; // 0x0 + } + + public static abstract class GnssMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation { + } + + public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation { + } + + public final class GnssMeasurementsEvent implements android.os.Parcelable { + ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]); + method public int describeContents(); + method public android.location.GnssClock getClock(); + method public java.util.Collection<android.location.GnssMeasurement> getMeasurements(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.location.GnssMeasurementsEvent> CREATOR; + field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2 + field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 + field public static final int STATUS_READY = 1; // 0x1 + } + + public static abstract class GnssMeasurementsEvent.Callback { + ctor public GnssMeasurementsEvent.Callback(); + method public void onGnssMeasurementsReceived(android.location.GnssMeasurementsEvent); + method public void onStatusChanged(int); + } + + public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation { + } + + public final class GnssNavigationMessage implements android.os.Parcelable { + method public int describeContents(); + method public byte[] getData(); + method public short getMessageId(); + method public byte getPrn(); + method public short getStatus(); + method public short getSubmessageId(); + method public byte getType(); + method public void reset(); + method public void set(android.location.GnssNavigationMessage); + method public void setData(byte[]); + method public void setMessageId(short); + method public void setPrn(byte); + method public void setStatus(short); + method public void setSubmessageId(short); + method public void setType(byte); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessage> CREATOR; + field public static final byte MESSAGE_TYPE_CNAV2 = 4; // 0x4 + field public static final byte MESSAGE_TYPE_L1CA = 1; // 0x1 + field public static final byte MESSAGE_TYPE_L2CNAV = 2; // 0x2 + field public static final byte MESSAGE_TYPE_L5CNAV = 3; // 0x3 + field public static final byte MESSAGE_TYPE_UNKNOWN = 0; // 0x0 + field public static final short STATUS_PARITY_PASSED = 1; // 0x1 + field public static final short STATUS_PARITY_REBUILT = 2; // 0x2 + field public static final short STATUS_UNKNOWN = 0; // 0x0 + } + + public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation { + } + + public final class GnssNavigationMessageEvent implements android.os.Parcelable { + ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage); + method public int describeContents(); + method public android.location.GnssNavigationMessage getNavigationMessage(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR; + field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2 + field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 + field public static final int STATUS_READY = 1; // 0x1 + } + + public static abstract class GnssNavigationMessageEvent.Callback { + ctor public GnssNavigationMessageEvent.Callback(); + method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent); + method public void onStatusChanged(int); + } + + public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation { + } + public abstract interface GnssNmeaListener { method public abstract void onNmeaReceived(long, java.lang.String); } @@ -20322,7 +20608,7 @@ package android.location { method public void onStopped(); } - public final class GpsClock implements android.os.Parcelable { + public class GpsClock implements android.os.Parcelable { method public int describeContents(); method public double getBiasInNs(); method public double getBiasUncertaintyInNs(); @@ -20331,7 +20617,6 @@ package android.location { method public long getFullBiasInNs(); method public short getLeapSecond(); method public long getTimeInNs(); - method public long getTimeOfLastHwClockDiscontinuityInNs(); method public double getTimeUncertaintyInNs(); method public byte getType(); method public boolean hasBiasInNs(); @@ -20357,20 +20642,16 @@ package android.location { method public void setFullBiasInNs(long); method public void setLeapSecond(short); method public void setTimeInNs(long); - method public void setTimeOfLastHwClockDiscontinuityInNs(long); method public void setTimeUncertaintyInNs(double); method public void setType(byte); method public void writeToParcel(android.os.Parcel, int); - field public static final byte CLOCK_TYPE_GPS_TIME = 2; // 0x2 - field public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; // 0x1 - field public static final byte CLOCK_TYPE_UNKNOWN = 0; // 0x0 field public static final android.os.Parcelable.Creator<android.location.GpsClock> CREATOR; + field public static final byte TYPE_GPS_TIME = 2; // 0x2 + field public static final byte TYPE_LOCAL_HW_TIME = 1; // 0x1 + field public static final byte TYPE_UNKNOWN = 0; // 0x0 } - public static abstract class GpsClock.GpsClockType implements java.lang.annotation.Annotation { - } - - public final class GpsMeasurement implements android.os.Parcelable { + public class GpsMeasurement implements android.os.Parcelable { method public int describeContents(); method public double getAccumulatedDeltaRangeInMeters(); method public short getAccumulatedDeltaRangeState(); @@ -20393,8 +20674,6 @@ package android.location { method public byte getMultipathIndicator(); method public byte getPrn(); method public double getPseudorangeInMeters(); - method public double getPseudorangeRateCarrierInMetersPerSec(); - method public double getPseudorangeRateCarrierUncertaintyInMetersPerSec(); method public double getPseudorangeRateInMetersPerSec(); method public double getPseudorangeRateUncertaintyInMetersPerSec(); method public double getPseudorangeUncertaintyInMeters(); @@ -20463,8 +20742,6 @@ package android.location { method public void setMultipathIndicator(byte); method public void setPrn(byte); method public void setPseudorangeInMeters(double); - method public void setPseudorangeRateCarrierInMetersPerSec(double); - method public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double); method public void setPseudorangeRateInMetersPerSec(double); method public void setPseudorangeRateUncertaintyInMetersPerSec(double); method public void setPseudorangeUncertaintyInMeters(double); @@ -20495,13 +20772,7 @@ package android.location { field public static final short STATE_UNKNOWN = 0; // 0x0 } - public static abstract class GpsMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation { - } - - public static abstract class GpsMeasurement.MultipathIndicator implements java.lang.annotation.Annotation { - } - - public final class GpsMeasurementsEvent implements android.os.Parcelable { + public class GpsMeasurementsEvent implements android.os.Parcelable { ctor public GpsMeasurementsEvent(android.location.GpsClock, android.location.GpsMeasurement[]); method public int describeContents(); method public android.location.GpsClock getClock(); @@ -20513,16 +20784,12 @@ package android.location { field public static final int STATUS_READY = 1; // 0x1 } - public static abstract class GpsMeasurementsEvent.Callback { - ctor public GpsMeasurementsEvent.Callback(); - method public void onGpsMeasurementsReceived(android.location.GpsMeasurementsEvent); - method public void onStatusChanged(int); - } - - public static abstract class GpsMeasurementsEvent.GpsMeasurementsStatus implements java.lang.annotation.Annotation { + public static abstract interface GpsMeasurementsEvent.Listener { + method public abstract void onGpsMeasurementsReceived(android.location.GpsMeasurementsEvent); + method public abstract void onStatusChanged(int); } - public final class GpsNavigationMessage implements android.os.Parcelable { + public class GpsNavigationMessage implements android.os.Parcelable { method public int describeContents(); method public byte[] getData(); method public short getMessageId(); @@ -20540,37 +20807,30 @@ package android.location { method public void setType(byte); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessage> CREATOR; - field public static final byte MESSAGE_TYPE_CNAV2 = 4; // 0x4 - field public static final byte MESSAGE_TYPE_L1CA = 1; // 0x1 - field public static final byte MESSAGE_TYPE_L2CNAV = 2; // 0x2 - field public static final byte MESSAGE_TYPE_L5CNAV = 3; // 0x3 - field public static final byte MESSAGE_TYPE_UNKNOWN = 0; // 0x0 field public static final short STATUS_PARITY_PASSED = 1; // 0x1 field public static final short STATUS_PARITY_REBUILT = 2; // 0x2 field public static final short STATUS_UNKNOWN = 0; // 0x0 + field public static final byte TYPE_CNAV2 = 4; // 0x4 + field public static final byte TYPE_L1CA = 1; // 0x1 + field public static final byte TYPE_L2CNAV = 2; // 0x2 + field public static final byte TYPE_L5CNAV = 3; // 0x3 + field public static final byte TYPE_UNKNOWN = 0; // 0x0 } - public static abstract class GpsNavigationMessage.GpsNavigationMessageType implements java.lang.annotation.Annotation { - } - - public final class GpsNavigationMessageEvent implements android.os.Parcelable { + public class GpsNavigationMessageEvent implements android.os.Parcelable { ctor public GpsNavigationMessageEvent(android.location.GpsNavigationMessage); method public int describeContents(); method public android.location.GpsNavigationMessage getNavigationMessage(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessageEvent> CREATOR; - field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2 - field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 - field public static final int STATUS_READY = 1; // 0x1 - } - - public static abstract class GpsNavigationMessageEvent.Callback { - ctor public GpsNavigationMessageEvent.Callback(); - method public void onGpsNavigationMessageReceived(android.location.GpsNavigationMessageEvent); - method public void onStatusChanged(int); + field public static int STATUS_GPS_LOCATION_DISABLED; + field public static int STATUS_NOT_SUPPORTED; + field public static int STATUS_READY; } - public static abstract class GpsNavigationMessageEvent.GpsNavigationMessageStatus implements java.lang.annotation.Annotation { + public static abstract interface GpsNavigationMessageEvent.Listener { + method public abstract void onGpsNavigationMessageReceived(android.location.GpsNavigationMessageEvent); + method public abstract void onStatusChanged(int); } public final class GpsSatellite { @@ -20677,6 +20937,8 @@ package android.location { } public class LocationManager { + method public deprecated boolean addGpsMeasurementListener(android.location.GpsMeasurementsEvent.Listener); + method public deprecated boolean addGpsNavigationMessageListener(android.location.GpsNavigationMessageEvent.Listener); method public deprecated boolean addGpsStatusListener(android.location.GpsStatus.Listener); method public deprecated boolean addNmeaListener(android.location.GpsStatus.NmeaListener); method public boolean addNmeaListener(android.location.GnssNmeaListener); @@ -20694,12 +20956,14 @@ package android.location { method public java.util.List<java.lang.String> getProviders(boolean); method public java.util.List<java.lang.String> getProviders(android.location.Criteria, boolean); method public boolean isProviderEnabled(java.lang.String); + method public boolean registerGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback); + method public boolean registerGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback, android.os.Handler); + method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); + method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler); method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback); method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler); - method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback); - method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback, android.os.Handler); - method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback); - method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback, android.os.Handler); + method public deprecated void removeGpsMeasurementListener(android.location.GpsMeasurementsEvent.Listener); + method public deprecated void removeGpsNavigationMessageListener(android.location.GpsNavigationMessageEvent.Listener); method public deprecated void removeGpsStatusListener(android.location.GpsStatus.Listener); method public deprecated void removeNmeaListener(android.location.GpsStatus.NmeaListener); method public void removeNmeaListener(android.location.GnssNmeaListener); @@ -20722,9 +20986,9 @@ package android.location { method public void setTestProviderEnabled(java.lang.String, boolean); method public void setTestProviderLocation(java.lang.String, android.location.Location); method public void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long); + method public void unregisterGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback); + method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback); - method public void unregisterGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback); - method public void unregisterGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback); field public static final java.lang.String GPS_PROVIDER = "gps"; field public static final java.lang.String KEY_LOCATION_CHANGED = "location"; field public static final java.lang.String KEY_PROVIDER_ENABLED = "providerEnabled"; @@ -24957,6 +25221,7 @@ package android.net { method public void unregisterNetworkCallback(android.app.PendingIntent); field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED"; field public static final java.lang.String ACTION_CAPTIVE_PORTAL_SIGN_IN = "android.net.conn.CAPTIVE_PORTAL"; + field public static final java.lang.String ACTION_RESTRICT_BACKGROUND_CHANGED = "android.net.conn.RESTRICT_BACKGROUND_CHANGED"; field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE"; field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1 field public static final java.lang.String EXTRA_CAPTIVE_PORTAL = "android.net.extra.CAPTIVE_PORTAL"; @@ -25015,6 +25280,12 @@ package android.net { method public int getUid(); } + public class DataUsageRequest implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.net.DataUsageRequest> CREATOR; + } + public class DhcpInfo implements android.os.Parcelable { ctor public DhcpInfo(); method public int describeContents(); @@ -26124,22 +26395,6 @@ package android.net.wifi { field public byte id; } - public class ScanInfo implements android.os.Parcelable { - ctor public ScanInfo(android.net.wifi.ScanResult); - ctor public ScanInfo(long, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, byte[], int); - method public int describeContents(); - method public long getBssid(); - method public byte[] getIconData(); - method public java.lang.String getIconType(); - method public java.lang.String getName(); - method public int getOsuIdentity(); - method public int getRssi(); - method public android.net.wifi.ScanResult getScanResult(); - method public java.lang.String getServiceDescription(); - method public java.lang.String getSsid(); - method public void writeToParcel(android.os.Parcel, int); - } - public class ScanResult implements android.os.Parcelable { method public int describeContents(); method public boolean is80211mcResponder(); @@ -26323,6 +26578,7 @@ package android.net.wifi { field public static final int SIM = 4; // 0x4 field public static final int TLS = 1; // 0x1 field public static final int TTLS = 2; // 0x2 + field public static final int UNAUTH_TLS = 7; // 0x7 } public static final class WifiEnterpriseConfig.Phase2 { @@ -26368,7 +26624,6 @@ package android.net.wifi { method public android.net.wifi.WifiConnectionStatistics getConnectionStatistics(); method public android.net.DhcpInfo getDhcpInfo(); method public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks(); - method public java.util.List<android.net.wifi.ScanInfo> getScanInfos(); method public java.util.List<android.net.wifi.ScanResult> getScanResults(); method public android.net.wifi.WifiConfiguration getWifiApConfiguration(); method public int getWifiApState(); @@ -26391,7 +26646,6 @@ package android.net.wifi { method public boolean reconnect(); method public boolean removeNetwork(int); method public boolean saveConfiguration(); - method public void setOsuSelection(int); method public void setTdlsEnabled(java.net.InetAddress, boolean); method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean); method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration); @@ -32183,6 +32437,7 @@ package android.provider { } public class BlockedNumberContract { + method public static boolean canCurrentUserBlockNumbers(android.content.Context); method public static boolean isBlocked(android.content.Context, java.lang.String); field public static final java.lang.String AUTHORITY = "com.android.blockednumber"; field public static final android.net.Uri AUTHORITY_URI; @@ -32192,7 +32447,6 @@ package android.provider { field public static final java.lang.String COLUMN_E164_NUMBER = "e164_number"; field public static final java.lang.String COLUMN_ID = "_id"; field public static final java.lang.String COLUMN_ORIGINAL_NUMBER = "original_number"; - field public static final java.lang.String COLUMN_STRIPPED_NUMBER = "stripped_number"; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/blocked_number"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/blocked_numbers"; field public static final android.net.Uri CONTENT_URI; @@ -33733,14 +33987,13 @@ package android.provider { field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type"; field public static final java.lang.String COLUMN_SIZE = "_size"; field public static final java.lang.String COLUMN_SUMMARY = "summary"; - field public static final int FLAG_ARCHIVE = 1024; // 0x400 field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10 field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20 field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8 field public static final int FLAG_SUPPORTS_COPY = 128; // 0x80 field public static final int FLAG_SUPPORTS_DELETE = 4; // 0x4 field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100 - field public static final int FLAG_SUPPORTS_REMOVE = 2048; // 0x800 + field public static final int FLAG_SUPPORTS_REMOVE = 1024; // 0x400 field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40 field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1 field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2 @@ -34268,6 +34521,7 @@ package android.provider { field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS"; field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS"; field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS"; + field public static final java.lang.String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS"; field public static final java.lang.String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS = "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"; @@ -38677,6 +38931,7 @@ package android.telecom { method public boolean isRinging(); method public boolean isTtySupported(); method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String); + method public void launchManageBlockedNumbersActivity(); method public void placeCall(android.net.Uri, android.os.Bundle); method public void registerPhoneAccount(android.telecom.PhoneAccount); method public void showInCallScreen(boolean); @@ -46110,6 +46365,7 @@ package android.view.accessibility { method public boolean isEnabled(); method public boolean isFocusable(); method public boolean isFocused(); + method public boolean isImportantForAccessibility(); method public boolean isLongClickable(); method public boolean isMultiLine(); method public boolean isPassword(); @@ -46148,6 +46404,7 @@ package android.view.accessibility { method public void setError(java.lang.CharSequence); method public void setFocusable(boolean); method public void setFocused(boolean); + method public void setImportantForAccessibility(boolean); method public void setInputType(int); method public void setLabelFor(android.view.View); method public void setLabelFor(android.view.View, int); @@ -52935,13 +53192,16 @@ package java.lang { method public static java.lang.Class<?> forName(java.lang.String, boolean, java.lang.ClassLoader) throws java.lang.ClassNotFoundException; method public A getAnnotation(java.lang.Class<A>); method public java.lang.annotation.Annotation[] getAnnotations(); + method public T[] getAnnotationsByType(java.lang.Class<T>); method public java.lang.String getCanonicalName(); method public java.lang.ClassLoader getClassLoader(); method public java.lang.Class<?>[] getClasses(); method public java.lang.Class<?> getComponentType(); method public java.lang.reflect.Constructor<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException; + method public T getDeclaredAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public java.lang.Class<?>[] getDeclaredClasses(); method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException; @@ -53472,7 +53732,10 @@ package java.lang { public class Package implements java.lang.reflect.AnnotatedElement { method public A getAnnotation(java.lang.Class<A>); method public java.lang.annotation.Annotation[] getAnnotations(); + method public T[] getAnnotationsByType(java.lang.Class<T>); + method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public java.lang.String getImplementationTitle(); method public java.lang.String getImplementationVendor(); method public java.lang.String getImplementationVersion(); @@ -54166,7 +54429,10 @@ package java.lang.reflect { ctor protected AccessibleObject(); method public T getAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getAnnotations(); + method public T[] getAnnotationsByType(java.lang.Class<T>); + method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public boolean isAccessible(); method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>); method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException; @@ -54176,7 +54442,10 @@ package java.lang.reflect { public abstract interface AnnotatedElement { method public abstract T getAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getAnnotations(); + method public abstract T[] getAnnotationsByType(java.lang.Class<T>); + method public abstract java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public abstract T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public abstract boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>); } @@ -55291,7 +55560,6 @@ package java.net { method public static void setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory); method public java.lang.String toExternalForm(); method public java.net.URI toURI() throws java.net.URISyntaxException; - method public java.net.URI toURILenient() throws java.net.URISyntaxException; } public class URLClassLoader extends java.security.SecureClassLoader implements java.io.Closeable { diff --git a/api/test-current.txt b/api/test-current.txt index 3e755ae299c7..278a47d1debb 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -68,7 +68,7 @@ package android { field public static final java.lang.String DUMP = "android.permission.DUMP"; field public static final java.lang.String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR"; field public static final java.lang.String FACTORY_TEST = "android.permission.FACTORY_TEST"; - field public static final deprecated java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; + field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED"; field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE"; field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS"; @@ -198,6 +198,7 @@ package android { public static final class R.attr { ctor public R.attr(); + field public static final int abiOverride = 16844054; // 0x1010516 field public static final int absListViewStyle = 16842858; // 0x101006a field public static final int accessibilityEventTypes = 16843648; // 0x1010380 field public static final int accessibilityFeedbackType = 16843650; // 0x1010382 @@ -305,6 +306,7 @@ package android { field public static final int baselineAlignBottom = 16843042; // 0x1010122 field public static final int baselineAligned = 16843046; // 0x1010126 field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127 + field public static final int bitmap = 16844055; // 0x1010517 field public static final int borderlessButtonStyle = 16843563; // 0x101032b field public static final int bottom = 16843184; // 0x10101b0 field public static final int bottomBright = 16842957; // 0x10100cd @@ -646,6 +648,8 @@ package android { field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353 field public static final int horizontalSpacing = 16843028; // 0x1010114 field public static final int host = 16842792; // 0x1010028 + field public static final int hotSpotX = 16844056; // 0x1010518 + field public static final int hotSpotY = 16844057; // 0x1010519 field public static final int hyphenationFrequency = 16843998; // 0x10104de field public static final int icon = 16842754; // 0x1010002 field public static final int iconPreview = 16843337; // 0x1010249 @@ -4422,9 +4426,11 @@ package android.app { method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle); method public deprecated void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle); method public void onLowMemory(); + method public void onMultiWindowChanged(boolean); method public boolean onOptionsItemSelected(android.view.MenuItem); method public void onOptionsMenuClosed(android.view.Menu); method public void onPause(); + method public void onPictureInPictureChanged(boolean); method public void onPrepareOptionsMenu(android.view.Menu); method public void onRequestPermissionsResult(int, java.lang.String[], int[]); method public void onResume(); @@ -4505,9 +4511,11 @@ package android.app { method public void dispatchDestroy(); method public void dispatchDestroyView(); method public void dispatchLowMemory(); + method public void dispatchMultiWindowChanged(boolean); method public boolean dispatchOptionsItemSelected(android.view.MenuItem); method public void dispatchOptionsMenuClosed(android.view.Menu); method public void dispatchPause(); + method public void dispatchPictureInPictureChanged(boolean); method public boolean dispatchPrepareOptionsMenu(android.view.Menu); method public void dispatchResume(); method public void dispatchStart(); @@ -6317,6 +6325,22 @@ package android.app.usage { field public static final android.os.Parcelable.Creator<android.app.usage.ConfigurationStats> CREATOR; } + public class DataUsagePolicy { + field public final int networkType; + field public final java.lang.String[] subscriberIds; + field public final long thresholdInBytes; + field public final int[] uids; + } + + public static class DataUsagePolicy.Builder { + ctor public DataUsagePolicy.Builder(); + method public android.app.usage.DataUsagePolicy.Builder addSubscriberId(java.lang.String); + method public android.app.usage.DataUsagePolicy.Builder addUid(int); + method public android.app.usage.DataUsagePolicy build(); + method public android.app.usage.DataUsagePolicy.Builder setNetworkType(int); + method public android.app.usage.DataUsagePolicy.Builder setThreshold(long); + } + public final class NetworkStats implements java.lang.AutoCloseable { method public void close(); method public boolean getNextBucket(android.app.usage.NetworkStats.Bucket); @@ -6357,6 +6381,14 @@ package android.app.usage { method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long, boolean) throws android.os.RemoteException, java.lang.SecurityException; + method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.DataUsageCallback); + method public void registerDataUsageCallback(android.app.usage.DataUsagePolicy, android.app.usage.NetworkStatsManager.DataUsageCallback, android.os.Handler); + method public void unregisterDataUsageCallback(android.app.usage.NetworkStatsManager.DataUsageCallback); + } + + public static class NetworkStatsManager.DataUsageCallback { + ctor public NetworkStatsManager.DataUsageCallback(); + method public void onLimitReached(); } public final class UsageEvents implements android.os.Parcelable { @@ -8060,6 +8092,7 @@ package android.content { field public static final int BIND_ALLOW_OOM_MANAGEMENT = 16; // 0x10 field public static final int BIND_AUTO_CREATE = 1; // 0x1 field public static final int BIND_DEBUG_UNBIND = 2; // 0x2 + field public static final int BIND_EXTERNAL_SERVICE = -2147483648; // 0x80000000 field public static final int BIND_IMPORTANT = 64; // 0x40 field public static final int BIND_NOT_FOREGROUND = 4; // 0x4 field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20 @@ -9919,6 +9952,7 @@ package android.content.pm { method public int describeContents(); method public void dump(android.util.Printer, java.lang.String); field public static final android.os.Parcelable.Creator<android.content.pm.ServiceInfo> CREATOR; + field public static final int FLAG_EXTERNAL_SERVICE = 4; // 0x4 field public static final int FLAG_ISOLATED_PROCESS = 2; // 0x2 field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000 field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1 @@ -19119,38 +19153,7 @@ package android.location { method public static boolean isPresent(); } - public abstract interface GnssNmeaListener { - method public abstract void onNmeaReceived(long, java.lang.String); - } - - public final class GnssStatus { - method public float getAzimuth(int); - method public int getConstellationType(int); - method public float getElevation(int); - method public int getNumSatellites(); - method public int getPrn(int); - method public float getSnr(int); - method public boolean hasAlmanac(int); - method public boolean hasEphemeris(int); - method public boolean usedInFix(int); - field public static final int CONSTELLATION_BEIDOU = 5; // 0x5 - field public static final int CONSTELLATION_GALILEO = 6; // 0x6 - field public static final int CONSTELLATION_GLONASS = 3; // 0x3 - field public static final int CONSTELLATION_GPS = 1; // 0x1 - field public static final int CONSTELLATION_QZSS = 4; // 0x4 - field public static final int CONSTELLATION_SBAS = 2; // 0x2 - field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0 - } - - public abstract class GnssStatusCallback { - ctor public GnssStatusCallback(); - method public void onFirstFix(int); - method public void onSatelliteStatusChanged(android.location.GnssStatus); - method public void onStarted(); - method public void onStopped(); - } - - public final class GpsClock implements android.os.Parcelable { + public final class GnssClock implements android.os.Parcelable { method public int describeContents(); method public double getBiasInNs(); method public double getBiasUncertaintyInNs(); @@ -19177,7 +19180,7 @@ package android.location { method public void resetFullBiasInNs(); method public void resetLeapSecond(); method public void resetTimeUncertaintyInNs(); - method public void set(android.location.GpsClock); + method public void set(android.location.GnssClock); method public void setBiasInNs(double); method public void setBiasUncertaintyInNs(double); method public void setDriftInNsPerSec(double); @@ -19192,13 +19195,13 @@ package android.location { field public static final byte CLOCK_TYPE_GPS_TIME = 2; // 0x2 field public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; // 0x1 field public static final byte CLOCK_TYPE_UNKNOWN = 0; // 0x0 - field public static final android.os.Parcelable.Creator<android.location.GpsClock> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssClock> CREATOR; } - public static abstract class GpsClock.GpsClockType implements java.lang.annotation.Annotation { + public static abstract class GnssClock.GnssClockType implements java.lang.annotation.Annotation { } - public final class GpsMeasurement implements android.os.Parcelable { + public final class GnssMeasurement implements android.os.Parcelable { method public int describeContents(); method public double getAccumulatedDeltaRangeInMeters(); method public short getAccumulatedDeltaRangeState(); @@ -19269,7 +19272,7 @@ package android.location { method public void resetPseudorangeUncertaintyInMeters(); method public void resetSnrInDb(); method public void resetTimeFromLastBitInMs(); - method public void set(android.location.GpsMeasurement); + method public void set(android.location.GnssMeasurement); method public void setAccumulatedDeltaRangeInMeters(double); method public void setAccumulatedDeltaRangeState(short); method public void setAccumulatedDeltaRangeUncertaintyInMeters(double); @@ -19308,7 +19311,7 @@ package android.location { field public static final short ADR_STATE_RESET = 2; // 0x2 field public static final short ADR_STATE_UNKNOWN = 0; // 0x0 field public static final short ADR_STATE_VALID = 1; // 0x1 - field public static final android.os.Parcelable.Creator<android.location.GpsMeasurement> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssMeasurement> CREATOR; field public static final byte LOSS_OF_LOCK_CYCLE_SLIP = 2; // 0x2 field public static final byte LOSS_OF_LOCK_OK = 1; // 0x1 field public static final byte LOSS_OF_LOCK_UNKNOWN = 0; // 0x0 @@ -19323,34 +19326,34 @@ package android.location { field public static final short STATE_UNKNOWN = 0; // 0x0 } - public static abstract class GpsMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation { + public static abstract class GnssMeasurement.LossOfLockStatus implements java.lang.annotation.Annotation { } - public static abstract class GpsMeasurement.MultipathIndicator implements java.lang.annotation.Annotation { + public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation { } - public final class GpsMeasurementsEvent implements android.os.Parcelable { - ctor public GpsMeasurementsEvent(android.location.GpsClock, android.location.GpsMeasurement[]); + public final class GnssMeasurementsEvent implements android.os.Parcelable { + ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]); method public int describeContents(); - method public android.location.GpsClock getClock(); - method public java.util.Collection<android.location.GpsMeasurement> getMeasurements(); + method public android.location.GnssClock getClock(); + method public java.util.Collection<android.location.GnssMeasurement> getMeasurements(); method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.location.GpsMeasurementsEvent> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssMeasurementsEvent> CREATOR; field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2 field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 field public static final int STATUS_READY = 1; // 0x1 } - public static abstract class GpsMeasurementsEvent.Callback { - ctor public GpsMeasurementsEvent.Callback(); - method public void onGpsMeasurementsReceived(android.location.GpsMeasurementsEvent); + public static abstract class GnssMeasurementsEvent.Callback { + ctor public GnssMeasurementsEvent.Callback(); + method public void onGnssMeasurementsReceived(android.location.GnssMeasurementsEvent); method public void onStatusChanged(int); } - public static abstract class GpsMeasurementsEvent.GpsMeasurementsStatus implements java.lang.annotation.Annotation { + public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation { } - public final class GpsNavigationMessage implements android.os.Parcelable { + public final class GnssNavigationMessage implements android.os.Parcelable { method public int describeContents(); method public byte[] getData(); method public short getMessageId(); @@ -19359,7 +19362,7 @@ package android.location { method public short getSubmessageId(); method public byte getType(); method public void reset(); - method public void set(android.location.GpsNavigationMessage); + method public void set(android.location.GnssNavigationMessage); method public void setData(byte[]); method public void setMessageId(short); method public void setPrn(byte); @@ -19367,7 +19370,7 @@ package android.location { method public void setSubmessageId(short); method public void setType(byte); method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessage> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessage> CREATOR; field public static final byte MESSAGE_TYPE_CNAV2 = 4; // 0x4 field public static final byte MESSAGE_TYPE_L1CA = 1; // 0x1 field public static final byte MESSAGE_TYPE_L2CNAV = 2; // 0x2 @@ -19378,27 +19381,58 @@ package android.location { field public static final short STATUS_UNKNOWN = 0; // 0x0 } - public static abstract class GpsNavigationMessage.GpsNavigationMessageType implements java.lang.annotation.Annotation { + public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation { } - public final class GpsNavigationMessageEvent implements android.os.Parcelable { - ctor public GpsNavigationMessageEvent(android.location.GpsNavigationMessage); + public final class GnssNavigationMessageEvent implements android.os.Parcelable { + ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage); method public int describeContents(); - method public android.location.GpsNavigationMessage getNavigationMessage(); + method public android.location.GnssNavigationMessage getNavigationMessage(); method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.location.GpsNavigationMessageEvent> CREATOR; + field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR; field public static final int STATUS_GPS_LOCATION_DISABLED = 2; // 0x2 field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 field public static final int STATUS_READY = 1; // 0x1 } - public static abstract class GpsNavigationMessageEvent.Callback { - ctor public GpsNavigationMessageEvent.Callback(); - method public void onGpsNavigationMessageReceived(android.location.GpsNavigationMessageEvent); + public static abstract class GnssNavigationMessageEvent.Callback { + ctor public GnssNavigationMessageEvent.Callback(); + method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent); method public void onStatusChanged(int); } - public static abstract class GpsNavigationMessageEvent.GpsNavigationMessageStatus implements java.lang.annotation.Annotation { + public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation { + } + + public abstract interface GnssNmeaListener { + method public abstract void onNmeaReceived(long, java.lang.String); + } + + public final class GnssStatus { + method public float getAzimuth(int); + method public int getConstellationType(int); + method public float getElevation(int); + method public int getNumSatellites(); + method public int getPrn(int); + method public float getSnr(int); + method public boolean hasAlmanac(int); + method public boolean hasEphemeris(int); + method public boolean usedInFix(int); + field public static final int CONSTELLATION_BEIDOU = 5; // 0x5 + field public static final int CONSTELLATION_GALILEO = 6; // 0x6 + field public static final int CONSTELLATION_GLONASS = 3; // 0x3 + field public static final int CONSTELLATION_GPS = 1; // 0x1 + field public static final int CONSTELLATION_QZSS = 4; // 0x4 + field public static final int CONSTELLATION_SBAS = 2; // 0x2 + field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0 + } + + public abstract class GnssStatusCallback { + ctor public GnssStatusCallback(); + method public void onFirstFix(int); + method public void onSatelliteStatusChanged(android.location.GnssStatus); + method public void onStarted(); + method public void onStopped(); } public final class GpsSatellite { @@ -19503,12 +19537,12 @@ package android.location { method public java.util.List<java.lang.String> getProviders(boolean); method public java.util.List<java.lang.String> getProviders(android.location.Criteria, boolean); method public boolean isProviderEnabled(java.lang.String); + method public boolean registerGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback); + method public boolean registerGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback, android.os.Handler); + method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); + method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler); method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback); method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler); - method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback); - method public boolean registerGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback, android.os.Handler); - method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback); - method public boolean registerGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback, android.os.Handler); method public deprecated void removeGpsStatusListener(android.location.GpsStatus.Listener); method public deprecated void removeNmeaListener(android.location.GpsStatus.NmeaListener); method public void removeNmeaListener(android.location.GnssNmeaListener); @@ -19529,9 +19563,9 @@ package android.location { method public void setTestProviderEnabled(java.lang.String, boolean); method public void setTestProviderLocation(java.lang.String, android.location.Location); method public void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long); + method public void unregisterGnssMeasurementCallback(android.location.GnssMeasurementsEvent.Callback); + method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback); - method public void unregisterGpsMeasurementCallback(android.location.GpsMeasurementsEvent.Callback); - method public void unregisterGpsNavigationMessageCallback(android.location.GpsNavigationMessageEvent.Callback); field public static final java.lang.String GPS_PROVIDER = "gps"; field public static final java.lang.String KEY_LOCATION_CHANGED = "location"; field public static final java.lang.String KEY_PROVIDER_ENABLED = "providerEnabled"; @@ -23399,6 +23433,7 @@ package android.net { method public void unregisterNetworkCallback(android.app.PendingIntent); field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED"; field public static final java.lang.String ACTION_CAPTIVE_PORTAL_SIGN_IN = "android.net.conn.CAPTIVE_PORTAL"; + field public static final java.lang.String ACTION_RESTRICT_BACKGROUND_CHANGED = "android.net.conn.RESTRICT_BACKGROUND_CHANGED"; field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE"; field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1 field public static final java.lang.String EXTRA_CAPTIVE_PORTAL = "android.net.extra.CAPTIVE_PORTAL"; @@ -23448,6 +23483,12 @@ package android.net { method public int getUid(); } + public class DataUsageRequest implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.net.DataUsageRequest> CREATOR; + } + public class DhcpInfo implements android.os.Parcelable { ctor public DhcpInfo(); method public int describeContents(); @@ -24314,22 +24355,6 @@ package android.net.sip { package android.net.wifi { - public class ScanInfo implements android.os.Parcelable { - ctor public ScanInfo(android.net.wifi.ScanResult); - ctor public ScanInfo(long, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, byte[], int); - method public int describeContents(); - method public long getBssid(); - method public byte[] getIconData(); - method public java.lang.String getIconType(); - method public java.lang.String getName(); - method public int getOsuIdentity(); - method public int getRssi(); - method public android.net.wifi.ScanResult getScanResult(); - method public java.lang.String getServiceDescription(); - method public java.lang.String getSsid(); - method public void writeToParcel(android.os.Parcel, int); - } - public class ScanResult implements android.os.Parcelable { method public int describeContents(); method public boolean is80211mcResponder(); @@ -24490,6 +24515,7 @@ package android.net.wifi { field public static final int SIM = 4; // 0x4 field public static final int TLS = 1; // 0x1 field public static final int TTLS = 2; // 0x2 + field public static final int UNAUTH_TLS = 7; // 0x7 } public static final class WifiEnterpriseConfig.Phase2 { @@ -24532,7 +24558,6 @@ package android.net.wifi { method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks(); method public android.net.wifi.WifiInfo getConnectionInfo(); method public android.net.DhcpInfo getDhcpInfo(); - method public java.util.List<android.net.wifi.ScanInfo> getScanInfos(); method public java.util.List<android.net.wifi.ScanResult> getScanResults(); method public int getWifiState(); method public boolean is5GHzBandSupported(); @@ -24548,7 +24573,6 @@ package android.net.wifi { method public boolean reconnect(); method public boolean removeNetwork(int); method public boolean saveConfiguration(); - method public void setOsuSelection(int); method public void setTdlsEnabled(java.net.InetAddress, boolean); method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean); method public boolean setWifiEnabled(boolean); @@ -30149,6 +30173,7 @@ package android.provider { } public class BlockedNumberContract { + method public static boolean canCurrentUserBlockNumbers(android.content.Context); method public static boolean isBlocked(android.content.Context, java.lang.String); field public static final java.lang.String AUTHORITY = "com.android.blockednumber"; field public static final android.net.Uri AUTHORITY_URI; @@ -30158,7 +30183,6 @@ package android.provider { field public static final java.lang.String COLUMN_E164_NUMBER = "e164_number"; field public static final java.lang.String COLUMN_ID = "_id"; field public static final java.lang.String COLUMN_ORIGINAL_NUMBER = "original_number"; - field public static final java.lang.String COLUMN_STRIPPED_NUMBER = "stripped_number"; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/blocked_number"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/blocked_numbers"; field public static final android.net.Uri CONTENT_URI; @@ -31669,14 +31693,13 @@ package android.provider { field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type"; field public static final java.lang.String COLUMN_SIZE = "_size"; field public static final java.lang.String COLUMN_SUMMARY = "summary"; - field public static final int FLAG_ARCHIVE = 1024; // 0x400 field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10 field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20 field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8 field public static final int FLAG_SUPPORTS_COPY = 128; // 0x80 field public static final int FLAG_SUPPORTS_DELETE = 4; // 0x4 field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100 - field public static final int FLAG_SUPPORTS_REMOVE = 2048; // 0x800 + field public static final int FLAG_SUPPORTS_REMOVE = 1024; // 0x400 field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40 field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1 field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2 @@ -32102,6 +32125,7 @@ package android.provider { field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS"; field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS"; field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS"; + field public static final java.lang.String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS"; field public static final java.lang.String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS = "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"; @@ -36345,6 +36369,7 @@ package android.telecom { method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle); method public boolean isInCall(); method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String); + method public void launchManageBlockedNumbersActivity(); method public void placeCall(android.net.Uri, android.os.Bundle); method public void registerPhoneAccount(android.telecom.PhoneAccount); method public void showInCallScreen(boolean); @@ -43706,6 +43731,7 @@ package android.view.accessibility { method public boolean isEnabled(); method public boolean isFocusable(); method public boolean isFocused(); + method public boolean isImportantForAccessibility(); method public boolean isLongClickable(); method public boolean isMultiLine(); method public boolean isPassword(); @@ -43744,6 +43770,7 @@ package android.view.accessibility { method public void setError(java.lang.CharSequence); method public void setFocusable(boolean); method public void setFocused(boolean); + method public void setImportantForAccessibility(boolean); method public void setInputType(int); method public void setLabelFor(android.view.View); method public void setLabelFor(android.view.View, int); @@ -50198,13 +50225,16 @@ package java.lang { method public static java.lang.Class<?> forName(java.lang.String, boolean, java.lang.ClassLoader) throws java.lang.ClassNotFoundException; method public A getAnnotation(java.lang.Class<A>); method public java.lang.annotation.Annotation[] getAnnotations(); + method public T[] getAnnotationsByType(java.lang.Class<T>); method public java.lang.String getCanonicalName(); method public java.lang.ClassLoader getClassLoader(); method public java.lang.Class<?>[] getClasses(); method public java.lang.Class<?> getComponentType(); method public java.lang.reflect.Constructor<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException; + method public T getDeclaredAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public java.lang.Class<?>[] getDeclaredClasses(); method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException; method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException; @@ -50735,7 +50765,10 @@ package java.lang { public class Package implements java.lang.reflect.AnnotatedElement { method public A getAnnotation(java.lang.Class<A>); method public java.lang.annotation.Annotation[] getAnnotations(); + method public T[] getAnnotationsByType(java.lang.Class<T>); + method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public java.lang.String getImplementationTitle(); method public java.lang.String getImplementationVendor(); method public java.lang.String getImplementationVersion(); @@ -51429,7 +51462,10 @@ package java.lang.reflect { ctor protected AccessibleObject(); method public T getAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getAnnotations(); + method public T[] getAnnotationsByType(java.lang.Class<T>); + method public java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); method public java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public boolean isAccessible(); method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>); method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException; @@ -51439,7 +51475,10 @@ package java.lang.reflect { public abstract interface AnnotatedElement { method public abstract T getAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getAnnotations(); + method public abstract T[] getAnnotationsByType(java.lang.Class<T>); + method public abstract java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations(); + method public abstract T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public abstract boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>); } @@ -52554,7 +52593,6 @@ package java.net { method public static void setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory); method public java.lang.String toExternalForm(); method public java.net.URI toURI() throws java.net.URISyntaxException; - method public java.net.URI toURILenient() throws java.net.URISyntaxException; } public class URLClassLoader extends java.security.SecureClassLoader implements java.io.Closeable { diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index ba93b2a2cafe..a74a1ca7cbe6 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -21,10 +21,12 @@ package com.android.commands.am; import static android.app.ActivityManager.StackId.DOCKED_STACK_ID; import static android.app.ActivityManager.RESIZE_MODE_SYSTEM; import static android.app.ActivityManager.RESIZE_MODE_USER; +import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID; import android.app.ActivityManager; import android.app.ActivityManager.StackInfo; import android.app.ActivityManagerNative; +import android.app.ActivityOptions; import android.app.IActivityContainer; import android.app.IActivityController; import android.app.IActivityManager; @@ -106,6 +108,7 @@ public class Am extends BaseCommand { private String mProfileFile; private int mSamplingInterval; private boolean mAutoStop; + private int mStackId; /** * Command-line entry point. @@ -191,6 +194,7 @@ public class Am extends BaseCommand { " --track-allocation: enable tracking of object allocations\n" + " --user <USER_ID> | current: Specify which user to run as; if not\n" + " specified then run as the current user.\n" + + " --stack <STACK_ID>: Specify into which stack should the activity be put." + "\n" + "am startservice: start a Service. Options are:\n" + " --user <USER_ID> | current: Specify which user to run as; if not\n" + @@ -467,6 +471,7 @@ public class Am extends BaseCommand { mSamplingInterval = 0; mAutoStop = false; mUserId = defUser; + mStackId = FULLSCREEN_WORKSPACE_STACK_ID; return Intent.parseCommandArgs(mArgs, new Intent.CommandOptionHandler() { @Override @@ -493,6 +498,8 @@ public class Am extends BaseCommand { mUserId = parseUserArg(nextArgRequired()); } else if (opt.equals("--receiver-permission")) { mReceiverPermission = nextArgRequired(); + } else if (opt.equals("--stack")) { + mStackId = Integer.parseInt(nextArgRequired()); } else { return false; } @@ -550,6 +557,7 @@ public class Am extends BaseCommand { mimeType = mAm.getProviderMimeType(intent.getData(), mUserId); } + do { if (mStopOption) { String packageName; @@ -604,13 +612,20 @@ public class Am extends BaseCommand { IActivityManager.WaitResult result = null; int res; final long startTime = SystemClock.uptimeMillis(); + ActivityOptions options = null; + if (mStackId != FULLSCREEN_WORKSPACE_STACK_ID) { + options = ActivityOptions.makeBasic(); + options.setLaunchStackId(mStackId); + } if (mWaitOption) { result = mAm.startActivityAndWait(null, null, intent, mimeType, - null, null, 0, mStartFlags, profilerInfo, null, mUserId); + null, null, 0, mStartFlags, profilerInfo, + options != null ? options.toBundle() : null, mUserId); res = result.result; } else { res = mAm.startActivityAsUser(null, null, intent, mimeType, - null, null, 0, mStartFlags, profilerInfo, null, mUserId); + null, null, 0, mStartFlags, profilerInfo, + options != null ? options.toBundle() : null, mUserId); } final long endTime = SystemClock.uptimeMillis(); PrintStream out = mWaitOption ? System.out : System.err; @@ -1759,18 +1774,33 @@ public class Am extends BaseCommand { System.err.println("Error: invalid input bounds"); return; } - resizeStack(stackId, bounds, 0, false); + resizeStack(stackId, bounds, 0); } private void runStackResizeAnimated() throws Exception { String stackIdStr = nextArgRequired(); int stackId = Integer.valueOf(stackIdStr); - final Rect bounds = getBounds(); - if (bounds == null) { - System.err.println("Error: invalid input bounds"); - return; + final Rect bounds; + if ("null".equals(mArgs.peekNextArg())) { + bounds = null; + } else { + bounds = getBounds(); + if (bounds == null) { + System.err.println("Error: invalid input bounds"); + return; + } + } + resizeStackUnchecked(stackId, bounds, 0, true); + } + + private void resizeStackUnchecked(int stackId, Rect bounds, int delayMs, boolean animate) { + try { + mAm.resizeStack(stackId, bounds, false, false, animate); + Thread.sleep(delayMs); + } catch (RemoteException e) { + showError("Error: resizing stack " + e); + } catch (InterruptedException e) { } - resizeStack(stackId, bounds, 0, true); } private void runStackResizeDocked() throws Exception { @@ -1787,20 +1817,13 @@ public class Am extends BaseCommand { } } - private void resizeStack(int stackId, Rect bounds, int delayMs, boolean animate) + private void resizeStack(int stackId, Rect bounds, int delayMs) throws Exception { if (bounds == null) { showError("Error: invalid input bounds"); return; } - - try { - mAm.resizeStack(stackId, bounds, false, false, animate); - Thread.sleep(delayMs); - } catch (RemoteException e) { - showError("Error: resizing stack " + e); - } catch (InterruptedException e) { - } + resizeStackUnchecked(stackId, bounds, delayMs, false); } private void runStackPositionTask() throws Exception { @@ -1909,7 +1932,7 @@ public class Am extends BaseCommand { maxChange = Math.min(stepSize, currentPoint - minPoint); currentPoint -= maxChange; setBoundsSide(bounds, side, currentPoint); - resizeStack(DOCKED_STACK_ID, bounds, delayMs, false); + resizeStack(DOCKED_STACK_ID, bounds, delayMs); } System.out.println("Growing docked stack side=" + side); @@ -1917,7 +1940,7 @@ public class Am extends BaseCommand { maxChange = Math.min(stepSize, maxPoint - currentPoint); currentPoint += maxChange; setBoundsSide(bounds, side, currentPoint); - resizeStack(DOCKED_STACK_ID, bounds, delayMs, false); + resizeStack(DOCKED_STACK_ID, bounds, delayMs); } System.out.println("Back to Original size side=" + side); @@ -1925,7 +1948,7 @@ public class Am extends BaseCommand { maxChange = Math.min(stepSize, currentPoint - startPoint); currentPoint -= maxChange; setBoundsSide(bounds, side, currentPoint); - resizeStack(DOCKED_STACK_ID, bounds, delayMs, false); + resizeStack(DOCKED_STACK_ID, bounds, delayMs); } } diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index 35695c47d19b..1d9e3bb4b4bb 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -430,46 +430,47 @@ public class AccountManager { } /** - * List every {@link Account} registered on the device that are managed by - * applications whose signatures match the caller. + * Lists all accounts of any type registered on the device. + * Equivalent to getAccountsByType(null). * - * <p>This method can be called safely from the main thread. It is - * equivalent to calling <code>getAccountsByType(null)</code>. + * <p>It is safe to call this method from the main thread. * - * <p><b>NOTE:</b> Apps declaring a {@code targetSdkVersion<=23} in their - * manifests will continue to behave as they did on devices that support - * API level 23. In particular the GET_ACCOUNTS permission is required to - * see all the Accounts registered with the AccountManager. See docs for - * this function in API level 23 for more information. + * <p>Clients of this method that have not been granted the + * {@link android.Manifest.permission#GET_ACCOUNTS} permission, + * will only see those accounts managed by AbstractAccountAuthenticators whose + * signature matches the client. * - * @return Array of Accounts. The array may be empty if no accounts are - * available to the caller. + * @return An array of {@link Account}, one for each account. Empty + * (never null) if no accounts have been added. */ @NonNull + @RequiresPermission(GET_ACCOUNTS) public Account[] getAccounts() { - return getAccountsByType(null); + try { + return mService.getAccounts(null, mContext.getOpPackageName()); + } catch (RemoteException e) { + // won't ever happen + throw new RuntimeException(e); + } } /** * @hide - * List every {@link Account} registered on the device for a specific User - * that are managed by applications whose signatures match the caller. + * Lists all accounts of any type registered on the device for a given + * user id. Equivalent to getAccountsByType(null). * - * <p><b>NOTE:</b> Apps declaring a {@code targetSdkVersion<=23} in their - * manifests will continue to behave as they did on devices that support - * API level 23. In particular the GET_ACCOUNTS permission is required to - * see all the Accounts registered with the AccountManager for the - * specified userId. See docs for this function in API level 23 for more - * information. + * <p>It is safe to call this method from the main thread. * - * <p>This method can be called safely from the main thread. + * <p>Clients of this method that have not been granted the + * {@link android.Manifest.permission#GET_ACCOUNTS} permission, + * will only see those accounts managed by AbstractAccountAuthenticators whose + * signature matches the client. * - * @param int userId associated with the User whose accounts should be - * queried. - * @return Array of Accounts. The array may be empty if no accounts are - * available to the caller. + * @return An array of {@link Account}, one for each account. Empty + * (never null) if no accounts have been added. */ @NonNull + @RequiresPermission(GET_ACCOUNTS) public Account[] getAccountsAsUser(int userId) { try { return mService.getAccountsAsUser(null, userId, mContext.getOpPackageName()); @@ -500,11 +501,10 @@ public class AccountManager { /** * Returns the accounts visible to the specified package, in an environment where some apps * are not authorized to view all accounts. This method can only be called by system apps. - * * @param type The type of accounts to return, null to retrieve all accounts * @param packageName The package name of the app for which the accounts are to be returned - * @return Array of Accounts. The array may be empty if no accounts of th - * specified type are visible to the caller. + * @return An array of {@link Account}, one per matching account. Empty + * (never null) if no accounts of the specified type have been added. */ @NonNull public Account[] getAccountsByTypeForPackage(String type, String packageName) { @@ -518,22 +518,29 @@ public class AccountManager { } /** - * List every {@link Account} of a specified type managed by applications - * whose signatures match the caller. + * Lists all accounts of a particular type. The account type is a + * string token corresponding to the authenticator and useful domain + * of the account. For example, there are types corresponding to Google + * and Facebook. The exact string token to use will be published somewhere + * associated with the authenticator in question. * - * <p><b>NOTE:</b> Apps declaring a {@code targetSdkVersion<=23} in their - * manifests will continue to behave as they did on devices that support - * API level 23. See docs for this function in API level 23 for more - * information. + * <p>It is safe to call this method from the main thread. + * + * <p>Clients of this method that have not been granted the + * {@link android.Manifest.permission#GET_ACCOUNTS} permission, + * will only see those accounts managed by AbstractAccountAuthenticators whose + * signature matches the client. * - * <p>This method can be called safely from the main thread. + * <p><b>NOTE:</b> If targeting your app to work on API level 22 and before, + * GET_ACCOUNTS permission is needed for those platforms, irrespective of uid + * or signature match. See docs for this function in API level 22. * - * @param type String denoting the type of the accounts to return, - * {@code null} to retrieve all accounts visible to the caller. - * @return An array of Accounts. Empty (never null) if no accounts - * are available to the caller. + * @param type The type of accounts to return, null to retrieve all accounts + * @return An array of {@link Account}, one per matching account. Empty + * (never null) if no accounts of the specified type have been added. */ @NonNull + @RequiresPermission(GET_ACCOUNTS) public Account[] getAccountsByType(String type) { return getAccountsByTypeAsUser(type, Process.myUserHandle()); } @@ -579,7 +586,6 @@ public class AccountManager { * @return a future containing the label string * @hide */ - @NonNull public AccountManagerFuture<String> getAuthTokenLabel( final String accountType, final String authTokenType, AccountManagerCallback<String> callback, Handler handler) { @@ -612,13 +618,9 @@ public class AccountManager { * <p>This method may be called from any thread, but the returned * {@link AccountManagerFuture} must not be used on the main thread. * - * <p><b>Note:</b>The specified account must be managed by an application - * whose signature matches the caller. - * - * <p><b>Further note:</b>Apps targeting API level 23 or earlier will continue to - * behave as they did on devices that support API level 23. In particular - * they may still require the GET_ACCOUNTS permission. See docs for this - * function in API level 23. + * <p>This method requires the caller to hold the permission + * {@link android.Manifest.permission#GET_ACCOUNTS} or be a signature + * match with the AbstractAccountAuthenticator that manages the account. * * @param account The {@link Account} to test * @param features An array of the account features to check @@ -627,11 +629,9 @@ public class AccountManager { * @param handler {@link Handler} identifying the callback thread, * null for the main thread * @return An {@link AccountManagerFuture} which resolves to a Boolean, - * true if the account exists and has all of the specified features. - * @throws SecurityException if the specified account is managed by an - * application whose signature doesn't match the caller's signature. + * true if the account exists and has all of the specified features. */ - @NonNull + @RequiresPermission(GET_ACCOUNTS) public AccountManagerFuture<Boolean> hasFeatures(final Account account, final String[] features, AccountManagerCallback<Boolean> callback, Handler handler) { @@ -654,10 +654,9 @@ public class AccountManager { /** * Lists all accounts of a type which have certain features. The account - * type identifies the authenticator (see {@link #getAccountsByType}). Said - * authenticator must be in a package whose signature matches the callers - * package signature. Account features are authenticator-specific string tokens - * identifying boolean account properties (see {@link #hasFeatures}). + * type identifies the authenticator (see {@link #getAccountsByType}). + * Account features are authenticator-specific string tokens identifying + * boolean account properties (see {@link #hasFeatures}). * * <p>Unlike {@link #getAccountsByType}, this method calls the authenticator, * which may contact the server or do other work to check account features, @@ -666,14 +665,19 @@ public class AccountManager { * <p>This method may be called from any thread, but the returned * {@link AccountManagerFuture} must not be used on the main thread. * - * <p><b>NOTE:</b> Apps targeting API level 23 or earlier will continue to - * behave as they did on devices that support API level 23. In particular - * they may still require the GET_ACCOUNTS permission. See docs for this - * function in API level 23. + * <p>Clients of this method that have not been granted the + * {@link android.Manifest.permission#GET_ACCOUNTS} permission, + * will only see those accounts managed by AbstractAccountAuthenticators whose + * signature matches the client. * * @param type The type of accounts to return, must not be null * @param features An array of the account features to require, * may be null or empty + * + * <p><b>NOTE:</b> If targeting your app to work on API level 22 and before, + * GET_ACCOUNTS permission is needed for those platforms, irrespective of uid + * or signature match. See docs for this function in API level 22. + * * @param callback Callback to invoke when the request completes, * null for no callback * @param handler {@link Handler} identifying the callback thread, @@ -682,7 +686,7 @@ public class AccountManager { * {@link Account}, one per account of the specified type which * matches the requested features. */ - @NonNull + @RequiresPermission(GET_ACCOUNTS) public AccountManagerFuture<Account[]> getAccountsByTypeAndFeatures( final String type, final String[] features, AccountManagerCallback<Account[]> callback, Handler handler) { diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java index 1ab55dd7c1d9..980329fe31c8 100644 --- a/core/java/android/animation/AnimatorSet.java +++ b/core/java/android/animation/AnimatorSet.java @@ -1030,6 +1030,20 @@ public final class AnimatorSet extends Animator { } } + /** + * @hide + * TODO: For animatorSet defined in XML, we can use a flag to indicate what the play order + * if defined (i.e. sequential or together), then we can use the flag instead of calculate + * dynamically. + * @return whether all the animators in the set are supposed to play together + */ + public boolean shouldPlayTogether() { + updateAnimatorsDuration(); + createDependencyGraph(); + // All the child nodes are set out to play right after the delay animation + return mRootNode.mChildNodes.size() == mNodes.size() - 1; + } + @Override public long getTotalDuration() { updateAnimatorsDuration(); diff --git a/core/java/android/animation/PathKeyframes.java b/core/java/android/animation/PathKeyframes.java index 2a47b68a41b0..8230ac5bbfc5 100644 --- a/core/java/android/animation/PathKeyframes.java +++ b/core/java/android/animation/PathKeyframes.java @@ -231,7 +231,7 @@ class PathKeyframes implements Keyframes { } } - private abstract static class IntKeyframesBase extends SimpleKeyframes implements IntKeyframes { + abstract static class IntKeyframesBase extends SimpleKeyframes implements IntKeyframes { @Override public Class getType() { return Integer.class; @@ -243,7 +243,7 @@ class PathKeyframes implements Keyframes { } } - private abstract static class FloatKeyframesBase extends SimpleKeyframes + abstract static class FloatKeyframesBase extends SimpleKeyframes implements FloatKeyframes { @Override public Class getType() { diff --git a/core/java/android/animation/PropertyValuesHolder.java b/core/java/android/animation/PropertyValuesHolder.java index e993cca9e325..6ba5b968dfe7 100644 --- a/core/java/android/animation/PropertyValuesHolder.java +++ b/core/java/android/animation/PropertyValuesHolder.java @@ -21,6 +21,7 @@ import android.graphics.PointF; import android.util.FloatProperty; import android.util.IntProperty; import android.util.Log; +import android.util.PathParser; import android.util.Property; import java.lang.reflect.InvocationTargetException; @@ -1046,6 +1047,43 @@ public class PropertyValuesHolder implements Cloneable { return mAnimatedValue; } + /** + * PropertyValuesHolder is Animators use to hold internal animation related data. + * Therefore, in order to replicate the animation behavior, we need to get data out of + * PropertyValuesHolder. + * @hide + */ + public void getPropertyValues(PropertyValues values) { + init(); + values.propertyName = mPropertyName; + values.type = mValueType; + values.startValue = mKeyframes.getValue(0); + if (values.startValue instanceof PathParser.PathData) { + // PathData evaluator returns the same mutable PathData object when query fraction, + // so we have to make a copy here. + values.startValue = new PathParser.PathData((PathParser.PathData) values.startValue); + } + values.endValue = mKeyframes.getValue(1); + if (values.endValue instanceof PathParser.PathData) { + // PathData evaluator returns the same mutable PathData object when query fraction, + // so we have to make a copy here. + values.endValue = new PathParser.PathData((PathParser.PathData) values.endValue); + } + // TODO: We need a better way to get data out of keyframes. + if (mKeyframes instanceof PathKeyframes.FloatKeyframesBase + || mKeyframes instanceof PathKeyframes.IntKeyframesBase) { + // property values will animate based on external data source (e.g. Path) + values.dataSource = new PropertyValues.DataSource() { + @Override + public Object getValueAtFraction(float fraction) { + return mKeyframes.getValue(fraction); + } + }; + } else { + values.dataSource = null; + } + } + @Override public String toString() { return mPropertyName + ": " + mKeyframes.toString(); @@ -1601,6 +1639,24 @@ public class PropertyValuesHolder implements Cloneable { } }; + /** + * @hide + */ + public static class PropertyValues { + public String propertyName; + public Class type; + public Object startValue; + public Object endValue; + public DataSource dataSource = null; + public interface DataSource { + Object getValueAtFraction(float fraction); + } + public String toString() { + return ("property name: " + propertyName + ", type: " + type + ", startValue: " + + startValue.toString() + ", endValue: " + endValue.toString()); + } + } + native static private long nGetIntMethod(Class targetClass, String methodName); native static private long nGetFloatMethod(Class targetClass, String methodName); native static private long nGetMultipleIntMethod(Class targetClass, String methodName, diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 378e44880023..e0eb3895b3d2 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1677,7 +1677,8 @@ public class Activity extends ContextThemeWrapper final char alphaShortcut = item.getAlphabeticShortcut(); if (title != null && alphaShortcut != MIN_VALUE) { if (group == null) { - group = new KeyboardShortcutGroup(null /* no label */); + final int resource = mApplication.getApplicationInfo().labelRes; + group = new KeyboardShortcutGroup(resource != 0 ? getString(resource) : null); } group.addItem(new KeyboardShortcutInfo( title, alphaShortcut, KeyEvent.META_CTRL_ON)); @@ -1837,6 +1838,7 @@ public class Activity extends ContextThemeWrapper public void onMultiWindowChanged(boolean inMultiWindow) { if (DEBUG_LIFECYCLE) Slog.v(TAG, "onMultiWindowChanged " + this + ": " + inMultiWindow); + mFragments.dispatchMultiWindowChanged(inMultiWindow); if (mWindow != null) { mWindow.onMultiWindowChanged(); } @@ -1862,9 +1864,11 @@ public class Activity extends ContextThemeWrapper * * @param inPictureInPicture True if the activity is in picture-in-picture mode. */ + @CallSuper public void onPictureInPictureChanged(boolean inPictureInPicture) { if (DEBUG_LIFECYCLE) Slog.v(TAG, "onPictureInPictureChanged " + this + ": " + inPictureInPicture); + mFragments.dispatchPictureInPictureChanged(inPictureInPicture); } /** diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index b5b27536d4c6..805b2034ff05 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4779,12 +4779,6 @@ public final class ActivityThread { return; } final ApplicationInfo appInfo = loadedApk.getApplicationInfo(); - if (isSharingRuntime(appInfo)) { - // If sharing is enabled we do not have a unique application - // in a process and therefore cannot rely on the package - // name inside the runtime. - return; - } final List<String> codePaths = new ArrayList<>(); if ((appInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0) { codePaths.add(appInfo.sourceDir); @@ -4827,37 +4821,6 @@ public final class ActivityThread { codePaths.toArray(new String[codePaths.size()])); } - /* - * Two possible indications that this package could be - * sharing its runtime with other packages: - * - * 1) the sharedUserId attribute is set in the manifest, - * indicating a request to share a VM with other - * packages with the same sharedUserId. - * - * 2) the application element of the manifest has an - * attribute specifying a non-default process name, - * indicating the desire to run in another packages VM. - */ - private static boolean isSharingRuntime(ApplicationInfo appInfo) { - IPackageManager pm = getPackageManager(); - android.content.pm.PackageInfo pi = null; - try { - pi = pm.getPackageInfo(appInfo.packageName, 0, UserHandle.myUserId()); - } catch (RemoteException e) { - } - if (pi != null) { - boolean sharedUserIdSet = (pi.sharedUserId != null); - boolean processNameNotDefault = (pi.applicationInfo != null) && - !appInfo.packageName.equals(pi.applicationInfo.processName); - boolean sharable = sharedUserIdSet || processNameNotDefault; - return sharable; - } - // We couldn't get information for the package. Be pessimistic and assume - // it's sharing the runtime. - return true; - } - private void updateDefaultDensity() { if (mCurDefaultDisplayDpi != Configuration.DENSITY_DPI_UNDEFINED && mCurDefaultDisplayDpi != DisplayMetrics.DENSITY_DEVICE @@ -5078,11 +5041,11 @@ public final class ActivityThread { Log.e(TAG, "Unable to setupGraphicsSupport and setupJitProfileSupport " + "due to missing code-cache directory"); } - } - // Add the lib dir path to hardware renderer so that vulkan layers - // can be searched for within that directory. - ThreadedRenderer.setLibDir(data.info.getLibDir()); + // Add the lib dir path to hardware renderer so that vulkan layers + // can be searched for within that directory. + ThreadedRenderer.setLibDir(data.info.getLibDir()); + } // Install the Network Security Config Provider. This must happen before the application // code is loaded to prevent issues with instances of TLS objects being created before diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 220fb607289a..c071162ca5b9 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -326,8 +326,7 @@ public class ApplicationPackageManager extends PackageManager { // This is a temporary hack. Callers must use // createPackageContext(packageName).getApplicationInfo() to // get the right paths. - maybeAdjustApplicationInfo(ai); - return ai; + return maybeAdjustApplicationInfo(ai); } } catch (RemoteException e) { throw new RuntimeException("Package manager has died", e); @@ -336,7 +335,7 @@ public class ApplicationPackageManager extends PackageManager { throw new NameNotFoundException(packageName); } - private static void maybeAdjustApplicationInfo(ApplicationInfo info) { + private static ApplicationInfo maybeAdjustApplicationInfo(ApplicationInfo info) { // If we're dealing with a multi-arch application that has both // 32 and 64 bit shared libraries, we might need to choose the secondary // depending on what the current runtime's instruction set is. @@ -353,9 +352,12 @@ public class ApplicationPackageManager extends PackageManager { // Everything will be set up correctly because info.nativeLibraryDir will // correspond to the right ISA. if (runtimeIsa.equals(secondaryIsa)) { - info.nativeLibraryDir = info.secondaryNativeLibraryDir; + ApplicationInfo modified = new ApplicationInfo(info); + modified.nativeLibraryDir = info.secondaryNativeLibraryDir; + return modified; } } + return info; } @Override diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 20eaf0b8dca4..688c9f8e4fc4 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -1576,6 +1576,25 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene public void onSaveInstanceState(Bundle outState) { } + /** + * Called when the Fragment's activity changes from fullscreen mode to multi-window mode and + * visa-versa. This is generally tied to {@link Activity#onMultiWindowChanged} of the containing + * Activity. + * + * @param inMultiWindow True if the activity is in multi-window mode. + */ + public void onMultiWindowChanged(boolean inMultiWindow) { + } + + /** + * Called by the system when the activity changes to and from picture-in-picture mode. This is + * generally tied to {@link Activity#onPictureInPictureChanged} of the containing Activity. + * + * @param inPictureInPicture True if the activity is in picture-in-picture mode. + */ + public void onPictureInPictureChanged(boolean inPictureInPicture) { + } + public void onConfigurationChanged(Configuration newConfig) { mCalled = true; } @@ -2308,6 +2327,20 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene } } + void performMultiWindowChanged(boolean inMultiWindow) { + onMultiWindowChanged(inMultiWindow); + if (mChildFragmentManager != null) { + mChildFragmentManager.dispatchMultiWindowChanged(inMultiWindow); + } + } + + void performPictureInPictureChanged(boolean inPictureInPicture) { + onPictureInPictureChanged(inPictureInPicture); + if (mChildFragmentManager != null) { + mChildFragmentManager.dispatchPictureInPictureChanged(inPictureInPicture); + } + } + void performConfigurationChanged(Configuration newConfig) { onConfigurationChanged(newConfig); if (mChildFragmentManager != null) { diff --git a/core/java/android/app/FragmentController.java b/core/java/android/app/FragmentController.java index 28dadfa78b32..a9270bc43e09 100644 --- a/core/java/android/app/FragmentController.java +++ b/core/java/android/app/FragmentController.java @@ -219,6 +219,28 @@ public class FragmentController { } /** + * Lets all Fragments managed by the controller's FragmentManager know the multi-window mode of + * the activity changed. + * <p>Call when the multi-window mode of the activity changed. + * + * @see Fragment#onMultiWindowChanged + */ + public void dispatchMultiWindowChanged(boolean inMultiWindow) { + mHost.mFragmentManager.dispatchMultiWindowChanged(inMultiWindow); + } + + /** + * Lets all Fragments managed by the controller's FragmentManager know the picture-in-picture + * mode of the activity changed. + * <p>Call when the picture-in-picture mode of the activity changed. + * + * @see Fragment#onPictureInPictureChanged + */ + public void dispatchPictureInPictureChanged(boolean inPictureInPicture) { + mHost.mFragmentManager.dispatchPictureInPictureChanged(inPictureInPicture); + } + + /** * Lets all Fragments managed by the controller's FragmentManager * know a configuration change occurred. * <p>Call when there is a configuration change. diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 84ae09d7e988..32fec842ca75 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -1987,7 +1987,31 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate mContainer = null; mParent = null; } - + + public void dispatchMultiWindowChanged(boolean inMultiWindow) { + if (mAdded == null) { + return; + } + for (int i = mAdded.size() - 1; i >= 0; --i) { + final Fragment f = mAdded.get(i); + if (f != null) { + f.performMultiWindowChanged(inMultiWindow); + } + } + } + + public void dispatchPictureInPictureChanged(boolean inPictureInPicture) { + if (mAdded == null) { + return; + } + for (int i = mAdded.size() - 1; i >= 0; --i) { + final Fragment f = mAdded.get(i); + if (f != null) { + f.performPictureInPictureChanged(inPictureInPicture); + } + } + } + public void dispatchConfigurationChanged(Configuration newConfig) { if (mAdded != null) { for (int i=0; i<mAdded.size(); i++) { diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index 3288cd91856d..40e58af57204 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -55,6 +55,7 @@ interface INotificationManager void setImportance(String pkg, int uid, in Notification.Topic topic, int importance); int getImportance(String pkg, int uid, in Notification.Topic topic); boolean doesAppUseTopics(String pkg, int uid); + boolean hasBannedTopics(String pkg, int uid); // TODO: Remove this when callers have been migrated to the equivalent // INotificationListener method. diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 7f037f22aa8d..34c90c165490 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -2623,9 +2623,6 @@ public class Notification implements Parcelable if (onMs != 0 || offMs != 0) { mN.flags |= FLAG_SHOW_LIGHTS; } - if ((mN.defaults & DEFAULT_LIGHTS) != 0) { - mN.flags |= FLAG_SHOW_LIGHTS; - } return this; } @@ -3603,6 +3600,10 @@ public class Notification implements Parcelable mStyle.buildStyled(mN); } + if ((mN.defaults & DEFAULT_LIGHTS) != 0) { + mN.flags |= FLAG_SHOW_LIGHTS; + } + return mN; } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index f04e76e22074..1247afefcd01 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -241,6 +241,48 @@ public class DevicePolicyManager { /** * Activity action: Starts the provisioning flow which sets up a managed device. + * + * <p>During device owner provisioning, a device admin app is downloaded and set as the owner of + * the device. A device owner has full control over the device. The device owner can not be + * modified by the user and the only way of resetting the device is via factory reset. + * + * <p>A typical use case would be a device that is owned by a company, but used by either an + * employee or client. + * + * <p>The provisioning message should be sent to an unprovisioned device. + * + * <p>Unlike {@link #ACTION_PROVISION_MANAGED_DEVICE}, the provisioning message can only be sent + * by a privileged app with the permission + * {@link android.Manifest.permission#DISPATCH_PROVISIONING_MESSAGE}. + * + * <p>The provisioning intent contains the following properties: + * <ul> + * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME}</li> + * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_LOCAL_TIME} (convert to String), optional</li> + * <li>{@link #EXTRA_PROVISIONING_TIME_ZONE}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_LOCALE}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_WIFI_SSID}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_WIFI_HIDDEN} (convert to String), optional</li> + * <li>{@link #EXTRA_PROVISIONING_WIFI_SECURITY_TYPE}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_WIFI_PASSWORD}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_HOST}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_PORT} (convert to String), optional</li> + * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_BYPASS}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_WIFI_PAC_URL}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li></ul> + * + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + @SystemApi + public static final String ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = + "android.app.action.PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE"; + + /** + * Activity action: Starts the provisioning flow which sets up a managed device. * Must be started with {@link android.app.Activity#startActivityForResult(Intent, int)}. * * <p>NOTE: This is only supported on split system user devices, and puts the device into a @@ -3474,8 +3516,7 @@ public class DevicePolicyManager { public boolean isProfileOwnerApp(String packageName) { if (mService != null) { try { - ComponentName profileOwner = mService.getProfileOwner( - Process.myUserHandle().getIdentifier()); + ComponentName profileOwner = mService.getProfileOwner(myUserId()); return profileOwner != null && profileOwner.getPackageName().equals(packageName); } catch (RemoteException re) { diff --git a/core/java/android/app/usage/DataUsagePolicy.java b/core/java/android/app/usage/DataUsagePolicy.java new file mode 100644 index 000000000000..5a5dcbc0ba2c --- /dev/null +++ b/core/java/android/app/usage/DataUsagePolicy.java @@ -0,0 +1,174 @@ +/** + * Copyright (C) 2016 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 android.app.usage; + +import android.net.ConnectivityManager; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.IntArray; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +/** + * Defines a policy for data usage callbacks, made through {@link DataUsagePolicy.Builder} and used + * to be notified on data usage via {@link NetworkStatsManager#registerDataUsageCallback}. + */ +public class DataUsagePolicy { + + /** + * Network type to be monitored, as defined in {@link ConnectivityManager}, e.g. + * {@link ConnectivityManager#TYPE_MOBILE}, {@link ConnectivityManager#TYPE_WIFI} etc. + */ + public final int networkType; + + /** + * Set of subscriber ids to be monitored for the given network type. May be empty if not + * applicable. + * <p>Should not be modified once created. + */ + public final String[] subscriberIds; + + /** + * Set of UIDs of which to monitor data usage. + * + * <p>If not {@code null}, the caller will be notified when any of the uids exceed + * the given threshold. If empty all uids for which the calling process has access + * to stats will be monitored. + * <p>Should not be modified once created. + */ + public final int[] uids; + + /** + * Threshold in bytes to be notified on. + */ + public final long thresholdInBytes; + + /** + * @hide + */ + DataUsagePolicy(int networkType, String[] subscriberIds, int[] uids, + long thresholdInBytes) { + this.networkType = networkType; + this.subscriberIds = subscriberIds; + this.uids = uids; + this.thresholdInBytes = thresholdInBytes; + } + + /** + * Builder used to create {@link DataUsagePolicy} objects. + */ + public static class Builder { + private static final int INVALID_NETWORK_TYPE = -1; + private int mNetworkType = INVALID_NETWORK_TYPE; + private List<String> mSubscriberList = new ArrayList<>(); + private IntArray mUids = new IntArray(); + private long mThresholdInBytes; + + /** + * Default constructor for Builder. + */ + public Builder() {} + + /** + * Build {@link DataUsagePolicy} given the current policies. + */ + public DataUsagePolicy build() { + if (mNetworkType == INVALID_NETWORK_TYPE) { + throw new IllegalArgumentException( + "DataUsagePolicy requires a valid network type to be set"); + } + return new DataUsagePolicy(mNetworkType, + mSubscriberList.toArray(new String[mSubscriberList.size()]), + mUids.toArray(), mThresholdInBytes); + } + + /** + * Specifies that the given {@code subscriberId} should be monitored. + * + * @param subscriberId the subscriber id of the network interface. + */ + public Builder addSubscriberId(String subscriberId) { + mSubscriberList.add(subscriberId); + return this; + } + + /** + * Specifies that the given {@code uid} should be monitored. + */ + public Builder addUid(int uid) { + mUids.add(uid); + return this; + } + + /** + * Specifies that the callback should monitor the given network. It is mandatory + * to set one. + * + * @param networkType As defined in {@link ConnectivityManager}, e.g. + * {@link ConnectivityManager#TYPE_MOBILE}, + * {@link ConnectivityManager#TYPE_WIFI}, etc. + */ + public Builder setNetworkType(int networkType) { + mNetworkType = networkType; + return this; + } + + /** + * Sets the threshold in bytes on which the listener should be called. The framework may + * impose a minimum threshold to avoid too many notifications to be triggered. + */ + public Builder setThreshold(long thresholdInBytes) { + mThresholdInBytes = thresholdInBytes; + return this; + } + } + + @Override + public String toString() { + return "DataUsagePolicy [ networkType=" + networkType + + ", subscriberIds=" + Arrays.toString(subscriberIds) + + ", uids=" + Arrays.toString(uids) + + ", thresholdInBytes=" + thresholdInBytes + " ]"; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof DataUsagePolicy == false) return false; + DataUsagePolicy that = (DataUsagePolicy) obj; + return that.networkType == this.networkType + && Arrays.deepEquals(that.subscriberIds, this.subscriberIds) + && Arrays.equals(that.uids, this.uids) + && that.thresholdInBytes == this.thresholdInBytes; + } + + @Override + public int hashCode() { + // Start with a non-zero constant. + int result = 17; + + // Include a hash for each field. + result = 31 * result + networkType; + result = 31 * result + Arrays.deepHashCode(subscriberIds); + result = 31 * result + Arrays.hashCode(uids); + result = 31 * result + (int) (thresholdInBytes ^ (thresholdInBytes >>> 32)); + + return result; + } +} diff --git a/core/java/android/app/usage/NetworkStatsManager.java b/core/java/android/app/usage/NetworkStatsManager.java index 4dc636b078b7..13aeef0058bb 100644 --- a/core/java/android/app/usage/NetworkStatsManager.java +++ b/core/java/android/app/usage/NetworkStatsManager.java @@ -16,12 +16,17 @@ package android.app.usage; +import static com.android.internal.util.Preconditions.checkNotNull; + +import android.annotation.Nullable; import android.app.usage.NetworkStats.Bucket; import android.content.Context; import android.net.ConnectivityManager; +import android.net.DataUsageRequest; import android.net.NetworkIdentity; import android.net.NetworkTemplate; import android.os.Build; +import android.os.Handler; import android.os.RemoteException; import android.util.Log; @@ -288,6 +293,62 @@ public class NetworkStatsManager { return result; } + /** + * Registers to receive notifications about data usage on specified networks and uids. + * The callbacks will continue to be called as long as the process is live or + * {@link #unregisterDataUsageCallback} is called. + * + * @param policy {@link DataUsagePolicy} describing this request. + * @param callback The {@link DataUsageCallback} that the system will call when data usage + * has exceeded the specified threshold. + */ + public void registerDataUsageCallback(DataUsagePolicy policy, DataUsageCallback callback) { + registerDataUsageCallback(policy, callback, null /* handler */); + } + + /** + * Registers to receive notifications about data usage on specified networks and uids. + * The callbacks will continue to be called as long as the process is live or + * {@link #unregisterDataUsageCallback} is called. + * + * @param policy {@link DataUsagePolicy} describing this request. + * @param callback The {@link DataUsageCallback} that the system will call when data usage + * has exceeded the specified threshold. + * @param handler to dispatch callback events through, otherwise if {@code null} it uses + * the calling thread. + */ + public void registerDataUsageCallback(DataUsagePolicy policy, DataUsageCallback callback, + @Nullable Handler handler) { + checkNotNull(policy, "DataUsagePolicy cannot be null"); + checkNotNull(callback, "DataUsageCallback cannot be null"); + + // TODO: Implement stub. + } + + /** + * Unregisters callbacks on data usage. + * + * @param callback The {@link DataUsageCallback} used when registering. + */ + public void unregisterDataUsageCallback(DataUsageCallback callback) { + checkNotNull(callback, "DataUsageCallback cannot be null"); + + // TODO: Implement stub. + } + + /** + * Base class for data usage callbacks. Should be extended by applications wanting + * notifications. + */ + public static class DataUsageCallback { + /** + * Called when data usage has reached the given policy threshold. + */ + public void onLimitReached() {} + + private DataUsageRequest request; + } + private static NetworkTemplate createTemplate(int networkType, String subscriberId) { NetworkTemplate template = null; switch (networkType) { diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index 55b8f0367885..bed91ecafb96 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -29,6 +29,7 @@ import android.graphics.Paint; import android.graphics.Rect; import android.os.Build; import android.os.Bundle; +import android.os.CancellationSignal; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -49,6 +50,8 @@ import android.widget.RemoteViews.OnClickHandler; import android.widget.RemoteViewsAdapter.RemoteAdapterConnectionCallback; import android.widget.TextView; +import java.util.concurrent.Executor; + /** * Provides the glue to show AppWidget views. This class offers automatic animation * between updates, and will try recycling old views for each incoming @@ -87,6 +90,9 @@ public class AppWidgetHostView extends FrameLayout { Paint mOldPaint = new Paint(); private OnClickHandler mOnClickHandler; + private Executor mAsyncExecutor; + private CancellationSignal mLastExecutionSignal; + /** * Create a host view. Uses default fade animations. */ @@ -340,6 +346,22 @@ public class AppWidgetHostView extends FrameLayout { } /** + * Sets an executor which can be used for asynchronously inflating and applying the remoteviews. + * @see {@link RemoteViews#applyAsync(Context, ViewGroup, RemoteViews.OnViewAppliedListener, Executor)} + * + * @param executor the executor to use or null. + * @hide + */ + public void setAsyncExecutor(Executor executor) { + if (mLastExecutionSignal != null) { + mLastExecutionSignal.cancel(); + mLastExecutionSignal = null; + } + + mAsyncExecutor = executor; + } + + /** * Update the AppWidgetProviderInfo for this view, and reset it to the * initial layout. */ @@ -380,6 +402,11 @@ public class AppWidgetHostView extends FrameLayout { } } + if (mLastExecutionSignal != null) { + mLastExecutionSignal.cancel(); + mLastExecutionSignal = null; + } + if (remoteViews == null) { if (mViewMode == VIEW_MODE_DEFAULT) { // We've already done this -- nothing to do. @@ -389,6 +416,10 @@ public class AppWidgetHostView extends FrameLayout { mLayoutId = -1; mViewMode = VIEW_MODE_DEFAULT; } else { + if (mAsyncExecutor != null) { + inflateAsync(remoteViews); + return; + } // Prepare a local reference to the remote Context so we're ready to // inflate any requested LayoutParams. mRemoteContext = getRemoteContext(); @@ -421,6 +452,10 @@ public class AppWidgetHostView extends FrameLayout { mViewMode = VIEW_MODE_CONTENT; } + applyContent(content, recycled, exception); + } + + private void applyContent(View content, boolean recycled, Exception exception) { if (content == null) { if (mViewMode == VIEW_MODE_ERROR) { // We've already done this -- nothing to do. @@ -452,6 +487,68 @@ public class AppWidgetHostView extends FrameLayout { } } + private void inflateAsync(RemoteViews remoteViews) { + // Prepare a local reference to the remote Context so we're ready to + // inflate any requested LayoutParams. + mRemoteContext = getRemoteContext(); + int layoutId = remoteViews.getLayoutId(); + + // If our stale view has been prepared to match active, and the new + // layout matches, try recycling it + if (layoutId == mLayoutId && mView != null) { + try { + mLastExecutionSignal = remoteViews.reapplyAsync(mContext, + mView, + mAsyncExecutor, + new ViewApplyListener(remoteViews, layoutId, true), + mOnClickHandler); + } catch (Exception e) { + // Reapply failed. Try apply + } + } + if (mLastExecutionSignal == null) { + mLastExecutionSignal = remoteViews.applyAsync(mContext, + this, + mAsyncExecutor, + new ViewApplyListener(remoteViews, layoutId, false), + mOnClickHandler); + } + } + + private class ViewApplyListener implements RemoteViews.OnViewAppliedListener { + private final RemoteViews mViews; + private final boolean mIsReapply; + private final int mLayoutId; + + public ViewApplyListener(RemoteViews views, int layoutId, boolean isReapply) { + mViews = views; + mLayoutId = layoutId; + mIsReapply = isReapply; + } + + @Override + public void onViewApplied(View v) { + AppWidgetHostView.this.mLayoutId = mLayoutId; + mViewMode = VIEW_MODE_CONTENT; + + applyContent(v, mIsReapply, null); + } + + @Override + public void onError(Exception e) { + if (mIsReapply) { + // Try a fresh replay + mLastExecutionSignal = mViews.applyAsync(mContext, + AppWidgetHostView.this, + mAsyncExecutor, + new ViewApplyListener(mViews, mLayoutId, false), + mOnClickHandler); + } else { + applyContent(null, false, e); + } + } + } + /** * Process data-changed notifications for the specified view in the specified * set of {@link RemoteViews} views. diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 622aad9c98bf..4918914ec9d5 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -342,9 +342,7 @@ public abstract class Context { * {@link android.R.attr#isolatedProcess isolated}, * {@link android.R.attr#externalService external} service. This binds the service into the * calling application's package, rather than the package in which the service is declared. - * @hide */ - @SystemApi public static final int BIND_EXTERNAL_SERVICE = 0x80000000; /** diff --git a/core/java/android/content/pm/IOtaDexopt.aidl b/core/java/android/content/pm/IOtaDexopt.aidl new file mode 100644 index 000000000000..8f38d6f90a7d --- /dev/null +++ b/core/java/android/content/pm/IOtaDexopt.aidl @@ -0,0 +1,49 @@ +/* +** +** Copyright 2016, 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 android.content.pm; + +/** + * A/B OTA dexopting service. + * + * {@hide} + */ +interface IOtaDexopt { + /** + * Prepare for A/B OTA dexopt. Initialize internal structures. + * + * Calls to the other methods are only valid after a call to prepare. You may not call + * prepare twice without a cleanup call. + */ + void prepare(); + + /** + * Clean up all internal state. + */ + void cleanup(); + + /** + * Check whether all updates have been performed. + */ + boolean isDone(); + + /** + * Optimize the next package. Note: this command is synchronous, that is, only returns after + * the package has been dexopted (or dexopting failed). + */ + void dexoptNextPackage(); +} diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 09b85c93e050..3802db85c1c0 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -291,6 +291,7 @@ public class PackageParser { public final boolean coreApp; public final boolean multiArch; + public final String abiOverride; public final boolean extractNativeLibs; public PackageLite(String codePath, ApkLite baseApk, String[] splitNames, @@ -307,6 +308,7 @@ public class PackageParser { this.splitRevisionCodes = splitRevisionCodes; this.coreApp = baseApk.coreApp; this.multiArch = baseApk.multiArch; + this.abiOverride = baseApk.abiOverride; this.extractNativeLibs = baseApk.extractNativeLibs; } @@ -334,11 +336,12 @@ public class PackageParser { public final Signature[] signatures; public final boolean coreApp; public final boolean multiArch; + public final String abiOverride; public final boolean extractNativeLibs; public ApkLite(String codePath, String packageName, String splitName, int versionCode, int revisionCode, int installLocation, List<VerifierInfo> verifiers, - Signature[] signatures, boolean coreApp, boolean multiArch, + Signature[] signatures, boolean coreApp, boolean multiArch, String abiOverride, boolean extractNativeLibs) { this.codePath = codePath; this.packageName = packageName; @@ -350,6 +353,7 @@ public class PackageParser { this.signatures = signatures; this.coreApp = coreApp; this.multiArch = multiArch; + this.abiOverride = abiOverride; this.extractNativeLibs = extractNativeLibs; } } @@ -793,6 +797,7 @@ public class PackageParser { } pkg.codePath = packageDir.getAbsolutePath(); + pkg.cpuAbiOverride = lite.abiOverride; return pkg; } finally { IoUtils.closeQuietly(assets); @@ -811,8 +816,8 @@ public class PackageParser { */ @Deprecated public Package parseMonolithicPackage(File apkFile, int flags) throws PackageParserException { + final PackageLite lite = parseMonolithicPackageLite(apkFile, flags); if (mOnlyCoreApps) { - final PackageLite lite = parseMonolithicPackageLite(apkFile, flags); if (!lite.coreApp) { throw new PackageParserException(INSTALL_PARSE_FAILED_MANIFEST_MALFORMED, "Not a coreApp: " + apkFile); @@ -823,6 +828,7 @@ public class PackageParser { try { final Package pkg = parseBaseApk(apkFile, assets, flags); pkg.codePath = apkFile.getAbsolutePath(); + pkg.cpuAbiOverride = lite.abiOverride; return pkg; } finally { IoUtils.closeQuietly(assets); @@ -1316,6 +1322,7 @@ public class PackageParser { int revisionCode = 0; boolean coreApp = false; boolean multiArch = false; + String abiOverride = null; boolean extractNativeLibs = true; for (int i = 0; i < attrs.getAttributeCount(); i++) { @@ -1356,6 +1363,9 @@ public class PackageParser { if ("multiArch".equals(attr)) { multiArch = attrs.getAttributeBooleanValue(i, false); } + if ("abiOverride".equals(attr)) { + abiOverride = attrs.getAttributeValue(i); + } if ("extractNativeLibs".equals(attr)) { extractNativeLibs = attrs.getAttributeBooleanValue(i, true); } @@ -1365,7 +1375,7 @@ public class PackageParser { return new ApkLite(codePath, packageSplit.first, packageSplit.second, versionCode, revisionCode, installLocation, verifiers, signatures, coreApp, multiArch, - extractNativeLibs); + abiOverride, extractNativeLibs); } /** @@ -3237,18 +3247,20 @@ public class PackageParser { SCREEN_ORIENTATION_UNSPECIFIED); a.info.resizeMode = RESIZE_MODE_UNRESIZEABLE; - if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.N) { - final boolean appDefault = (owner.applicationInfo.privateFlags - & PRIVATE_FLAG_RESIZEABLE_ACTIVITIES) != 0; - if (sa.getBoolean( - R.styleable.AndroidManifestActivity_resizeableActivity, appDefault)) { - if (sa.getBoolean(R.styleable.AndroidManifestActivity_supportsPictureInPicture, - false)) { - a.info.resizeMode = RESIZE_MODE_RESIZEABLE_AND_PIPABLE; - } else { - a.info.resizeMode = RESIZE_MODE_RESIZEABLE; - } + final boolean appDefault = (owner.applicationInfo.privateFlags + & PRIVATE_FLAG_RESIZEABLE_ACTIVITIES) != 0; + final boolean resizeable = sa.getBoolean( + R.styleable.AndroidManifestActivity_resizeableActivity, appDefault); + + if (resizeable) { + if (sa.getBoolean(R.styleable.AndroidManifestActivity_supportsPictureInPicture, + false)) { + a.info.resizeMode = RESIZE_MODE_RESIZEABLE_AND_PIPABLE; + } else { + a.info.resizeMode = RESIZE_MODE_RESIZEABLE; } + } else if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.N) { + a.info.resizeMode = RESIZE_MODE_UNRESIZEABLE; } else if (a.info.screenOrientation == SCREEN_ORIENTATION_UNSPECIFIED && (a.info.flags & FLAG_IMMERSIVE) == 0) { a.info.resizeMode = RESIZE_MODE_CROP_WINDOWS; diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java index eecf0de5afa8..6bd285a6c394 100644 --- a/core/java/android/content/pm/ServiceInfo.java +++ b/core/java/android/content/pm/ServiceInfo.java @@ -52,7 +52,6 @@ public class ServiceInfo extends ComponentInfo * Bit in {@link #flags}: If set, the service can be bound and run in the * calling application's package, rather than the package in which it is * declared. Set from {@link android.R.attr#externalService} attribute. - * @hide */ public static final int FLAG_EXTERNAL_SERVICE = 0x0004; diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java index 8bdd42a30c78..bb0a04279904 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java +++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java @@ -175,7 +175,8 @@ public class LegacyMetadataMapper { * colorCorrection.* */ m.set(COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES, - new int[] { COLOR_CORRECTION_ABERRATION_MODE_FAST }); + new int[] { COLOR_CORRECTION_ABERRATION_MODE_FAST, + COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY }); /* * control.ae* */ @@ -210,7 +211,8 @@ public class LegacyMetadataMapper { * noiseReduction.* */ m.set(NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES, - new int[] { NOISE_REDUCTION_MODE_FAST }); + new int[] { NOISE_REDUCTION_MODE_FAST, + NOISE_REDUCTION_MODE_HIGH_QUALITY}); /* * scaler.* @@ -1389,7 +1391,22 @@ public class LegacyMetadataMapper { /* * noiseReduction.* */ - m.set(CaptureRequest.NOISE_REDUCTION_MODE, NOISE_REDUCTION_MODE_FAST); + if (templateId == CameraDevice.TEMPLATE_STILL_CAPTURE) { + m.set(CaptureRequest.NOISE_REDUCTION_MODE, NOISE_REDUCTION_MODE_HIGH_QUALITY); + } else { + m.set(CaptureRequest.NOISE_REDUCTION_MODE, NOISE_REDUCTION_MODE_FAST); + } + + /* + * colorCorrection.* + */ + if (templateId == CameraDevice.TEMPLATE_STILL_CAPTURE) { + m.set(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE, + COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY); + } else { + m.set(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE, + COLOR_CORRECTION_ABERRATION_MODE_FAST); + } /* * lens.* diff --git a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java index 6a44ac50de0a..2e06d5fb3b6f 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java +++ b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java @@ -89,7 +89,8 @@ public class LegacyRequestMapper { COLOR_CORRECTION_ABERRATION_MODE, /*defaultValue*/COLOR_CORRECTION_ABERRATION_MODE_FAST); - if (aberrationMode != COLOR_CORRECTION_ABERRATION_MODE_FAST) { + if (aberrationMode != COLOR_CORRECTION_ABERRATION_MODE_FAST && + aberrationMode != COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY) { Log.w(TAG, "convertRequestToMetadata - Ignoring unsupported " + "colorCorrection.aberrationMode = " + aberrationMode); } @@ -446,7 +447,8 @@ public class LegacyRequestMapper { NOISE_REDUCTION_MODE, /*defaultValue*/NOISE_REDUCTION_MODE_FAST); - if (mode != NOISE_REDUCTION_MODE_FAST) { + if (mode != NOISE_REDUCTION_MODE_FAST && + mode != NOISE_REDUCTION_MODE_HIGH_QUALITY) { Log.w(TAG, "convertRequestToMetadata - Ignoring unsupported " + "noiseReduction.mode = " + mode); } diff --git a/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java b/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java index ce850052b19d..dc5823d80f21 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java +++ b/core/java/android/hardware/camera2/legacy/LegacyResultMapper.java @@ -67,7 +67,9 @@ public class LegacyResultMapper { /* * Attempt to look up the result from the cache if the parameters haven't changed */ - if (mCachedRequest != null && legacyRequest.parameters.same(mCachedRequest.parameters)) { + if (mCachedRequest != null && + legacyRequest.parameters.same(mCachedRequest.parameters) && + legacyRequest.captureRequest.equals(mCachedRequest.captureRequest)) { result = new CameraMetadataNative(mCachedResult); cached = true; } else { @@ -124,8 +126,8 @@ public class LegacyResultMapper { */ // colorCorrection.aberrationMode { - // Always hardcoded to FAST - result.set(COLOR_CORRECTION_ABERRATION_MODE, COLOR_CORRECTION_ABERRATION_MODE_FAST); + result.set(COLOR_CORRECTION_ABERRATION_MODE, + request.get(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE)); } /* @@ -282,7 +284,7 @@ public class LegacyResultMapper { * noiseReduction.* */ // noiseReduction.mode - result.set(NOISE_REDUCTION_MODE, NOISE_REDUCTION_MODE_FAST); + result.set(NOISE_REDUCTION_MODE, request.get(CaptureRequest.NOISE_REDUCTION_MODE)); return result; } diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 25b38c07aa66..7004e9725bd2 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -3215,11 +3215,24 @@ public class ConnectivityManager { /** * Device is restricting metered network activity while application is running on background. + * <p> * In this state, application should not try to use the network while running on background, * because it would be denied. */ public static final int RESTRICT_BACKGROUND_STATUS_ENABLED = 3; + /** + * A change in the background metered network activity restriction has occurred. + * <p> + * Applications should call {@link #getRestrictBackgroundStatus()} to check if the restriction + * applies to them. + * <p> + * This is only sent to registered receivers, not manifest receivers. + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_RESTRICT_BACKGROUND_CHANGED = + "android.net.conn.RESTRICT_BACKGROUND_CHANGED"; + /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef(flag = false, value = { diff --git a/core/java/android/net/DataUsageRequest.aidl b/core/java/android/net/DataUsageRequest.aidl new file mode 100644 index 000000000000..d1937c7b8c62 --- /dev/null +++ b/core/java/android/net/DataUsageRequest.aidl @@ -0,0 +1,19 @@ +/** + * Copyright (c) 2016, 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 android.net; + +parcelable DataUsageRequest; diff --git a/core/java/android/net/DataUsageRequest.java b/core/java/android/net/DataUsageRequest.java new file mode 100644 index 000000000000..0e46f4c0cbdf --- /dev/null +++ b/core/java/android/net/DataUsageRequest.java @@ -0,0 +1,143 @@ +/** + * Copyright (C) 2016 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 android.net; + +import android.net.NetworkTemplate; +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.Arrays; +import java.util.Objects; + +/** + * Defines a request to register a callbacks. Used to be notified on data usage via + * {@link android.app.usage.NetworkStatsManager#registerDataUsageCallback}. + * If no {@code uid}s are set, callbacks are restricted to device-owners, + * carrier-privileged apps, or system apps. + */ +public class DataUsageRequest implements Parcelable { + + /** + * @hide + */ + public static final int REQUEST_ID_UNSET = 0; + + /** + * Identifies the request. {@link DataUsageRequest}s should only be constructed by + * the Framework and it is used internally to identify the request. + * @hide + */ + public final int requestId; + + /** + * Set of {@link NetworkTemplate}s describing the networks to monitor. + * @hide + */ + public final NetworkTemplate[] templates; + + /** + * Set of UIDs of which to monitor data usage. + * + * <p>If not {@code null}, the caller will be notified when any of the uids exceed + * the given threshold. If {@code null} all uids for which the calling process has access + * to stats will be monitored. + * @hide + */ + public final int[] uids; + + /** + * Threshold in bytes to be notified on. + * @hide + */ + public final long thresholdInBytes; + + /** + * @hide + */ + public DataUsageRequest(int requestId, NetworkTemplate[] templates, int[] uids, + long thresholdInBytes) { + this.requestId = requestId; + this.templates = templates; + this.uids = uids; + this.thresholdInBytes = thresholdInBytes; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(requestId); + dest.writeTypedArray(templates, flags); + dest.writeIntArray(uids); + dest.writeLong(thresholdInBytes); + } + + public static final Creator<DataUsageRequest> CREATOR = + new Creator<DataUsageRequest>() { + @Override + public DataUsageRequest createFromParcel(Parcel in) { + int requestId = in.readInt(); + NetworkTemplate[] templates = in.createTypedArray(NetworkTemplate.CREATOR); + int[] uids = in.createIntArray(); + long thresholdInBytes = in.readLong(); + DataUsageRequest result = new DataUsageRequest(requestId, + templates, uids, thresholdInBytes); + return result; + } + + @Override + public DataUsageRequest[] newArray(int size) { + return new DataUsageRequest[size]; + } + }; + + @Override + public String toString() { + return "DataUsageRequest [ requestId=" + requestId + + ", networkTemplates=" + Arrays.toString(templates) + + ", uids=" + Arrays.toString(uids) + + ", thresholdInBytes=" + thresholdInBytes + " ]"; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof DataUsageRequest == false) return false; + DataUsageRequest that = (DataUsageRequest) obj; + return that.requestId == this.requestId + && Arrays.deepEquals(that.templates, this.templates) + && Arrays.equals(that.uids, this.uids) + && that.thresholdInBytes == this.thresholdInBytes; + } + + @Override + public int hashCode() { + // Start with a non-zero constant. + int result = 17; + + // Include a hash for each field. + result = 31 * result + requestId; + result = 31 * result + Arrays.deepHashCode(templates); + result = 31 * result + Arrays.hashCode(uids); + result = 31 * result + (int) (thresholdInBytes ^ (thresholdInBytes >>> 32)); + + return result; + } + +} diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 1e4ee4bc2ef5..b2cabd860bfa 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -373,6 +373,12 @@ public class Process { **/ public static final int THREAD_GROUP_AUDIO_SYS = 4; + /** + * Thread group for top foreground app. + * @hide + **/ + public static final int THREAD_GROUP_TOP_APP = 5; + public static final int SIGNAL_QUIT = 3; public static final int SIGNAL_KILL = 9; public static final int SIGNAL_USR1 = 10; diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index 407ff08ef2de..154c9bbab312 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -67,6 +67,7 @@ public class RecoverySystem { /** Used to communicate with recovery. See bootable/recovery/recovery.cpp. */ private static File RECOVERY_DIR = new File("/cache/recovery"); + private static File BLOCK_MAP_FILE = new File(RECOVERY_DIR, "block.map"); private static File COMMAND_FILE = new File(RECOVERY_DIR, "command"); private static File UNCRYPT_FILE = new File(RECOVERY_DIR, "uncrypt_file"); private static File LOG_FILE = new File(RECOVERY_DIR, "log"); @@ -473,7 +474,9 @@ public class RecoverySystem { Log.e(TAG, "Error reading recovery log", e); } - if (UNCRYPT_FILE.exists()) { + // Only remove the OTA package if it's partially processed (uncrypt'd). + boolean reservePackage = BLOCK_MAP_FILE.exists(); + if (!reservePackage && UNCRYPT_FILE.exists()) { String filename = null; try { filename = FileUtils.readTextFile(UNCRYPT_FILE, 0, null); @@ -492,11 +495,18 @@ public class RecoverySystem { } } - // Delete everything in RECOVERY_DIR except those beginning - // with LAST_PREFIX + // We keep the update logs (beginning with LAST_PREFIX), and optionally + // the block map file (BLOCK_MAP_FILE) for a package. BLOCK_MAP_FILE + // will be created at the end of a successful uncrypt. If seeing this + // file, we keep the block map file and the file that contains the + // package name (UNCRYPT_FILE). This is to reduce the work for GmsCore + // to avoid re-downloading everything again. String[] names = RECOVERY_DIR.list(); for (int i = 0; names != null && i < names.length; i++) { if (names[i].startsWith(LAST_PREFIX)) continue; + if (reservePackage && names[i].equals(BLOCK_MAP_FILE.getName())) continue; + if (reservePackage && names[i].equals(UNCRYPT_FILE.getName())) continue; + recursiveDelete(new File(RECOVERY_DIR, names[i])); } diff --git a/core/java/android/os/ShellCommand.java b/core/java/android/os/ShellCommand.java index 54d1090d1327..fc804e592148 100644 --- a/core/java/android/os/ShellCommand.java +++ b/core/java/android/os/ShellCommand.java @@ -234,6 +234,16 @@ public abstract class ShellCommand { } } + public String peekNextArg() { + if (mCurArgData != null) { + return mCurArgData; + } else if (mArgPos < mArgs.length) { + return mArgs[mArgPos]; + } else { + return null; + } + } + /** * Return the next argument on the command line, whatever it is; if there are * no arguments left, throws an IllegalArgumentException to report this to the user. diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index ad7b4e21d368..dc0e249d72ec 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -64,8 +64,8 @@ public class UserManager { * use {@link android.accounts.AccountManager} APIs to add or remove accounts when account * management is disallowed. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -75,10 +75,10 @@ public class UserManager { /** * Specifies if a user is disallowed from changing Wi-Fi * access points. The default value is <code>false</code>. - * <p/>This restriction has no effect in a managed profile. + * <p>This restriction has no effect in a managed profile. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -89,8 +89,8 @@ public class UserManager { * Specifies if a user is disallowed from installing applications. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -101,8 +101,8 @@ public class UserManager { * Specifies if a user is disallowed from uninstalling applications. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -112,11 +112,11 @@ public class UserManager { /** * Specifies if a user is disallowed from turning on location sharing. * The default value is <code>false</code>. - * <p/>In a managed profile, location sharing always reflects the primary user's setting, but + * <p>In a managed profile, location sharing always reflects the primary user's setting, but * can be overridden and forced off by setting this restriction to true in the managed profile. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -128,8 +128,8 @@ public class UserManager { * "Unknown Sources" setting, that allows installation of apps from unknown sources. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -140,10 +140,10 @@ public class UserManager { * Specifies if a user is disallowed from configuring bluetooth. * This does <em>not</em> restrict the user from turning bluetooth on or off. * The default value is <code>false</code>. - * <p/>This restriction has no effect in a managed profile. + * <p>This restriction has no effect in a managed profile. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -155,8 +155,8 @@ public class UserManager { * USB. This can only be set by device owners and profile owners on the primary user. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -167,8 +167,8 @@ public class UserManager { * Specifies if a user is disallowed from configuring user * credentials. The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -181,8 +181,8 @@ public class UserManager { * This restriction has no effect on managed profiles. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -193,8 +193,8 @@ public class UserManager { * Specifies if a user is disallowed from enabling or * accessing debugging features. The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -207,8 +207,8 @@ public class UserManager { * This restriction has an effect in a managed profile only from * {@link android.os.Build.VERSION_CODES#M} * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -220,8 +220,8 @@ public class UserManager { * & portable hotspots. This can only be set by device owners and profile owners on the * primary user. The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -232,11 +232,11 @@ public class UserManager { * Specifies if a user is disallowed from resetting network settings * from Settings. This can only be set by device owners and profile owners on the primary user. * The default value is <code>false</code>. - * <p/>This restriction has no effect on secondary users and managed profiles since only the + * <p>This restriction has no effect on secondary users and managed profiles since only the * primary user can reset the network settings of the device. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -247,11 +247,11 @@ public class UserManager { * Specifies if a user is disallowed from factory resetting * from Settings. This can only be set by device owners and profile owners on the primary user. * The default value is <code>false</code>. - * <p/>This restriction has no effect on secondary users and managed profiles since only the + * <p>This restriction has no effect on secondary users and managed profiles since only the * primary user can factory reset the device. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -262,11 +262,11 @@ public class UserManager { * Specifies if a user is disallowed from adding new users and * profiles. This can only be set by device owners and profile owners on the primary user. * The default value is <code>false</code>. - * <p/>This restriction has no effect on secondary users and managed profiles since only the + * <p>This restriction has no effect on secondary users and managed profiles since only the * primary user can add other users. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -277,8 +277,8 @@ public class UserManager { * Specifies if a user is disallowed from disabling application * verification. The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -289,11 +289,11 @@ public class UserManager { * Specifies if a user is disallowed from configuring cell * broadcasts. This can only be set by device owners and profile owners on the primary user. * The default value is <code>false</code>. - * <p/>This restriction has no effect on secondary users and managed profiles since only the + * <p>This restriction has no effect on secondary users and managed profiles since only the * primary user can configure cell broadcasts. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -304,11 +304,11 @@ public class UserManager { * Specifies if a user is disallowed from configuring mobile * networks. This can only be set by device owners and profile owners on the primary user. * The default value is <code>false</code>. - * <p/>This restriction has no effect on secondary users and managed profiles since only the + * <p>This restriction has no effect on secondary users and managed profiles since only the * primary user can configure mobile networks. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -328,8 +328,8 @@ public class UserManager { * <p> * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -341,8 +341,8 @@ public class UserManager { * physical external media. This can only be set by device owners and profile owners on the * primary user. The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -354,8 +354,8 @@ public class UserManager { * volume. If set, the microphone will be muted. This can only be set by device owners * and profile owners on the primary user. The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -367,8 +367,8 @@ public class UserManager { * volume. If set, the master volume will be muted. This can only be set by device owners * and profile owners on the primary user. The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -379,11 +379,11 @@ public class UserManager { * Specifies that the user is not allowed to make outgoing * phone calls. Emergency calls are still permitted. * The default value is <code>false</code>. - * <p/>This restriction has no effect on managed profiles since call intents are normally + * <p>This restriction has no effect on managed profiles since call intents are normally * forwarded to the primary user. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -394,8 +394,8 @@ public class UserManager { * Specifies that the user is not allowed to send or receive * SMS messages. The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -407,8 +407,8 @@ public class UserManager { * device owner may wish to prevent the user from experiencing amusement or * joy while using the device. The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -428,8 +428,8 @@ public class UserManager { * <p>This can only be set by device owners and profile owners on the primary user. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -442,8 +442,8 @@ public class UserManager { * pasted in this profile. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -454,8 +454,8 @@ public class UserManager { * Specifies if the user is not allowed to use NFC to beam out data from apps. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -492,8 +492,8 @@ public class UserManager { * This can only be set by device owners and profile owners on the primary user. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -568,8 +568,8 @@ public class UserManager { * define a host can handle intents from the managed profile. * The default value is <code>false</code>. * - * <p/>Key for user restrictions. - * <p/>Type: Boolean + * <p>Key for user restrictions. + * <p>Type: Boolean * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() @@ -588,8 +588,8 @@ public class UserManager { * management application that sets this flag to update it when the final * restrictions are enforced. * - * <p/>Key for application restrictions. - * <p/>Type: Boolean + * <p>Key for application restrictions. + * <p>Type: Boolean * @see android.app.admin.DevicePolicyManager#setApplicationRestrictions( * android.content.ComponentName, String, Bundle) * @see android.app.admin.DevicePolicyManager#getApplicationRestrictions( diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index 5997515e58d2..4b706496db20 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -438,8 +438,11 @@ public class VolumeInfo implements Parcelable { final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE); intent.addCategory(Intent.CATEGORY_DEFAULT); intent.setData(uri); + + // note that docsui treats this as *force* show advanced. So sending + // false permits advanced to be shown based on user preferences. + intent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, isPrimary()); intent.putExtra(DocumentsContract.EXTRA_SHOW_FILESIZE, true); - intent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, true); return intent; } diff --git a/core/java/android/print/PrintAttributes.java b/core/java/android/print/PrintAttributes.java index 8892e3430fe4..e9c196d0cdad 100644 --- a/core/java/android/print/PrintAttributes.java +++ b/core/java/android/print/PrintAttributes.java @@ -27,6 +27,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; import android.util.ArrayMap; +import android.util.ArraySet; import android.util.Log; import com.android.internal.R; @@ -872,6 +873,23 @@ public final class PrintAttributes implements Parcelable { mPackageName = null; } + /** + * Get the Id of all predefined media sizes beside the {@link #UNKNOWN_PORTRAIT} and + * {@link #UNKNOWN_LANDSCAPE}. + * + * @return List of all predefined media sizes + * + * @hide + */ + public static @NonNull ArraySet<MediaSize> getAllPredefinedSizes() { + ArraySet<MediaSize> definedMediaSizes = new ArraySet<>(sIdToMediaSizeMap.values()); + + definedMediaSizes.remove(UNKNOWN_PORTRAIT); + definedMediaSizes.remove(UNKNOWN_LANDSCAPE); + + return definedMediaSizes; + } + /** @hide */ public MediaSize(String id, String label, String packageName, int widthMils, int heightMils, int labelResId) { diff --git a/core/java/android/provider/BlockedNumberContract.java b/core/java/android/provider/BlockedNumberContract.java index 2a9d4ae762e9..7a9d0625c199 100644 --- a/core/java/android/provider/BlockedNumberContract.java +++ b/core/java/android/provider/BlockedNumberContract.java @@ -91,14 +91,6 @@ public class BlockedNumberContract { /** * Phone number to block. The system generates it from {@link #COLUMN_ORIGINAL_NUMBER} * by removing all formatting characters. - * <p>Must NOT be specified in {@code insert}. - * <p>TYPE: String</p> - */ - public static final String COLUMN_STRIPPED_NUMBER = "stripped_number"; - - /** - * Phone number to block. The system generates it from {@link #COLUMN_ORIGINAL_NUMBER} - * by removing all formatting characters. * <p>Optional in {@code insert}. When not specified, the system tries to generate it * assuming the current country. (Which will still be null if the number is not valid.) * <p>TYPE: String</p> @@ -112,17 +104,32 @@ public class BlockedNumberContract { /** @hide */ public static final String RES_NUMBER_IS_BLOCKED = "blocked"; + /** @hide */ + public static final String METHOD_CAN_CURRENT_USER_BLOCK_NUMBERS = + "can_current_user_block_numbers"; + + /** @hide */ + public static final String RES_CAN_BLOCK_NUMBERS = "can_block"; + /** * Returns whether a given number is in the blocked list. - * - * TODO This should probably catch IllegalArgumentException to guard against the case where - * the provider is encrypted or the user is not running. - * (See addEntryAndRemoveExpiredEntries() in - * http://ag/#/c/844426/3/core/java/android/provider/CallLog.java) + * <p> Note that if the {@link #canCurrentUserBlockNumbers} is {@code false} for the user + * context {@code context}, this method will throw an {@link UnsupportedOperationException}. */ public static boolean isBlocked(Context context, String phoneNumber) { final Bundle res = context.getContentResolver().call(AUTHORITY_URI, METHOD_IS_BLOCKED, phoneNumber, null); return res != null && res.getBoolean(RES_NUMBER_IS_BLOCKED, false); } + + /** + * Returns {@code true} if blocking numbers is supported for the current user. + * <p> Typically, blocking numbers is only supported for the primary user. + */ + public static boolean canCurrentUserBlockNumbers(Context context) { + final Bundle res = context.getContentResolver().call( + AUTHORITY_URI, METHOD_CAN_CURRENT_USER_BLOCK_NUMBERS, null, null); + return res != null && res.getBoolean(RES_CAN_BLOCK_NUMBERS, false); + } + } diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 032d83d9bc3b..8468040b1bad 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -362,6 +362,15 @@ public final class DocumentsContract { public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 9; /** + * Flag indicating that a document can be removed from a parent. + * + * @see #COLUMN_FLAGS + * @see DocumentsContract#removeDocument(ContentProviderClient, Uri, Uri) + * @see DocumentsProvider#removeDocument(String, String) + */ + public static final int FLAG_SUPPORTS_REMOVE = 1 << 10; + + /** * Flag indicating that a document is an archive, and it's contents can be * obtained via {@link DocumentsProvider#queryChildDocuments}. * <p> @@ -370,18 +379,10 @@ public final class DocumentsContract { * * @see #COLUMN_FLAGS * @see DocumentsProvider#queryChildDocuments(String, String[], String) + * @hide */ - public static final int FLAG_ARCHIVE = 1 << 10; - - /** - * Flag indicating that a document can be removed from a parent. - * - * @see #COLUMN_FLAGS - * @see DocumentsContract#removeDocument(ContentProviderClient, Uri, Uri) - * @see DocumentsProvider#removeDocument(String, String) - */ - public static final int FLAG_SUPPORTS_REMOVE = 1 << 11; + public static final int FLAG_ARCHIVE = 1 << 15; /** * Flag indicating that document titles should be hidden when viewing * this directory in a larger format grid. For example, a directory diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1561d46447a9..dfc86012c810 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -670,14 +670,14 @@ public final class Settings { "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"; /** - * Activity Action: Ask the user to allow an to ignore battery optimizations (that is, + * Activity Action: Ask the user to allow an app to ignore battery optimizations (that is, * put them on the whitelist of apps shown by * {@link #ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS}). For an app to use this, it also * must hold the {@link android.Manifest.permission#REQUEST_IGNORE_BATTERY_OPTIMIZATIONS} * permission. * <p><b>Note:</b> most applications should <em>not</em> use this; there are many facilities * provided by the platform for applications to operate correctly in the various power - * saving mode. This is only for unusual applications that need to deeply control their own + * saving modes. This is only for unusual applications that need to deeply control their own * execution, at the potential expense of the user's battery life. Note that these applications * greatly run the risk of showing to the user as high power consumers on their device.</p> * <p> @@ -695,6 +695,24 @@ public final class Settings { "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; /** + * Activity Action: Show screen for controlling which apps can ignore background data + * restrictions. + * <p> + * Input: if the Intent's data URI is set with an application name (using the "package" schema, + * like "package:com.my.app"), then when the screen is displayed it will focus on such app. If + * the data is not set, it will just open the screen. + * <p> + * Output: Nothing. + * <p> + * Applications can also use {@link android.net.ConnectivityManager#getRestrictBackgroundStatus + * ConnectivityManager#getRestrictBackgroundStatus()} to determine the status of the background + * data restrictions for them. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = + "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS"; + + /** * @hide * Activity Action: Show the "app ops" settings screen. * <p> @@ -6895,6 +6913,15 @@ public final class Settings { public static final String TETHER_DUN_APN = "tether_dun_apn"; /** + * List of carrier apps which are whitelisted to prompt the user for install when + * a sim card with matching uicc carrier privilege rules is inserted. + * + * The value is "package1;package2;..." + * @hide + */ + public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist"; + + /** * USB Mass Storage Enabled */ public static final String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled"; diff --git a/core/java/android/text/BidiFormatter.java b/core/java/android/text/BidiFormatter.java index a535480e3ac0..675803c7b7bd 100644 --- a/core/java/android/text/BidiFormatter.java +++ b/core/java/android/text/BidiFormatter.java @@ -293,7 +293,7 @@ public final class BidiFormatter { * directionality is determined by scanning the end of the string, the overall directionality is * given explicitly by a heuristic to estimate the {@code str}'s directionality. * - * @param str String after which the mark may need to appear. + * @param str CharSequence after which the mark may need to appear. * @param heuristic The text direction heuristic that will be used to estimate the {@code str}'s * directionality. * @return LRM for RTL text in LTR context; RLM for LTR text in RTL context; @@ -301,7 +301,7 @@ public final class BidiFormatter { * * @hide */ - public String markAfter(String str, TextDirectionHeuristic heuristic) { + public String markAfter(CharSequence str, TextDirectionHeuristic heuristic) { final boolean isRtl = heuristic.isRtl(str, 0, str.length()); // getExitDir() is called only if needed (short-circuit). if (!mIsRtlContext && (isRtl || getExitDir(str) == DIR_RTL)) { @@ -322,7 +322,7 @@ public final class BidiFormatter { * entry directionality is determined by scanning the beginning of the string, the overall * directionality is given explicitly by a heuristic to estimate the {@code str}'s directionality. * - * @param str String before which the mark may need to appear. + * @param str CharSequence before which the mark may need to appear. * @param heuristic The text direction heuristic that will be used to estimate the {@code str}'s * directionality. * @return LRM for RTL text in LTR context; RLM for LTR text in RTL context; @@ -330,7 +330,7 @@ public final class BidiFormatter { * * @hide */ - public String markBefore(String str, TextDirectionHeuristic heuristic) { + public String markBefore(CharSequence str, TextDirectionHeuristic heuristic) { final boolean isRtl = heuristic.isRtl(str, 0, str.length()); // getEntryDir() is called only if needed (short-circuit). if (!mIsRtlContext && (isRtl || getEntryDir(str) == DIR_RTL)) { @@ -350,6 +350,13 @@ public final class BidiFormatter { * false. */ public boolean isRtl(String str) { + return isRtl((CharSequence) str); + } + + /** + * @hide + */ + public boolean isRtl(CharSequence str) { return mDefaultTextDirectionHeuristic.isRtl(str, 0, str.length()); } @@ -384,9 +391,16 @@ public final class BidiFormatter { * {@code null}. */ public String unicodeWrap(String str, TextDirectionHeuristic heuristic, boolean isolate) { + return unicodeWrap((CharSequence) str, heuristic, isolate).toString(); + } + + /** + * @hide + */ + public CharSequence unicodeWrap(CharSequence str, TextDirectionHeuristic heuristic, boolean isolate) { if (str == null) return null; final boolean isRtl = heuristic.isRtl(str, 0, str.length()); - StringBuilder result = new StringBuilder(); + SpannableStringBuilder result = new SpannableStringBuilder(); if (getStereoReset() && isolate) { result.append(markBefore(str, isRtl ? TextDirectionHeuristics.RTL : TextDirectionHeuristics.LTR)); @@ -402,7 +416,7 @@ public final class BidiFormatter { result.append(markAfter(str, isRtl ? TextDirectionHeuristics.RTL : TextDirectionHeuristics.LTR)); } - return result.toString(); + return result; } /** @@ -419,6 +433,14 @@ public final class BidiFormatter { } /** + * @hide + */ + public CharSequence unicodeWrap(CharSequence str, TextDirectionHeuristic heuristic) { + return unicodeWrap(str, heuristic, true /* isolate */); + } + + + /** * Operates like {@link #unicodeWrap(String, TextDirectionHeuristic, boolean)}, but uses the * formatter's default direction estimation algorithm. * @@ -432,6 +454,13 @@ public final class BidiFormatter { } /** + * @hide + */ + public CharSequence unicodeWrap(CharSequence str, boolean isolate) { + return unicodeWrap(str, mDefaultTextDirectionHeuristic, isolate); + } + + /** * Operates like {@link #unicodeWrap(String, TextDirectionHeuristic, boolean)}, but uses the * formatter's default direction estimation algorithm and assumes {@code isolate} is true. * @@ -442,6 +471,13 @@ public final class BidiFormatter { return unicodeWrap(str, mDefaultTextDirectionHeuristic, true /* isolate */); } + /** + * @hide + */ + public CharSequence unicodeWrap(CharSequence str) { + return unicodeWrap(str, mDefaultTextDirectionHeuristic, true /* isolate */); + } + private static BidiFormatter getDefaultInstanceFromContext(boolean isRtlContext) { return isRtlContext ? DEFAULT_RTL_INSTANCE : DEFAULT_LTR_INSTANCE; } @@ -477,7 +513,7 @@ public final class BidiFormatter { * * @param str the string to check. */ - private static int getExitDir(String str) { + private static int getExitDir(CharSequence str) { return new DirectionalityEstimator(str, false /* isHtml */).getExitDir(); } @@ -494,7 +530,7 @@ public final class BidiFormatter { * * @param str the string to check. */ - private static int getEntryDir(String str) { + private static int getEntryDir(CharSequence str) { return new DirectionalityEstimator(str, false /* isHtml */).getEntryDir(); } @@ -532,7 +568,7 @@ public final class BidiFormatter { /** * The text to be scanned. */ - private final String text; + private final CharSequence text; /** * Whether the text to be scanned is to be treated as HTML, i.e. skipping over tags and @@ -565,7 +601,7 @@ public final class BidiFormatter { * @param isHtml Whether the text to be scanned is to be treated as HTML, i.e. skipping over * tags and entities. */ - DirectionalityEstimator(String text, boolean isHtml) { + DirectionalityEstimator(CharSequence text, boolean isHtml) { this.text = text; this.isHtml = isHtml; length = text.length(); @@ -896,4 +932,4 @@ public final class BidiFormatter { return Character.DIRECTIONALITY_OTHER_NEUTRALS; } } -}
\ No newline at end of file +} diff --git a/core/java/android/util/PathParser.java b/core/java/android/util/PathParser.java index 78d5bcd90624..29a72fdf2288 100644 --- a/core/java/android/util/PathParser.java +++ b/core/java/android/util/PathParser.java @@ -104,6 +104,7 @@ public class PathParser { } super.finalize(); } + } /** diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java index 34713ad487fe..b9a7421fe14c 100644 --- a/core/java/android/view/NotificationHeaderView.java +++ b/core/java/android/view/NotificationHeaderView.java @@ -21,7 +21,6 @@ import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.RemoteViews; import android.widget.TextView; @@ -33,9 +32,9 @@ import java.util.ArrayList; * @hide */ @RemoteViews.RemoteView -public class NotificationHeaderView extends LinearLayout { +public class NotificationHeaderView extends ViewGroup { public static final int NO_COLOR = -1; - private final int mHeaderMinWidth; + private final int mChildMinWidth; private final int mExpandTopPadding; private final int mContentEndMargin; private View mAppName; @@ -46,6 +45,7 @@ public class NotificationHeaderView extends LinearLayout { private View mIcon; private TextView mChildCount; private View mProfileBadge; + private View mInfo; private int mIconColor; private int mOriginalNotificationColor; private boolean mGroupHeader; @@ -66,7 +66,7 @@ public class NotificationHeaderView extends LinearLayout { public NotificationHeaderView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - mHeaderMinWidth = getResources().getDimensionPixelSize( + mChildMinWidth = getResources().getDimensionPixelSize( com.android.internal.R.dimen.notification_header_shrink_min_width); mContentEndMargin = getResources().getDimensionPixelSize( com.android.internal.R.dimen.notification_content_margin_end); @@ -82,6 +82,7 @@ public class NotificationHeaderView extends LinearLayout { mIcon = findViewById(com.android.internal.R.id.icon); mChildCount = (TextView) findViewById(com.android.internal.R.id.number_of_children); mProfileBadge = findViewById(com.android.internal.R.id.profile_badge); + mInfo = findViewById(com.android.internal.R.id.header_content_info); } @Override @@ -109,14 +110,23 @@ public class NotificationHeaderView extends LinearLayout { } if (totalWidth > givenWidth) { int overFlow = totalWidth - givenWidth; - // We are overflowing, lets shrink + // We are overflowing, lets shrink the info first + final int infoWidth = mInfo.getMeasuredWidth(); + if (mInfo.getVisibility() != GONE && infoWidth > mChildMinWidth) { + int newSize = infoWidth - Math.min(infoWidth - mChildMinWidth, overFlow); + int childWidthSpec = MeasureSpec.makeMeasureSpec(newSize, MeasureSpec.AT_MOST); + mInfo.measure(childWidthSpec, wrapContentHeightSpec); + overFlow -= infoWidth - newSize; + } + // still overflowing, lets shrink the app name now final int appWidth = mAppName.getMeasuredWidth(); - if (mAppName.getVisibility() != GONE && appWidth > mHeaderMinWidth) { - int newSize = appWidth - Math.min(appWidth - mHeaderMinWidth, overFlow); + if (overFlow > 0 && mAppName.getVisibility() != GONE && appWidth > mChildMinWidth) { + int newSize = appWidth - Math.min(appWidth - mChildMinWidth, overFlow); int childWidthSpec = MeasureSpec.makeMeasureSpec(newSize, MeasureSpec.AT_MOST); mAppName.measure(childWidthSpec, wrapContentHeightSpec); overFlow -= appWidth - newSize; } + // still overflowing, finaly we shrink the subtext if (overFlow > 0 && mSubTextView.getVisibility() != GONE) { // we're still too big final int subTextWidth = mSubTextView.getMeasuredWidth(); @@ -124,37 +134,52 @@ public class NotificationHeaderView extends LinearLayout { int childWidthSpec = MeasureSpec.makeMeasureSpec(newSize, MeasureSpec.AT_MOST); mSubTextView.measure(childWidthSpec, wrapContentHeightSpec); } - totalWidth = givenWidth; - } - if (mProfileBadge.getVisibility() != View.GONE) { - totalWidth = givenWidth; } - setMeasuredDimension(totalWidth, givenHeight); + setMeasuredDimension(givenWidth, givenHeight); } @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { - super.onLayout(changed, l, t, r, b); - if (mProfileBadge.getVisibility() != View.GONE) { - int paddingEnd = getPaddingEnd(); - if (mShowWorkBadgeAtEnd) { - paddingEnd = mContentEndMargin; + int left = getPaddingStart(); + int childCount = getChildCount(); + int ownHeight = getHeight() - getPaddingTop() - getPaddingBottom(); + for (int i = 0; i < childCount; i++) { + View child = getChildAt(i); + if (child.getVisibility() == GONE) { + continue; + } + int childHeight = child.getMeasuredHeight(); + MarginLayoutParams params = (MarginLayoutParams) child.getLayoutParams(); + left += params.getMarginStart(); + int right = left + child.getMeasuredWidth(); + int top = (int) (getPaddingTop() + (ownHeight - childHeight) / 2.0f); + int bottom = top + childHeight; + int layoutLeft = left; + int layoutRight = right; + if (child == mProfileBadge) { + int paddingEnd = getPaddingEnd(); + if (mShowWorkBadgeAtEnd) { + paddingEnd = mContentEndMargin; + } + layoutRight = getWidth() - paddingEnd; + layoutLeft = layoutRight - child.getMeasuredWidth(); } if (getLayoutDirection() == LAYOUT_DIRECTION_RTL) { - mProfileBadge.layout(paddingEnd, - mProfileBadge.getTop(), - paddingEnd + mProfileBadge.getMeasuredWidth(), - mProfileBadge.getBottom()); - } else { - mProfileBadge.layout(getWidth() - paddingEnd - mProfileBadge.getMeasuredWidth(), - mProfileBadge.getTop(), - getWidth() - paddingEnd, - mProfileBadge.getBottom()); + int ltrLeft = layoutLeft; + layoutLeft = getWidth() - layoutRight; + layoutRight = getWidth() - ltrLeft; } + child.layout(layoutLeft, top, layoutRight, bottom); + left = right + params.getMarginEnd(); } updateTouchListener(); } + @Override + public LayoutParams generateLayoutParams(AttributeSet attrs) { + return new ViewGroup.MarginLayoutParams(getContext(), attrs); + } + private void updateTouchListener() { if (mExpandClickListener != null) { mTouchListener.bindTouchRects(); @@ -256,18 +281,16 @@ public class NotificationHeaderView extends LinearLayout { mTouchRects.clear(); addRectAroundViewView(mIcon); addRectAroundViewView(mExpandButton); - addInBetweenRect(); + addWidthRect(); mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop(); } - private void addInBetweenRect() { - final Rect r = new Rect(); + private void addWidthRect() { + Rect r = new Rect(); r.top = 0; r.bottom = (int) (32 * getResources().getDisplayMetrics().density); - Rect leftRect = mTouchRects.get(0); - r.left = leftRect.right; - Rect rightRect = mTouchRects.get(1); - r.right = rightRect.left; + r.left = 0; + r.right = getWidth(); mTouchRects.add(r); } diff --git a/core/java/android/view/RemotableViewMethod.java b/core/java/android/view/RemotableViewMethod.java index 4318290affc4..e5cae84942f9 100644 --- a/core/java/android/view/RemotableViewMethod.java +++ b/core/java/android/view/RemotableViewMethod.java @@ -29,6 +29,12 @@ import java.lang.annotation.Target; @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) public @interface RemotableViewMethod { + /** + * @return Method name which can be called on a background thread. It should have the + * same arguments as the original method and should return a {@link Runnable} (or null) + * which will be called on the UI thread. + */ + String asyncImpl() default ""; } diff --git a/core/java/android/view/RenderNode.java b/core/java/android/view/RenderNode.java index 88bffb5827aa..2aace0f30139 100644 --- a/core/java/android/view/RenderNode.java +++ b/core/java/android/view/RenderNode.java @@ -22,6 +22,7 @@ import android.graphics.Matrix; import android.graphics.Outline; import android.graphics.Paint; import android.graphics.Rect; +import android.graphics.drawable.AnimatedVectorDrawable; /** * <p>A display list records a series of graphics related operations and can replay @@ -771,6 +772,14 @@ public class RenderNode { mOwningView.mAttachInfo.mViewRootImpl.registerAnimatingRenderNode(this); } + public void addAnimator(AnimatedVectorDrawable.VectorDrawableAnimator animatorSet) { + if (mOwningView == null || mOwningView.mAttachInfo == null) { + throw new IllegalStateException("Cannot start this animator on a detached view!"); + } + nAddAnimator(mNativeRenderNode, animatorSet.getAnimatorNativePtr()); + mOwningView.mAttachInfo.mViewRootImpl.registerAnimatingRenderNode(this); + } + public void endAllAnimators() { nEndAllAnimators(mNativeRenderNode); } diff --git a/core/java/android/view/RenderNodeAnimatorSetHelper.java b/core/java/android/view/RenderNodeAnimatorSetHelper.java new file mode 100644 index 000000000000..ba592d29fa3d --- /dev/null +++ b/core/java/android/view/RenderNodeAnimatorSetHelper.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2016 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 android.view; + +import android.animation.TimeInterpolator; +import com.android.internal.view.animation.FallbackLUTInterpolator; +import com.android.internal.view.animation.NativeInterpolatorFactory; +import com.android.internal.view.animation.NativeInterpolatorFactoryHelper; + +/** + * This is a helper class to get access to methods and fields needed for RenderNodeAnimatorSet + * that are internal or package private to android.view package. + * + * @hide + */ +public class RenderNodeAnimatorSetHelper { + + public static RenderNode getTarget(DisplayListCanvas recordingCanvas) { + return recordingCanvas.mNode; + } + + public static long createNativeInterpolator(TimeInterpolator interpolator, long + duration) { + if (interpolator == null) { + // create LinearInterpolator + return NativeInterpolatorFactoryHelper.createLinearInterpolator(); + } else if (RenderNodeAnimator.isNativeInterpolator(interpolator)) { + return ((NativeInterpolatorFactory)interpolator).createNativeInterpolator(); + } else { + return FallbackLUTInterpolator.createNativeInterpolator(interpolator, duration); + } + } + +} diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index dd0887f8f8c5..4a0a0b0dbeb7 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6770,6 +6770,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, info.setVisibleToUser(isVisibleToUser()); + if ((mAttachInfo != null) && ((mAttachInfo.mAccessibilityFetchFlags + & AccessibilityNodeInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS) != 0)) { + info.setImportantForAccessibility(isImportantForAccessibility()); + } else { + info.setImportantForAccessibility(true); + } + info.setPackageName(mContext.getPackageName()); info.setClassName(getAccessibilityClassName()); info.setContentDescription(getContentDescription()); diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index b67338655057..bdaf291a2d3c 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -16,6 +16,7 @@ package android.view.accessibility; +import android.accessibilityservice.AccessibilityService; import android.accessibilityservice.AccessibilityServiceInfo; import android.annotation.Nullable; import android.graphics.Rect; @@ -568,6 +569,8 @@ public class AccessibilityNodeInfo implements Parcelable { private static final int BOOLEAN_PROPERTY_CONTEXT_CLICKABLE = 0x00020000; + private static final int BOOLEAN_PROPERTY_IMPORTANCE = 0x0040000; + /** * Bits that provide the id of a virtual descendant of a view. */ @@ -2156,6 +2159,33 @@ public class AccessibilityNodeInfo implements Parcelable { } /** + * Returns whether the node originates from a view considered important for accessibility. + * + * @return {@code true} if the node originates from a view considered important for + * accessibility, {@code false} otherwise + * + * @see View#isImportantForAccessibility() + */ + public boolean isImportantForAccessibility() { + return getBooleanProperty(BOOLEAN_PROPERTY_IMPORTANCE); + } + + /** + * Sets whether the node is considered important for accessibility. + * <p> + * <strong>Note:</strong> Cannot be called from an + * {@link android.accessibilityservice.AccessibilityService}. + * This class is made immutable before being delivered to an AccessibilityService. + * </p> + * + * @param important {@code true} if the node is considered important for accessibility, + * {@code false} otherwise + */ + public void setImportantForAccessibility(boolean important) { + setBooleanProperty(BOOLEAN_PROPERTY_IMPORTANCE, important); + } + + /** * Gets the package this node comes from. * * @return The package name. @@ -3311,9 +3341,21 @@ public class AccessibilityNodeInfo implements Parcelable { * </li> * <li><strong>Overriden standard actions</strong> - These are actions that override * standard actions to customize them. For example, an app may add a label to the - * standard click action to announce that this action clears browsing history. + * standard {@link #ACTION_CLICK} action to announce that this action clears browsing history. * </ul> * </p> + * <p> + * Actions are typically added to an {@link AccessibilityNodeInfo} by using + * {@link AccessibilityNodeInfo#addAction(AccessibilityAction)} within + * {@link View#onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo)} and are performed + * within {@link View#performAccessibilityAction(int, Bundle)}. + * </p> + * <p class="note"> + * <strong>Note:</strong> Views which support these actions should invoke + * {@link View#setImportantForAccessibility(int)} with + * {@link View#IMPORTANT_FOR_ACCESSIBILITY_YES} to ensure an {@link AccessibilityService} + * can discover the set of supported actions. + * </p> */ public static final class AccessibilityAction { diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index 6e90baf26fa2..f601f7df1fa8 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -392,6 +392,26 @@ public class ImageView extends View { return mDrawable; } + private class ImageDrawableCallback implements Runnable { + + private final Drawable drawable; + private final Uri uri; + private final int resource; + + ImageDrawableCallback(Drawable drawable, Uri uri, int resource) { + this.drawable = drawable; + this.uri = uri; + this.resource = resource; + } + + @Override + public void run() { + setImageDrawable(drawable); + mUri = uri; + mResource = resource; + } + } + /** * Sets a drawable as the content of this ImageView. * @@ -405,7 +425,7 @@ public class ImageView extends View { * * @attr ref android.R.styleable#ImageView_src */ - @android.view.RemotableViewMethod + @android.view.RemotableViewMethod(asyncImpl="setImageResourceAsync") public void setImageResource(@DrawableRes int resId) { // The resource configuration may have changed, so we should always // try to load the resource even if the resId hasn't changed. @@ -424,6 +444,11 @@ public class ImageView extends View { invalidate(); } + /** @hide **/ + public Runnable setImageResourceAsync(@DrawableRes int resId) { + return new ImageDrawableCallback(getContext().getDrawable(resId), null, resId); + } + /** * Sets the content of this ImageView to the specified Uri. * @@ -435,7 +460,7 @@ public class ImageView extends View { * * @param uri the Uri of an image, or {@code null} to clear the content */ - @android.view.RemotableViewMethod + @android.view.RemotableViewMethod(asyncImpl="setImageURIAsync") public void setImageURI(@Nullable Uri uri) { if (mResource != 0 || (mUri != uri && (uri == null || mUri == null || !uri.equals(mUri)))) { updateDrawable(null); @@ -454,6 +479,19 @@ public class ImageView extends View { } } + /** @hide **/ + public Runnable setImageURIAsync(@Nullable Uri uri) { + if (mResource != 0 || (mUri != uri && (uri == null || mUri == null || !uri.equals(mUri)))) { + Drawable d = uri == null ? null : getDrawableFromUri(uri); + if (d == null) { + // Do not set the URI if the drawable couldn't be loaded. + uri = null; + } + return new ImageDrawableCallback(d, uri, 0); + } + return null; + } + /** * Sets a drawable as the content of this ImageView. * @@ -490,11 +528,16 @@ public class ImageView extends View { * @param icon an Icon holding the desired image, or {@code null} to clear * the content */ - @android.view.RemotableViewMethod + @android.view.RemotableViewMethod(asyncImpl="setImageIconAsync") public void setImageIcon(@Nullable Icon icon) { setImageDrawable(icon == null ? null : icon.loadDrawable(mContext)); } + /** @hide **/ + public Runnable setImageIconAsync(@Nullable Icon icon) { + return new ImageDrawableCallback(icon == null ? null : icon.loadDrawable(mContext), null, 0); + } + /** * Applies a tint to the image drawable. Does not modify the current tint * mode, which is {@link PorterDuff.Mode#SRC_IN} by default. @@ -786,8 +829,7 @@ public class ImageView extends View { return; } - final Resources res = getResources(); - if (res == null) { + if (getResources() == null) { return; } @@ -802,37 +844,7 @@ public class ImageView extends View { mUri = null; } } else if (mUri != null) { - final String scheme = mUri.getScheme(); - if (ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)) { - try { - // Load drawable through Resources, to get the source density information - ContentResolver.OpenResourceIdResult r = - mContext.getContentResolver().getResourceId(mUri); - d = r.r.getDrawable(r.id, mContext.getTheme()); - } catch (Exception e) { - Log.w(LOG_TAG, "Unable to open content: " + mUri, e); - } - } else if (ContentResolver.SCHEME_CONTENT.equals(scheme) - || ContentResolver.SCHEME_FILE.equals(scheme)) { - InputStream stream = null; - try { - stream = mContext.getContentResolver().openInputStream(mUri); - d = Drawable.createFromResourceStream( - mUseCorrectStreamDensity ? res : null, null, stream, null); - } catch (Exception e) { - Log.w(LOG_TAG, "Unable to open content: " + mUri, e); - } finally { - if (stream != null) { - try { - stream.close(); - } catch (IOException e) { - Log.w(LOG_TAG, "Unable to close content: " + mUri, e); - } - } - } - } else { - d = Drawable.createFromPath(mUri.toString()); - } + d = getDrawableFromUri(mUri); if (d == null) { Log.w(LOG_TAG, "resolveUri failed on bad bitmap uri: " + mUri); @@ -846,6 +858,41 @@ public class ImageView extends View { updateDrawable(d); } + private Drawable getDrawableFromUri(Uri uri) { + final String scheme = uri.getScheme(); + if (ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)) { + try { + // Load drawable through Resources, to get the source density information + ContentResolver.OpenResourceIdResult r = + mContext.getContentResolver().getResourceId(uri); + return r.r.getDrawable(r.id, mContext.getTheme()); + } catch (Exception e) { + Log.w(LOG_TAG, "Unable to open content: " + uri, e); + } + } else if (ContentResolver.SCHEME_CONTENT.equals(scheme) + || ContentResolver.SCHEME_FILE.equals(scheme)) { + InputStream stream = null; + try { + stream = mContext.getContentResolver().openInputStream(uri); + return Drawable.createFromResourceStream( + mUseCorrectStreamDensity ? getResources() : null, null, stream, null); + } catch (Exception e) { + Log.w(LOG_TAG, "Unable to open content: " + uri, e); + } finally { + if (stream != null) { + try { + stream.close(); + } catch (IOException e) { + Log.w(LOG_TAG, "Unable to close content: " + uri, e); + } + } + } + } else { + return Drawable.createFromPath(uri.toString()); + } + return null; + } + @Override public int[] onCreateDrawableState(int extraSpace) { if (mState == null) { diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 584df08412f2..8fa71a21cd4a 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -43,6 +43,7 @@ import android.view.Gravity; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; +import android.view.View.OnAttachStateChangeListener; import android.view.View.OnTouchListener; import android.view.ViewGroup; import android.view.ViewParent; @@ -164,7 +165,20 @@ public class PopupWindow { com.android.internal.R.attr.state_above_anchor }; + private final OnAttachStateChangeListener mOnAnchorRootDetachedListener = + new OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View v) {} + + @Override + public void onViewDetachedFromWindow(View v) { + mIsAnchorRootAttached = false; + } + }; + private WeakReference<View> mAnchor; + private WeakReference<View> mAnchorRoot; + private boolean mIsAnchorRootAttached; private final OnScrollChangedListener mOnScrollChangedListener = new OnScrollChangedListener() { @Override @@ -1037,7 +1051,7 @@ public class PopupWindow { TransitionManager.endTransitions(mDecorView); - unregisterForScrollChanged(); + unregisterForViewTreeChanges(); mIsShowing = true; mIsDropdown = false; @@ -1120,7 +1134,7 @@ public class PopupWindow { TransitionManager.endTransitions(mDecorView); - registerForScrollChanged(anchor, xoff, yoff, gravity); + registerForViewTreeChanges(anchor, xoff, yoff, gravity); mIsShowing = true; mIsDropdown = true; @@ -1633,14 +1647,23 @@ public class PopupWindow { mIsShowing = false; mIsTransitioningToDismiss = true; + // This method may be called as part of window detachment, in which + // case the anchor view (and its root) will still return true from + // isAttachedToWindow() during execution of this method; however, we + // can expect the OnAttachStateChangeListener to have been called prior + // to executing this method, so we can rely on that instead. final Transition exitTransition = mExitTransition; - if (exitTransition != null && decorView.isLaidOut()) { + if (!mIsAnchorRootAttached && exitTransition != null && decorView.isLaidOut()) { // The decor view is non-interactive during exit transitions. final LayoutParams p = (LayoutParams) decorView.getLayoutParams(); p.flags |= LayoutParams.FLAG_NOT_TOUCHABLE; p.flags |= LayoutParams.FLAG_NOT_FOCUSABLE; mWindowManager.updateViewLayout(decorView, p); + // Once we start dismissing the decor view, all state (including + // the anchor root) needs to be moved to the decor view since we + // may open another popup while it's busy exiting. + final View anchorRoot = mAnchorRoot != null ? mAnchorRoot.get() : null; final Rect epicenter = getTransitionEpicenter(); exitTransition.setEpicenterCallback(new EpicenterCallback() { @Override @@ -1648,18 +1671,19 @@ public class PopupWindow { return epicenter; } }); - decorView.startExitTransition(exitTransition, new TransitionListenerAdapter() { - @Override - public void onTransitionEnd(Transition transition) { - dismissImmediate(decorView, contentHolder, contentView); - } - }); + decorView.startExitTransition(exitTransition, anchorRoot, + new TransitionListenerAdapter() { + @Override + public void onTransitionEnd(Transition transition) { + dismissImmediate(decorView, contentHolder, contentView); + } + }); } else { dismissImmediate(decorView, contentHolder, contentView); } // Clears the anchor view. - unregisterForScrollChanged(); + unregisterForViewTreeChanges(); if (mOnDismissListener != null) { mOnDismissListener.onDismiss(); @@ -1925,7 +1949,7 @@ public class PopupWindow { final WeakReference<View> oldAnchor = mAnchor; final boolean needsUpdate = updateLocation && (mAnchorXoff != xoff || mAnchorYoff != yoff); if (oldAnchor == null || oldAnchor.get() != anchor || (needsUpdate && !mIsDropdown)) { - registerForScrollChanged(anchor, xoff, yoff, mAnchoredGravity); + registerForViewTreeChanges(anchor, xoff, yoff, mAnchoredGravity); } else if (needsUpdate) { // No need to register again if this is a DropDown, showAsDropDown already did. mAnchorXoff = xoff; @@ -1969,27 +1993,38 @@ public class PopupWindow { public void onDismiss(); } - private void unregisterForScrollChanged() { - final WeakReference<View> anchorRef = mAnchor; - final View anchor = anchorRef == null ? null : anchorRef.get(); + private void unregisterForViewTreeChanges() { + final View anchor = mAnchor != null ? mAnchor.get() : null; if (anchor != null) { final ViewTreeObserver vto = anchor.getViewTreeObserver(); vto.removeOnScrollChangedListener(mOnScrollChangedListener); } + final View anchorRoot = mAnchorRoot != null ? mAnchorRoot.get() : null; + if (anchorRoot != null) { + anchorRoot.removeOnAttachStateChangeListener(mOnAnchorRootDetachedListener); + } + mAnchor = null; + mAnchorRoot = null; + mIsAnchorRootAttached = false; } - private void registerForScrollChanged(View anchor, int xoff, int yoff, int gravity) { - unregisterForScrollChanged(); - - mAnchor = new WeakReference<>(anchor); + private void registerForViewTreeChanges(View anchor, int xoff, int yoff, int gravity) { + unregisterForViewTreeChanges(); final ViewTreeObserver vto = anchor.getViewTreeObserver(); if (vto != null) { vto.addOnScrollChangedListener(mOnScrollChangedListener); } + final View anchorRoot = anchor.getRootView(); + anchorRoot.addOnAttachStateChangeListener(mOnAnchorRootDetachedListener); + + mAnchor = new WeakReference<>(anchor); + mAnchorRoot = new WeakReference<>(anchorRoot); + mIsAnchorRootAttached = anchorRoot.isAttachedToWindow(); + mAnchorXoff = xoff; mAnchorYoff = yoff; mAnchoredGravity = gravity; @@ -2109,16 +2144,23 @@ public class PopupWindow { * its {@code onTransitionEnd} method called even if the transition * never starts; however, it may be called with a {@code null} argument. */ - public void startExitTransition(Transition transition, final TransitionListener listener) { + public void startExitTransition(Transition transition, final View anchorRoot, + final TransitionListener listener) { if (transition == null) { return; } + // The anchor view's window may go away while we're executing our + // transition, in which case we need to end the transition + // immediately and execute the listener to remove the popup. + anchorRoot.addOnAttachStateChangeListener(mOnAnchorRootDetachedListener); + // The exit listener MUST be called for cleanup, even if the // transition never starts or ends. Stash it for later. mPendingExitListener = new TransitionListenerAdapter() { @Override public void onTransitionEnd(Transition transition) { + anchorRoot.removeOnAttachStateChangeListener(mOnAnchorRootDetachedListener); listener.onTransitionEnd(transition); // The listener was called. Our job here is done. @@ -2153,6 +2195,19 @@ public class PopupWindow { mPendingExitListener.onTransitionEnd(null); } } + + private final OnAttachStateChangeListener mOnAnchorRootDetachedListener = + new OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View v) {} + + @Override + public void onViewDetachedFromWindow(View v) { + v.removeOnAttachStateChangeListener(this); + + TransitionManager.endTransitions(PopupDecorView.this); + } + }; } private class PopupBackgroundView extends FrameLayout { diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 0dd803a23d30..dee25d35364c 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -39,8 +39,10 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.net.Uri; +import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; +import android.os.CancellationSignal; import android.os.Parcel; import android.os.Parcelable; import android.os.StrictMode; @@ -66,6 +68,7 @@ import java.lang.annotation.Target; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; +import java.util.concurrent.Executor; /** * A class that describes a view hierarchy that can be displayed in @@ -146,6 +149,8 @@ public class RemoteViews implements Parcelable, Filter { private static final Object[] sMethodsLock = new Object[0]; private static final ArrayMap<Class<? extends View>, ArrayMap<MutablePair<String, Class<?>>, Method>> sMethods = new ArrayMap<Class<? extends View>, ArrayMap<MutablePair<String, Class<?>>, Method>>(); + private static final ArrayMap<Method, Method> sAsyncMethods = new ArrayMap<>(); + private static final ThreadLocal<Object[]> sInvokeArgsTls = new ThreadLocal<Object[]>() { @Override protected Object[] initialValue() { @@ -293,10 +298,40 @@ public class RemoteViews implements Parcelable, Filter { return (getActionName() + viewId); } + /** + * This is called on the background thread. It should perform any non-ui computations + * and return the final action which will run on the UI thread. + * Override this if some of the tasks can be performed async. + */ + public Action initActionAsync(ViewTree root, ViewGroup rootParent, OnClickHandler handler) { + return this; + } + int viewId; } /** + * Action class used during async inflation of RemoteViews. Subclasses are not parcelable. + */ + private static abstract class RuntimeAction extends Action { + @Override + public final String getActionName() { + return "RuntimeAction"; + } + + @Override + public final void writeToParcel(Parcel dest, int flags) { + throw new UnsupportedOperationException(); + } + } + + // Constant used during async execution. It is not parcelable. + private static final Action ACTION_NOOP = new RuntimeAction() { + @Override + public void apply(View root, ViewGroup rootParent, OnClickHandler handler) { } + }; + + /** * Merges the passed RemoteViews actions with this RemoteViews actions according to * action-specific merge rules. * @@ -810,6 +845,36 @@ public class RemoteViews implements Parcelable, Filter { return method; } + /** + * @return the async implementation of the provided method. + */ + private Method getAsyncMethod(Method method) { + synchronized (sAsyncMethods) { + int valueIndex = sAsyncMethods.indexOfKey(method); + if (valueIndex >= 0) { + return sAsyncMethods.valueAt(valueIndex); + } + + RemotableViewMethod annotation = method.getAnnotation(RemotableViewMethod.class); + Method asyncMethod = null; + if (!annotation.asyncImpl().isEmpty()) { + try { + asyncMethod = method.getDeclaringClass() + .getMethod(annotation.asyncImpl(), method.getParameterTypes()); + if (!asyncMethod.getReturnType().equals(Runnable.class)) { + throw new ActionException("Async implementation for " + method.getName() + + " does not return a Runnable"); + } + } catch (NoSuchMethodException ex) { + throw new ActionException("Async implementation declared but not defined for " + + method.getName()); + } + } + sAsyncMethods.put(method, asyncMethod); + return asyncMethod; + } + } + private static String getParameters(Class<?> paramType) { if (paramType == null) return "()"; return "(" + paramType + ")"; @@ -1324,6 +1389,37 @@ public class RemoteViews implements Parcelable, Filter { } } + @Override + public Action initActionAsync(ViewTree root, ViewGroup rootParent, OnClickHandler handler) { + final View view = root.findViewById(viewId); + if (view == null) return ACTION_NOOP; + + Class<?> param = getParameterType(); + if (param == null) { + throw new ActionException("bad type: " + this.type); + } + + try { + Method method = getMethod(view, this.methodName, param); + Method asyncMethod = getAsyncMethod(method); + + if (asyncMethod != null) { + Runnable endAction = (Runnable) asyncMethod.invoke(view, wrapArg(this.value)); + if (endAction == null) { + return ACTION_NOOP; + } else { + return new RunnableAction(endAction); + } + } + } catch (ActionException e) { + throw e; + } catch (Exception ex) { + throw new ActionException(ex); + } + + return this; + } + public int mergeBehavior() { // smoothScrollBy is cumulative, everything else overwites. if (methodName.equals("smoothScrollBy")) { @@ -1340,6 +1436,22 @@ public class RemoteViews implements Parcelable, Filter { } } + /** + * This is only used for async execution of actions and it not parcelable. + */ + private static final class RunnableAction extends RuntimeAction { + private final Runnable mRunnable; + + RunnableAction(Runnable r) { + mRunnable = r; + } + + @Override + public void apply(View root, ViewGroup rootParent, OnClickHandler handler) { + mRunnable.run(); + } + } + private void configureRemoteViewsAsChild(RemoteViews rv) { mBitmapCache.assimilate(rv.mBitmapCache); rv.setBitmapCache(mBitmapCache); @@ -1401,6 +1513,43 @@ public class RemoteViews implements Parcelable, Filter { } @Override + public Action initActionAsync(ViewTree root, ViewGroup rootParent, OnClickHandler handler) { + // In the async implementation, update the view tree so that subsequent calls to + // findViewById return the currect view. + root.createTree(); + ViewTree target = root.findViewTreeById(viewId); + if ((target == null) || !(target.mRoot instanceof ViewGroup)) { + return ACTION_NOOP; + } + if (nestedViews == null) { + // Clear all children when nested views omitted + target.mChildren = null; + return this; + } else { + // Inflate nested views and perform all the async tasks for the child remoteView. + final Context context = root.mRoot.getContext(); + final AsyncApplyTask task = nestedViews.getAsyncApplyTask( + context, (ViewGroup) target.mRoot, null, handler); + final ViewTree tree = task.doInBackground(); + + // Update the global view tree, so that next call to findViewTreeById + // goes through the subtree as well. + target.addChild(tree); + + return new RuntimeAction() { + + @Override + public void apply(View root, ViewGroup rootParent, OnClickHandler handler) throws ActionException { + // This view will exist as we have already made sure + final ViewGroup target = (ViewGroup) root.findViewById(viewId); + task.onPostExecute(tree); + target.addView(task.mResult); + } + }; + } + } + + @Override public void updateMemoryUsageEstimate(MemoryUsageCounter counter) { if (nestedViews != null) { counter.increment(nestedViews.estimateMemoryUsage()); @@ -1520,7 +1669,13 @@ public class RemoteViews implements Parcelable, Filter { public void apply(View root, ViewGroup rootParent, OnClickHandler handler) { final TextView target = (TextView) root.findViewById(viewId); if (target == null) return; - if (useIcons) { + if (drawablesLoaded) { + if (isRelative) { + target.setCompoundDrawablesRelativeWithIntrinsicBounds(id1, id2, id3, id4); + } else { + target.setCompoundDrawablesWithIntrinsicBounds(id1, id2, id3, id4); + } + } else if (useIcons) { final Context ctx = target.getContext(); final Drawable id1 = i1 == null ? null : i1.loadDrawable(ctx); final Drawable id2 = i2 == null ? null : i2.loadDrawable(ctx); @@ -1540,6 +1695,33 @@ public class RemoteViews implements Parcelable, Filter { } } + @Override + public Action initActionAsync(ViewTree root, ViewGroup rootParent, OnClickHandler handler) { + final TextView target = (TextView) root.findViewById(viewId); + if (target == null) return ACTION_NOOP; + + TextViewDrawableAction copy = useIcons ? + new TextViewDrawableAction(viewId, isRelative, i1, i2, i3, i4) : + new TextViewDrawableAction(viewId, isRelative, d1, d2, d3, d4); + + // Load the drawables on the background thread. + copy.drawablesLoaded = true; + final Context ctx = target.getContext(); + + if (useIcons) { + copy.id1 = i1 == null ? null : i1.loadDrawable(ctx); + copy.id2 = i2 == null ? null : i2.loadDrawable(ctx); + copy.id3 = i3 == null ? null : i3.loadDrawable(ctx); + copy.id4 = i4 == null ? null : i4.loadDrawable(ctx); + } else { + copy.id1 = d1 == 0 ? null : ctx.getDrawable(d1); + copy.id2 = d2 == 0 ? null : ctx.getDrawable(d2); + copy.id3 = d3 == 0 ? null : ctx.getDrawable(d3); + copy.id4 = d4 == 0 ? null : ctx.getDrawable(d4); + } + return copy; + } + public String getActionName() { return "TextViewDrawableAction"; } @@ -1549,6 +1731,9 @@ public class RemoteViews implements Parcelable, Filter { int d1, d2, d3, d4; Icon i1, i2, i3, i4; + boolean drawablesLoaded = false; + Drawable id1, id2, id3, id4; + public final static int TAG = 11; } @@ -2852,7 +3037,15 @@ public class RemoteViews implements Parcelable, Filter { public View apply(Context context, ViewGroup parent, OnClickHandler handler) { RemoteViews rvToApply = getRemoteViewsToApply(context); - View result; + View result = inflateView(context, rvToApply, parent); + loadTransitionOverride(context, handler); + + rvToApply.performApply(result, parent, handler); + + return result; + } + + private View inflateView(Context context, RemoteViews rv, ViewGroup parent) { // RemoteViews may be built by an application installed in another // user. So build a context that loads resources from that user but // still returns the current users userId so settings like data / time formats @@ -2880,13 +3073,7 @@ public class RemoteViews implements Parcelable, Filter { // we don't add a filter to the static version returned by getSystemService. inflater = inflater.cloneInContext(inflationContext); inflater.setFilter(this); - result = inflater.inflate(rvToApply.getLayoutId(), parent, false); - - loadTransitionOverride(context, handler); - - rvToApply.performApply(result, parent, handler); - - return result; + return inflater.inflate(rv.getLayoutId(), parent, false); } private static void loadTransitionOverride(Context context, @@ -2908,6 +3095,143 @@ public class RemoteViews implements Parcelable, Filter { } /** + * Implement this interface to receive a callback when + * {@link #applyAsync} or {@link #reapplyAsync} is finished. + * @hide + */ + public interface OnViewAppliedListener { + void onViewApplied(View v); + + void onError(Exception e); + } + + /** + * Applies the views asynchronously, moving as much of the task on the background + * thread as possible. + * + * @see {@link #apply(Context, ViewGroup)} + * @param context Default context to use + * @param parent Parent that the resulting view hierarchy will be attached to. This method + * does <strong>not</strong> attach the hierarchy. The caller should do so when appropriate. + * @param listener the callback to run when all actions have been applied. May be null. + * @param executor The executor to use. If null {@link AsyncTask#THREAD_POOL_EXECUTOR} is used. + * @return CancellationSignal + * @hide + */ + public CancellationSignal applyAsync( + Context context, ViewGroup parent, Executor executor, OnViewAppliedListener listener) { + return applyAsync(context, parent, executor, listener, null); + } + + private CancellationSignal startTaskOnExecutor(AsyncApplyTask task, Executor executor) { + CancellationSignal cancelSignal = new CancellationSignal(); + cancelSignal.setOnCancelListener(task); + + task.executeOnExecutor(executor == null ? AsyncTask.THREAD_POOL_EXECUTOR : executor); + return cancelSignal; + } + + /** @hide */ + public CancellationSignal applyAsync(Context context, ViewGroup parent, + Executor executor, OnViewAppliedListener listener, OnClickHandler handler) { + return startTaskOnExecutor(getAsyncApplyTask(context, parent, listener, handler), executor); + } + + private AsyncApplyTask getAsyncApplyTask(Context context, ViewGroup parent, + OnViewAppliedListener listener, OnClickHandler handler) { + return new AsyncApplyTask(getRemoteViewsToApply(context), parent, context, listener, + handler, null); + } + + private class AsyncApplyTask extends AsyncTask<Void, Void, ViewTree> + implements CancellationSignal.OnCancelListener { + final RemoteViews mRV; + final ViewGroup mParent; + final Context mContext; + final OnViewAppliedListener mListener; + final OnClickHandler mHandler; + + private View mResult; + private ViewTree mTree; + private Action[] mActions; + private Exception mError; + + private AsyncApplyTask( + RemoteViews rv, ViewGroup parent, Context context, OnViewAppliedListener listener, + OnClickHandler handler, View result) { + mRV = rv; + mParent = parent; + mContext = context; + mListener = listener; + mHandler = handler; + + mResult = result; + loadTransitionOverride(context, handler); + } + + @Override + protected ViewTree doInBackground(Void... params) { + try { + if (mResult == null) { + mResult = inflateView(mContext, mRV, mParent); + } + + mTree = new ViewTree(mResult); + if (mRV.mActions != null) { + int count = mRV.mActions.size(); + mActions = new Action[count]; + for (int i = 0; i < count && !isCancelled(); i++) { + // TODO: check if isCanclled in nested views. + mActions[i] = mRV.mActions.get(i).initActionAsync(mTree, mParent, mHandler); + } + } else { + mActions = null; + } + return mTree; + } catch (Exception e) { + mError = e; + return null; + } + } + + @Override + protected void onPostExecute(ViewTree viewTree) { + if (mError == null) { + try { + if (mActions != null) { + OnClickHandler handler = mHandler == null + ? DEFAULT_ON_CLICK_HANDLER : mHandler; + for (Action a : mActions) { + a.apply(viewTree.mRoot, mParent, handler); + } + } + } catch (Exception e) { + mError = e; + } + } + + if (mListener != null) { + if (mError != null) { + mListener.onError(mError); + } else { + mListener.onViewApplied(viewTree.mRoot); + } + } else if (mError != null) { + if (mError instanceof ActionException) { + throw (ActionException) mError; + } else { + throw new ActionException(mError); + } + } + } + + @Override + public void onCancel() { + cancel(true); + } + } + + /** * Applies all of the actions to the provided view. * * <p><strong>Caller beware: this may throw</strong> @@ -2936,6 +3260,43 @@ public class RemoteViews implements Parcelable, Filter { rvToApply.performApply(v, (ViewGroup) v.getParent(), handler); } + /** + * Applies all the actions to the provided view, moving as much of the task on the background + * thread as possible. + * + * @see {@link #reapply(Context, View)} + * @param context Default context to use + * @param v The view to apply the actions to. This should be the result of + * the {@link #apply(Context,ViewGroup)} call. + * @param listener the callback to run when all actions have been applied. May be null. + * @param executor The executor to use. If null {@link AsyncTask#THREAD_POOL_EXECUTOR} is used + * @return CancellationSignal + * @hide + */ + public CancellationSignal reapplyAsync( + Context context, View v, Executor executor, OnViewAppliedListener listener) { + return reapplyAsync(context, v, executor, listener, null); + } + + /** @hide */ + public CancellationSignal reapplyAsync(Context context, View v, Executor executor, + OnViewAppliedListener listener, OnClickHandler handler) { + RemoteViews rvToApply = getRemoteViewsToApply(context); + + // In the case that a view has this RemoteViews applied in one orientation, is persisted + // across orientation change, and has the RemoteViews re-applied in the new orientation, + // we throw an exception, since the layouts may be completely unrelated. + if (hasLandscapeAndPortraitLayouts()) { + if (v.getId() != rvToApply.getLayoutId()) { + throw new RuntimeException("Attempting to re-apply RemoteViews to a view that" + + " that does not share the same root layout id."); + } + } + + return startTaskOnExecutor(new AsyncApplyTask(rvToApply, (ViewGroup) v.getParent(), + context, listener, handler, v), executor); + } + private void performApply(View v, ViewGroup parent, OnClickHandler handler) { if (mActions != null) { handler = handler == null ? DEFAULT_ON_CLICK_HANDLER : handler; @@ -3058,4 +3419,90 @@ public class RemoteViews implements Parcelable, Filter { return new RemoteViews[size]; } }; + + /** + * A representation of the view hierarchy. Only views which have a valid ID are added + * and can be searched. + */ + private static class ViewTree { + private final View mRoot; + + private ArrayList<ViewTree> mChildren; + + private ViewTree(View root) { + mRoot = root; + } + + public void createTree() { + if (mChildren != null) { + return; + } + + mChildren = new ArrayList<>(); + if (mRoot instanceof ViewGroup && mRoot.isRootNamespace()) { + ViewGroup vg = (ViewGroup) mRoot; + int count = vg.getChildCount(); + for (int i = 0; i < count; i++) { + addViewChild(vg.getChildAt(i)); + } + } + } + + public ViewTree findViewTreeById(int id) { + if (mRoot.getId() == id) { + return this; + } + if (mChildren == null) { + return null; + } + for (ViewTree tree : mChildren) { + ViewTree result = tree.findViewTreeById(id); + if (result != null) { + return result; + } + } + return null; + } + + public View findViewById(int id) { + if (mChildren == null) { + return mRoot.findViewById(id); + } + ViewTree tree = findViewTreeById(id); + return tree == null ? null : tree.mRoot; + } + + public void addChild(ViewTree child) { + if (mChildren == null) { + mChildren = new ArrayList<>(); + } + child.createTree(); + mChildren.add(child); + } + + private void addViewChild(View v) { + final ViewTree target; + + // If the view has a valid id, i.e., if can be found using findViewById, add it to the + // tree, otherwise skip this view and add its children instead. + if (v.getId() != 0) { + ViewTree tree = new ViewTree(v); + mChildren.add(tree); + target = tree; + } else { + target = this; + } + + if (v instanceof ViewGroup && v.isRootNamespace()) { + if (target.mChildren == null) { + target.mChildren = new ArrayList<>(); + ViewGroup vg = (ViewGroup) v; + int count = vg.getChildCount(); + for (int i = 0; i < count; i++) { + target.addViewChild(vg.getChildAt(i)); + } + } + } + } + } } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index c626af65016c..712a04bf6fae 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -115,7 +115,6 @@ import android.view.ContextMenu; import android.view.DragEvent; import android.view.Gravity; import android.view.HapticFeedbackConstants; -import android.view.InputDevice; import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.MotionEvent; @@ -395,6 +394,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } /** + * @return {@code true} if this object contains metadata that needs to + * be retained, {@code false} otherwise + */ + public boolean hasMetadata() { + return mDrawablePadding != 0 || mHasTintMode || mHasTint; + } + + /** * Updates the list of displayed drawables to account for the current * layout direction. * @@ -2174,7 +2181,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (!drawables) { // Clearing drawables... can we free the data structure? if (dr != null) { - if (dr.mDrawablePadding == 0) { + if (!dr.hasMetadata()) { mDrawables = null; } else { // We need to retain the last set padding, so just clear @@ -2377,7 +2384,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (!drawables) { // Clearing drawables... can we free the data structure? if (dr != null) { - if (dr.mDrawablePadding == 0) { + if (!dr.hasMetadata()) { mDrawables = null; } else { // We need to retain the last set padding, so just clear diff --git a/core/java/com/android/internal/app/AlertController.java b/core/java/com/android/internal/app/AlertController.java index fd857fd10c82..aac7bc3810e9 100644 --- a/core/java/com/android/internal/app/AlertController.java +++ b/core/java/com/android/internal/app/AlertController.java @@ -234,7 +234,6 @@ public class AlertController { int contentView = selectContentView(); mWindow.setContentView(contentView); setupView(); - setupDecor(); } private int selectContentView() { @@ -431,27 +430,6 @@ public class AlertController { return mScrollView != null && mScrollView.executeKeyEvent(event); } - private void setupDecor() { - final View decor = mWindow.getDecorView(); - final View parent = mWindow.findViewById(R.id.parentPanel); - if (parent != null && decor != null) { - decor.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() { - @Override - public WindowInsets onApplyWindowInsets(View view, WindowInsets insets) { - if (insets.isRound()) { - // TODO: Get the padding as a function of the window size. - int roundOffset = mContext.getResources().getDimensionPixelOffset( - R.dimen.alert_dialog_round_padding); - parent.setPadding(roundOffset, roundOffset, roundOffset, roundOffset); - } - return insets.consumeSystemWindowInsets(); - } - }); - decor.setFitsSystemWindows(true); - decor.requestApplyInsets(); - } - } - /** * Resolves whether a custom or default panel should be used. Removes the * default panel if a custom panel should be used. If the resolved panel is diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 27333915b2b6..cf13a13cafb7 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -25,6 +25,7 @@ import android.content.Intent; import android.content.IntentSender; import android.content.IntentSender.SendIntentException; import android.content.ServiceConnection; +import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.LabeledIntent; import android.content.pm.PackageManager; @@ -35,6 +36,7 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; +import android.os.Environment; import android.os.Handler; import android.os.IBinder; import android.os.Message; @@ -68,6 +70,7 @@ import com.android.internal.R; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsProto.MetricsEvent; +import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -91,6 +94,11 @@ public class ChooserActivity extends ResolverActivity { private ChooserListAdapter mChooserListAdapter; private ChooserRowAdapter mChooserRowAdapter; + private SharedPreferences mPinnedSharedPrefs; + private static final float PINNED_TARGET_SCORE_BOOST = 1000.f; + private static final String PINNED_SHARED_PREFS_NAME = "chooser_pin_settings"; + private static final String TARGET_DETAILS_FRAGMENT_TAG = "targetDetailsFragment"; + private final List<ChooserTargetServiceConnection> mServiceConnections = new ArrayList<>(); private static final int CHOOSER_TARGET_SERVICE_RESULT = 1; @@ -207,12 +215,30 @@ public class ChooserActivity extends ResolverActivity { mRefinementIntentSender = intent.getParcelableExtra( Intent.EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER); setSafeForwardingMode(true); + + mPinnedSharedPrefs = getPinnedSharedPrefs(this); super.onCreate(savedInstanceState, target, title, defaultTitleRes, initialIntents, null, false); MetricsLogger.action(this, MetricsEvent.ACTION_ACTIVITY_CHOOSER_SHOWN); } + static SharedPreferences getPinnedSharedPrefs(Context context) { + // The code below is because in the android:ui process, no one can hear you scream. + // The package info in the context isn't initialized in the way it is for normal apps, + // so the standard, name-based context.getSharedPreferences doesn't work. Instead, we + // build the path manually below using the same policy that appears in ContextImpl. + // This fails silently under the hood if there's a problem, so if we find ourselves in + // the case where we don't have access to credential encrypted storage we just won't + // have our pinned target info. + final File prefsFile = new File(new File( + Environment.getDataUserCredentialEncryptedPackageDirectory(null, + context.getUserId(), context.getPackageName()), + "shared_prefs"), + PINNED_SHARED_PREFS_NAME + ".xml"); + return context.getSharedPreferences(prefsFile, MODE_PRIVATE); + } + @Override protected void onDestroy() { super.onDestroy(); @@ -243,7 +269,7 @@ public class ChooserActivity extends ResolverActivity { } @Override - void onActivityStarted(TargetInfo cti) { + public void onActivityStarted(TargetInfo cti) { if (mChosenComponentSender != null) { final ComponentName target = cti.getResolvedComponentName(); if (target != null) { @@ -259,7 +285,7 @@ public class ChooserActivity extends ResolverActivity { } @Override - void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter, + public void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter, boolean alwaysUseOption) { final ListView listView = adapterView instanceof ListView ? (ListView) adapterView : null; mChooserListAdapter = (ChooserListAdapter) adapter; @@ -272,17 +298,17 @@ public class ChooserActivity extends ResolverActivity { } @Override - int getLayoutResource() { + public int getLayoutResource() { return R.layout.chooser_grid; } @Override - boolean shouldGetActivityMetadata() { + public boolean shouldGetActivityMetadata() { return true; } @Override - boolean shouldAutoLaunchSingleChoice(TargetInfo target) { + public boolean shouldAutoLaunchSingleChoice(TargetInfo target) { final Intent intent = target.getResolvedIntent(); final ResolveInfo resolve = target.getResolveInfo(); @@ -299,6 +325,16 @@ public class ChooserActivity extends ResolverActivity { return false; } + @Override + public void showTargetDetails(ResolveInfo ri) { + ComponentName name = ri.activityInfo.getComponentName(); + boolean pinned = mPinnedSharedPrefs.getBoolean(name.flattenToString(), false); + ResolverTargetActionsDialogFragment f = + new ResolverTargetActionsDialogFragment(ri.loadLabel(getPackageManager()), + name, pinned); + f.show(getFragmentManager(), TARGET_DETAILS_FRAGMENT_TAG); + } + private void modifyTargetIntent(Intent in) { final String action = in.getAction(); if (Intent.ACTION_SEND.equals(action) || @@ -340,7 +376,7 @@ public class ChooserActivity extends ResolverActivity { } @Override - void startSelected(int which, boolean always, boolean filtered) { + public void startSelected(int which, boolean always, boolean filtered) { super.startSelected(which, always, filtered); if (mChooserListAdapter != null) { @@ -471,7 +507,7 @@ public class ChooserActivity extends ResolverActivity { mChooserHandler.removeMessages(CHOOSER_TARGET_SERVICE_WATCHDOG_TIMEOUT); } - void onSetupVoiceInteraction() { + public void onSetupVoiceInteraction() { // Do nothing. We'll send the voice stuff ourselves. } @@ -543,7 +579,7 @@ public class ChooserActivity extends ResolverActivity { } @Override - ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents, + public ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents, Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid, boolean filterLastUsed) { final ChooserListAdapter adapter = new ChooserListAdapter(context, payloadIntents, @@ -711,6 +747,11 @@ public class ChooserActivity extends ResolverActivity { } return results; } + + @Override + public boolean isPinned() { + return mSourceInfo != null ? mSourceInfo.isPinned() : false; + } } public class ChooserListAdapter extends ResolveListAdapter { @@ -777,6 +818,20 @@ public class ChooserActivity extends ResolverActivity { } @Override + public boolean isComponentPinned(ComponentName name) { + return mPinnedSharedPrefs.getBoolean(name.flattenToString(), false); + } + + @Override + public float getScore(DisplayResolveInfo target) { + float score = super.getScore(target); + if (target.isPinned()) { + score += PINNED_TARGET_SCORE_BOOST; + } + return score; + } + + @Override public View onCreateView(ViewGroup parent) { return mInflater.inflate( com.android.internal.R.layout.resolve_grid_item, parent, false); @@ -1121,7 +1176,7 @@ public class ChooserActivity extends ResolverActivity { v.setOnLongClickListener(new OnLongClickListener() { @Override public boolean onLongClick(View v) { - showAppDetails( + showTargetDetails( mChooserListAdapter.resolveInfoForPosition( holder.itemIndices[column], true)); return true; diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java index dbec7405fe49..015e60dd2a7d 100644 --- a/core/java/com/android/internal/app/IntentForwarderActivity.java +++ b/core/java/com/android/internal/app/IntentForwarderActivity.java @@ -85,8 +85,10 @@ public class IntentForwarderActivity extends Activity { int callingUserId = getUserId(); if (canForward(newIntent, targetUserId)) { - if (newIntent.getAction().equals(Intent.ACTION_CHOOSER)) { + if (Intent.ACTION_CHOOSER.equals(newIntent.getAction())) { Intent innerIntent = (Intent) newIntent.getParcelableExtra(Intent.EXTRA_INTENT); + // At this point, innerIntent is not null. Otherwise, canForward would have returned + // false. innerIntent.prepareToLeaveUser(callingUserId); } else { newIntent.prepareToLeaveUser(callingUserId); @@ -124,7 +126,7 @@ public class IntentForwarderActivity extends Activity { Toast.makeText(this, getString(userMessageId), Toast.LENGTH_LONG).show(); } } else { - Slog.wtf(TAG, "the intent: " + newIntent + "cannot be forwarded from user " + Slog.wtf(TAG, "the intent: " + newIntent + " cannot be forwarded from user " + callingUserId + " to user " + targetUserId); } finish(); @@ -132,7 +134,7 @@ public class IntentForwarderActivity extends Activity { boolean canForward(Intent intent, int targetUserId) { IPackageManager ipm = AppGlobals.getPackageManager(); - if (intent.getAction().equals(Intent.ACTION_CHOOSER)) { + if (Intent.ACTION_CHOOSER.equals(intent.getAction())) { // The EXTRA_INITIAL_INTENTS may not be allowed to be forwarded. if (intent.hasExtra(Intent.EXTRA_INITIAL_INTENTS)) { Slog.wtf(TAG, "An chooser intent with extra initial intents cannot be forwarded to" @@ -145,6 +147,11 @@ public class IntentForwarderActivity extends Activity { return false; } intent = (Intent) intent.getParcelableExtra(Intent.EXTRA_INTENT); + if (intent == null) { + Slog.wtf(TAG, "Cannot forward a chooser intent with no extra " + + Intent.EXTRA_INTENT); + return false; + } } String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); if (intent.getSelector() != null) { diff --git a/core/java/com/android/internal/app/LocalePickerWithRegion.java b/core/java/com/android/internal/app/LocalePickerWithRegion.java index 9a1788373534..956ee8c9242d 100644 --- a/core/java/com/android/internal/app/LocalePickerWithRegion.java +++ b/core/java/com/android/internal/app/LocalePickerWithRegion.java @@ -138,22 +138,12 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O super.onCreate(savedInstanceState); setHasOptionsMenu(true); - Locale sortingLocale; - if (mCountryMode) { - if (mParentLocale == null) { - sortingLocale = Locale.getDefault(); - this.getActivity().setTitle(R.string.country_selection_title); - } else { - sortingLocale = mParentLocale.getLocale(); - this.getActivity().setTitle(mParentLocale.getFullNameNative()); - } - } else { - sortingLocale = Locale.getDefault(); - this.getActivity().setTitle(R.string.language_selection_title); - } + final Locale sortingLocale = (mCountryMode && mParentLocale != null) + ? mParentLocale.getLocale() + : Locale.getDefault(); mAdapter = new SuggestedLocaleAdapter(mLocaleList, mCountryMode); - LocaleHelper.LocaleInfoComparator comp = + final LocaleHelper.LocaleInfoComparator comp = new LocaleHelper.LocaleInfoComparator(sortingLocale); mAdapter.sort(comp); setListAdapter(mAdapter); @@ -173,6 +163,17 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O @Override public void onResume() { super.onResume(); + + if (mCountryMode) { + if (mParentLocale == null) { + this.getActivity().setTitle(R.string.country_selection_title); + } else { + this.getActivity().setTitle(mParentLocale.getFullNameNative()); + } + } else { + this.getActivity().setTitle(R.string.language_selection_title); + } + getListView().requestFocus(); } diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index ec148c554bb7..53e329d090cf 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -22,6 +22,7 @@ import android.app.ActivityThread; import android.app.VoiceInteractor.PickOptionRequest; import android.app.VoiceInteractor.PickOptionRequest.Option; import android.app.VoiceInteractor.Prompt; +import android.content.pm.ComponentInfo; import android.os.AsyncTask; import android.provider.Settings; import android.text.TextUtils; @@ -336,12 +337,12 @@ public class ResolverActivity extends Activity { /** * Perform any initialization needed for voice interaction. */ - void onSetupVoiceInteraction() { + public void onSetupVoiceInteraction() { // Do it right now. Subclasses may delay this and send it later. sendVoiceChoicesIfNeeded(); } - void sendVoiceChoicesIfNeeded() { + public void sendVoiceChoicesIfNeeded() { if (!isVoiceInteraction()) { // Clearly not needed. return; @@ -382,7 +383,7 @@ public class ResolverActivity extends Activity { return null; } - int getLayoutResource() { + public int getLayoutResource() { return R.layout.resolver_list; } @@ -591,7 +592,7 @@ public class ResolverActivity extends Activity { mAlwaysUseOption); } - void startSelected(int which, boolean always, boolean filtered) { + public void startSelected(int which, boolean always, boolean filtered) { if (isFinishing()) { return; } @@ -761,7 +762,7 @@ public class ResolverActivity extends Activity { return true; } - void safelyStartActivity(TargetInfo cti) { + public void safelyStartActivity(TargetInfo cti) { // If needed, show that intent is forwarded // from managed profile to owner or other way around. if (mProfileSwitchMessageId != -1) { @@ -791,26 +792,26 @@ public class ResolverActivity extends Activity { } } - void onActivityStarted(TargetInfo cti) { + public void onActivityStarted(TargetInfo cti) { // Do nothing } - boolean shouldGetActivityMetadata() { + public boolean shouldGetActivityMetadata() { return false; } - boolean shouldAutoLaunchSingleChoice(TargetInfo target) { + public boolean shouldAutoLaunchSingleChoice(TargetInfo target) { return true; } - void showAppDetails(ResolveInfo ri) { + public void showTargetDetails(ResolveInfo ri) { Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) .setData(Uri.fromParts("package", ri.activityInfo.packageName, null)) .addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); startActivity(in); } - ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents, + public ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents, Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid, boolean filterLastUsed) { return new ResolveListAdapter(context, payloadIntents, initialIntents, rList, @@ -820,7 +821,7 @@ public class ResolverActivity extends Activity { /** * Returns true if the activity is finishing and creation should halt */ - boolean configureContentView(List<Intent> payloadIntents, Intent[] initialIntents, + public boolean configureContentView(List<Intent> payloadIntents, Intent[] initialIntents, List<ResolveInfo> rList, boolean alwaysUseOption) { // The last argument of createAdapter is whether to do special handling // of the last used choice to highlight it in the list. We need to always @@ -867,7 +868,7 @@ public class ResolverActivity extends Activity { return false; } - void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter, + public void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter, boolean alwaysUseOption) { final boolean useHeader = adapter.hasFilteredItem(); final ListView listView = adapterView instanceof ListView ? (ListView) adapterView : null; @@ -898,7 +899,7 @@ public class ResolverActivity extends Activity { && Objects.equals(lhs.activityInfo.packageName, rhs.activityInfo.packageName); } - final class DisplayResolveInfo implements TargetInfo { + public final class DisplayResolveInfo implements TargetInfo { private final ResolveInfo mResolveInfo; private final CharSequence mDisplayLabel; private Drawable mDisplayIcon; @@ -906,8 +907,9 @@ public class ResolverActivity extends Activity { private final CharSequence mExtendedInfo; private final Intent mResolvedIntent; private final List<Intent> mSourceIntents = new ArrayList<>(); + private boolean mPinned; - DisplayResolveInfo(Intent originalIntent, ResolveInfo pri, CharSequence pLabel, + public DisplayResolveInfo(Intent originalIntent, ResolveInfo pri, CharSequence pLabel, CharSequence pInfo, Intent pOrigIntent) { mSourceIntents.add(originalIntent); mResolveInfo = pri; @@ -932,6 +934,7 @@ public class ResolverActivity extends Activity { mExtendedInfo = other.mExtendedInfo; mResolvedIntent = new Intent(other.mResolvedIntent); mResolvedIntent.fillIn(fillInIntent, flags); + mPinned = other.mPinned; } public ResolveInfo getResolveInfo() { @@ -1026,6 +1029,15 @@ public class ResolverActivity extends Activity { activity.startActivityAsUser(mResolvedIntent, options, user); return false; } + + @Override + public boolean isPinned() { + return mPinned; + } + + public void setPinned(boolean pinned) { + mPinned = pinned; + } } /** @@ -1039,7 +1051,7 @@ public class ResolverActivity extends Activity { * * @return the resolved intent for this target */ - public Intent getResolvedIntent(); + Intent getResolvedIntent(); /** * Get the resolved component name that represents this target. Note that this may not @@ -1048,7 +1060,7 @@ public class ResolverActivity extends Activity { * * @return the resolved ComponentName for this target */ - public ComponentName getResolvedComponentName(); + ComponentName getResolvedComponentName(); /** * Start the activity referenced by this target. @@ -1057,7 +1069,7 @@ public class ResolverActivity extends Activity { * @param options ActivityOptions bundle * @return true if the start completed successfully */ - public boolean start(Activity activity, Bundle options); + boolean start(Activity activity, Bundle options); /** * Start the activity referenced by this target as if the ResolverActivity's caller @@ -1068,7 +1080,7 @@ public class ResolverActivity extends Activity { * @param userId userId to start as or {@link UserHandle#USER_NULL} for activity's caller * @return true if the start completed successfully */ - public boolean startAsCaller(Activity activity, Bundle options, int userId); + boolean startAsCaller(Activity activity, Bundle options, int userId); /** * Start the activity referenced by this target as a given user. @@ -1078,7 +1090,7 @@ public class ResolverActivity extends Activity { * @param user handle for the user to start the activity as * @return true if the start completed successfully */ - public boolean startAsUser(Activity activity, Bundle options, UserHandle user); + boolean startAsUser(Activity activity, Bundle options, UserHandle user); /** * Return the ResolveInfo about how and why this target matched the original query @@ -1086,14 +1098,14 @@ public class ResolverActivity extends Activity { * * @return ResolveInfo representing this target's match */ - public ResolveInfo getResolveInfo(); + ResolveInfo getResolveInfo(); /** * Return the human-readable text label for this target. * * @return user-visible target label */ - public CharSequence getDisplayLabel(); + CharSequence getDisplayLabel(); /** * Return any extended info for this target. This may be used to disambiguate @@ -1101,35 +1113,40 @@ public class ResolverActivity extends Activity { * * @return human-readable disambig string or null if none present */ - public CharSequence getExtendedInfo(); + CharSequence getExtendedInfo(); /** * @return The drawable that should be used to represent this target */ - public Drawable getDisplayIcon(); + Drawable getDisplayIcon(); /** * @return The (small) icon to badge the target with */ - public Drawable getBadgeIcon(); + Drawable getBadgeIcon(); /** * @return The content description for the badge icon */ - public CharSequence getBadgeContentDescription(); + CharSequence getBadgeContentDescription(); /** * Clone this target with the given fill-in information. */ - public TargetInfo cloneFilledIn(Intent fillInIntent, int flags); + TargetInfo cloneFilledIn(Intent fillInIntent, int flags); /** * @return the list of supported source intents deduped against this single target */ - public List<Intent> getAllSourceIntents(); + List<Intent> getAllSourceIntents(); + + /** + * @return true if this target should be pinned to the front by the request of the user + */ + boolean isPinned(); } - class ResolveListAdapter extends BaseAdapter { + public class ResolveListAdapter extends BaseAdapter { private final List<Intent> mIntents; private final Intent[] mInitialIntents; private final List<ResolveInfo> mBaseResolveList; @@ -1376,9 +1393,12 @@ public class ResolverActivity extends Activity { } } if (!found) { - into.add(new ResolvedComponentInfo(new ComponentName( - newInfo.activityInfo.packageName, newInfo.activityInfo.name), - intent, newInfo)); + final ComponentName name = new ComponentName( + newInfo.activityInfo.packageName, newInfo.activityInfo.name); + final ResolvedComponentInfo rci = new ResolvedComponentInfo(name, + intent, newInfo); + rci.setPinned(isComponentPinned(name)); + into.add(rci); } } } @@ -1454,6 +1474,7 @@ public class ResolverActivity extends Activity { final Intent replaceIntent = getReplacementIntent(add.activityInfo, intent); final DisplayResolveInfo dri = new DisplayResolveInfo(intent, add, roLabel, extraInfo, replaceIntent); + dri.setPinned(rci.isPinned()); addResolveInfo(dri); if (replaceIntent == intent) { // Only add alternates if we didn't get a specific replacement from @@ -1537,11 +1558,11 @@ public class ResolverActivity extends Activity { return false; } - protected int getDisplayResolveInfoCount() { + public int getDisplayResolveInfoCount() { return mDisplayList.size(); } - protected DisplayResolveInfo getDisplayResolveInfo(int index) { + public DisplayResolveInfo getDisplayResolveInfo(int index) { // Used to query services. We only query services for primary targets, not alternates. return mDisplayList.get(index); } @@ -1571,6 +1592,10 @@ public class ResolverActivity extends Activity { return !TextUtils.isEmpty(info.getExtendedInfo()); } + public boolean isComponentPinned(ComponentName name) { + return false; + } + public final void bindView(int position, View view) { onBindView(view, getItem(position)); } @@ -1607,6 +1632,7 @@ public class ResolverActivity extends Activity { static final class ResolvedComponentInfo { public final ComponentName name; + private boolean mPinned; private final List<Intent> mIntents = new ArrayList<>(); private final List<ResolveInfo> mResolveInfos = new ArrayList<>(); @@ -1649,6 +1675,14 @@ public class ResolverActivity extends Activity { } return -1; } + + public boolean isPinned() { + return mPinned; + } + + public void setPinned(boolean pinned) { + mPinned = pinned; + } } static class ViewHolder { @@ -1702,7 +1736,7 @@ public class ResolverActivity extends Activity { return false; } ResolveInfo ri = mAdapter.resolveInfoForPosition(position, true); - showAppDetails(ri); + showTargetDetails(ri); return true; } diff --git a/core/java/com/android/internal/app/ResolverComparator.java b/core/java/com/android/internal/app/ResolverComparator.java index 31556e29bc32..0ae21c61112f 100644 --- a/core/java/com/android/internal/app/ResolverComparator.java +++ b/core/java/com/android/internal/app/ResolverComparator.java @@ -47,8 +47,8 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { private static final boolean DEBUG = false; - // Two weeks - private static final long USAGE_STATS_PERIOD = 1000 * 60 * 60 * 24 * 14; + // One week + private static final long USAGE_STATS_PERIOD = 1000 * 60 * 60 * 24 * 7; private static final long RECENCY_TIME_PERIOD = 1000 * 60 * 60 * 12; @@ -171,15 +171,27 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { } } - if (mStats != null) { - final ScoredTarget lhsTarget = mScoredTargets.get(new ComponentName( - lhs.activityInfo.packageName, lhs.activityInfo.name)); - final ScoredTarget rhsTarget = mScoredTargets.get(new ComponentName( - rhs.activityInfo.packageName, rhs.activityInfo.name)); - final float diff = rhsTarget.score - lhsTarget.score; + final boolean lPinned = lhsp.isPinned(); + final boolean rPinned = rhsp.isPinned(); - if (diff != 0) { - return diff > 0 ? 1 : -1; + if (lPinned && !rPinned) { + return -1; + } else if (!lPinned && rPinned) { + return 1; + } + + // Pinned items stay stable within a normal lexical sort and ignore scoring. + if (!lPinned && !rPinned) { + if (mStats != null) { + final ScoredTarget lhsTarget = mScoredTargets.get(new ComponentName( + lhs.activityInfo.packageName, lhs.activityInfo.name)); + final ScoredTarget rhsTarget = mScoredTargets.get(new ComponentName( + rhs.activityInfo.packageName, rhs.activityInfo.name)); + final float diff = rhsTarget.score - lhsTarget.score; + + if (diff != 0) { + return diff > 0 ? 1 : -1; + } } } diff --git a/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java b/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java new file mode 100644 index 000000000000..8156f79f3be3 --- /dev/null +++ b/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2016 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.app; + +import android.app.AlertDialog.Builder; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.ComponentName; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.net.Uri; +import android.os.Bundle; +import android.provider.Settings; + +import com.android.internal.R; + +/** + * Shows a dialog with actions to take on a chooser target + */ +public class ResolverTargetActionsDialogFragment extends DialogFragment + implements DialogInterface.OnClickListener { + private static final String NAME_KEY = "componentName"; + private static final String PINNED_KEY = "pinned"; + private static final String TITLE_KEY = "title"; + + // Sync with R.array.resolver_target_actions_* resources + private static final int TOGGLE_PIN_INDEX = 0; + private static final int APP_INFO_INDEX = 1; + + public ResolverTargetActionsDialogFragment() { + } + + public ResolverTargetActionsDialogFragment(CharSequence title, ComponentName name, + boolean pinned) { + Bundle args = new Bundle(); + args.putCharSequence(TITLE_KEY, title); + args.putParcelable(NAME_KEY, name); + args.putBoolean(PINNED_KEY, pinned); + setArguments(args); + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final Bundle args = getArguments(); + final int itemRes = args.getBoolean(PINNED_KEY, false) + ? R.array.resolver_target_actions_unpin + : R.array.resolver_target_actions_pin; + return new Builder(getContext()) + .setCancelable(true) + .setItems(itemRes, this) + .setTitle(args.getCharSequence(TITLE_KEY)) + .create(); + } + + @Override + public void onClick(DialogInterface dialog, int which) { + final Bundle args = getArguments(); + ComponentName name = args.getParcelable(NAME_KEY); + switch (which) { + case TOGGLE_PIN_INDEX: + SharedPreferences sp = ChooserActivity.getPinnedSharedPrefs(getContext()); + final String key = name.flattenToString(); + boolean currentVal = sp.getBoolean(name.flattenToString(), false); + if (currentVal) { + sp.edit().remove(key).apply(); + } else { + sp.edit().putBoolean(key, true).apply(); + } + + // Force the chooser to requery and resort things + getActivity().recreate(); + break; + case APP_INFO_INDEX: + Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) + .setData(Uri.fromParts("package", name.getPackageName(), null)) + .addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); + startActivity(in); + break; + } + dismiss(); + } +} diff --git a/core/java/com/android/internal/policy/BackdropFrameRenderer.java b/core/java/com/android/internal/policy/BackdropFrameRenderer.java index de54d96df78b..5047c4c11889 100644 --- a/core/java/com/android/internal/policy/BackdropFrameRenderer.java +++ b/core/java/com/android/internal/policy/BackdropFrameRenderer.java @@ -289,12 +289,17 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame DisplayListCanvas canvas = mFrameAndBackdropNode.start(width, height); final Drawable drawable = mUserCaptionBackgroundDrawable != null ? mUserCaptionBackgroundDrawable : mCaptionBackgroundDrawable; - drawable.setBounds(0, 0, left + width, top + mLastCaptionHeight); - drawable.draw(canvas); + + if (drawable != null) { + drawable.setBounds(0, 0, left + width, top + mLastCaptionHeight); + drawable.draw(canvas); + } // The backdrop: clear everything with the background. Clipping is done elsewhere. - mResizingBackgroundDrawable.setBounds(0, mLastCaptionHeight, left + width, top + height); - mResizingBackgroundDrawable.draw(canvas); + if (mResizingBackgroundDrawable != null) { + mResizingBackgroundDrawable.setBounds(0, mLastCaptionHeight, left + width, top + height); + mResizingBackgroundDrawable.draw(canvas); + } mFrameAndBackdropNode.end(canvas); if (mSystemBarBackgroundNode != null && mStatusBarColor != null) { diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index 36009dcf8847..1a20e5ce5793 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -205,6 +205,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind private float mAvailableWidth; String mLogTag = TAG; + private final Rect mFloatingInsets = new Rect(); + private boolean mApplyFloatingVerticalInsets = false; + private boolean mApplyFloatingHorizontalInsets = false; DecorView(Context context, int featureId, PhoneWindow window, WindowManager.LayoutParams params) { @@ -567,6 +570,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind final int heightMode = getMode(heightMeasureSpec); boolean fixedWidth = false; + mApplyFloatingHorizontalInsets = false; if (widthMode == AT_MOST) { final TypedValue tvw = isPortrait ? mWindow.mFixedWidthMinor : mWindow.mFixedWidthMajor; if (tvw != null && tvw.type != TypedValue.TYPE_NULL) { @@ -584,10 +588,16 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind widthMeasureSpec = MeasureSpec.makeMeasureSpec( Math.min(w, widthSize), EXACTLY); fixedWidth = true; + } else { + widthMeasureSpec = MeasureSpec.makeMeasureSpec( + widthMeasureSpec - mFloatingInsets.left - mFloatingInsets.right, + AT_MOST); + mApplyFloatingHorizontalInsets = true; } } } + mApplyFloatingVerticalInsets = false; if (heightMode == AT_MOST) { final TypedValue tvh = isPortrait ? mWindow.mFixedHeightMajor : mWindow.mFixedHeightMinor; @@ -601,10 +611,14 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind h = 0; } if (DEBUG_MEASURE) Log.d(mLogTag, "Fixed height: " + h); + final int heightSize = MeasureSpec.getSize(heightMeasureSpec); if (h > 0) { - final int heightSize = MeasureSpec.getSize(heightMeasureSpec); heightMeasureSpec = MeasureSpec.makeMeasureSpec( Math.min(h, heightSize), EXACTLY); + } else if ((mWindow.getAttributes().flags & FLAG_FULLSCREEN) == 0) { + heightMeasureSpec = MeasureSpec.makeMeasureSpec( + heightSize - mFloatingInsets.top - mFloatingInsets.bottom, AT_MOST); + mApplyFloatingVerticalInsets = true; } } } @@ -672,6 +686,12 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind if (mOutsets.top > 0) { offsetTopAndBottom(-mOutsets.top); } + if (mApplyFloatingVerticalInsets) { + offsetTopAndBottom(mFloatingInsets.top); + } + if (mApplyFloatingHorizontalInsets) { + offsetLeftAndRight(mFloatingInsets.left); + } // If the application changed its SystemUI metrics, we might also have to adapt // our shadow elevation. @@ -868,6 +888,25 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind @Override public WindowInsets onApplyWindowInsets(WindowInsets insets) { + final WindowManager.LayoutParams attrs = mWindow.getAttributes(); + mFloatingInsets.setEmpty(); + if ((attrs.flags & FLAG_FULLSCREEN) == 0) { + // For dialog windows we want to make sure they don't go over the status bar or nav bar. + // We consume the system insets and we will reuse them later during the measure phase. + // We allow the app to ignore this and handle insets itself by using FLAG_FULLSCREEN. + if (attrs.height == WindowManager.LayoutParams.WRAP_CONTENT) { + mFloatingInsets.top = insets.getSystemWindowInsetTop(); + mFloatingInsets.bottom = insets.getSystemWindowInsetBottom(); + insets = insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, + insets.getSystemWindowInsetRight(), 0); + } + if (mWindow.getAttributes().width == WindowManager.LayoutParams.WRAP_CONTENT) { + mFloatingInsets.left = insets.getSystemWindowInsetTop(); + mFloatingInsets.right = insets.getSystemWindowInsetBottom(); + insets = insets.replaceSystemWindowInsets(0, insets.getSystemWindowInsetTop(), + 0, insets.getSystemWindowInsetBottom()); + } + } mFrameOffsets.set(insets.getSystemWindowInsets()); insets = updateColorViews(insets, true /* animate */); insets = updateStatusGuard(insets); diff --git a/core/java/com/android/internal/widget/FloatingToolbar.java b/core/java/com/android/internal/widget/FloatingToolbar.java index 02efcc67bee9..ce03bb81c08b 100644 --- a/core/java/com/android/internal/widget/FloatingToolbar.java +++ b/core/java/com/android/internal/widget/FloatingToolbar.java @@ -322,7 +322,7 @@ public final class FloatingToolbar { /* View components */ private final ViewGroup mContentContainer; // holds all contents. private final ViewGroup mMainPanel; // holds menu items that are initially displayed. - private final ListView mOverflowPanel; // holds menu items hidden in the overflow. + private final OverflowPanel mOverflowPanel; // holds menu items hidden in the overflow. private final ImageButton mOverflowButton; // opens/closes the overflow. /* overflow button drawables. */ private final Drawable mArrow; @@ -895,6 +895,7 @@ public final class FloatingToolbar { private void setPanelsStatesAtRestingPosition() { mOverflowButton.setEnabled(true); + mOverflowPanel.awakenScrollBars(); if (mIsOverflowOpen) { // Set open state. @@ -1333,27 +1334,8 @@ public final class FloatingToolbar { return overflowButton; } - private ListView createOverflowPanel() { - final ListView overflowPanel = new ListView(FloatingToolbarPopup.this.mContext) { - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - // Update heightMeasureSpec to make sure that this view is not clipped - // as we offset it's coordinates with respect to it's parent. - heightMeasureSpec = MeasureSpec.makeMeasureSpec( - mOverflowPanelSize.getHeight() - mOverflowButtonSize.getHeight(), - MeasureSpec.EXACTLY); - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - } - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - if (isOverflowAnimating()) { - // Eat the touch event. - return true; - } - return super.dispatchTouchEvent(ev); - } - }; + private OverflowPanel createOverflowPanel() { + final OverflowPanel overflowPanel = new OverflowPanel(this); overflowPanel.setLayoutParams(new ViewGroup.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); overflowPanel.setDivider(null); @@ -1464,6 +1446,43 @@ public final class FloatingToolbar { } /** + * A custom ListView for the overflow panel. + */ + private static final class OverflowPanel extends ListView { + + private final FloatingToolbarPopup mPopup; + + OverflowPanel(FloatingToolbarPopup popup) { + super(Preconditions.checkNotNull(popup).mContext); + this.mPopup = popup; + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + // Update heightMeasureSpec to make sure that this view is not clipped + // as we offset it's coordinates with respect to it's parent. + int height = mPopup.mOverflowPanelSize.getHeight() + - mPopup.mOverflowButtonSize.getHeight(); + heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY); + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } + + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + if (mPopup.isOverflowAnimating()) { + // Eat the touch event. + return true; + } + return super.dispatchTouchEvent(ev); + } + + @Override + protected boolean awakenScrollBars() { + return super.awakenScrollBars(); + } + } + + /** * A custom interpolator used for various floating toolbar animations. */ private static final class LogAccelerateInterpolator implements Interpolator { diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index ba456f9ce052..e239852673e8 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -883,6 +883,15 @@ public class LockPatternUtils { } /** + * Determine if the device is file encrypted + * @return true if device is file encrypted + */ + public static boolean isFileEncryptionEnabled() { + final String status = SystemProperties.get("ro.crypto.type", ""); + return "file".equalsIgnoreCase(status); + } + + /** * Clears the encryption password. */ public void clearEncryptionPassword() { diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 9211eaaf4592..96492e283e1f 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -334,6 +334,7 @@ public class LockPatternView extends View { mExploreByTouchHelper = new PatternExploreByTouchHelper(this); setAccessibilityDelegate(mExploreByTouchHelper); mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); + a.recycle(); } public CellState[][] getCellStates() { diff --git a/core/jni/Android.mk b/core/jni/Android.mk index ffa3fa631b82..1b6b53ae49f4 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -51,6 +51,7 @@ LOCAL_SRC_FILES:= \ android_database_SQLiteConnection.cpp \ android_database_SQLiteGlobal.cpp \ android_database_SQLiteDebug.cpp \ + android_graphics_drawable_AnimatedVectorDrawable.cpp \ android_graphics_drawable_VectorDrawable.cpp \ android_view_DisplayEventReceiver.cpp \ android_view_DisplayListCanvas.cpp \ diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 2e45f8c4d9c0..223fc1af46d5 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -131,6 +131,7 @@ extern int register_android_graphics_Rasterizer(JNIEnv* env); extern int register_android_graphics_Region(JNIEnv* env); extern int register_android_graphics_SurfaceTexture(JNIEnv* env); extern int register_android_graphics_Xfermode(JNIEnv* env); +extern int register_android_graphics_drawable_AnimatedVectorDrawable(JNIEnv* env); extern int register_android_graphics_drawable_VectorDrawable(JNIEnv* env); extern int register_android_graphics_pdf_PdfDocument(JNIEnv* env); extern int register_android_graphics_pdf_PdfEditor(JNIEnv* env); @@ -1321,6 +1322,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_graphics_Typeface), REG_JNI(register_android_graphics_Xfermode), REG_JNI(register_android_graphics_YuvImage), + REG_JNI(register_android_graphics_drawable_AnimatedVectorDrawable), REG_JNI(register_android_graphics_drawable_VectorDrawable), REG_JNI(register_android_graphics_pdf_PdfDocument), REG_JNI(register_android_graphics_pdf_PdfEditor), diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 80ccb614ad73..43e26b332f11 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -1087,6 +1087,8 @@ static jboolean Bitmap_writeToParcel(JNIEnv* env, jobject, p->writeInt32(density); if (bitmap.colorType() == kIndex_8_SkColorType) { + // The bitmap needs to be locked to access its color table. + SkAutoLockPixels alp(bitmap); SkColorTable* ctable = bitmap.getColorTable(); if (ctable != NULL) { int count = ctable->count(); diff --git a/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp b/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp new file mode 100644 index 000000000000..7a3c598e0aed --- /dev/null +++ b/core/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp @@ -0,0 +1,194 @@ +/* + * Copyright (C) 2016 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. + */ +#define LOG_TAG "OpenGLRenderer" + +#include "jni.h" +#include "GraphicsJNI.h" +#include "core_jni_helpers.h" +#include "log/log.h" + +#include "Animator.h" +#include "Interpolator.h" +#include "PropertyValuesAnimatorSet.h" +#include "PropertyValuesHolder.h" +#include "VectorDrawable.h" + +namespace android { +using namespace uirenderer; +using namespace VectorDrawable; + +static struct { + jclass clazz; + jmethodID callOnFinished; +} gVectorDrawableAnimatorClassInfo; + +static JNIEnv* getEnv(JavaVM* vm) { + JNIEnv* env; + if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { + return 0; + } + return env; +} + +static AnimationListener* createAnimationListener(JNIEnv* env, jobject finishListener) { + class AnimationListenerBridge : public AnimationListener { + public: + AnimationListenerBridge(JNIEnv* env, jobject finishListener) { + mFinishListener = env->NewGlobalRef(finishListener); + env->GetJavaVM(&mJvm); + } + + virtual ~AnimationListenerBridge() { + if (mFinishListener) { + onAnimationFinished(NULL); + } + } + + virtual void onAnimationFinished(BaseRenderNodeAnimator*) { + LOG_ALWAYS_FATAL_IF(!mFinishListener, "Finished listener twice?"); + JNIEnv* env = getEnv(mJvm); + env->CallStaticVoidMethod( + gVectorDrawableAnimatorClassInfo.clazz, + gVectorDrawableAnimatorClassInfo.callOnFinished, + mFinishListener); + releaseJavaObject(); + } + + private: + void releaseJavaObject() { + JNIEnv* env = getEnv(mJvm); + env->DeleteGlobalRef(mFinishListener); + mFinishListener = NULL; + } + + JavaVM* mJvm; + jobject mFinishListener; + }; + return new AnimationListenerBridge(env, finishListener); +} + +static void addAnimator(JNIEnv*, jobject, jlong animatorSetPtr, jlong propertyHolderPtr, + jlong interpolatorPtr, jlong startDelay, jlong duration, jint repeatCount) { + PropertyValuesAnimatorSet* set = reinterpret_cast<PropertyValuesAnimatorSet*>(animatorSetPtr); + PropertyValuesHolder* holder = reinterpret_cast<PropertyValuesHolder*>(propertyHolderPtr); + Interpolator* interpolator = reinterpret_cast<Interpolator*>(interpolatorPtr); + set->addPropertyAnimator(holder, interpolator, startDelay, duration, repeatCount); +} + +static jlong createAnimatorSet(JNIEnv*, jobject) { + PropertyValuesAnimatorSet* animatorSet = new PropertyValuesAnimatorSet(); + return reinterpret_cast<jlong>(animatorSet); +} + +static jlong createGroupPropertyHolder(JNIEnv*, jobject, jlong nativePtr, jint propertyId, + jfloat startValue, jfloat endValue) { + VectorDrawable::Group* group = reinterpret_cast<VectorDrawable::Group*>(nativePtr); + GroupPropertyValuesHolder* newHolder = new GroupPropertyValuesHolder(group, propertyId, + startValue, endValue); + return reinterpret_cast<jlong>(newHolder); +} + +static jlong createPathDataPropertyHolder(JNIEnv*, jobject, jlong nativePtr, jlong startValuePtr, + jlong endValuePtr) { + VectorDrawable::Path* path = reinterpret_cast<VectorDrawable::Path*>(nativePtr); + PathData* startData = reinterpret_cast<PathData*>(startValuePtr); + PathData* endData = reinterpret_cast<PathData*>(endValuePtr); + PathDataPropertyValuesHolder* newHolder = new PathDataPropertyValuesHolder(path, + startData, endData); + return reinterpret_cast<jlong>(newHolder); +} + +static jlong createPathColorPropertyHolder(JNIEnv*, jobject, jlong nativePtr, jint propertyId, + int startValue, jint endValue) { + VectorDrawable::FullPath* fullPath = reinterpret_cast<VectorDrawable::FullPath*>(nativePtr); + FullPathColorPropertyValuesHolder* newHolder = new FullPathColorPropertyValuesHolder(fullPath, + propertyId, startValue, endValue); + return reinterpret_cast<jlong>(newHolder); +} + +static jlong createPathPropertyHolder(JNIEnv*, jobject, jlong nativePtr, jint propertyId, + float startValue, jfloat endValue) { + VectorDrawable::FullPath* fullPath = reinterpret_cast<VectorDrawable::FullPath*>(nativePtr); + FullPathPropertyValuesHolder* newHolder = new FullPathPropertyValuesHolder(fullPath, + propertyId, startValue, endValue); + return reinterpret_cast<jlong>(newHolder); +} + +static jlong createRootAlphaPropertyHolder(JNIEnv*, jobject, jlong nativePtr, jfloat startValue, + float endValue) { + VectorDrawable::Tree* tree = reinterpret_cast<VectorDrawable::Tree*>(nativePtr); + RootAlphaPropertyValuesHolder* newHolder = new RootAlphaPropertyValuesHolder(tree, + startValue, endValue); + return reinterpret_cast<jlong>(newHolder); +} +static void setPropertyHolderData(JNIEnv* env, jobject, jlong propertyHolderPtr, + jfloatArray srcData, jint length) { + + jfloat* propertyData = env->GetFloatArrayElements(srcData, nullptr); + PropertyValuesHolder* holder = reinterpret_cast<PropertyValuesHolder*>(propertyHolderPtr); + holder->setPropertyDataSource(propertyData, length); + env->ReleaseFloatArrayElements(srcData, propertyData, JNI_ABORT); +} +static void start(JNIEnv* env, jobject, jlong animatorSetPtr, jobject finishListener) { + PropertyValuesAnimatorSet* set = reinterpret_cast<PropertyValuesAnimatorSet*>(animatorSetPtr); + // TODO: keep a ref count in finish listener + AnimationListener* listener = createAnimationListener(env, finishListener); + set->start(listener); +} + +static void reverse(JNIEnv* env, jobject, jlong animatorSetPtr, jobject finishListener) { + // TODO: implement reverse +} + +static void end(JNIEnv*, jobject, jlong animatorSetPtr) { + PropertyValuesAnimatorSet* set = reinterpret_cast<PropertyValuesAnimatorSet*>(animatorSetPtr); + set->end(); +} + +static void reset(JNIEnv*, jobject, jlong animatorSetPtr) { + PropertyValuesAnimatorSet* set = reinterpret_cast<PropertyValuesAnimatorSet*>(animatorSetPtr); + set->reset(); +} + +static const JNINativeMethod gMethods[] = { + {"nCreateAnimatorSet", "()J", (void*)createAnimatorSet}, + {"nAddAnimator", "(JJJJJI)V", (void*)addAnimator}, + {"nCreateGroupPropertyHolder", "!(JIFF)J", (void*)createGroupPropertyHolder}, + {"nCreatePathDataPropertyHolder", "!(JJJ)J", (void*)createPathDataPropertyHolder}, + {"nCreatePathColorPropertyHolder", "!(JIII)J", (void*)createPathColorPropertyHolder}, + {"nCreatePathPropertyHolder", "!(JIFF)J", (void*)createPathPropertyHolder}, + {"nCreateRootAlphaPropertyHolder", "!(JFF)J", (void*)createRootAlphaPropertyHolder}, + {"nSetPropertyHolderData", "(J[FI)V", (void*)setPropertyHolderData}, + {"nStart", "(JLandroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimator;)V", (void*)start}, + {"nReverse", "(JLandroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimator;)V", (void*)reverse}, + {"nEnd", "!(J)V", (void*)end}, + {"nReset", "!(J)V", (void*)reset}, +}; + +const char* const kClassPathName = "android/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimator"; +int register_android_graphics_drawable_AnimatedVectorDrawable(JNIEnv* env) { + gVectorDrawableAnimatorClassInfo.clazz = FindClassOrDie(env, kClassPathName); + gVectorDrawableAnimatorClassInfo.clazz = MakeGlobalRefOrDie(env, + gVectorDrawableAnimatorClassInfo.clazz); + + gVectorDrawableAnimatorClassInfo.callOnFinished = GetStaticMethodIDOrDie( + env, gVectorDrawableAnimatorClassInfo.clazz, "callOnFinished", + "(Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimator;)V"); + return RegisterMethodsOrDie(env, "android/graphics/drawable/AnimatedVectorDrawable", + gMethods, NELEM(gMethods)); +} + +}; // namespace android diff --git a/core/jni/android_graphics_drawable_VectorDrawable.cpp b/core/jni/android_graphics_drawable_VectorDrawable.cpp index 563ec8bd9834..e88287644555 100644 --- a/core/jni/android_graphics_drawable_VectorDrawable.cpp +++ b/core/jni/android_graphics_drawable_VectorDrawable.cpp @@ -32,11 +32,6 @@ static jlong createTree(JNIEnv*, jobject, jlong groupPtr) { return reinterpret_cast<jlong>(tree); } -static void deleteTree(JNIEnv*, jobject, jlong treePtr) { - VectorDrawable::Tree* tree = reinterpret_cast<VectorDrawable::Tree*>(treePtr); - delete tree; -} - static void setTreeViewportSize(JNIEnv*, jobject, jlong treePtr, jfloat viewportWidth, jfloat viewportHeight) { VectorDrawable::Tree* tree = reinterpret_cast<VectorDrawable::Tree*>(treePtr); @@ -333,7 +328,6 @@ static void setTrimPathOffset(JNIEnv*, jobject, jlong fullPathPtr, jfloat trimPa static const JNINativeMethod gMethods[] = { {"nCreateRenderer", "!(J)J", (void*)createTree}, - {"nDestroyRenderer", "!(J)V", (void*)deleteTree}, {"nSetRendererViewportSize", "!(JFF)V", (void*)setTreeViewportSize}, {"nSetRootAlpha", "!(JF)Z", (void*)setRootAlpha}, {"nGetRootAlpha", "!(J)F", (void*)getRootAlpha}, diff --git a/core/jni/android_hardware_SoundTrigger.cpp b/core/jni/android_hardware_SoundTrigger.cpp index 048b3c71c2c3..793d1325ab6f 100644 --- a/core/jni/android_hardware_SoundTrigger.cpp +++ b/core/jni/android_hardware_SoundTrigger.cpp @@ -68,6 +68,10 @@ static struct { jfieldID data; } gSoundModelFields; +static const char* const kGenericSoundModelClassPathName = + "android/hardware/soundtrigger/SoundTrigger$GenericSoundModel"; +static jclass gGenericSoundModelClass; + static const char* const kKeyphraseClassPathName = "android/hardware/soundtrigger/SoundTrigger$Keyphrase"; static jclass gKeyphraseClass; @@ -105,6 +109,11 @@ static const char* const kKeyphraseRecognitionEventClassPathName = static jclass gKeyphraseRecognitionEventClass; static jmethodID gKeyphraseRecognitionEventCstor; +static const char* const kGenericRecognitionEventClassPathName = + "android/hardware/soundtrigger/SoundTrigger$GenericRecognitionEvent"; +static jclass gGenericRecognitionEventClass; +static jmethodID gGenericRecognitionEventCstor; + static const char* const kKeyphraseRecognitionExtraClassPathName = "android/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra"; static jclass gKeyphraseRecognitionExtraClass; @@ -266,6 +275,12 @@ void JNISoundTriggerCallback::onRecognitionEvent(struct sound_trigger_recognitio event->capture_preamble_ms, event->trigger_in_data, jAudioFormat, jData, jExtras); env->DeleteLocalRef(jExtras); + } else if (event->type == SOUND_MODEL_TYPE_GENERIC) { + jEvent = env->NewObject(gGenericRecognitionEventClass, gGenericRecognitionEventCstor, + event->status, event->model, event->capture_available, + event->capture_session, event->capture_delay_ms, + event->capture_preamble_ms, event->trigger_in_data, + jAudioFormat, jData); } else { jEvent = env->NewObject(gRecognitionEventClass, gRecognitionEventCstor, event->status, event->model, event->capture_available, @@ -524,6 +539,9 @@ android_hardware_SoundTrigger_loadSoundModel(JNIEnv *env, jobject thiz, if (env->IsInstanceOf(jSoundModel, gKeyphraseSoundModelClass)) { offset = sizeof(struct sound_trigger_phrase_sound_model); type = SOUND_MODEL_TYPE_KEYPHRASE; + } else if (env->IsInstanceOf(jSoundModel, gGenericSoundModelClass)) { + offset = sizeof(struct sound_trigger_generic_sound_model); + type = SOUND_MODEL_TYPE_GENERIC; } else { offset = sizeof(struct sound_trigger_sound_model); type = SOUND_MODEL_TYPE_UNKNOWN; @@ -631,6 +649,8 @@ android_hardware_SoundTrigger_loadSoundModel(JNIEnv *env, jobject thiz, env->DeleteLocalRef(jPhrase); } env->DeleteLocalRef(jPhrases); + } else if (type == SOUND_MODEL_TYPE_GENERIC) { + /* No initialization needed */ } status = module->loadSoundModel(memory, &handle); ALOGV("loadSoundModel status %d handle %d", status, handle); @@ -831,6 +851,9 @@ int register_android_hardware_SoundTrigger(JNIEnv *env) "Ljava/util/UUID;"); gSoundModelFields.data = GetFieldIDOrDie(env, soundModelClass, "data", "[B"); + jclass genericSoundModelClass = FindClassOrDie(env, kGenericSoundModelClassPathName); + gGenericSoundModelClass = MakeGlobalRefOrDie(env, genericSoundModelClass); + jclass keyphraseClass = FindClassOrDie(env, kKeyphraseClassPathName); gKeyphraseClass = MakeGlobalRefOrDie(env, keyphraseClass); gKeyphraseFields.id = GetFieldIDOrDie(env, keyphraseClass, "id", "I"); @@ -857,6 +880,11 @@ int register_android_hardware_SoundTrigger(JNIEnv *env) gKeyphraseRecognitionEventCstor = GetMethodIDOrDie(env, keyphraseRecognitionEventClass, "<init>", "(IIZIIIZLandroid/media/AudioFormat;[B[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;)V"); + jclass genericRecognitionEventClass = FindClassOrDie(env, + kGenericRecognitionEventClassPathName); + gGenericRecognitionEventClass = MakeGlobalRefOrDie(env, genericRecognitionEventClass); + gGenericRecognitionEventCstor = GetMethodIDOrDie(env, genericRecognitionEventClass, "<init>", + "(IIZIIIZLandroid/media/AudioFormat;[B)V"); jclass keyRecognitionConfigClass = FindClassOrDie(env, kRecognitionConfigClassPathName); gRecognitionConfigClass = MakeGlobalRefOrDie(env, keyRecognitionConfigClass); diff --git a/core/jni/android_view_DisplayListCanvas.cpp b/core/jni/android_view_DisplayListCanvas.cpp index a6c61dedb103..03c94a683ec2 100644 --- a/core/jni/android_view_DisplayListCanvas.cpp +++ b/core/jni/android_view_DisplayListCanvas.cpp @@ -27,13 +27,8 @@ #include <SkBitmap.h> #include <SkRegion.h> -#if HWUI_NEW_OPS -#include <RecordingCanvas.h> -typedef android::uirenderer::RecordingCanvas canvas_t; -#else -#include <DisplayListCanvas.h> -typedef android::uirenderer::DisplayListCanvas canvas_t; -#endif + +#include <Canvas.h> #include <Rect.h> #include <RenderNode.h> #include <CanvasProperty.h> @@ -52,7 +47,7 @@ using namespace uirenderer; static void android_view_DisplayListCanvas_insertReorderBarrier(JNIEnv* env, jobject clazz, jlong canvasPtr, jboolean reorderEnable) { - canvas_t* canvas = reinterpret_cast<canvas_t*>(canvasPtr); + Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr); canvas->insertReorderBarrier(reorderEnable); } @@ -62,7 +57,7 @@ static void android_view_DisplayListCanvas_insertReorderBarrier(JNIEnv* env, job static void android_view_DisplayListCanvas_callDrawGLFunction(JNIEnv* env, jobject clazz, jlong canvasPtr, jlong functorPtr) { - canvas_t* canvas = reinterpret_cast<canvas_t*>(canvasPtr); + Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr); Functor* functor = reinterpret_cast<Functor*>(functorPtr); canvas->callDrawGLFunction(functor); } @@ -92,7 +87,7 @@ static jint android_view_DisplayListCanvas_getMaxTextureHeight(JNIEnv* env, jobj static void android_view_DisplayListCanvas_drawRoundRectProps(JNIEnv* env, jobject clazz, jlong canvasPtr, jlong leftPropPtr, jlong topPropPtr, jlong rightPropPtr, jlong bottomPropPtr, jlong rxPropPtr, jlong ryPropPtr, jlong paintPropPtr) { - canvas_t* canvas = reinterpret_cast<canvas_t*>(canvasPtr); + Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr); CanvasPropertyPrimitive* leftProp = reinterpret_cast<CanvasPropertyPrimitive*>(leftPropPtr); CanvasPropertyPrimitive* topProp = reinterpret_cast<CanvasPropertyPrimitive*>(topPropPtr); CanvasPropertyPrimitive* rightProp = reinterpret_cast<CanvasPropertyPrimitive*>(rightPropPtr); @@ -105,7 +100,7 @@ static void android_view_DisplayListCanvas_drawRoundRectProps(JNIEnv* env, jobje static void android_view_DisplayListCanvas_drawCircleProps(JNIEnv* env, jobject clazz, jlong canvasPtr, jlong xPropPtr, jlong yPropPtr, jlong radiusPropPtr, jlong paintPropPtr) { - canvas_t* canvas = reinterpret_cast<canvas_t*>(canvasPtr); + Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr); CanvasPropertyPrimitive* xProp = reinterpret_cast<CanvasPropertyPrimitive*>(xPropPtr); CanvasPropertyPrimitive* yProp = reinterpret_cast<CanvasPropertyPrimitive*>(yPropPtr); CanvasPropertyPrimitive* radiusProp = reinterpret_cast<CanvasPropertyPrimitive*>(radiusPropPtr); @@ -119,25 +114,25 @@ static void android_view_DisplayListCanvas_drawCircleProps(JNIEnv* env, jobject static jlong android_view_DisplayListCanvas_finishRecording(JNIEnv* env, jobject clazz, jlong canvasPtr) { - canvas_t* canvas = reinterpret_cast<canvas_t*>(canvasPtr); + Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr); return reinterpret_cast<jlong>(canvas->finishRecording()); } static jlong android_view_DisplayListCanvas_createDisplayListCanvas(JNIEnv* env, jobject clazz, jint width, jint height) { - return reinterpret_cast<jlong>(new canvas_t(width, height)); + return reinterpret_cast<jlong>(Canvas::create_recording_canvas(width, height)); } static void android_view_DisplayListCanvas_resetDisplayListCanvas(JNIEnv* env, jobject clazz, jlong canvasPtr, jint width, jint height) { - canvas_t* canvas = reinterpret_cast<canvas_t*>(canvasPtr); - canvas->reset(width, height); + Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr); + canvas->resetRecording(width, height); } static void android_view_DisplayListCanvas_drawRenderNode(JNIEnv* env, jobject clazz, jlong canvasPtr, jlong renderNodePtr) { - canvas_t* canvas = reinterpret_cast<canvas_t*>(canvasPtr); + Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr); RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr); canvas->drawRenderNode(renderNode); } @@ -148,7 +143,7 @@ static void android_view_DisplayListCanvas_drawRenderNode(JNIEnv* env, static void android_view_DisplayListCanvas_drawLayer(JNIEnv* env, jobject clazz, jlong canvasPtr, jlong layerPtr) { - canvas_t* canvas = reinterpret_cast<canvas_t*>(canvasPtr); + Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr); DeferredLayerUpdater* layer = reinterpret_cast<DeferredLayerUpdater*>(layerPtr); canvas->drawLayer(layer); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a518cc464885..cc489022345c 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -231,6 +231,7 @@ <!-- @deprecated. Only {@link android.net.ConnectivityManager.CONNECTIVITY_ACTION} is sent. --> <protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE_IMMEDIATE" /> <protected-broadcast android:name="android.net.conn.DATA_ACTIVITY_CHANGE" /> + <protected-broadcast android:name="android.net.conn.RESTRICT_BACKGROUND_CHANGED" /> <protected-broadcast android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" /> <protected-broadcast android:name="android.net.conn.CAPTIVE_PORTAL_TEST_COMPLETED" /> @@ -291,9 +292,12 @@ <protected-broadcast android:name="android.intent.action.REMOTE_BUGREPORT_FINISHED" /> <protected-broadcast android:name="android.intent.action.REMOTE_BUGREPORT_DISPATCH" /> + <!-- Legacy --> <protected-broadcast android:name="android.intent.action.ACTION_IDLE_MAINTENANCE_START" /> <protected-broadcast android:name="android.intent.action.ACTION_IDLE_MAINTENANCE_END" /> + <protected-broadcast android:name="com.android.server.task.controllers.IdleController.ACTION_TRIGGER_IDLE" /> + <protected-broadcast android:name="android.intent.action.HDMI_PLUGGED" /> <protected-broadcast android:name="android.intent.action.PHONE_STATE" /> @@ -1209,8 +1213,7 @@ <eat-comment /> <!-- Allows access to the list of accounts in the Accounts Service. - <p>Protection level: dangerous - @deprecated Not operative for apps apps with targetSdkVersion >= 24. + <p>Protection level: normal --> <permission android:name="android.permission.GET_ACCOUNTS" android:permissionGroup="android.permission-group.CONTACTS" @@ -2874,6 +2877,12 @@ <permission android:name="android.permission.MANAGE_SOUND_TRIGGER" android:protectionLevel="signature|privileged" /> + <!-- @SystemApi Allows trusted applications to dispatch managed provisioning message to Managed + Provisioning app. If requesting app does not have permission, it will be ignored. + @hide --> + <permission android:name="android.permission.DISPATCH_PROVISIONING_MESSAGE" + android:protectionLevel="signature|privileged" /> + <application android:process="system" android:persistent="true" android:hasCode="false" diff --git a/core/res/res/drawable-hdpi/ic_user_secure.png b/core/res/res/drawable-hdpi/ic_user_secure.png Binary files differnew file mode 100644 index 000000000000..60dcf2adc786 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_user_secure.png diff --git a/core/res/res/drawable-mdpi/ic_user_secure.png b/core/res/res/drawable-mdpi/ic_user_secure.png Binary files differnew file mode 100644 index 000000000000..0dea77a7b8b8 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_user_secure.png diff --git a/core/res/res/drawable-xhdpi/ic_user_secure.png b/core/res/res/drawable-xhdpi/ic_user_secure.png Binary files differnew file mode 100644 index 000000000000..a6ef51af2ea8 --- /dev/null +++ b/core/res/res/drawable-xhdpi/ic_user_secure.png diff --git a/core/res/res/drawable-xxhdpi/ic_user_secure.png b/core/res/res/drawable-xxhdpi/ic_user_secure.png Binary files differnew file mode 100644 index 000000000000..e6154e59518d --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_user_secure.png diff --git a/core/res/res/drawable-xxxhdpi/ic_user_secure.png b/core/res/res/drawable-xxxhdpi/ic_user_secure.png Binary files differnew file mode 100644 index 000000000000..9a3959b292a3 --- /dev/null +++ b/core/res/res/drawable-xxxhdpi/ic_user_secure.png diff --git a/core/res/res/layout/notification_template_header.xml b/core/res/res/layout/notification_template_header.xml index 163db30d6c28..6669baedcfab 100644 --- a/core/res/res/layout/notification_template_header.xml +++ b/core/res/res/layout/notification_template_header.xml @@ -22,8 +22,6 @@ android:layout_width="wrap_content" android:layout_height="48dp" android:clipChildren="false" - android:layout_gravity="start|top" - android:gravity="center_vertical" android:paddingTop="5dp" android:paddingBottom="16dp" android:paddingStart="@dimen/notification_content_margin_start" @@ -89,7 +87,6 @@ android:layout_marginStart="2dp" android:layout_marginEnd="2dp" android:visibility="gone" - android:maxWidth="72dp" android:singleLine="true"/> <TextView android:id="@+id/time_divider" diff --git a/core/res/res/menu/language_selection_list.xml b/core/res/res/menu/language_selection_list.xml index 63b962740e75..377c4fab962a 100644 --- a/core/res/res/menu/language_selection_list.xml +++ b/core/res/res/menu/language_selection_list.xml @@ -14,12 +14,12 @@ limitations under the License. --> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/locale_search_menu" android:title="@string/locale_search_menu" - app:showAsAction="always" - app:actionViewClass="android.widget.SearchView" /> + android:icon="@*android:drawable/ic_search_api_material" + android:showAsAction="always|collapseActionView" + android:actionViewClass="android.widget.SearchView" /> </menu> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index b4c557603ea9..c8ab29558a26 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -232,7 +232,7 @@ <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string> <string name="notification_hidden_text" msgid="1135169301897151909">"Inhoud versteek"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Inhoud word versteek deur beleid"</string> + <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Inhoud word versteek volgens beleid"</string> <string name="safeMode" msgid="2788228061547930246">"Veiligmodus"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-stelsel"</string> <string name="user_owner_label" msgid="2804351898001038951">"Persoonlik"</string> @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-kaart bygevoeg"</string> <string name="sim_added_message" msgid="7797975656153714319">"Herbegin jou toestel om toegang tot die sellulêre netwerk te verkry."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Herbegin"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Jy sal \'n program van jou diensverskaffer af moet installeer en oopmaak om jou nuwe SIM behoorlik te laat werk."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"KRY DIE PROGRAM"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"NIE NOU NIE"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Nuwe SIM is ingesit"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tik om dit op te stel"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Stel tyd"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Stel datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Stel"</string> @@ -1550,11 +1555,12 @@ <string name="suspended_package_message" msgid="6341091587106868601">"Deur %1$s-administrateur gedeaktiveer. Kontak hulle om meer uit te vind."</string> <string name="new_sms_notification_title" msgid="8442817549127555977">"Jy het nuwe boodskappe"</string> <string name="new_sms_notification_content" msgid="7002938807812083463">"Maak SMS-program oop om te bekyk"</string> - <string name="user_encrypted_title" msgid="7664361246988454307">"Sommige funksies sal dalk nie beskikbaar wees nie"</string> + <string name="user_encrypted_title" msgid="7664361246988454307">"Party funksies dalk nie beskikbaar nie"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Raak om voort te gaan"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Gebruikerprofiel is gesluit"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Gekoppel aan <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tik om lêers te bekyk"</string> + <string name="pin_target" msgid="3052256031352291362">"Speld vas"</string> + <string name="unpin_target" msgid="3556545602439143442">"Ontspeld"</string> + <string name="app_info" msgid="6856026610594615344">"Programinligting"</string> </resources> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 94419c02da8a..461c78a0afda 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1031,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM ካርድ አክል"</string> <string name="sim_added_message" msgid="7797975656153714319">"የተንቀሳቃሽ ስልክ አውታረ መረብ ለመድረስ መሣሪያዎን ዳግም ያስጀምሩት።"</string> <string name="sim_restart_button" msgid="4722407842815232347">"ዳግም ጀምር"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"ጊዜ አዘጋጅ"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"ውሂብ አዘጋጅ"</string> <string name="date_time_set" msgid="5777075614321087758">"አዘጋጅ"</string> @@ -1553,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"አንዳንድ ተግባሮች ላይገኙ ይችላሉ"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"ለመቀጠል ይንኩ"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"የተጠቃሚ መገለጫ ተቆልፏል"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"ከ<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> ጋር ተገናኝቷል"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ፋይሎችን ለመመልከት መታ ያድርጉ"</string> + <string name="pin_target" msgid="3052256031352291362">"ፒን"</string> + <string name="unpin_target" msgid="3556545602439143442">"ንቀል"</string> + <string name="app_info" msgid="6856026610594615344">"የመተግበሪያ መረጃ"</string> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 8a6df9d2450a..e927d5418099 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1063,6 +1063,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"تمت إضافة شريحة SIM"</string> <string name="sim_added_message" msgid="7797975656153714319">"أعد تشغيل جهازك للدخول إلى شبكة الجوّال."</string> <string name="sim_restart_button" msgid="4722407842815232347">"إعادة التشغيل"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"لتشغيل شريحة SIM الجديدة بشكل سليم، يجب تثبيت تطبيق من مشغّل شبكة الجوّال وفتحه."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"الحصول على التطبيق"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"ليس الآن"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"تعيين التاريخ"</string> <string name="date_time_set" msgid="5777075614321087758">"تعيين"</string> @@ -1629,8 +1634,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"قد لا تكون بعض الوظائف متاحة"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"المس للمتابعة"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"تم قفل الملف الشخصي للمستخدم"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"تم الاتصال بـ <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"انقر لعرض الملفات"</string> + <string name="pin_target" msgid="3052256031352291362">"تثبيت"</string> + <string name="unpin_target" msgid="3556545602439143442">"إزالة تثبيت"</string> + <string name="app_info" msgid="6856026610594615344">"معلومات عن التطبيق"</string> </resources> diff --git a/core/res/res/values-az-rAZ/strings.xml b/core/res/res/values-az-rAZ/strings.xml index c3cbe4a43b6b..211346fa6803 100644 --- a/core/res/res/values-az-rAZ/strings.xml +++ b/core/res/res/values-az-rAZ/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SİM kart əlavə edildi"</string> <string name="sim_added_message" msgid="7797975656153714319">"Mobil şəbəkəyə giriş üçün cihazınızı sıfırlayın."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Yenidən başlat"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Yeni SIM kartınızın düzgün işləməsi üçün, operatorunuzdan tətbiq yükləməli və açmalısınız."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"TƏTBİQİ ƏLDƏ EDİN"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"İNDİ YOX"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Yeni SIM kart taxılıb"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Quraşdırmaq üçün tıklayın"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Vaxt ayarlayın"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Tarixi quraşdır"</string> <string name="date_time_set" msgid="5777075614321087758">"Ayarlayın"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Bəzi funksiyalar əlçatan olmaya bilər"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Davam etmək üçün toxunun"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"İstifadəçi profili kilidlidir"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> məhsuluna bağlandı"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Faylları görmək üçün basın"</string> + <string name="pin_target" msgid="3052256031352291362">"Pin kod"</string> + <string name="unpin_target" msgid="3556545602439143442">"Çıxarın"</string> + <string name="app_info" msgid="6856026610594615344">"Tətbiq məlumatı"</string> </resources> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 293fcbd09e80..7e27050d7fbe 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -1039,6 +1039,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM kartica je dodata"</string> <string name="sim_added_message" msgid="7797975656153714319">"Ponovo pokrenite uređaj da biste pristupili mobilnoj mreži."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Ponovo pokreni"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Podešavanje vremena"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Podešavanje datuma"</string> <string name="date_time_set" msgid="5777075614321087758">"Podesi"</string> @@ -1572,8 +1582,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Neke funkcije nisu dostupne"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Dodirnite da biste nastavili"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil korisnika je zaključan"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Povezano je sa proizvodom <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Dodirnite za pregled datoteka"</string> + <string name="pin_target" msgid="3052256031352291362">"Zakači"</string> + <string name="unpin_target" msgid="3556545602439143442">"Otkači"</string> + <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 4426d07f08ec..84834ee5c44d 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1031,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM картата е добавена"</string> <string name="sim_added_message" msgid="7797975656153714319">"Рестартирайте устройството си, за да осъществите достъп до клетъчната мрежа."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Рестартиране"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Задаване на часа"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Задаване на дата"</string> <string name="date_time_set" msgid="5777075614321087758">"Задаване"</string> @@ -1553,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Някои функции може да не са налице"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Докоснете, за да продължите"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Потр. профил е заключен"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Установена е връзка с <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Докоснете, за да прегледате файловете"</string> + <string name="pin_target" msgid="3052256031352291362">"Фиксиране"</string> + <string name="unpin_target" msgid="3556545602439143442">"Освобождаване"</string> + <string name="app_info" msgid="6856026610594615344">"Информация за приложението"</string> </resources> diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml index 2abddb4dfffe..db2df411886f 100644 --- a/core/res/res/values-bn-rBD/strings.xml +++ b/core/res/res/values-bn-rBD/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"সিম কার্ড যোগ করা হয়েছে"</string> <string name="sim_added_message" msgid="7797975656153714319">"সেলুলার নেটওয়ার্ক অ্যাক্সেস করতে আপনার ডিভাইস পুনর্সূচনা করুন"</string> <string name="sim_restart_button" msgid="4722407842815232347">"পুনর্সূচনা"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"যাতে আপনার নতুন SIM সঠিকভাবে কাজ করে, তার জন্য আপনাকে আপনার পরিষেবা প্রদানকারীর থেকে একটি অ্যাপ্লিকেশান ইনস্টল করতে এবং খুলতে হবে৷"</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"অ্যাপ্লিকেশানটি পান"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"এখনই নয়"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"তারিখ সেট করুন"</string> <string name="date_time_set" msgid="5777075614321087758">"সেট করুন"</string> @@ -1551,10 +1556,11 @@ <string name="new_sms_notification_title" msgid="8442817549127555977">"আপনার নতুন বার্তা আছে"</string> <string name="new_sms_notification_content" msgid="7002938807812083463">"দেখার জন্য SMS অ্যাপ্লিকেশান খুলুন"</string> <string name="user_encrypted_title" msgid="7664361246988454307">"কিছু ক্রিয়াকলাপ উপলব্ধ নাও হতে পারে"</string> - <string name="user_encrypted_message" msgid="7504541494700807850">"অবিরততে স্পর্শ করুন"</string> + <string name="user_encrypted_message" msgid="7504541494700807850">"অবিরত রাখতে স্পর্শ করুন"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"ব্যবহারকারীর প্রোফাইল লক করা আছে"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> এর সাথে সংযুক্ত হয়েছে"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ফাইলগুলি দেখতে আলতো চাপ দিন"</string> + <string name="pin_target" msgid="3052256031352291362">"পিন করুন"</string> + <string name="unpin_target" msgid="3556545602439143442">"আনপিন করুন"</string> + <string name="app_info" msgid="6856026610594615344">"অ্যাপ্লিকেশানের তথ্য"</string> </resources> diff --git a/core/res/res/values-bs-rBA/strings.xml b/core/res/res/values-bs-rBA/strings.xml index d68f9baba36c..7a1c98809828 100644 --- a/core/res/res/values-bs-rBA/strings.xml +++ b/core/res/res/values-bs-rBA/strings.xml @@ -1905,6 +1905,16 @@ <skip /> <!-- no translation found for sim_restart_button (4722407842815232347) --> <skip /> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <!-- no translation found for time_picker_dialog_title (8349362623068819295) --> <skip /> <!-- no translation found for date_picker_dialog_title (5879450659453782278) --> @@ -2859,8 +2869,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Neke funkcije možda neće biti dostupne"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Dodirnite da biste nastavili"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil korisnika je zaključan"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Povezan na <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Dodirnite za prikaz datoteka"</string> + <string name="pin_target" msgid="3052256031352291362">"Zakači"</string> + <string name="unpin_target" msgid="3556545602439143442">"Otkači"</string> + <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 19e4ae4a0ae2..0f971b24a9dd 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1031,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"Addició de la targeta SIM"</string> <string name="sim_added_message" msgid="7797975656153714319">"Reinicia el dispositiu per accedir a la xarxa mòbil."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Reinicia"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Defineix l\'hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Establiment de data"</string> <string name="date_time_set" msgid="5777075614321087758">"Defineix"</string> @@ -1550,11 +1560,12 @@ <string name="suspended_package_message" msgid="6341091587106868601">"L\'administrador de l\'empresa %1$s ha desactivat el paquet. Contacta-hi per obtenir-ne més informació."</string> <string name="new_sms_notification_title" msgid="8442817549127555977">"Tens missatges nous"</string> <string name="new_sms_notification_content" msgid="7002938807812083463">"Obre l\'aplicació de SMS per veure\'ls"</string> - <string name="user_encrypted_title" msgid="7664361246988454307">"Hi pot haver func. no dispon."</string> + <string name="user_encrypted_title" msgid="7664361246988454307">"Hi pot haver funcions no disponibles"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Toca per continuar"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Perfil d\'usuari bloquejat"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"S\'ha connectat a <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Toca per veure els fitxers"</string> + <string name="pin_target" msgid="3052256031352291362">"Fixa"</string> + <string name="unpin_target" msgid="3556545602439143442">"No fixis"</string> + <string name="app_info" msgid="6856026610594615344">"Informació de l\'aplicació"</string> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index e05ab549d042..d0716469564a 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1047,6 +1047,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM karta přidána."</string> <string name="sim_added_message" msgid="7797975656153714319">"Mobilní síť bude přístupná po restartu zařízení."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Restartovat"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Nastavit čas"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nastavení data"</string> <string name="date_time_set" msgid="5777075614321087758">"Nastavit"</string> @@ -1591,8 +1601,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Některé funkce nemusí být k dispozici"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Pokračujte klepnutím"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Uživatelský profil je uzamčen"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Připojeno k zařízení <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Klepnutím zobrazíte soubory"</string> + <string name="pin_target" msgid="3052256031352291362">"Připnout"</string> + <string name="unpin_target" msgid="3556545602439143442">"Odepnout"</string> + <string name="app_info" msgid="6856026610594615344">"Informace o aplikaci"</string> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 4cfdfce75673..4a3780ca84eb 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-kort blev tilføjet"</string> <string name="sim_added_message" msgid="7797975656153714319">"Genstart din enhed for at få adgang til mobilnetværket."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Genstart"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Du skal installere og åbne en app fra dit mobilselskab for at få dit nye SIM-kort til at fungere korrekt."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"HENT APPEN"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"IKKE NU"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Nyt SIM-kort er indsat"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tryk for at konfigurere"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Angiv tidspunkt"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Angiv dato"</string> <string name="date_time_set" msgid="5777075614321087758">"Angiv"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Nogle funktioner er muligvis ikke tilgængelige"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Tryk for at fortsætte"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Brugerprofilen er låst"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Tilsluttet <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tryk for at se filer"</string> + <string name="pin_target" msgid="3052256031352291362">"Fastgør"</string> + <string name="unpin_target" msgid="3556545602439143442">"Frigør"</string> + <string name="app_info" msgid="6856026610594615344">"Oplysninger om appen"</string> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 26a8b8b78ace..f04521fc7265 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -191,7 +191,7 @@ <string name="reboot_to_update_prepare" msgid="6305853831955310890">"Aktualisierung wird vorbereitet…"</string> <string name="reboot_to_update_package" msgid="3871302324500927291">"Updatepaket wird verarbeitet…"</string> <string name="reboot_to_update_reboot" msgid="6428441000951565185">"Neustart…"</string> - <string name="reboot_to_reset_title" msgid="4142355915340627490">"Auf Werkszustand zurück"</string> + <string name="reboot_to_reset_title" msgid="4142355915340627490">"Auf Werkszustand zurücksetzen"</string> <string name="reboot_to_reset_message" msgid="2432077491101416345">"Neustart…"</string> <string name="shutdown_progress" msgid="2281079257329981203">"Wird heruntergefahren..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Dein Tablet wird heruntergefahren."</string> @@ -926,7 +926,7 @@ <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> reagiert nicht"</string> <string name="anr_process" msgid="6156880875555921105">"Der Prozess <xliff:g id="PROCESS">%1$s</xliff:g> reagiert nicht"</string> <string name="force_close" msgid="8346072094521265605">"OK"</string> - <string name="report" msgid="4060218260984795706">"Bericht"</string> + <string name="report" msgid="4060218260984795706">"Melden"</string> <string name="wait" msgid="7147118217226317732">"Warten"</string> <string name="webpage_unresponsive" msgid="3272758351138122503">"Die Seite reagiert nicht mehr.\n\nMöchtest du die Seite schließen?"</string> <string name="launch_warning_title" msgid="1547997780506713581">"App umgeleitet"</string> @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-Karte hinzugefügt"</string> <string name="sim_added_message" msgid="7797975656153714319">"Starte zur Nutzung des Mobilfunknetzes dein Gerät neu."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Neu starten"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Damit deine neue SIM-Karte ordnungsgemäß funktioniert, musst du zuerst eine App deines Mobilfunkanbieters installieren und öffnen."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"APP HERUNTERLADEN"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"JETZT NICHT"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Neue SIM-Karte eingelegt"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Zum Einrichten tippen"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Uhrzeit festlegen"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datum festlegen"</string> <string name="date_time_set" msgid="5777075614321087758">"Speichern"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Einige Funktionen sind evtl. nicht verfügbar"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Zum Fortfahren tippen"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Nutzerprofil gesperrt"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Verbunden mit <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Zum Ansehen der Dateien tippen"</string> + <string name="pin_target" msgid="3052256031352291362">"Markieren"</string> + <string name="unpin_target" msgid="3556545602439143442">"Markierung entfernen"</string> + <string name="app_info" msgid="6856026610594615344">"App-Informationen"</string> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index b1dfe0b03039..c557c7350c3f 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Προστέθηκε κάρτα SIM"</string> <string name="sim_added_message" msgid="7797975656153714319">"Επανεκκινήστε τη συσκευή σας, για να αποκτήσετε πρόσβαση στο δίκτυο κινητής τηλεφωνίας."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Επανεκκίνηση"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Για να λειτουργεί σωστά η νέα κάρτα SIM, θα πρέπει να εγκαταστήσετε και να ανοίξετε μια εφαρμογή από την εταιρεία κινητής τηλεφωνίας που χρησιμοποιείτε."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"ΛΗΨΗ ΤΗΣ ΕΦΑΡΜΟΓΗΣ"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"ΟΧΙ ΤΩΡΑ"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ορισμός ημερομηνίας"</string> <string name="date_time_set" msgid="5777075614321087758">"Ορισμός"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Ενδεχόμενο μη διαθέσιμων λειτουργιών"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Αγγίξτε για συνέχεια"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Το προφίλ χρήστη κλειδώθηκε"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Συνδέθηκε με το <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Πατήστε για να δείτε τα αρχεία"</string> + <string name="pin_target" msgid="3052256031352291362">"Καρφίτσωμα"</string> + <string name="unpin_target" msgid="3556545602439143442">"Ξεκαρφίτσωμα"</string> + <string name="app_info" msgid="6856026610594615344">"Πληροφορίες εφαρμογής"</string> </resources> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 9df47bd8af46..a0a5493af1cf 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM card added"</string> <string name="sim_added_message" msgid="7797975656153714319">"Restart your device to access the mobile network."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Restart"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"To get your new SIM working properly, you\'ll need to install and open an app from your operator."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"GET THE APP"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"NOT NOW"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"New SIM inserted"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tap to set it up"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Set time"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Set date"</string> <string name="date_time_set" msgid="5777075614321087758">"Set"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Some functions might not be available"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Touch to continue"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"User profile locked"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Connected to <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tap to view files"</string> + <string name="pin_target" msgid="3052256031352291362">"Pin"</string> + <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> + <string name="app_info" msgid="6856026610594615344">"App info"</string> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 9df47bd8af46..a0a5493af1cf 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM card added"</string> <string name="sim_added_message" msgid="7797975656153714319">"Restart your device to access the mobile network."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Restart"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"To get your new SIM working properly, you\'ll need to install and open an app from your operator."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"GET THE APP"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"NOT NOW"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"New SIM inserted"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tap to set it up"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Set time"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Set date"</string> <string name="date_time_set" msgid="5777075614321087758">"Set"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Some functions might not be available"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Touch to continue"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"User profile locked"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Connected to <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tap to view files"</string> + <string name="pin_target" msgid="3052256031352291362">"Pin"</string> + <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> + <string name="app_info" msgid="6856026610594615344">"App info"</string> </resources> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 9df47bd8af46..a0a5493af1cf 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM card added"</string> <string name="sim_added_message" msgid="7797975656153714319">"Restart your device to access the mobile network."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Restart"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"To get your new SIM working properly, you\'ll need to install and open an app from your operator."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"GET THE APP"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"NOT NOW"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"New SIM inserted"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tap to set it up"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Set time"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Set date"</string> <string name="date_time_set" msgid="5777075614321087758">"Set"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Some functions might not be available"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Touch to continue"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"User profile locked"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Connected to <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tap to view files"</string> + <string name="pin_target" msgid="3052256031352291362">"Pin"</string> + <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> + <string name="app_info" msgid="6856026610594615344">"App info"</string> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 5a2689cc0457..f07745bb4bff 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"Ninguna aplicación puede realizar esta acción."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> se detuvo"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> se detuvo"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> continúa fallando"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> continúa fallando"</string> <string name="aerr_restart" msgid="9001379185665886595">"Reiniciar app"</string> <string name="aerr_reset" msgid="7645427603514220451">"Restablecer y reiniciar la app"</string> <string name="aerr_report" msgid="5371800241488400617">"Enviar comentarios"</string> <string name="aerr_close" msgid="2991640326563991340">"Cerrar"</string> <string name="aerr_mute" msgid="7698966346654789433">"Silenciar"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Esperar"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Cerrar app"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> no responde"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> no responde"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> no responde"</string> + <string name="anr_process" msgid="6156880875555921105">"El proceso <xliff:g id="PROCESS">%1$s</xliff:g> no responde"</string> <string name="force_close" msgid="8346072094521265605">"Aceptar"</string> <string name="report" msgid="4060218260984795706">"Notificar"</string> <string name="wait" msgid="7147118217226317732">"Esperar"</string> @@ -1039,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Tarjeta SIM agregada"</string> <string name="sim_added_message" msgid="7797975656153714319">"Reinicia el dispositivo para acceder a la red móvil."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Reiniciar"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Para que tu SIM nueva funcione correctamente, debes instalar y abrir la app de tu proveedor."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"OBTENER LA APP"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"AHORA NO"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Nueva SIM insertada"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Presiona para configurar"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Configurar hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Configurar fecha"</string> <string name="date_time_set" msgid="5777075614321087758">"Establecer"</string> @@ -1470,10 +1467,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Solicitar PIN para quitar fijación"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicitar patrón de desbloqueo para quitar fijación"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Solicitar contraseña para quitar fijación"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"No se puede modificar el tamaño de la app. Desplázala con dos dedos."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"La app no es compatible con la función de pantalla dividida."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Lo instaló el administrador."</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Actualizado por el administrador"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Lo eliminó el administrador."</string> @@ -1563,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Funciones no disponibles"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Tocar para continuar"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Perfil de usuario bloqueado"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Conectado a <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Presiona para ver archivos"</string> + <string name="pin_target" msgid="3052256031352291362">"Fijar"</string> + <string name="unpin_target" msgid="3556545602439143442">"No fijar"</string> + <string name="app_info" msgid="6856026610594615344">"Información de la app"</string> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 147d841f694c..518b1574244c 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Tarjeta SIM añadida"</string> <string name="sim_added_message" msgid="7797975656153714319">"Reinicia el dispositivo para acceder a la red móvil."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Reiniciar"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Para que tu nueva SIM funcione correctamente, debes instalar y abrir una aplicación de tu operador."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"DESCARGAR LA APLICACIÓN"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"AHORA NO"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Nueva SIM insertada"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Toca para configurar"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Establecer hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Establecer fecha"</string> <string name="date_time_set" msgid="5777075614321087758">"Establecer"</string> @@ -1557,8 +1562,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Algunas funciones no disponibles"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Toca para continuar"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Perfil de usuario bloqueado"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Conectado a <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Toca para ver archivos"</string> + <string name="pin_target" msgid="3052256031352291362">"Fijar"</string> + <string name="unpin_target" msgid="3556545602439143442">"No fijar"</string> + <string name="app_info" msgid="6856026610594615344">"Información de la aplicación"</string> </resources> diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml index bcad12cf02f8..234892975128 100644 --- a/core/res/res/values-et-rEE/strings.xml +++ b/core/res/res/values-et-rEE/strings.xml @@ -1031,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-kaart lisatud"</string> <string name="sim_added_message" msgid="7797975656153714319">"Mobiilsidevõrku pääsemiseks taaskäivitage seade."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Taaskäivita"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Kellaaja määramine"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Kuupäeva määramine"</string> <string name="date_time_set" msgid="5777075614321087758">"Määra"</string> @@ -1553,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Mõni funktsioon pole võib-olla saadaval"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Puudutage jätkamiseks"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Kasutajaprofiil on lukustatud"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Ühendatud seadmega <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Failide vaatamiseks puudutage"</string> + <string name="pin_target" msgid="3052256031352291362">"Kinnita"</string> + <string name="unpin_target" msgid="3556545602439143442">"Vabasta"</string> + <string name="app_info" msgid="6856026610594615344">"Rakenduse teave"</string> </resources> diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml index d3e877c59cde..a595603f4775 100644 --- a/core/res/res/values-eu-rES/strings.xml +++ b/core/res/res/values-eu-rES/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM txartela gehitu da"</string> <string name="sim_added_message" msgid="7797975656153714319">"Sare mugikorra atzitzeko, berrabiarazi gailua."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Berrabiarazi"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"SIM berriak behar bezala funtziona dezan, operadorearen aplikazio bat instalatu eta ireki behar duzu."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"ESKURATU APLIKAZIOA"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"ORAIN EZ"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"SIM berria sartu da"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Sakatu konfiguratzeko"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Ezarri ordua"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ezarri data"</string> <string name="date_time_set" msgid="5777075614321087758">"Ezarri"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Baliteke funtzio batzuk ez egotea"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Ukitu jarraitzeko"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Blokeatuta dago profila"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> zerbitzura konektatuta"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Sakatu fitxategiak ikusteko"</string> + <string name="pin_target" msgid="3052256031352291362">"Ainguratu"</string> + <string name="unpin_target" msgid="3556545602439143442">"Kendu aingura"</string> + <string name="app_info" msgid="6856026610594615344">"Aplikazioari buruzko informazioa"</string> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index c41eda496ca9..14b87e874349 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"سیم کارت اضافه شد"</string> <string name="sim_added_message" msgid="7797975656153714319">"برای دسترسی به شبکه تلفن همراه، دستگاهتان را مجدداً راهاندازی کنید."</string> <string name="sim_restart_button" msgid="4722407842815232347">"راهاندازی مجدد"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"برای اینکه سیمکارت جدیدتان عملکرد درستی داشته باشد باید برنامهای را از شرکت مخابراتیتان نصب و باز کنید."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"دریافت برنامه"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"اکنون نه"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"سیمکارت جدید جاگذاری شد"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"برای تنظیم آن ضربه بزنید"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"تنظیم زمان"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"تاریخ تنظیم"</string> <string name="date_time_set" msgid="5777075614321087758">"تنظیم"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"شاید برخی عملکردها دردسترس نباشند"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"برای ادامه لمس کنید"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"نمایه کاربر قفل است"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"به <xliff:g id="PRODUCT_NAME">%1$s</xliff:g> متصل شد"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"برای دیدن فایلها، ضربه بزنید"</string> + <string name="pin_target" msgid="3052256031352291362">"پین کردن"</string> + <string name="unpin_target" msgid="3556545602439143442">"برداشتن پین"</string> + <string name="app_info" msgid="6856026610594615344">"اطلاعات برنامه"</string> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 4c115974c009..ff78c91f7e20 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"Yksikään sovellus ei voi suorittaa tätä toimintoa."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> pysähtyi."</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> pysähtyi."</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> pysähtyy toistuvasti."</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> pysähtyy toistuvasti."</string> <string name="aerr_restart" msgid="9001379185665886595">"Käynnistä sovellus uudelleen"</string> <string name="aerr_reset" msgid="7645427603514220451">"Nollaa sovellus ja käynnistä uudelleen"</string> <string name="aerr_report" msgid="5371800241488400617">"Lähetä palautetta"</string> <string name="aerr_close" msgid="2991640326563991340">"Sulje"</string> <string name="aerr_mute" msgid="7698966346654789433">"Ohita"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Odota"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Sulje sovellus"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> ei vastaa."</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> ei vastaa."</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> ei vastaa."</string> + <string name="anr_process" msgid="6156880875555921105">"Prosessi <xliff:g id="PROCESS">%1$s</xliff:g> ei vastaa."</string> <string name="force_close" msgid="8346072094521265605">"OK"</string> <string name="report" msgid="4060218260984795706">"Ilmoita"</string> <string name="wait" msgid="7147118217226317732">"Odota"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-kortti lisätty"</string> <string name="sim_added_message" msgid="7797975656153714319">"Käynnistä laite uudelleen, niin pääset käyttämään matkapuhelinverkkoa."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Käynnistä uudelleen"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Aseta aika"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Aseta päivämäärä"</string> <string name="date_time_set" msgid="5777075614321087758">"Aseta"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Pyydä PIN ennen irrotusta"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pyydä lukituksenpoistokuvio ennen irrotusta"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Pyydä salasana ennen irrotusta"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Sovelluksen kokoa ei voi muuttaa. Vieritä näkymää kahdella sormella."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Sovellus ei tue jaetun näytön tilaa."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Järjestelmänvalvoja on asentanut paketin."</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Järjestelmänvalvojasi on päivittänyt paketin."</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Järjestelmänvalvoja on poistanut paketin."</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Osaa toiminnoista ei ehkä voi käyttää"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Jatka koskettamalla."</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Käyttäjäprofiili on lukittu."</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> yhdistetty"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Näytä tiedostot koskettamalla"</string> + <string name="pin_target" msgid="3052256031352291362">"Kiinnitä"</string> + <string name="unpin_target" msgid="3556545602439143442">"Irrota"</string> + <string name="app_info" msgid="6856026610594615344">"Sovelluksen tiedot"</string> </resources> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index a366dbbffca8..1cef50aeb59f 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"Aucune application ne peut effectuer cette action."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> a cessé de fonctionner"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> a cessé de fonctionner"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> plante continuellement"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> plante continuellement"</string> <string name="aerr_restart" msgid="9001379185665886595">"Redémarrer l\'application"</string> <string name="aerr_reset" msgid="7645427603514220451">"Réinitialiser et redémarrer l\'application"</string> <string name="aerr_report" msgid="5371800241488400617">"Envoyer des commentaires"</string> <string name="aerr_close" msgid="2991640326563991340">"Fermer"</string> <string name="aerr_mute" msgid="7698966346654789433">"Désactiver les notifications"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Attendre"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Fermer l\'application"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> ne répond pas"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> ne répond pas"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> ne répond pas"</string> + <string name="anr_process" msgid="6156880875555921105">"Le processus <xliff:g id="PROCESS">%1$s</xliff:g> ne répond pas"</string> <string name="force_close" msgid="8346072094521265605">"OK"</string> <string name="report" msgid="4060218260984795706">"Signaler"</string> <string name="wait" msgid="7147118217226317732">"Attendre"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"Carte SIM ajoutée."</string> <string name="sim_added_message" msgid="7797975656153714319">"Redémarrez votre appareil pour accéder au réseau cellulaire."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Recommencer"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Définir l\'heure"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Définir la date"</string> <string name="date_time_set" msgid="5777075614321087758">"Paramètres"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Demander le NIP avant d\'annuler l\'épinglage"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Demander le schéma de déverrouillage avant d\'annuler l\'épinglage"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Demander le mot de passe avant d\'annuler l\'épinglage"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Impossible de redimensionner l\'application. Faites-la défiler avec deux doigts."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"L\'application n\'est pas compatible avec l\'écran partagé."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Installé par votre administrateur"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Mis à jour par votre administrateur"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Supprimé par votre administrateur"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Certaines fonct. p-ê non dispo."</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Touchez pour continuer"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil d\'utilisateur verrouillé"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Connecté à <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Touchez ici pour afficher les fichiers"</string> + <string name="pin_target" msgid="3052256031352291362">"Épingler"</string> + <string name="unpin_target" msgid="3556545602439143442">"Annuler l\'épinglage"</string> + <string name="app_info" msgid="6856026610594615344">"Détails de l\'application"</string> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index e275aeb88025..662076dff4c7 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Carte SIM ajoutée."</string> <string name="sim_added_message" msgid="7797975656153714319">"Redémarrez votre appareil pour accéder au réseau mobile."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Redémarrer"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Pour que la nouvelle carte SIM fonctionne correctement, vous devez installer et ouvrir une application fournie par votre opérateur."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"TÉLÉCHARGER L\'APPLICATION"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"PLUS TARD"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Nouvelle carte SIM insérée"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Appuyez ici pour effectuer la configuration."</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Définir l\'heure"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Définir la date"</string> <string name="date_time_set" msgid="5777075614321087758">"Définir"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Certaines fonctions potentiellement non dispos"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Appuyer pour continuer"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil utilisateur verrouillé"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Connecté à <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Appuyez ici pour voir les fichiers."</string> + <string name="pin_target" msgid="3052256031352291362">"Épingler"</string> + <string name="unpin_target" msgid="3556545602439143442">"Retirer"</string> + <string name="app_info" msgid="6856026610594615344">"Infos sur l\'appli"</string> </resources> diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml index d7acd73fc1b0..f2e1850bfd0f 100644 --- a/core/res/res/values-gl-rES/strings.xml +++ b/core/res/res/values-gl-rES/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Engadiuse unha tarxeta SIM"</string> <string name="sim_added_message" msgid="7797975656153714319">"Reinicia o teu dispositivo para acceder á rede móbil."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Reiniciar"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Para conseguir que a túa SIM nova funcione correctamente, deberás instalar e abrir unha aplicación do teu operador."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"DESCARGAR A APLICACIÓN"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"AGORA NON"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Introduciuse unha nova SIM"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tocar para configurar"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Configurar hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Establecer data"</string> <string name="date_time_set" msgid="5777075614321087758">"Configurar"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Quizais haxa funcións non dispoñibles"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Toca para continuar"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Bloqueouse o perfil do usuario"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Conectado a <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Toca para ver os ficheiros"</string> + <string name="pin_target" msgid="3052256031352291362">"Fixar"</string> + <string name="unpin_target" msgid="3556545602439143442">"Soltar"</string> + <string name="app_info" msgid="6856026610594615344">"Información da aplicación"</string> </resources> diff --git a/core/res/res/values-gu-rIN/strings.xml b/core/res/res/values-gu-rIN/strings.xml index 19eb33bc2568..ec613b096b9b 100644 --- a/core/res/res/values-gu-rIN/strings.xml +++ b/core/res/res/values-gu-rIN/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM કાર્ડ ઉમેર્યું"</string> <string name="sim_added_message" msgid="7797975656153714319">"સેલ્યુલર નેટવર્કને ઍક્સેસ કરવામાં તમારા ઉપકરણને પુનઃપ્રારંભ કરો."</string> <string name="sim_restart_button" msgid="4722407842815232347">"પુનઃપ્રારંભ કરો"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"તમારું નવું SIM ઠીકથી કામ કરે તે માટે, તમને તમારા કેરીઅર પરથી ઍપ્લિકેશન ઇન્સ્ટૉલ કરીને ખોલવી પડશે."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"ઍપ્લિકેશન મેળવો"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"હમણાં નહીં"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"તારીખ સેટ કરો"</string> <string name="date_time_set" msgid="5777075614321087758">"સેટ કરો"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"કેટલાક કાર્યો કદાચ ઉપલબ્ધ ન હોય"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"ચાલુ રાખવા માટે ટચ કરો"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"વપરાશકર્તા પ્રોફાઇલ લૉક કરી"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> થી કનેક્ટ કરેલું છે"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ફાઇલો જોવા માટે ટૅપ કરો"</string> + <string name="pin_target" msgid="3052256031352291362">"પિન કરો"</string> + <string name="unpin_target" msgid="3556545602439143442">"અનપિન કરો"</string> + <string name="app_info" msgid="6856026610594615344">"ઍપ્લિકેશન માહિતી"</string> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 3130abca275f..4c944c3095b8 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"सिम कार्ड जोड़ा गया"</string> <string name="sim_added_message" msgid="7797975656153714319">"सेल्युलर नेटवर्क एक्सेस करने के लिए अपना डिवाइस पुन: प्रारंभ करें."</string> <string name="sim_restart_button" msgid="4722407842815232347">"पुन: प्रारंभ करें"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"आपकी नई SIM ठीक से काम करे, इसके लिए आपको अपने वाहक से किसी ऐप को इंस्टॉल करना होगा और खोलना होगा."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"ऐप प्राप्त करें"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"अभी नहीं"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"दिनांक सेट करें"</string> <string name="date_time_set" msgid="5777075614321087758">"सेट करें"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"संभवत: कुछ फंक्शन उपलब्ध न हों"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"जारी रखने के लिए स्पर्श करें"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"उपयोगकर्ता प्रोफ़ाइल लॉक है"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> से कनेक्ट किया गया"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"फ़ाइलें देखने के लिए टैप करें"</string> + <string name="pin_target" msgid="3052256031352291362">"पिन करें"</string> + <string name="unpin_target" msgid="3556545602439143442">"अनपिन करें"</string> + <string name="app_info" msgid="6856026610594615344">"ऐप की जानकारी"</string> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 81522028d003..407841fb06b3 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1039,6 +1039,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM kartica dodana"</string> <string name="sim_added_message" msgid="7797975656153714319">"Za pristup mobilnoj mreži ponovo pokrenite uređaj."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Ponovno pokreni"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Postavljanje vremena"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Postavi datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Postavi"</string> @@ -1572,8 +1582,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Možda ima nedostupnih funkcija"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Dodirnite da biste nastavili"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Korisnički je profil zaključan"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> – veza je uspostavljena"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Dodirnite da biste pregledali datoteke"</string> + <string name="pin_target" msgid="3052256031352291362">"Prikvači"</string> + <string name="unpin_target" msgid="3556545602439143442">"Otkvači"</string> + <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index c8c53d1b716d..22a9ac456dc6 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1031,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM kártya hozzáadva"</string> <string name="sim_added_message" msgid="7797975656153714319">"A mobilhálózat eléréséhez indítsa újra az eszközt."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Újraindítás"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Idő beállítása"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Dátum beállítása"</string> <string name="date_time_set" msgid="5777075614321087758">"Beállítás"</string> @@ -1553,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Néhány funkció nem használható"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Érintse meg a folytatáshoz"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Felhasználói profil zárolva"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Csatlakoztatva a(z) <xliff:g id="PRODUCT_NAME">%1$s</xliff:g> eszközhöz"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Koppintson ide a fájlok megtekintéséhez"</string> + <string name="pin_target" msgid="3052256031352291362">"Rögzítés"</string> + <string name="unpin_target" msgid="3556545602439143442">"Feloldás"</string> + <string name="app_info" msgid="6856026610594615344">"Alkalmazásinformáció"</string> </resources> diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml index 49ea7fc5f11b..dfdabaa97093 100644 --- a/core/res/res/values-hy-rAM/strings.xml +++ b/core/res/res/values-hy-rAM/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"Ոչ մի հավելված չի կարող կատարել այս գործողությունը:"</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածի աշխատանքն ընդհատվել է"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> գործընթացն ընդհատվել է"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածի աշխատանքը շարունակաբար ընդհատվում է"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> գործընթացը շարունակաբար ընդհատվում է"</string> <string name="aerr_restart" msgid="9001379185665886595">"Վերագործարկել հավելվածը"</string> <string name="aerr_reset" msgid="7645427603514220451">"Վերակայել և վերագործարկել հավելվածը"</string> <string name="aerr_report" msgid="5371800241488400617">"Ուղարկել կարծիք"</string> <string name="aerr_close" msgid="2991640326563991340">"Փակել"</string> <string name="aerr_mute" msgid="7698966346654789433">"Անջատել ձայնը"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Սպասել"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Փակել հավելվածը"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> հավելվածը չի արձագանքում"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> գործունեությունը չի արձագանքում"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածը չի արձագանքում"</string> + <string name="anr_process" msgid="6156880875555921105">"<xliff:g id="PROCESS">%1$s</xliff:g> գործընթացը չի արձագանքում"</string> <string name="force_close" msgid="8346072094521265605">"Լավ"</string> <string name="report" msgid="4060218260984795706">"Զեկույց"</string> <string name="wait" msgid="7147118217226317732">"Սպասեք"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM քարտը ավելացվել է"</string> <string name="sim_added_message" msgid="7797975656153714319">"Վերագործարկեք ձեր սարքը` բջջային ցանց մուտք ունենալու համար:"</string> <string name="sim_restart_button" msgid="4722407842815232347">"Վերագործարկել"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Սահմանել ժամը"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Սահմանել ամսաթիվը"</string> <string name="date_time_set" msgid="5777075614321087758">"Սահմանել"</string> @@ -1216,7 +1218,7 @@ <string name="activitychooserview_choose_application" msgid="2125168057199941199">"Ընտրել ծրագիր"</string> <string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"Չհաջողվեց գործարկել <xliff:g id="APPLICATION_NAME">%s</xliff:g> ծրագիրը"</string> <string name="shareactionprovider_share_with" msgid="806688056141131819">"Տարածել"</string> - <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Համօգտագործել <xliff:g id="APPLICATION_NAME">%s</xliff:g>-ի հետ"</string> + <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Կիսվել <xliff:g id="APPLICATION_NAME">%s</xliff:g>-ի հետ"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Սահող բռնակ: Հպել & պահել:"</string> <string name="description_target_unlock_tablet" msgid="3833195335629795055">"Սահեցրեք` ապակողպելու համար:"</string> <string name="keyboard_headset_required_to_hear_password" msgid="7011927352267668657">"Միացրեք ականջակալները` արտասանվող գաղտնաբառը լսելու համար:"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Ապաամրացնելուց առաջ հարցնել PIN-կոդը"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Ապաամրացնելուց առաջ հարցնել ապակողպող նախշը"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Ապաամրացնելուց առաջ հարցնել գաղտնաբառը"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Հավելվածի չափը հնարավոր չէ փոխել, ոլորեք այն երկու մատի օգնությամբ:"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Հավելվածը չի աջակցում էկրանի տրոհումը:"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Ադմինիստրատորը տեղադրել է այն"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Ադմինիստրատորը թարմացրել է այն"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Ադմինիստրատորը ջնջել է այն"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Հնարավոր է՝ որոշ գործառույթներ հասանելի չլինեն"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Հպեք՝ շարունակելու համար"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Օգտվողի պրոֆիլը կողպված է"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Միացված է <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>-ին"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Հպեք՝ ֆայլերը տեսնելու համար"</string> + <string name="pin_target" msgid="3052256031352291362">"Ամրացնել"</string> + <string name="unpin_target" msgid="3556545602439143442">"Ապամրացնել"</string> + <string name="app_info" msgid="6856026610594615344">"Հավելվածի տվյալներ"</string> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 9f488f4b9425..4d4f45e1dd44 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Kartu SIM ditambahkan"</string> <string name="sim_added_message" msgid="7797975656153714319">"Mulai ulang perangkat untuk mengakses jaringan seluler."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Mulai Ulang"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Agar SIM baru bekerja dengan baik, Anda harus memasang dan membuka aplikasi dari operator."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"DAPATKAN APLIKASI"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"LAIN KALI"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"SIM baru dimasukkan"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Ketuk untuk menyiapkan"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Setel waktu"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Setel tanggal"</string> <string name="date_time_set" msgid="5777075614321087758">"Setel"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Beberapa fungsi tidak ada"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Sentuh untuk melanjutkan"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil pengguna terkunci"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Tersambung ke <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Ketuk untuk melihat file"</string> + <string name="pin_target" msgid="3052256031352291362">"Pasang pin"</string> + <string name="unpin_target" msgid="3556545602439143442">"Lepas pin"</string> + <string name="app_info" msgid="6856026610594615344">"Info aplikasi"</string> </resources> diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml index 7c388478d7ff..4ad48a943b0f 100644 --- a/core/res/res/values-is-rIS/strings.xml +++ b/core/res/res/values-is-rIS/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"Engin forrit geta framkvæmt þessa aðgerð."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> stöðvaðist"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> stöðvaðist"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> stöðvast ítrekað"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> stöðvast ítrekað"</string> <string name="aerr_restart" msgid="9001379185665886595">"Endurræsa forritið"</string> <string name="aerr_reset" msgid="7645427603514220451">"Endurstilla og endurræsa forritið"</string> <string name="aerr_report" msgid="5371800241488400617">"Senda ábendingu"</string> <string name="aerr_close" msgid="2991640326563991340">"Loka"</string> <string name="aerr_mute" msgid="7698966346654789433">"Þagga"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Bíða"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Loka forriti"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> svarar ekki"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> svarar ekki"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> svarar ekki"</string> + <string name="anr_process" msgid="6156880875555921105">"Vinnslan <xliff:g id="PROCESS">%1$s</xliff:g> svarar ekki"</string> <string name="force_close" msgid="8346072094521265605">"Í lagi"</string> <string name="report" msgid="4060218260984795706">"Tilkynna"</string> <string name="wait" msgid="7147118217226317732">"Bíða"</string> @@ -1039,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-korti bætt við"</string> <string name="sim_added_message" msgid="7797975656153714319">"Endurræstu tækið til að tengjast farsímakerfinu."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Endurræsa"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Þú þarft að setja upp og opna forrit frá símafyrirtækinu þínu til að nýja SIM-kortið þitt virki eins og vera ber."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"SÆKJA FORRITIÐ"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"EKKI NÚNA"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Nýtt SIM-kort sett í"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Ýttu til að setja það upp"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Veldu tíma"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Veldu dagsetningu"</string> <string name="date_time_set" msgid="5777075614321087758">"Velja"</string> @@ -1470,10 +1467,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Biðja um PIN-númer til að losa"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Biðja um opnunarmynstur til að losa"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Biðja um aðgangsorð til að losa"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Ekki er hægt að breyta stærð forritsins; flettu upp og niður með tveimur fingrum."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Forritið styður ekki að skjánum sé skipt."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Uppsett af kerfisstjóra"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Uppfært af kerfisstjóranum"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Eytt af kerfisstjóra"</string> @@ -1563,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Sumir eiginleikar e.t.v. ekki í boði"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Snertu til að halda áfram"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Notandaprófíll læstur"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Tengt við <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Ýttu til að skoða skrárnar"</string> + <string name="pin_target" msgid="3052256031352291362">"Festa"</string> + <string name="unpin_target" msgid="3556545602439143442">"Losa"</string> + <string name="app_info" msgid="6856026610594615344">"Forritsupplýsingar"</string> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index eb0bd940509d..88bbf5617206 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Scheda SIM aggiunta"</string> <string name="sim_added_message" msgid="7797975656153714319">"Riavvia il dispositivo per accedere alla rete cellulare."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Riavvia"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Per far funzionare correttamente la tua nuova SIM, dovrai installare e aprire un\'app del tuo operatore."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"SCARICA L\'APP"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"NON ORA"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Nuova SIM inserita"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tocca per configurarla"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Imposta ora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Imposta data"</string> <string name="date_time_set" msgid="5777075614321087758">"Imposta"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Alcune funzioni potrebbero non essere disponibili"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Tocca per continuare"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profilo utente bloccato"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Connesso a <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tocca per visualizzare i file"</string> + <string name="pin_target" msgid="3052256031352291362">"Blocca"</string> + <string name="unpin_target" msgid="3556545602439143442">"Sblocca"</string> + <string name="app_info" msgid="6856026610594615344">"Informazioni app"</string> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index a4942d7cdb79..ffdfdab6dc84 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1047,6 +1047,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"כרטיס ה-SIM נוסף"</string> <string name="sim_added_message" msgid="7797975656153714319">"אתחל את המכשיר כדי לגשת אל הרשת הסלולרית."</string> <string name="sim_restart_button" msgid="4722407842815232347">"הפעל מחדש"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"הגדרת שעה"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"הגדר תאריך"</string> <string name="date_time_set" msgid="5777075614321087758">"הגדר"</string> @@ -1591,8 +1601,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"ייתכן שפונקציות מסוימות לא יהיו זמינות"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"גע כדי להמשיך"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"פרופיל המשתמש נעול"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"מחובר אל <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"הקש כדי להציג קבצים"</string> + <string name="pin_target" msgid="3052256031352291362">"הצמד"</string> + <string name="unpin_target" msgid="3556545602439143442">"בטל הצמדה"</string> + <string name="app_info" msgid="6856026610594615344">"פרטי אפליקציה"</string> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 01779ad4590f..7dc7653a7cbb 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1032,6 +1032,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIMカードが追加されました"</string> <string name="sim_added_message" msgid="7797975656153714319">"モバイルネットワークにアクセスするには端末を再起動してください。"</string> <string name="sim_restart_button" msgid="4722407842815232347">"再起動"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"時刻設定"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"日付設定"</string> <string name="date_time_set" msgid="5777075614321087758">"設定"</string> @@ -1559,8 +1569,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"一部の機能が利用できない可能性"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"続行するにはタップしてください"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"ユーザー プロフィールはロックされています"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> に接続しました"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"タップしてファイルを表示"</string> + <string name="pin_target" msgid="3052256031352291362">"固定"</string> + <string name="unpin_target" msgid="3556545602439143442">"固定を解除"</string> + <string name="app_info" msgid="6856026610594615344">"アプリ情報"</string> </resources> diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml index f26c32bddace..be172aa66d9d 100644 --- a/core/res/res/values-ka-rGE/strings.xml +++ b/core/res/res/values-ka-rGE/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"ვერც ერთი აპი ვერ შეასრულებს ამ ქმედებას."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> შეჩერდა"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> შეწყდა"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> განუწყვეტლივ ჩერდება"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> განუწყვეტლივ წყდება"</string> <string name="aerr_restart" msgid="9001379185665886595">"აპის გადატვირთვა"</string> <string name="aerr_reset" msgid="7645427603514220451">"გადაყენება და აპის გადატვირთვა"</string> <string name="aerr_report" msgid="5371800241488400617">"გამოხმაურება"</string> <string name="aerr_close" msgid="2991640326563991340">"დახურვა"</string> <string name="aerr_mute" msgid="7698966346654789433">"დადუმება"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"მოცდა"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"აპის დახურვა"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> არ რეაგირებს"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> არ რეაგირებს"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> არ რეაგირებს"</string> + <string name="anr_process" msgid="6156880875555921105">"პროცესი — <xliff:g id="PROCESS">%1$s</xliff:g> არ რეაგირებს"</string> <string name="force_close" msgid="8346072094521265605">"OK"</string> <string name="report" msgid="4060218260984795706">"ანგარიში"</string> <string name="wait" msgid="7147118217226317732">"მოცდა"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM ბარათი დაემატა"</string> <string name="sim_added_message" msgid="7797975656153714319">"გადატვირთეთ თქვენი მოწყობილობა ფიჭურ ქსელზე წვდომისთვის."</string> <string name="sim_restart_button" msgid="4722407842815232347">"გადატვირთვა"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"დროის დაყენება"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"თარიღის დაყენება"</string> <string name="date_time_set" msgid="5777075614321087758">"დაყენება"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ფიქსაციის მოხსნამდე PIN-ის მოთხოვნა"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ფიქსაციის მოხსნამდე განბლოკვის ნიმუშის მოთხოვნა"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ფიქსაციის მოხსნამდე პაროლის მოთხოვნა"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"აპის ზომა ვერ შეიცვლება. გადაადგილდით მასში ორი თითის მეშვეობით."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"ეკრანის გაყოფა არ არის მხარდაჭერილი აპის მიერ."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"თქვენი ადმინისტრატორის მიერ დაყენებული"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"განახლებულია თქვენი ადმინისტრატორის მიერ"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"თქვენი ადმინისტრატორის მიერ წაშლილი"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"ზოგიერთი ფუნქცია შეიძლება მიუწვდომელი იყოს"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"შეეხეთ გასაგრძელებლად"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"მომხმარებლის პროფილი ჩაკეტილია"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"დაკავშირებულია <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>-თან"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"შეეხეთ ფაილების სანახავად"</string> + <string name="pin_target" msgid="3052256031352291362">"ჩამაგრება"</string> + <string name="unpin_target" msgid="3556545602439143442">"ჩამაგრების მოხსნა"</string> + <string name="app_info" msgid="6856026610594615344">"აპის შესახებ"</string> </resources> diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml index f583c9f9de88..a9eecd97f0ca 100644 --- a/core/res/res/values-kk-rKZ/strings.xml +++ b/core/res/res/values-kk-rKZ/strings.xml @@ -1031,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM картасы қосылды"</string> <string name="sim_added_message" msgid="7797975656153714319">"Ұялы желіге қатынасу үшін құрылғыны қайта іске қосыңыз."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Қайта бастау"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Уақытты реттеу"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Мезгілін реттеу"</string> <string name="date_time_set" msgid="5777075614321087758">"Орнату"</string> @@ -1553,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Кейбір функциялар қол жетімді болмауы мүмкін"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Жалғастыру үшін түртіңіз"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Пайдаланушы профилі құлыпталған"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> қосылу орындалды"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Файлдарды көру үшін түртіңіз"</string> + <string name="pin_target" msgid="3052256031352291362">"PIN код"</string> + <string name="unpin_target" msgid="3556545602439143442">"Босату"</string> + <string name="app_info" msgid="6856026610594615344">"Қолданба ақпараты"</string> </resources> diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml index 150b5724afc2..4dbb28381483 100644 --- a/core/res/res/values-km-rKH/strings.xml +++ b/core/res/res/values-km-rKH/strings.xml @@ -1033,6 +1033,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"បានបន្ថែមស៊ីមកាត"</string> <string name="sim_added_message" msgid="7797975656153714319">"ចាប់ផ្ដើមឧបករណ៍របស់អ្នកឡើងវិញ ដើម្បីចូលប្រើបណ្ដាញចល័ត។"</string> <string name="sim_restart_button" msgid="4722407842815232347">"ចាប់ផ្ដើមឡើងវិញ"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"កំណត់ម៉ោង"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"កំណត់កាលបរិច្ឆេទ"</string> <string name="date_time_set" msgid="5777075614321087758">"កំណត់"</string> @@ -1555,8 +1565,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"មុខងារមួយចំនួនមិនអាចប្រើបានទេ"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"ប៉ះដើម្បីបន្ត"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"ប្រវត្តិរូបអ្នកប្រើត្រូវបានចាក់សោ"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"បានភ្ជាប់ទៅ <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ប៉ះដើម្បីមើលឯកសារ"</string> + <string name="pin_target" msgid="3052256031352291362">"ខ្ទាស់"</string> + <string name="unpin_target" msgid="3556545602439143442">"មិនខ្ទាស់"</string> + <string name="app_info" msgid="6856026610594615344">"ព័ត៌មានកម្មវិធី"</string> </resources> diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml index f13e77e31c55..d251f82a4a50 100644 --- a/core/res/res/values-kn-rIN/strings.xml +++ b/core/res/res/values-kn-rIN/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"ಸಿಮ್ ಕಾರ್ಡ್ ಸೇರಿಸಲಾಗಿದೆ"</string> <string name="sim_added_message" msgid="7797975656153714319">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್ವರ್ಕ್ ಪ್ರವೇಶಿಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string> <string name="sim_restart_button" msgid="4722407842815232347">"ಮರುಪ್ರಾರಂಭಿಸು"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"ನಿಮ್ಮ ಹೊಸ ಸಿಮ್ ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡಲು, ನಿಮ್ಮ ವಾಹಕದಿಂದ ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನೀವು ಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ ಮತ್ತು ತೆರೆಯಬೇಕಾಗುತ್ತದೆ."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"ಅಪ್ಲಿಕೇಶನ್ ಪಡೆದುಕೊಳ್ಳಿ"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"ಈಗ ಬೇಡ"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"ಹೊಸ ಸಿಮ್ ಸೇರಿಸಲಾಗಿದೆ"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"ಇದನ್ನು ಸ್ಥಾಪಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"ಸಮಯವನ್ನು ಹೊಂದಿಸಿ"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"ದಿನಾಂಕವನ್ನು ಹೊಂದಿಸಿ"</string> <string name="date_time_set" msgid="5777075614321087758">"ಹೊಂದಿಸು"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"ಕೆಲವು ಫಂಕ್ಷನ್ಗಳು ಲಭ್ಯವಿಲ್ಲದಿರಬಹುದು"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"ಮುಂದುವರಿಸಲು ಸ್ಪರ್ಶಿಸಿ"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"ಬಳಕೆದಾರ ಪ್ರೊಫೈಲ್ ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ಫೈಲ್ಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> + <string name="pin_target" msgid="3052256031352291362">"ಪಿನ್ ಮಾಡು"</string> + <string name="unpin_target" msgid="3556545602439143442">"ಅನ್ಪಿನ್"</string> + <string name="app_info" msgid="6856026610594615344">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 04304bf71f4d..6f725aae3db4 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"작업을 수행할 수 있는 앱이 없습니다."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g>이(가) 중지됨"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g>이(가) 중지됨"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g>이(가) 계속 중단됨"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g>이(가) 계속 중단됨"</string> <string name="aerr_restart" msgid="9001379185665886595">"앱 다시 시작"</string> <string name="aerr_reset" msgid="7645427603514220451">"앱 재설정 및 다시 시작"</string> <string name="aerr_report" msgid="5371800241488400617">"의견 보내기"</string> <string name="aerr_close" msgid="2991640326563991340">"닫기"</string> <string name="aerr_mute" msgid="7698966346654789433">"숨기기"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"대기"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"앱 닫기"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g>이(가) 응답하지 않음"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g>이(가) 응답하지 않음"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g>이(가) 응답하지 않음"</string> + <string name="anr_process" msgid="6156880875555921105">"<xliff:g id="PROCESS">%1$s</xliff:g> 프로세스가 응답하지 않음"</string> <string name="force_close" msgid="8346072094521265605">"확인"</string> <string name="report" msgid="4060218260984795706">"신고"</string> <string name="wait" msgid="7147118217226317732">"대기"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM 카드 추가됨"</string> <string name="sim_added_message" msgid="7797975656153714319">"이동통신망에 액세스하려면 기기를 다시 시작하세요."</string> <string name="sim_restart_button" msgid="4722407842815232347">"다시 시작"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"시간 설정"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"날짜 설정"</string> <string name="date_time_set" msgid="5777075614321087758">"설정"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"고정 해제 이전에 PIN 요청"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"고정 해제 이전에 잠금해제 패턴 요청"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"고정 해제 이전에 비밀번호 요청"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"앱에서 크기 조절이 불가능합니다. 두 손가락을 사용해 스크롤하세요."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"앱이 화면 분할을 지원하지 않습니다."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"관리자가 설치함"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"관리자에 의해 업데이트됨"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"관리자가 삭제함"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"일부 기능을 사용할 수 없음"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"계속하려면 터치하세요."</string> <string name="user_encrypted_detail" msgid="979981584766912935">"사용자 프로필이 잠겨 있습니다."</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g>에 연결됨"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"파일을 확인하려면 탭하세요."</string> + <string name="pin_target" msgid="3052256031352291362">"고정"</string> + <string name="unpin_target" msgid="3556545602439143442">"고정 해제"</string> + <string name="app_info" msgid="6856026610594615344">"앱 정보"</string> </resources> diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml index 9ec79ccff7e2..6b6145edcaca 100644 --- a/core/res/res/values-ky-rKG/strings.xml +++ b/core/res/res/values-ky-rKG/strings.xml @@ -232,7 +232,7 @@ <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string> <string name="notification_hidden_text" msgid="1135169301897151909">"Мазмундар жашырылган"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Саясат тарабынан жашырылган мазмундар"</string> + <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Тийиштүү саясат боюнча жашырылган мазмундар"</string> <string name="safeMode" msgid="2788228061547930246">"Коопсуз режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Android Тутуму"</string> <string name="user_owner_label" msgid="2804351898001038951">"Жеке"</string> @@ -912,28 +912,20 @@ <string name="noApplications" msgid="2991814273936504689">"Бул аракетти аткара турган колдонмо жок."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> токтотулду"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> токтотулду"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> кайра эле токтотулууда"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> кайра эле токтотулууда"</string> <string name="aerr_restart" msgid="9001379185665886595">"Колдонмону кайра жүргүзүү"</string> <string name="aerr_reset" msgid="7645427603514220451">"Колдонмону баштапкы абалга келтирип, кайра жүргүзүү"</string> <string name="aerr_report" msgid="5371800241488400617">"Жооп пикир жөнөтүү"</string> <string name="aerr_close" msgid="2991640326563991340">"Жабуу"</string> <string name="aerr_mute" msgid="7698966346654789433">"Үнсүз"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Күтүү"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Колдонмону жабуу"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> жооп бербей жатат"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> жооп бербей жатат"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> жооп бербей жатат"</string> + <string name="anr_process" msgid="6156880875555921105">"<xliff:g id="PROCESS">%1$s</xliff:g> процесси жооп бербей жатат"</string> <string name="force_close" msgid="8346072094521265605">"OK"</string> <string name="report" msgid="4060218260984795706">"Кабарлоо"</string> <string name="wait" msgid="7147118217226317732">"Күтүү"</string> @@ -1040,6 +1032,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-карта кошулду"</string> <string name="sim_added_message" msgid="7797975656153714319">"Уюктук тармакка кирүү үчүн түзмөгүңүздү өчүрүп күйгүзүңүз."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Кайра баштоо"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Убакыт орнотуу"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Күнүн орнотуу"</string> <string name="date_time_set" msgid="5777075614321087758">"Коюу"</string> @@ -1471,10 +1473,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Бошотуудан мурун PIN суралсын"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Бошотуудан мурун кулпуну ачкан үлгү суралсын"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Бошотуудан мурун сырсөз суралсын"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Колдонмонун көлөмүн өзгөртүүгө болбойт, андыктан эки манжаңыз менен сыдырып караңыз."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Колдонмо экранды бөлүүнү колдобойт."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Администраторуңуз тарабынан орнотулган"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Администраторуңуз жаңырткан"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Администраторуңуз тарабынан жок кылынган"</string> @@ -1547,7 +1547,7 @@ <string name="importance_from_topic" msgid="3572280439880023233">"Бул эскертмелердин маанилүүлүгүн белгиледиңиз."</string> <string name="importance_from_person" msgid="9160133597262938296">"Булар сиз үчүн маанилүү адамдар."</string> <string name="user_creation_account_exists" msgid="1942606193570143289">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу <xliff:g id="ACCOUNT">%2$s</xliff:g> каттоо эсеби менен жаңы колдонуучу түзө берсинби ?"</string> - <string name="user_creation_adding" msgid="4482658054622099197">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу <xliff:g id="ACCOUNT">%2$s</xliff:g> каттоо эсеби менен жаңы колдонуучу түзө берсинби (мындай каттоо эсеби менен колдонуучу мурунтан эле бар) ?"</string> + <string name="user_creation_adding" msgid="4482658054622099197">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу <xliff:g id="ACCOUNT">%2$s</xliff:g> каттоо эсеби менен жаңы колдонуучу түзө берсинби (мындай каттоо эсеби бар колдонуучу мурунтан эле бар) ?"</string> <string name="language_selection_title" msgid="7181332986330337171">"Тил жөндөөлөрү"</string> <string name="country_selection_title" msgid="2954859441620215513">"Чөлкөмдүк жөндөөлөр"</string> <string name="search_language_hint" msgid="7042102592055108574">"Тилди киргизиңиз"</string> @@ -1564,8 +1564,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Айрым функциялар иштбши мүмкн"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Улантуу үчүн тийип коюңуз"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Колдонуучнн профили кулпулнгн"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> менен туташты"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Файлдарды көрүү үчүн таптап коюңуз"</string> + <string name="pin_target" msgid="3052256031352291362">"Кадоо"</string> + <string name="unpin_target" msgid="3556545602439143442">"Кадоодон алып коюу"</string> + <string name="app_info" msgid="6856026610594615344">"Колдонмо тууралуу"</string> </resources> diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml index 01ccd698b159..2e0a6ad38c35 100644 --- a/core/res/res/values-lo-rLA/strings.xml +++ b/core/res/res/values-lo-rLA/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"ບໍ່ມີແອັບຯໃດສາມາດເຮັດວຽກນີ້ໄດ້."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> ໄດ້ຢຸດແລ້ວ"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> ໄດ້ຢຸດແລ້ວ"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> ຢຸດເລື້ອຍໆ"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> ຢຸດເລື້ອຍໆ"</string> <string name="aerr_restart" msgid="9001379185665886595">"ເລີ່ມແອັບໃໝ່"</string> <string name="aerr_reset" msgid="7645427603514220451">"ຣີເຊັດ ແລະ ເລີ່ມແອັບໃໝ່"</string> <string name="aerr_report" msgid="5371800241488400617">"ສົ່ງຄຳຕິຊົມ"</string> <string name="aerr_close" msgid="2991640326563991340">"ປິດ"</string> <string name="aerr_mute" msgid="7698966346654789433">"ປິດສຽງ"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"ລໍຖ້າ"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"ປິດແອັບ"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> ບໍ່ຕອບສະໜອງ"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> ບໍ່ຕອບສະໜອງ"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> ບໍ່ຕອບສະໜອງ"</string> + <string name="anr_process" msgid="6156880875555921105">"ຂະບວນການ <xliff:g id="PROCESS">%1$s</xliff:g> ບໍ່ຕອບສະໜອງ"</string> <string name="force_close" msgid="8346072094521265605">"ຕົກລົງ"</string> <string name="report" msgid="4060218260984795706">"ລາຍງານ"</string> <string name="wait" msgid="7147118217226317732">"ລໍຖ້າ"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"ເພີ່ມຊິມກາດແລ້ວ"</string> <string name="sim_added_message" msgid="7797975656153714319">"ຣີສະຕາດອຸປະກອນຂອງທ່ານເພື່ອເຂົ້າເຖິງເຄືອຂ່າຍມືຖື."</string> <string name="sim_restart_button" msgid="4722407842815232347">"ຣີສະຕາດ"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"ຕັ້ງເວລາ"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"ກໍານົດວັນທີ"</string> <string name="date_time_set" msgid="5777075614321087758">"ຕັ້ງຄ່າ"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ຖາມຫາ PIN ກ່ອນຍົກເລີກການປັກໝຸດ"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ຖາມຫາຮູບແບບປົດລັອກກ່ອນຍົກເລີກການປັກໝຸດ"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ຖາມຫາລະຫັດຜ່ານກ່ອນຍົກເລີກການປັກໝຸດ"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"ບໍ່ສາມາດປັບຂະໜາດແອັບໄດ້, ໃຫ້ເລື່ອນມັນໂດຍໃຊ້ນິ້ວມືສອງນິ້ວ."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"ແອັບບໍ່ຮອງຮັບໜ້າຈໍແບບແຍກກັນ."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"ຜູ້ຄວບຄຸມຂອງທ່ານຕິດຕັ້ງໃສ່ແລ້ວ"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"ອັບເດດໂດຍຜູ້ຄວບຄຸມຂອງທ່ານແລ້ວ"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"ຖືກຜູ້ຄວບຄຸມຂອງທ່ານລຶບໄປແລ້ວ"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"ບາງຟັງຊັນອາດບໍ່ສາມາດໃຊ້ໄດ້"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"ແຕະເພື່ອສືບຕໍ່"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"ໂປຣໄຟລ໌ຜູ້ໃຊ້ຖືກລັອກໄວ້ແລ້ວ"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"ເຊື່ອມຕໍ່ກັບ <xliff:g id="PRODUCT_NAME">%1$s</xliff:g> ແລ້ວ"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ແຕະເພື່ອເບິ່ງໄຟລ໌"</string> + <string name="pin_target" msgid="3052256031352291362">"ປັກໝຸດ"</string> + <string name="unpin_target" msgid="3556545602439143442">"ຖອນປັກໝຸດ"</string> + <string name="app_info" msgid="6856026610594615344">"ຂໍ້ມູນແອັບ"</string> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 0d0a4ede3cd1..698cebe8dc61 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1047,6 +1047,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM kortelė pridėta"</string> <string name="sim_added_message" msgid="7797975656153714319">"Iš naujo paleiskite įrenginį, kad pasiektumėte korinį tinklą."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Paleisti iš naujo"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Kad nauja SIM kortelė veiktų tinkamai, turite įdiegti ir atidaryti iš operatoriaus gautą programą."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"GAUTI PROGRAMĄ"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"NE DABAR"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Įdėta nauja SIM kortelė"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Jei norite tai nustatyti, palieskite"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Nustatyti laiką"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nustatyti datą"</string> <string name="date_time_set" msgid="5777075614321087758">"Nustatyti"</string> @@ -1591,8 +1596,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Kelios funkc. gali būti nepas."</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Jei norite tęsti, palieskite"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Naudotojo profilis užrakintas"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Prisijungta prie „<xliff:g id="PRODUCT_NAME">%1$s</xliff:g>“"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Palieskite, kad peržiūrėtumėte failus"</string> + <string name="pin_target" msgid="3052256031352291362">"Prisegti"</string> + <string name="unpin_target" msgid="3556545602439143442">"Atsegti"</string> + <string name="app_info" msgid="6856026610594615344">"Programos informacija"</string> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index c8754bfbfc2c..8c0081bf27f6 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -1039,6 +1039,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM karte ir pievienota."</string> <string name="sim_added_message" msgid="7797975656153714319">"Lai piekļūtu mobilajam tīklam, restartējiet ierīci."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Restartēt"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Iestatīt laiku"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datuma iestatīšana"</string> <string name="date_time_set" msgid="5777075614321087758">"Iestatīt"</string> @@ -1572,8 +1582,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Dažas funkcijas var nebūt pieejamas"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Pieskarieties, lai turpinātu."</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Lietotāja profils ir bloķēts."</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Izveidots savienojums ar: <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Pieskarieties, lai skatītu failus."</string> + <string name="pin_target" msgid="3052256031352291362">"Piespraust"</string> + <string name="unpin_target" msgid="3556545602439143442">"Atspraust"</string> + <string name="app_info" msgid="6856026610594615344">"Lietotnes informācija"</string> </resources> diff --git a/core/res/res/values-mcc310-mnc200-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc200-az-rAZ/strings.xml new file mode 100644 index 000000000000..94e7f8888fd4 --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-es/strings.xml b/core/res/res/values-mcc310-mnc200-es/strings.xml new file mode 100644 index 000000000000..9ec401a74ad3 --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-hi/strings.xml b/core/res/res/values-mcc310-mnc200-hi/strings.xml new file mode 100644 index 000000000000..1d8272ad1603 --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-in/strings.xml b/core/res/res/values-mcc310-mnc200-in/strings.xml new file mode 100644 index 000000000000..c71dbf721acf --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-mr-rIN/strings.xml new file mode 100644 index 000000000000..fc89cfca8551 --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-nl/strings.xml b/core/res/res/values-mcc310-mnc200-nl/strings.xml new file mode 100644 index 000000000000..22f8de25bc44 --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-pa-rIN/strings.xml new file mode 100644 index 000000000000..0083af30640b --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc200-pt-rPT/strings.xml new file mode 100644 index 000000000000..530b065b20a5 --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-te-rIN/strings.xml new file mode 100644 index 000000000000..85f29eecd08b --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-zu/strings.xml b/core/res/res/values-mcc310-mnc200-zu/strings.xml new file mode 100644 index 000000000000..f4209a633b67 --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-Fi, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-Fi futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc210-az-rAZ/strings.xml new file mode 100644 index 000000000000..6a818359c61b --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-es/strings.xml b/core/res/res/values-mcc310-mnc210-es/strings.xml new file mode 100644 index 000000000000..8fe5eba15927 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-hi/strings.xml b/core/res/res/values-mcc310-mnc210-hi/strings.xml new file mode 100644 index 000000000000..b560f048e4d2 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-in/strings.xml b/core/res/res/values-mcc310-mnc210-in/strings.xml new file mode 100644 index 000000000000..264bb51b14b1 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-mr-rIN/strings.xml new file mode 100644 index 000000000000..1d2958552f85 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-nl/strings.xml b/core/res/res/values-mcc310-mnc210-nl/strings.xml new file mode 100644 index 000000000000..d90df1267167 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-pa-rIN/strings.xml new file mode 100644 index 000000000000..39bdd6405934 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc210-pt-rPT/strings.xml new file mode 100644 index 000000000000..173d97daeff9 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-te-rIN/strings.xml new file mode 100644 index 000000000000..d3141d8540c0 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-zu/strings.xml b/core/res/res/values-mcc310-mnc210-zu/strings.xml new file mode 100644 index 000000000000..cde0a8c73820 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-Fi, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-Fi futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc220-az-rAZ/strings.xml new file mode 100644 index 000000000000..e169bc23736f --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-es/strings.xml b/core/res/res/values-mcc310-mnc220-es/strings.xml new file mode 100644 index 000000000000..5292afee270e --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-hi/strings.xml b/core/res/res/values-mcc310-mnc220-hi/strings.xml new file mode 100644 index 000000000000..d1e7bd26e7af --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-in/strings.xml b/core/res/res/values-mcc310-mnc220-in/strings.xml new file mode 100644 index 000000000000..075d2ef508ee --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-mr-rIN/strings.xml new file mode 100644 index 000000000000..c40186458e51 --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-nl/strings.xml b/core/res/res/values-mcc310-mnc220-nl/strings.xml new file mode 100644 index 000000000000..ed37e20e5020 --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-pa-rIN/strings.xml new file mode 100644 index 000000000000..0da091d59911 --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc220-pt-rPT/strings.xml new file mode 100644 index 000000000000..4fcb1787e57f --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-te-rIN/strings.xml new file mode 100644 index 000000000000..3529f932ee17 --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-zu/strings.xml b/core/res/res/values-mcc310-mnc220-zu/strings.xml new file mode 100644 index 000000000000..f0c0f6af1983 --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-Fi, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-Fi futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc230-az-rAZ/strings.xml new file mode 100644 index 000000000000..f85048a63e40 --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-es/strings.xml b/core/res/res/values-mcc310-mnc230-es/strings.xml new file mode 100644 index 000000000000..034e47f9d9ac --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-hi/strings.xml b/core/res/res/values-mcc310-mnc230-hi/strings.xml new file mode 100644 index 000000000000..61cdf58a201e --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-in/strings.xml b/core/res/res/values-mcc310-mnc230-in/strings.xml new file mode 100644 index 000000000000..d385771ed9b4 --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-mr-rIN/strings.xml new file mode 100644 index 000000000000..008a2cc13fa0 --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-nl/strings.xml b/core/res/res/values-mcc310-mnc230-nl/strings.xml new file mode 100644 index 000000000000..157bd3c96ec9 --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-pa-rIN/strings.xml new file mode 100644 index 000000000000..20160e812eee --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc230-pt-rPT/strings.xml new file mode 100644 index 000000000000..d253f8f1898e --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-te-rIN/strings.xml new file mode 100644 index 000000000000..f14c57438c19 --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-zu/strings.xml b/core/res/res/values-mcc310-mnc230-zu/strings.xml new file mode 100644 index 000000000000..0b043d0e6ef8 --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-Fi, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-Fi futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc240-az-rAZ/strings.xml new file mode 100644 index 000000000000..84575b65d7fe --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-es/strings.xml b/core/res/res/values-mcc310-mnc240-es/strings.xml new file mode 100644 index 000000000000..29b80aaabad4 --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-hi/strings.xml b/core/res/res/values-mcc310-mnc240-hi/strings.xml new file mode 100644 index 000000000000..90531375bece --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-in/strings.xml b/core/res/res/values-mcc310-mnc240-in/strings.xml new file mode 100644 index 000000000000..2d17f2071ab7 --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-mr-rIN/strings.xml new file mode 100644 index 000000000000..d9ffd6350099 --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-nl/strings.xml b/core/res/res/values-mcc310-mnc240-nl/strings.xml new file mode 100644 index 000000000000..c35dc6abeaf0 --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-pa-rIN/strings.xml new file mode 100644 index 000000000000..0f1b5bcac857 --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc240-pt-rPT/strings.xml new file mode 100644 index 000000000000..af0550547354 --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-te-rIN/strings.xml new file mode 100644 index 000000000000..ccace1af9736 --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-zu/strings.xml b/core/res/res/values-mcc310-mnc240-zu/strings.xml new file mode 100644 index 000000000000..9aa62d358b42 --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-Fi, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-Fi futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc250-az-rAZ/strings.xml new file mode 100644 index 000000000000..fb70ba858127 --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-es/strings.xml b/core/res/res/values-mcc310-mnc250-es/strings.xml new file mode 100644 index 000000000000..afe979da3ac8 --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-hi/strings.xml b/core/res/res/values-mcc310-mnc250-hi/strings.xml new file mode 100644 index 000000000000..46c756bbf275 --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-in/strings.xml b/core/res/res/values-mcc310-mnc250-in/strings.xml new file mode 100644 index 000000000000..b1d5024421fe --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-mr-rIN/strings.xml new file mode 100644 index 000000000000..a2a10e10a19a --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-nl/strings.xml b/core/res/res/values-mcc310-mnc250-nl/strings.xml new file mode 100644 index 000000000000..f356b49ee68c --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-pa-rIN/strings.xml new file mode 100644 index 000000000000..29bac711a61c --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc250-pt-rPT/strings.xml new file mode 100644 index 000000000000..47482606478e --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-te-rIN/strings.xml new file mode 100644 index 000000000000..81e7e3c843d3 --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-zu/strings.xml b/core/res/res/values-mcc310-mnc250-zu/strings.xml new file mode 100644 index 000000000000..fc845e79e099 --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-Fi, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-Fi futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc270-az-rAZ/strings.xml new file mode 100644 index 000000000000..71e7a8a8d9e2 --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-es/strings.xml b/core/res/res/values-mcc310-mnc270-es/strings.xml new file mode 100644 index 000000000000..733412ad8922 --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-hi/strings.xml b/core/res/res/values-mcc310-mnc270-hi/strings.xml new file mode 100644 index 000000000000..c91d0b5ac751 --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-in/strings.xml b/core/res/res/values-mcc310-mnc270-in/strings.xml new file mode 100644 index 000000000000..67edf3ccf9fb --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-mr-rIN/strings.xml new file mode 100644 index 000000000000..650735cfab14 --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-nl/strings.xml b/core/res/res/values-mcc310-mnc270-nl/strings.xml new file mode 100644 index 000000000000..fd4957c749ed --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-pa-rIN/strings.xml new file mode 100644 index 000000000000..d17c01f7bd57 --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc270-pt-rPT/strings.xml new file mode 100644 index 000000000000..09a8dcbd6375 --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-te-rIN/strings.xml new file mode 100644 index 000000000000..d103e222704f --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-zu/strings.xml b/core/res/res/values-mcc310-mnc270-zu/strings.xml new file mode 100644 index 000000000000..49a203732572 --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-Fi, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-Fi futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc310-az-rAZ/strings.xml new file mode 100644 index 000000000000..0748e91fe501 --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-es/strings.xml b/core/res/res/values-mcc310-mnc310-es/strings.xml new file mode 100644 index 000000000000..6dd980b5657d --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-hi/strings.xml b/core/res/res/values-mcc310-mnc310-hi/strings.xml new file mode 100644 index 000000000000..611ec9c4d934 --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-in/strings.xml b/core/res/res/values-mcc310-mnc310-in/strings.xml new file mode 100644 index 000000000000..e65f2658f089 --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-mr-rIN/strings.xml new file mode 100644 index 000000000000..ce76a49c0bec --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-nl/strings.xml b/core/res/res/values-mcc310-mnc310-nl/strings.xml new file mode 100644 index 000000000000..0266e3d597cb --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-pa-rIN/strings.xml new file mode 100644 index 000000000000..7e9b8a48cd4f --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc310-pt-rPT/strings.xml new file mode 100644 index 000000000000..e782c43d76db --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-te-rIN/strings.xml new file mode 100644 index 000000000000..01613427d04f --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-zu/strings.xml b/core/res/res/values-mcc310-mnc310-zu/strings.xml new file mode 100644 index 000000000000..465ee60e7b21 --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-Fi, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-Fi futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc490-az-rAZ/strings.xml new file mode 100644 index 000000000000..e74d24755bff --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-es/strings.xml b/core/res/res/values-mcc310-mnc490-es/strings.xml new file mode 100644 index 000000000000..949fabba0833 --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-hi/strings.xml b/core/res/res/values-mcc310-mnc490-hi/strings.xml new file mode 100644 index 000000000000..27f5351e0496 --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-in/strings.xml b/core/res/res/values-mcc310-mnc490-in/strings.xml new file mode 100644 index 000000000000..4ae2c34e6701 --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-mr-rIN/strings.xml new file mode 100644 index 000000000000..25564bd860b1 --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-nl/strings.xml b/core/res/res/values-mcc310-mnc490-nl/strings.xml new file mode 100644 index 000000000000..27c41cfc949a --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-pa-rIN/strings.xml new file mode 100644 index 000000000000..39142f0b9454 --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc490-pt-rPT/strings.xml new file mode 100644 index 000000000000..743348b0e872 --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-te-rIN/strings.xml new file mode 100644 index 000000000000..a7ec75336c19 --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-zu/strings.xml b/core/res/res/values-mcc310-mnc490-zu/strings.xml new file mode 100644 index 000000000000..f8468b79f602 --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-Fi, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-Fi futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc660-az-rAZ/strings.xml new file mode 100644 index 000000000000..24d9da37bd94 --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-es/strings.xml b/core/res/res/values-mcc310-mnc660-es/strings.xml new file mode 100644 index 000000000000..1c107efc054f --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-hi/strings.xml b/core/res/res/values-mcc310-mnc660-hi/strings.xml new file mode 100644 index 000000000000..487af6708571 --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-in/strings.xml b/core/res/res/values-mcc310-mnc660-in/strings.xml new file mode 100644 index 000000000000..a894b4cc1ab3 --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-mr-rIN/strings.xml new file mode 100644 index 000000000000..34a8182e3e82 --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-nl/strings.xml b/core/res/res/values-mcc310-mnc660-nl/strings.xml new file mode 100644 index 000000000000..100d7fc02810 --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-pa-rIN/strings.xml new file mode 100644 index 000000000000..57fc35e798d4 --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc660-pt-rPT/strings.xml new file mode 100644 index 000000000000..39b1ec15d070 --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-te-rIN/strings.xml new file mode 100644 index 000000000000..ac3c8916e98c --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-zu/strings.xml b/core/res/res/values-mcc310-mnc660-zu/strings.xml new file mode 100644 index 000000000000..9ee70dfb9a97 --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-FI, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-FI futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc800-az-rAZ/strings.xml new file mode 100644 index 000000000000..ac2fec35e0ed --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-az-rAZ/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"Wi-Fi üzərindən zəng etmək və mesaj göndərmək üçün ilk öncə operatordan bu xidməti ayarlamağı tələb edin. Sonra Ayarlardan Wi-Fi çağrısını aktivləşdirin."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"Operatorla qeydiyyatdan keçin"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"%s Wi-Fi Zəngi"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-es/strings.xml b/core/res/res/values-mcc310-mnc800-es/strings.xml new file mode 100644 index 000000000000..ca19be345aa3 --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-es/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"Para hacer llamadas y enviar mensajes por Wi-Fi, solicita a tu operador que configure este servicio y, cuando lo haga, vuelve a activar las llamadas por Wi-Fi en Ajustes."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"Regístrate con tu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"Llamada por Wi-Fi de %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-hi/strings.xml b/core/res/res/values-mcc310-mnc800-hi/strings.xml new file mode 100644 index 000000000000..c2b121b8e32e --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-hi/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"वाई-फ़ाई से कॉल करने और संदेश भेजने के लिए, सबसे पहले अपने वाहक से इस सेवा को सेट करने के लिए कहें. उसके बाद सेटिंग से पुन: वाई-फ़ाई कॉलिंग चालू करें."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"अपने वाहक के साथ पंजीकृत करें"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"%s वाई-फ़ाई कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-in/strings.xml b/core/res/res/values-mcc310-mnc800-in/strings.xml new file mode 100644 index 000000000000..52b1f6ed4c0b --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-in/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"Untuk melakukan panggilan telepon dan mengirim pesan melalui Wi-Fi, terlebih dahulu minta operator untuk menyiapkan layanan ini. Lalu, aktifkan lagi panggilan telepon Wi-Fi dari Setelan."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"Harap daftarkan ke operator"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"Panggilan Wi-Fi %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-mr-rIN/strings.xml new file mode 100644 index 000000000000..1f360d573739 --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-mr-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"वाय-फायवरून कॉल करण्यासाठी आणि संदेश पाठविण्यासाठी, प्रथम आपल्या वाहकास ही सेवा सेट करण्यास सांगा. नंतर सेटिंग्जमधून पुन्हा वाय-फाय कॉलिंग चालू करा."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"आपल्या वाहकासह नोंदणी करा"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"%s वाय-फाय कॉलिंग"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-nl/strings.xml b/core/res/res/values-mcc310-mnc800-nl/strings.xml new file mode 100644 index 000000000000..b87fce95fb5e --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-nl/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"Als je wilt bellen en berichten wilt verzenden via wifi, moet je eerst je provider vragen deze service in te stellen. Schakel bellen via wifi vervolgens opnieuw in via Instellingen."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"Registreren bij je provider"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"Bellen via wifi van %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-pa-rIN/strings.xml new file mode 100644 index 000000000000..5923eba2136c --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-pa-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"Wi-Fi \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਇਹ ਸੇਵਾ ਸੈੱਟ ਕਰਨ ਲਈ ਕਹੋ। ਫਿਰ ਸੈਟਿੰਗਾਂ ਤੋਂ Wi-Fi ਕਾਲਿੰਗ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰੋ।"</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਰਜਿਸਟਰ ਕਰੋ"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"%s Wi-Fi ਕਾਲਿੰਗ"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-pt-rPT/strings.xml b/core/res/res/values-mcc310-mnc800-pt-rPT/strings.xml new file mode 100644 index 000000000000..1ff0681e35e9 --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-pt-rPT/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"Para fazer chamadas e enviar mensagens por Wi-Fi, comece por pedir ao seu operador para configurar este serviço. Em seguida, nas Definições, ative novamente as Chamadas Wi-Fi."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"Registar-se junto do seu operador"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"Chamadas Wi-Fi da %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-te-rIN/strings.xml new file mode 100644 index 000000000000..28bba73c0ec9 --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-te-rIN/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"Wi-Fiలో కాల్లు చేయడానికి మరియు సందేశాలు పంపడానికి, ముందుగా ఈ సేవను సెటప్ చేయమని మీ క్యారియర్ను అడగండి. ఆపై సెట్టింగ్ల నుండి Wi-Fi కాలింగ్ను మళ్లీ ఆన్ చేయండి."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"మీ క్యారియర్తో నమోదు చేయండి"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"%s Wi-Fi కాలింగ్"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-zu/strings.xml b/core/res/res/values-mcc310-mnc800-zu/strings.xml new file mode 100644 index 000000000000..1335ac5e41fe --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-zu/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, 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 my 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. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"Ukuze wenze amakholi uphinde uthumele imilayezo nge-Wi-FI, qala ucele inkampani yakho yenethiwekhi ukuthi isethe le divayisi. Bese uvula ukushaya kwe-Wi-FI futhi kusukela kuzilungiselelo."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"Bhalisa ngenkampani yakho yenethiwekhi"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"%s ukushaya kwe-Wi-Fi"</string> +</resources> diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml index 0e45601ed187..d67d78d15aa6 100644 --- a/core/res/res/values-mk-rMK/strings.xml +++ b/core/res/res/values-mk-rMK/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Додадена е СИМ картичка"</string> <string name="sim_added_message" msgid="7797975656153714319">"Рестартирајте го уредот за да пристапите кон мобилна мрежа."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Рестартирај"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"За да работи правилно вашата нова СИМ-картичка, треба да ја инсталирате и да ја отворите апликацијата од операторот."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"ПРЕЗЕМИ ЈА АПЛИКАЦИЈАТА"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"НЕ СЕГА"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Вметната е нова СИМ-картичка"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Допрете за да поставите"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Подеси време"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Постави датум"</string> <string name="date_time_set" msgid="5777075614321087758">"Подеси"</string> @@ -1555,8 +1560,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Некои функции се недостапни"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Допрете за да продолжите"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Корисничкиот профил е заклучен"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Поврзан на <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Допрете за да ги погледнете датотеките"</string> + <string name="pin_target" msgid="3052256031352291362">"Прикачете"</string> + <string name="unpin_target" msgid="3556545602439143442">"Откачете"</string> + <string name="app_info" msgid="6856026610594615344">"Информации за апликација"</string> </resources> diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml index afa11f842efe..4054577c251a 100644 --- a/core/res/res/values-ml-rIN/strings.xml +++ b/core/res/res/values-ml-rIN/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"അപ്ലിക്കേഷനുകൾക്കൊന്നും ഈ പ്രവർത്തനം നിർവഹിക്കാനാവില്ല."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> നിലച്ചിരിക്കുന്നു"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> നിലച്ചിരിക്കുന്നു"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> നിലയ്ക്കുന്നത് തുടരുന്നു"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> നിലയ്ക്കുന്നത് തുടരുന്നു"</string> <string name="aerr_restart" msgid="9001379185665886595">"ആപ്പ് പുനഃരാരംഭിക്കുക"</string> <string name="aerr_reset" msgid="7645427603514220451">"ആപ്പ് പുനഃക്രമീകരിച്ച് പുനഃരാരംഭിക്കുക"</string> <string name="aerr_report" msgid="5371800241488400617">"ഫീഡ്ബാക്ക് അയയ്ക്കുക"</string> <string name="aerr_close" msgid="2991640326563991340">"അടയ്ക്കുക"</string> <string name="aerr_mute" msgid="7698966346654789433">"മ്യൂട്ടുചെയ്യുക"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"കാത്തിരിക്കുക"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"ആപ്പ് അടയ്ക്കുക"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> പ്രതികരിക്കുന്നില്ല"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> പ്രതികരിക്കുന്നില്ല"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> പ്രതികരിക്കുന്നില്ല"</string> + <string name="anr_process" msgid="6156880875555921105">"<xliff:g id="PROCESS">%1$s</xliff:g> എന്ന പ്രോസസ്സ് പ്രതികരിക്കുന്നില്ല"</string> <string name="force_close" msgid="8346072094521265605">"ശരി"</string> <string name="report" msgid="4060218260984795706">"റിപ്പോര്ട്ടുചെയ്യുക"</string> <string name="wait" msgid="7147118217226317732">"കാത്തിരിക്കുക"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"സിം കാർഡ് ചേർത്തു"</string> <string name="sim_added_message" msgid="7797975656153714319">"സെല്ലുലാർ നെറ്റ്വർക്ക് ആക്സസ്സുചെയ്യാൻ നിങ്ങളുടെ ഉപകരണം പുനരാരംഭിക്കുക."</string> <string name="sim_restart_button" msgid="4722407842815232347">"പുനരാരംഭിക്കുക"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"സമയം സജ്ജീകരിക്കുക"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"ദിവസം സജ്ജീകരിക്കുക"</string> <string name="date_time_set" msgid="5777075614321087758">"സജ്ജമാക്കുക"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ചെയ്യുംമുമ്പ് പിൻ ചോദിക്കൂ"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് അൺലോക്ക് പാറ്റേൺ ആവശ്യപ്പെടുക"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് പാസ്വേഡ് ആവശ്യപ്പെടുക"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"ആപ്പിന്റെ വലുപ്പം ക്രമീകരിക്കാൻ കഴിയില്ല, രണ്ട് വിരലുകൾ ഉപയോഗിച്ച് അത് സ്ക്രോൾ ചെയ്യുക."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"സ്പ്ലിറ്റ്-സ്ക്രീനിനെ ആപ്പ് പിന്തുണയ്ക്കുന്നില്ല."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ ഇൻസ്റ്റാളുചെയ്തു"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ അപ്ഡേറ്റുചെയ്തു"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ ഇല്ലാതാക്കി"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"ചില ഫംഗ്ഷനുകൾ ലഭ്യമായേക്കില്ല"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"തുടരുന്നതിന് സ്പർശിക്കുക"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"ഉപയോക്തൃ പ്രൊഫൈൽ ലോക്കുചെയ്തു"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> എന്നതിലേക്ക് കണക്റ്റുചെയ്തു"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ഫയലുകൾ കാണുന്നതിന് ടാപ്പുചെയ്യുക"</string> + <string name="pin_target" msgid="3052256031352291362">"പിൻ ചെയ്യുക"</string> + <string name="unpin_target" msgid="3556545602439143442">"അൺപിൻ ചെയ്യുക"</string> + <string name="app_info" msgid="6856026610594615344">"ആപ്പ് വിവരം"</string> </resources> diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml index b559e36ac92b..3321b5d2ce93 100644 --- a/core/res/res/values-mn-rMN/strings.xml +++ b/core/res/res/values-mn-rMN/strings.xml @@ -1031,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM карт нэмэгдсэн"</string> <string name="sim_added_message" msgid="7797975656153714319">"Үүрэн сүлжээнд хандах бол төхөөрөмжөө дахин асаан уу."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Дахин эхлүүлэх"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Цагийн тохируулах"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Огноо оруулах"</string> <string name="date_time_set" msgid="5777075614321087758">"Тохируулах"</string> @@ -1551,8 +1561,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Зарим функц байхгүй"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Үргэлжлүүлэхийн тулд дарах"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Хэрэглэгчийн профайл түгжээтэй"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g>-д холбогдсон"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Файлыг үзэхийн тулд дарна уу"</string> + <string name="pin_target" msgid="3052256031352291362">"PIN"</string> + <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> + <string name="app_info" msgid="6856026610594615344">"Апп-н мэдээлэл"</string> </resources> diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml index 5c4229b05549..3041601444c3 100644 --- a/core/res/res/values-mr-rIN/strings.xml +++ b/core/res/res/values-mr-rIN/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"सिम कार्ड जोडले"</string> <string name="sim_added_message" msgid="7797975656153714319">"सेल्युलर नेटवर्कवर प्रवेश करण्यासाठी आपले डिव्हाइस रीस्टार्ट करा."</string> <string name="sim_restart_button" msgid="4722407842815232347">"रीस्टार्ट"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"आपल्या नवीन सिमने योग्यरित्या कार्य करण्यासाठी, आपल्याला अॅप स्थापित करण्याची आणि तो आपल्या वाहकामधून उघडण्याची आवश्यकता असेल."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"अॅप मिळवा"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"आता नाही"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"नवीन सिम घाला"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"ते सेट करण्यासाठी टॅप करा"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"वेळ सेट करा"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"तारीख सेट करा"</string> <string name="date_time_set" msgid="5777075614321087758">"सेट करा"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"काही कार्ये कदाचित उपलब्ध नसू शकतात"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"सुरू ठेवण्यासाठी स्पर्श करा"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"वापरकर्ता प्रोफाईल लॉक केले"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> शी कनेक्ट केलेले"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"फायली पाहण्यासाठी टॅप करा"</string> + <string name="pin_target" msgid="3052256031352291362">"पिन"</string> + <string name="unpin_target" msgid="3556545602439143442">"अनपिन करा"</string> + <string name="app_info" msgid="6856026610594615344">"अॅप माहिती"</string> </resources> diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml index dca53aa889d8..d88d97f31097 100644 --- a/core/res/res/values-ms-rMY/strings.xml +++ b/core/res/res/values-ms-rMY/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"Tiada apl yang boleh menjalankan tindakan ini."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> telah berhenti"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> telah berhenti"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> asyik berhenti"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> asyik berhenti"</string> <string name="aerr_restart" msgid="9001379185665886595">"Mulakan semula apl"</string> <string name="aerr_reset" msgid="7645427603514220451">"Tetapkan semula dan mulakan semula apl"</string> <string name="aerr_report" msgid="5371800241488400617">"Hantar maklum balas"</string> <string name="aerr_close" msgid="2991640326563991340">"Tutup"</string> <string name="aerr_mute" msgid="7698966346654789433">"Redam"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Tunggu"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Tutup apl"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> tidak bertindak balas"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> tidak bertindak balas"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> tidak bertindak balas"</string> + <string name="anr_process" msgid="6156880875555921105">"Proses <xliff:g id="PROCESS">%1$s</xliff:g> tidak bertindak balas"</string> <string name="force_close" msgid="8346072094521265605">"OK"</string> <string name="report" msgid="4060218260984795706">"Laporkan"</string> <string name="wait" msgid="7147118217226317732">"Tunggu"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"Kad SIM ditambah"</string> <string name="sim_added_message" msgid="7797975656153714319">"Mulakan semula peranti anda untuk mengakses rangkaian selular."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Mulakan semula"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Tetapkan masa"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Tetapkan tarikh"</string> <string name="date_time_set" msgid="5777075614321087758">"Tetapkan"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Minta PIN sebelum menyahsemat"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Minta corak buka kunci sebelum menyahsemat"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Minta kata laluan sebelum menyahsemat"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Apl tidak boleh ditukar saiznya, tatal apl itu menggunakan dua jari."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Apl tidak menyokong skrin pisah."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Dipasang oleh pentadbir anda"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Dikemas kini oleh pentadbir anda"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Dipadamkan oleh pentadbir anda"</string> @@ -1561,10 +1561,11 @@ <string name="new_sms_notification_title" msgid="8442817549127555977">"Anda mempunyai mesej baharu"</string> <string name="new_sms_notification_content" msgid="7002938807812083463">"Buka apl SMS untuk melihat"</string> <string name="user_encrypted_title" msgid="7664361246988454307">"Sesetengah fungsi mgkn tidak tersedia"</string> - <string name="user_encrypted_message" msgid="7504541494700807850">"Sentuh untuk meneruskan"</string> + <string name="user_encrypted_message" msgid="7504541494700807850">"Ketik untuk meneruskan"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil pengguna dikunci"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Disambungkan ke <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Ketik untuk melihat fail"</string> + <string name="pin_target" msgid="3052256031352291362">"Semat"</string> + <string name="unpin_target" msgid="3556545602439143442">"Nyahsemat"</string> + <string name="app_info" msgid="6856026610594615344">"Maklumat apl"</string> </resources> diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml index 34db25bee638..ca28662b453e 100644 --- a/core/res/res/values-my-rMM/strings.xml +++ b/core/res/res/values-my-rMM/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"ဆင်းမ်ကဒ် ထည့်ပါသည်"</string> <string name="sim_added_message" msgid="7797975656153714319">"ဆယ်လူလာ ကွန်ရက်ကို ရယူသုံးရန် သင့် ကိရိယာကို ပြန်ဖွင့်ပေးပါ။"</string> <string name="sim_restart_button" msgid="4722407842815232347">"အစက ပြန်စရန်"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"သင့် SIM အသစ်ပုံမှန် အလုပ်လုပ်ရန်၊ သင်အသုံးပြုသည့် မိုဘိုင်းဝန်ဆောင်မှုမှ အက်ပ်တစ်ခုထည့်သွင်း၍ ဖွင့်ရန်လိုအပ်ပါသည်။"</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"အက်ပ်ကို ရယူပါ"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"ယခုမဟုတ်သေးပါ"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"ရက်စွဲ အတည်ပြုရန်"</string> <string name="date_time_set" msgid="5777075614321087758">"အတည်ပြုရန်"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"အချို့လုပ်ဆောင်ချက်များ ရနိုင်သေးမည်မဟုတ်ပါ"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"ရှေ့ဆက်ရန်တို့ပါ"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"အသုံးပြုသူပရိုဖိုင် သော့ခတ်ထားသည်"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> ချိတ်ဆက်ထားသည်"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ဖိုင်များကိုကြည့်ရန် တို့ပါ"</string> + <string name="pin_target" msgid="3052256031352291362">"တွဲပါ"</string> + <string name="unpin_target" msgid="3556545602439143442">"ဖြုတ်ပါ"</string> + <string name="app_info" msgid="6856026610594615344">"အက်ပ်အချက်အလက်"</string> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index ff292dbee28a..737743a59c46 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-kort er lagt til"</string> <string name="sim_added_message" msgid="7797975656153714319">"Start enheten på nytt for å få tilgang til mobilnettverket."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Start på nytt"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"For at det nye SIM-kortet ditt skal fungere skikkelig, må du installere og åpne en app fra operatøren din."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"SKAFF DEG APPEN"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"IKKE NÅ"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Et nytt SIM-kort er satt inn"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Trykk for å konfigurere"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Stille klokken"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Angi dato"</string> <string name="date_time_set" msgid="5777075614321087758">"Lagre"</string> @@ -1555,8 +1560,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Noen funksjoner kan være utilgjengelige"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Trykk for å fortsette"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Brukerprofilen er låst"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Koblet til <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Trykk for å se filer"</string> + <string name="pin_target" msgid="3052256031352291362">"Fest"</string> + <string name="unpin_target" msgid="3556545602439143442">"Løsne"</string> + <string name="app_info" msgid="6856026610594615344">"Info om appen"</string> </resources> diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml index 934337ca0696..7ea4b48b345d 100644 --- a/core/res/res/values-ne-rNP/strings.xml +++ b/core/res/res/values-ne-rNP/strings.xml @@ -1037,6 +1037,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM कार्ड थप गरियो"</string> <string name="sim_added_message" msgid="7797975656153714319">"सेलुलर सञ्जाल पहुँच गर्न तपाईँको उपकरण पुनः सुरु गर्नुहोस्।"</string> <string name="sim_restart_button" msgid="4722407842815232347">"पुनःस्टार्ट गर्नुहोस्"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"तपाईंको नयाँ SIM ले राम्रोसँग काम गर्न, तपाईंले आफ्नो वाहक मार्फत अनुप्रयोग स्थापना र खोल्न आवश्यक हुनेछ।"</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"अनुप्रयोग प्राप्त गर्नुहोस्"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"अहिले होइन"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"मिति मिलाउनुहोस्"</string> <string name="date_time_set" msgid="5777075614321087758">"सेट गर्नुहोस्"</string> @@ -1541,7 +1546,7 @@ <string name="default_notification_topic_label" msgid="227586145791870829">"विविध"</string> <string name="importance_from_topic" msgid="3572280439880023233">"तपाईंले यी सूचनाहरूको महत्त्व सेट गर्नुहुन्छ।"</string> <string name="importance_from_person" msgid="9160133597262938296">"यसमा सङ्लग्न भएका मानिसहरूको कारणले गर्दा यो महत्वपूर्ण छ।"</string> - <string name="user_creation_account_exists" msgid="1942606193570143289">"<xliff:g id="ACCOUNT">%2$s</xliff:g> सँगै नयाँ प्रयोगकर्ता सिर्जना गर्न <xliff:g id="APP">%1$s</xliff:g> लाई अनुमति दिने ?"</string> + <string name="user_creation_account_exists" msgid="1942606193570143289">"<xliff:g id="ACCOUNT">%2$s</xliff:g> सँगै नयाँ प्रयोगकर्ता सिर्जना गर्न <xliff:g id="APP">%1$s</xliff:g> लाई अनुमति दिने हो?"</string> <string name="user_creation_adding" msgid="4482658054622099197">"<xliff:g id="ACCOUNT">%2$s</xliff:g> सँगै नयाँ प्रयोगकर्ता सिर्जना गर्न <xliff:g id="APP">%1$s</xliff:g> लाई अनुमति दिने (यस खाताको प्रयोगकर्ता पहिले नै अवस्थित छ) ?"</string> <string name="language_selection_title" msgid="7181332986330337171">"भाषाको प्राथमिकता"</string> <string name="country_selection_title" msgid="2954859441620215513">"क्षेत्रको प्राथमिकता"</string> @@ -1559,8 +1564,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"केही कार्यहरू उपलब्ध नहुन सक्छन्"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"जारी राख्नका लागि छुनुहोस्"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"प्रयोगकर्ता प्रोफाइल लक भयो"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> मा जडान गरिएको छ"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"फाइलहरू हेर्न ट्याप गर्नुहोस्"</string> + <string name="pin_target" msgid="3052256031352291362">"पिन गर्नुहोस्"</string> + <string name="unpin_target" msgid="3556545602439143442">"अनपिन गर्नुहोस्"</string> + <string name="app_info" msgid="6856026610594615344">"अनुप्रयोगका बारे जानकारी"</string> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index a5c1904cae86..750b7166559a 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Simkaart aangesloten"</string> <string name="sim_added_message" msgid="7797975656153714319">"Start je apparaat opnieuw voor toegang tot het mobiele netwerk."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Opnieuw starten"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Je moet een app van je provider installeren en openen om te zorgen dat je nieuwe simkaart correct werkt."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"DE APP DOWNLOADEN"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"NIET NU"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Nieuwe simkaart geplaatst"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tik om dit in te stellen"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Tijd instellen"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datum instellen"</string> <string name="date_time_set" msgid="5777075614321087758">"Instellen"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Sommige functies zijn mogelijk niet beschikbaar"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Tik om door te gaan"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Gebruikersprofiel vergrendeld"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Verbonden met <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tik om bestanden te bekijken"</string> + <string name="pin_target" msgid="3052256031352291362">"Vastzetten"</string> + <string name="unpin_target" msgid="3556545602439143442">"Losmaken"</string> + <string name="app_info" msgid="6856026610594615344">"App-info"</string> </resources> diff --git a/core/res/res/values-pa-rIN/strings.xml b/core/res/res/values-pa-rIN/strings.xml index 2f80f02fe8e1..05f0ce23fd74 100644 --- a/core/res/res/values-pa-rIN/strings.xml +++ b/core/res/res/values-pa-rIN/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM ਕਾਰਡ ਜੋੜਿਆ ਗਿਆ"</string> <string name="sim_added_message" msgid="7797975656153714319">"ਸੈਲਿਊਲਰ ਨੈਟਵਰਕ ਤੱਕ ਪਹੁੰਚ ਲਈ ਆਪਣੀ ਡਿਵਾਈਸ ਰੀਸਟਾਰਟ ਕਰੋ।"</string> <string name="sim_restart_button" msgid="4722407842815232347">"ਰੀਸਟਾਰਟ ਕਰੋ"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"ਤੁਹਾਡੀ ਨਵੀਂ SIM ਦੇ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਤੋਂ ਇੱਕ ਐਪ ਸਥਾਪਤ ਕਰਨ ਅਤੇ ਖੋਲ੍ਹਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"ਐਪ ਪ੍ਰਾਪਤ ਕਰੋ"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"ਹੁਣੇ ਨਹੀਂ"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"ਤਾਰੀਖ ਸੈਟ ਕਰੋ"</string> <string name="date_time_set" msgid="5777075614321087758">"ਸੈਟ ਕਰੋ"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"ਹੋ ਸਕਦਾ ਹੈ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਉਪਲਬਧ ਨਾ ਹੋਣ"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਸਪਰਸ਼ ਕਰੋ"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"ਵਰਤੋਂਕਾਰ ਪ੍ਰੋਫਾਈਲ ਲੌਕ ਕੀਤੀ ਗਈ"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋਈ"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ਫ਼ਾਈਲਾਂ ਵੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string> + <string name="pin_target" msgid="3052256031352291362">"ਪਿੰਨ ਕਰੋ"</string> + <string name="unpin_target" msgid="3556545602439143442">"ਅਨਪਿੰਨ ਕਰੋ"</string> + <string name="app_info" msgid="6856026610594615344">"ਐਪ ਜਾਣਕਾਰੀ"</string> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index e53ddb76f565..7e320a606be4 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1047,6 +1047,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Dodano kartę SIM"</string> <string name="sim_added_message" msgid="7797975656153714319">"Uruchom urządzenie ponownie, by uzyskać dostęp do sieci komórkowej."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Uruchom ponownie"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Aby nowa karta SIM działała prawidłowo, musisz zainstalować i otworzyć aplikację udostępnioną przez operatora."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"POBIERZ APLIKACJĘ"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"NIE TERAZ"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Włożono nową kartę SIM"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Kliknij, by skonfigurować"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Ustaw godzinę"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ustaw datę"</string> <string name="date_time_set" msgid="5777075614321087758">"Ustaw"</string> @@ -1591,8 +1596,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Niektóre funkcje mogą być niedostępne"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Kliknij, by kontynuować"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil użytkownika zablokowany"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Połączono z: <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Dotknij, by wyświetlić pliki"</string> + <string name="pin_target" msgid="3052256031352291362">"Przypnij"</string> + <string name="unpin_target" msgid="3556545602439143442">"Odepnij"</string> + <string name="app_info" msgid="6856026610594615344">"O aplikacji"</string> </resources> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index ce25b7d2be55..1e3a887cf6c9 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Cartão SIM adicionado"</string> <string name="sim_added_message" msgid="7797975656153714319">"Reinicie o dispositivo para acessar a rede celular."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Reiniciar"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Para que seu novo SIM funcione corretamente, instale e abra um app da sua operadora."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"FAZER O DOWNLOAD DO APP"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"AGORA NÃO"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Novo SIM inserido"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Toque para configurar"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Definir hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Definir data"</string> <string name="date_time_set" msgid="5777075614321087758">"Definir"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Algumas funções podem não estar disponíveis."</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Toque para continuar"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Perfil do usuário bloqueado"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Conectado a <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Toque para ver os arquivos"</string> + <string name="pin_target" msgid="3052256031352291362">"Fixar guia"</string> + <string name="unpin_target" msgid="3556545602439143442">"Liberar guia"</string> + <string name="app_info" msgid="6856026610594615344">"Informações do app"</string> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 4ff5f3edb430..2855e9ba5ea1 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -232,7 +232,7 @@ <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string> <string name="notification_hidden_text" msgid="1135169301897151909">"Conteúdo oculto"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Conteúdo oculto pela política"</string> + <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Conteúdo ocultado pela política"</string> <string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="user_owner_label" msgid="2804351898001038951">"Pessoal"</string> @@ -909,8 +909,8 @@ <string name="chooseActivity" msgid="7486876147751803333">"Escolha uma ação"</string> <string name="chooseUsbActivity" msgid="6894748416073583509">"Escolher uma aplicação para o dispositivo USB"</string> <string name="noApplications" msgid="2991814273936504689">"Nenhuma aplicação pode efetuar esta ação."</string> - <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> parou"</string> - <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> parou"</string> + <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> sofreu uma falha de sistema."</string> + <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> sofreu uma falha de sistema."</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> continua a parar"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> continua a parar"</string> <string name="aerr_restart" msgid="9001379185665886595">"Reiniciar aplicação"</string> @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Cartão SIM adicionado"</string> <string name="sim_added_message" msgid="7797975656153714319">"Reinicie o dispositivo para aceder à rede móvel."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Reiniciar"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Para que o novo SIM funcione corretamente, tem de instalar e abrir uma aplicação do seu operador."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"OBTER A APLICAÇÃO"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"AGORA NÃO"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Novo SIM inserido"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Toque para configurar"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Definir hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Definir data"</string> <string name="date_time_set" msgid="5777075614321087758">"Definir"</string> @@ -1535,8 +1540,8 @@ <string name="default_notification_topic_label" msgid="227586145791870829">"Diversos"</string> <string name="importance_from_topic" msgid="3572280439880023233">"Definiu a importância destas notificações."</string> <string name="importance_from_person" msgid="9160133597262938296">"É importante devido às pessoas envolvidas."</string> - <string name="user_creation_account_exists" msgid="1942606193570143289">"Permitir que o <xliff:g id="APP">%1$s</xliff:g> crie um novo utilizador com <xliff:g id="ACCOUNT">%2$s</xliff:g>?"</string> - <string name="user_creation_adding" msgid="4482658054622099197">"Permitir que o <xliff:g id="APP">%1$s</xliff:g> crie um novo utilizador com <xliff:g id="ACCOUNT">%2$s</xliff:g> (já existe um utilizador com esta conta)?"</string> + <string name="user_creation_account_exists" msgid="1942606193570143289">"Pretende permitir que o <xliff:g id="APP">%1$s</xliff:g> crie um novo utilizador com <xliff:g id="ACCOUNT">%2$s</xliff:g>?"</string> + <string name="user_creation_adding" msgid="4482658054622099197">"Pretende permitir que o <xliff:g id="APP">%1$s</xliff:g> crie um novo utilizador com <xliff:g id="ACCOUNT">%2$s</xliff:g> (já existe um utilizador com esta conta)?"</string> <string name="language_selection_title" msgid="7181332986330337171">"Preferência de idioma"</string> <string name="country_selection_title" msgid="2954859441620215513">"Preferência de região"</string> <string name="search_language_hint" msgid="7042102592055108574">"Intr. nome do idioma"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Algumas funções podem não estar disp."</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Toque para continuar"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Perfil de utilizador bloqueado"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Ligado a <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tocar para ver ficheiros"</string> + <string name="pin_target" msgid="3052256031352291362">"Fixar"</string> + <string name="unpin_target" msgid="3556545602439143442">"Soltar"</string> + <string name="app_info" msgid="6856026610594615344">"Informações da aplicação"</string> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index ce25b7d2be55..1e3a887cf6c9 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Cartão SIM adicionado"</string> <string name="sim_added_message" msgid="7797975656153714319">"Reinicie o dispositivo para acessar a rede celular."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Reiniciar"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Para que seu novo SIM funcione corretamente, instale e abra um app da sua operadora."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"FAZER O DOWNLOAD DO APP"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"AGORA NÃO"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Novo SIM inserido"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Toque para configurar"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Definir hora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Definir data"</string> <string name="date_time_set" msgid="5777075614321087758">"Definir"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Algumas funções podem não estar disponíveis."</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Toque para continuar"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Perfil do usuário bloqueado"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Conectado a <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Toque para ver os arquivos"</string> + <string name="pin_target" msgid="3052256031352291362">"Fixar guia"</string> + <string name="unpin_target" msgid="3556545602439143442">"Liberar guia"</string> + <string name="app_info" msgid="6856026610594615344">"Informações do app"</string> </resources> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 8f659c93fab0..9ad5a5afcc03 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -49,7 +49,7 @@ <string name="serviceEnabled" msgid="8147278346414714315">"Serviciul a fost activat."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Serviciul a fost activat pentru:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Serviciul a fost dezactivat."</string> - <string name="serviceRegistered" msgid="6275019082598102493">"Înregistrarea a reuşit."</string> + <string name="serviceRegistered" msgid="6275019082598102493">"Înregistrarea a reușit."</string> <string name="serviceErased" msgid="1288584695297200972">"Ștergerea a reușit."</string> <string name="passwordIncorrect" msgid="7612208839450128715">"Parolă incorectă."</string> <string name="mmiComplete" msgid="8232527495411698359">"MMI finalizat."</string> @@ -79,7 +79,7 @@ <string name="PinMmi" msgid="3113117780361190304">"Cod PIN modificat"</string> <string name="CnipMmi" msgid="3110534680557857162">"Se apelează numărul prezent"</string> <string name="CnirMmi" msgid="3062102121430548731">"Se apelează un număr restricţionat"</string> - <string name="ThreeWCMmi" msgid="9051047170321190368">"Apelare de tip conferinţă"</string> + <string name="ThreeWCMmi" msgid="9051047170321190368">"Apelare de tip conferință"</string> <string name="RuacMmi" msgid="7827887459138308886">"Respingere apeluri supărătoare nedorite"</string> <string name="CndMmi" msgid="3116446237081575808">"Se apelează serviciul de furnizare a numerelor"</string> <string name="DndMmi" msgid="1265478932418334331">"Nu deranjaţi"</string> @@ -88,7 +88,7 @@ <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"ID-ul apelantului este nerestricționat în mod prestabilit. Apelul următor: Restricționat."</string> <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"ID-ul apelantului este nerestricționat în mod prestabilit. Apelul următor: nerestricționat"</string> <string name="serviceNotProvisioned" msgid="8614830180508686666">"Nu se asigură accesul la acest serviciu."</string> - <string name="CLIRPermanent" msgid="3377371145926835671">"Nu puteți să modificaţi setarea pentru ID-ul apelantului."</string> + <string name="CLIRPermanent" msgid="3377371145926835671">"Nu puteți să modificați setarea pentru ID-ul apelantului."</string> <string name="RestrictedChangedTitle" msgid="5592189398956187498">"Acces restricționat modificat"</string> <string name="RestrictedOnData" msgid="8653794784690065540">"Serviciul de date este blocat."</string> <string name="RestrictedOnEmergency" msgid="6581163779072833665">"Serviciul de urgență este blocat."</string> @@ -138,8 +138,8 @@ <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neredirecționată"</string> <string name="cfTemplateForwarded" msgid="1302922117498590521">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> după <xliff:g id="TIME_DELAY">{2}</xliff:g> (de) secunde"</string> - <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neredirecţionat"</string> - <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neredirecţionat"</string> + <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neredirecționat"</string> + <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neredirecționat"</string> <string name="fcComplete" msgid="3118848230966886575">"Cod de funcție complet."</string> <string name="fcError" msgid="3327560126588500777">"Problemă de conectare sau cod de funcție nevalid."</string> <string name="httpErrorOk" msgid="1191919378083472204">"OK"</string> @@ -147,7 +147,7 @@ <string name="httpErrorLookup" msgid="4711687456111963163">"Nu s-a putut găsi adresa URL."</string> <string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"Schema de autentificare a site-ului nu este acceptată."</string> <string name="httpErrorAuth" msgid="1435065629438044534">"Nu s-a realizat autentificarea."</string> - <string name="httpErrorProxyAuth" msgid="1788207010559081331">"Autentificarea prin intermediul serverului proxy nu a reuşit."</string> + <string name="httpErrorProxyAuth" msgid="1788207010559081331">"Autentificarea prin intermediul serverului proxy nu a reușit."</string> <string name="httpErrorConnect" msgid="8714273236364640549">"Nu s-a putut stabili conexiunea cu serverul."</string> <string name="httpErrorIO" msgid="2340558197489302188">"Nu s-a putut efectua comunicarea cu serverul. Încercați din nou mai târziu."</string> <string name="httpErrorTimeout" msgid="4743403703762883954">"Conexiunea la server a expirat."</string> @@ -162,10 +162,10 @@ <string name="contentServiceSync" msgid="8353523060269335667">"Sincronizare"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Sincronizare"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Prea multe ştergeri <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> - <string name="low_memory" product="tablet" msgid="6494019234102154896">"Stocarea pe tabletă este plină. Ștergeți câteva fișiere pentru a elibera spaţiu."</string> + <string name="low_memory" product="tablet" msgid="6494019234102154896">"Stocarea pe tabletă este plină. Ștergeți câteva fișiere pentru a elibera spațiu."</string> <string name="low_memory" product="watch" msgid="4415914910770005166">"Spațiul de stocare de pe ceas este plin! Ștergeți câteva fișiere pentru a elibera spațiu."</string> <string name="low_memory" product="tv" msgid="516619861191025923">"Spațiul de stocare al televizorului este plin. Ștergeți câteva fișiere pentru a elibera spațiu."</string> - <string name="low_memory" product="default" msgid="3475999286680000541">"Stocarea pe telefon este plină. Ștergeți câteva fișiere pentru a elibera spaţiu."</string> + <string name="low_memory" product="default" msgid="3475999286680000541">"Stocarea pe telefon este plină. Ștergeți câteva fișiere pentru a elibera spațiu."</string> <string name="ssl_ca_cert_warning" msgid="5848402127455021714">"Rețeaua poate fi monitorizată"</string> <string name="ssl_ca_cert_noti_by_unknown" msgid="4475437862189850602">"De o terță parte necunoscută"</string> <string name="ssl_ca_cert_noti_by_administrator" msgid="550758088185764312">"De administratorul profilului de serviciu"</string> @@ -199,7 +199,7 @@ <string name="shutdown_confirm" product="tv" msgid="476672373995075359">"Televizorul se va închide."</string> <string name="shutdown_confirm" product="watch" msgid="3490275567476369184">"Ceasul dvs. se va închide."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Telefonul dvs. se va închide."</string> - <string name="shutdown_confirm_question" msgid="2906544768881136183">"Doriți să închideţi?"</string> + <string name="shutdown_confirm_question" msgid="2906544768881136183">"Doriți să închideți?"</string> <string name="reboot_safemode_title" msgid="7054509914500140361">"Reporniţi în modul sigur"</string> <string name="reboot_safemode_confirm" msgid="55293944502784668">"Doriți să reporniţi în modul sigur? Astfel vor fi dezactivate toate aplicațiile terţă parte pe care le-ați instalat. Acestea vor fi restabilite când reporniţi din nou."</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string> @@ -290,7 +290,7 @@ <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"citire feeduri abonat"</string> <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"Permite aplicației să obţină detalii despre feedurile sincronizate în prezent."</string> <string name="permlab_sendSms" msgid="7544599214260982981">"trimită și să vadă mesajele SMS"</string> - <string name="permdesc_sendSms" msgid="7094729298204937667">"Permite aplicației să trimită mesaje SMS, ceea ce ar putea determina apariția unor taxe neaşteptate. Aplicaţiile rău intenţionate pot acumula costuri prin trimiterea mesajelor fără confirmarea dvs."</string> + <string name="permdesc_sendSms" msgid="7094729298204937667">"Permite aplicației să trimită mesaje SMS, ceea ce ar putea determina apariția unor taxe neașteptate. Aplicaţiile rău intenţionate pot acumula costuri prin trimiterea mesajelor fără confirmarea dvs."</string> <string name="permlab_readSms" msgid="8745086572213270480">"citeşte mesajele text (SMS sau MMS)"</string> <string name="permdesc_readSms" product="tablet" msgid="2467981548684735522">"Permite aplicației să citească mesajele SMS stocate pe tabletă sau pe cardul SIM. În acest fel, aplicația poate citi toate mesajele SMS, indiferent de conţinutul sau de gradul de confidenţialitate al acestora."</string> <string name="permdesc_readSms" product="tv" msgid="5102425513647038535">"Permite aplicației să citească mesajele SMS stocate pe televizor sau pe cardul SIM. Cu această permisiune, aplicația poate citi toate mesajele SMS, indiferent de conținutul sau de gradul de confidențialitate al acestora."</string> @@ -313,7 +313,7 @@ <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permite aplicației să declare persistente în memorie anumite părți ale sale. Acest lucru poate limita memoria disponibilă pentru alte aplicații și poate încetini funcționarea tabletei."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Permite aplicației să declare persistente în memorie anumite părți ale sale. Acest lucru poate limita memoria disponibilă pentru alte aplicații și poate încetini funcționarea televizorului."</string> <string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"Permite aplicației să declare persistente în memorie anumite părți ale sale. Acest lucru poate limita memoria disponibilă pentru alte aplicații și poate încetini funcționarea telefonului."</string> - <string name="permlab_getPackageSize" msgid="7472921768357981986">"măsurare spaţiu de stocare al aplicației"</string> + <string name="permlab_getPackageSize" msgid="7472921768357981986">"măsurare spațiu de stocare al aplicației"</string> <string name="permdesc_getPackageSize" msgid="3921068154420738296">"Permite aplicației să preia dimensiunile codului, ale datelor și ale memoriei cache"</string> <string name="permlab_writeSettings" msgid="2226195290955224730">"modifică setări de sistem"</string> <string name="permdesc_writeSettings" msgid="7775723441558907181">"Permite aplicației să modifice datele din setările sistemului. Aplicaţiile rău intenţionate pot corupe configuraţia sistemului dvs."</string> @@ -326,13 +326,13 @@ <string name="permdesc_broadcastSticky" product="tv" msgid="6839285697565389467">"Permite aplicației să trimită mesaje difuzate persistente, care se păstrează după terminarea difuzării mesajului. Utilizarea excesivă a acestei funcții poate să încetinească sau să destabilizeze televizorul, determinându-l să utilizeze prea multă memorie."</string> <string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"Permite aplicației să trimită mesaje difuzate persistente, care se păstrează după terminarea difuzării mesajului. Utilizarea excesivă a acestei funcții poate să încetinească sau să destabilizeze telefonul, determinându-l să utilizeze prea multă memorie."</string> <string name="permlab_readContacts" msgid="8348481131899886131">"citeşte agenda"</string> - <string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"Permite aplicației să citească datele despre persoanele din agenda stocată pe tabletă, inclusiv frecvența cu care aţi apelat, aţi trimis e-mailuri sau aţi comunicat în alte moduri cu anumite persoane. Cu această permisiune aplicația salvează datele dvs. de contact, iar aplicațiile rău intenţionate pot distribui datele de contact fără știrea dvs."</string> + <string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"Permite aplicației să citească datele despre persoanele din agenda stocată pe tabletă, inclusiv frecvența cu care ați apelat, ați trimis e-mailuri sau ați comunicat în alte moduri cu anumite persoane. Cu această permisiune aplicația salvează datele dvs. de contact, iar aplicațiile rău intenţionate pot distribui datele de contact fără știrea dvs."</string> <string name="permdesc_readContacts" product="tv" msgid="1839238344654834087">"Permite aplicației să citească datele despre persoanele de contact salvate pe televizor, inclusiv frecvența cu care ați apelat, ați trimis e-mailuri sau ați comunicat în alte moduri cu anumite persoane. Cu această permisiune, aplicațiile pot salva datele de contact, iar aplicațiile rău-intenționate pot permite accesul la datele de contact fără cunoștința dvs."</string> - <string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"Permite aplicației să citească datele despre persoanele din agenda stocată pe telefon, inclusiv frecvența cu care aţi apelat, aţi trimis e-mailuri sau aţi comunicat în alte moduri cu anumite persoane. Cu această permisiune aplicația salvează datele dvs. de contact, iar aplicațiile rău intenţionate pot distribui datele de contact fără știrea dvs."</string> + <string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"Permite aplicației să citească datele despre persoanele din agenda stocată pe telefon, inclusiv frecvența cu care ați apelat, ați trimis e-mailuri sau ați comunicat în alte moduri cu anumite persoane. Cu această permisiune aplicația salvează datele dvs. de contact, iar aplicațiile rău intenţionate pot distribui datele de contact fără știrea dvs."</string> <string name="permlab_writeContacts" msgid="5107492086416793544">"modifică agenda"</string> - <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"Permite aplicației să modifice datele despre persoanele din agenda stocată pe tabletă, inclusiv frecvența cu care aţi apelat, aţi trimis e-mailuri sau aţi comunicat în alte moduri cu anumite persoane din agendă. Cu această permisiune aplicația poate șterge datele de contact."</string> + <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"Permite aplicației să modifice datele despre persoanele din agenda stocată pe tabletă, inclusiv frecvența cu care ați apelat, ați trimis e-mailuri sau ați comunicat în alte moduri cu anumite persoane din agendă. Cu această permisiune aplicația poate șterge datele de contact."</string> <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Permite aplicației să modifice datele despre persoanele de contact salvate pe televizor, inclusiv frecvența cu care ați apelat, ați trimis e-mailuri sau ați comunicat în alte moduri cu anumite persoane de contact. Cu această permisiune, aplicația poate șterge datele de contact."</string> - <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permite aplicației să modifice datele despre persoanele din agenda stocată pe telefon, inclusiv frecvența cu care aţi apelat, aţi trimis e-mailuri sau aţi comunicat în alte moduri cu anumite persoane din agendă. Cu această permisiune aplicația poate șterge datele de contact."</string> + <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permite aplicației să modifice datele despre persoanele din agenda stocată pe telefon, inclusiv frecvența cu care ați apelat, ați trimis e-mailuri sau ați comunicat în alte moduri cu anumite persoane din agendă. Cu această permisiune aplicația poate șterge datele de contact."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"citeşte jurnalul de apeluri"</string> <string name="permdesc_readCallLog" product="tablet" msgid="3700645184870760285">"Permite aplicației să citească jurnalul de apeluri al tabletei, inclusiv datele despre apelurile primite și efectuate. Cu această permisiune aplicația salvează datele dvs. din jurnalul de apeluri, iar aplicațiile rău intenţionate pot distribui aceste date fără știrea dvs."</string> <string name="permdesc_readCallLog" product="tv" msgid="5611770887047387926">"Permite aplicației să citească jurnalul de apeluri al televizorului, inclusiv datele despre apelurile primite și efectuate. Cu această permisiune, aplicațiile pot să salveze datele din jurnalul de apeluri, iar aplicațiile rău-intenționate pot permite accesul la datele din jurnalul de apeluri fără cunoștința dvs."</string> @@ -368,7 +368,7 @@ <string name="permlab_vibrate" msgid="7696427026057705834">"controlează vibrarea"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Permite aplicației să controleze mecanismul de vibrare."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"apelare directă numere de telefon"</string> - <string name="permdesc_callPhone" msgid="3740797576113760827">"Permite aplicației să apeleze numere de telefon fără intervenţia dvs. Acest lucru poate determina apariția unor taxe sau a unor apeluri neaşteptate. Cu această permisiune aplicația nu poate apela numerele de urgenţă. Aplicaţiile rău intenţionate pot acumula costuri prin efectuarea unor apeluri fără confirmare."</string> + <string name="permdesc_callPhone" msgid="3740797576113760827">"Permite aplicației să apeleze numere de telefon fără intervenţia dvs. Acest lucru poate determina apariția unor taxe sau a unor apeluri neașteptate. Cu această permisiune aplicația nu poate apela numerele de urgenţă. Aplicaţiile rău intenţionate pot acumula costuri prin efectuarea unor apeluri fără confirmare."</string> <string name="permlab_accessImsCallService" msgid="3574943847181793918">"accesează serviciul de apelare IMS"</string> <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"Permite aplicației să folosească serviciul IMS pentru apeluri, fără intervenția dvs."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"citeşte starea și identitatea telefonului"</string> @@ -391,7 +391,7 @@ <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"Permite aplicației să schimbe fusul orar al tabletei."</string> <string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"Permite aplicației să modifice fusul orar al televizorului."</string> <string name="permdesc_setTimeZone" product="default" msgid="4499943488436633398">"Permite aplicației să schimbe fusul orar al telefonului."</string> - <string name="permlab_getAccounts" msgid="1086795467760122114">"găseşte conturi pe dispozitiv"</string> + <string name="permlab_getAccounts" msgid="1086795467760122114">"găsește conturi pe dispozitiv"</string> <string name="permdesc_getAccounts" product="tablet" msgid="2741496534769660027">"Permite aplicației să obţină lista de conturi cunoscute de tabletă. Aceasta poate include conturile create de aplicațiile pe care le-ați instalat."</string> <string name="permdesc_getAccounts" product="tv" msgid="4190633395633907543">"Permite aplicației să obțină lista de conturi cunoscute de televizor. Aceasta poate include conturile create de aplicațiile pe care le-ați instalat."</string> <string name="permdesc_getAccounts" product="default" msgid="3448316822451807382">"Permite aplicației să obţină lista de conturi cunoscute de telefon. Aceasta poate include conturile create de aplicațiile pe care le-ați instalat."</string> @@ -417,7 +417,7 @@ <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"Permite aplicației să configureze telefonul Bluetooth local, să descopere și să se împerecheze cu dispozitive la distanță."</string> <string name="permlab_accessWimaxState" msgid="4195907010610205703">"se conectează și se deconectează de la WiMAX"</string> <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Permite aplicației să stabilească dacă o rețea WiMAX este activată și să vadă informațiile cu privire la toate reţelele WiMAX conectate."</string> - <string name="permlab_changeWimaxState" msgid="340465839241528618">"schimbaţi starea WiMAX"</string> + <string name="permlab_changeWimaxState" msgid="340465839241528618">"schimbați starea WiMAX"</string> <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"Permite aplicației să conecteze și să deconecteze tableta la și de la reţelele WiMAX."</string> <string name="permdesc_changeWimaxState" product="tv" msgid="6022307083934827718">"Permite aplicației să conecteze și să deconecteze televizorul la și de la rețelele WiMAX."</string> <string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"Permite aplicației să conecteze și să deconecteze telefonul la și de la reţelele WiMAX."</string> @@ -482,7 +482,7 @@ <string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Permite aplicației să citească utilizarea statistică a rețelei pentru anumite rețele și aplicații."</string> <string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"gestionează politica de rețea"</string> <string name="permdesc_manageNetworkPolicy" msgid="7537586771559370668">"Permite aplicației să gestioneze politicile de rețea și să definească regulile specifice aplicațiilor."</string> - <string name="permlab_modifyNetworkAccounting" msgid="5088217309088729650">"modificaţi modul de calcul al utilizării rețelei"</string> + <string name="permlab_modifyNetworkAccounting" msgid="5088217309088729650">"modificați modul de calcul al utilizării rețelei"</string> <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Permite aplicației să modifice modul în care este calculată utilizarea rețelei pentru aplicații. Nu se utilizează de aplicațiile obişnuite."</string> <string name="permlab_accessNotifications" msgid="7673416487873432268">"accesare notificări"</string> <string name="permdesc_accessNotifications" msgid="458457742683431387">"Permite aplicației să recupereze, să examineze și să șteargă notificări, inclusiv pe cele postate de alte aplicații."</string> @@ -663,12 +663,12 @@ <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Introduceţi parola pentru a debloca"</string> <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Introduceţi codul PIN pentru a debloca"</string> <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Cod PIN incorect."</string> - <string name="keyguard_label_text" msgid="861796461028298424">"Pentru a debloca, apăsaţi Meniu, apoi 0."</string> + <string name="keyguard_label_text" msgid="861796461028298424">"Pentru a debloca, apăsați Meniu, apoi 0."</string> <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Număr de urgență"</string> <string name="lockscreen_carrier_default" msgid="6169005837238288522">"Fără semnal"</string> <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Ecranul este blocat."</string> <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Apăsați Meniu pentru a debloca sau pentru a efectua apeluri de urgență."</string> - <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Apăsaţi Meniu pentru deblocare."</string> + <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Apăsați Meniu pentru deblocare."</string> <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Desenaţi modelul pentru a debloca"</string> <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Urgență"</string> <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Reveniţi la apel"</string> @@ -700,9 +700,9 @@ <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"Aţi introdus incorect parola de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"Aţi introdus incorect codul PIN de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori.\n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi tableta cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați tableta cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="5316664559603394684">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați televizorul cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi telefonul cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați telefonul cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="6128106399745755604">"Aţi efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a tabletei. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, aceasta va fi resetată la setările prestabilite din fabrică, iar toate datele de utilizator vor fi pierdute."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="950408382418270260">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a televizorului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, televizorul va reveni la setările prestabilite din fabrică, iar toate datele de utilizator se vor pierde."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="8603565142156826565">"Aţi efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a telefonului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, acesta va fi resetat la setările prestabilite din fabrică, iar toate datele de utilizator vor fi pierdute."</string> @@ -757,7 +757,7 @@ <string name="granularity_label_word" msgid="7075570328374918660">"cuvânt"</string> <string name="granularity_label_link" msgid="5815508880782488267">"link"</string> <string name="granularity_label_line" msgid="5764267235026120888">"rând"</string> - <string name="factorytest_failed" msgid="5410270329114212041">"Testarea de fabrică nu a reuşit"</string> + <string name="factorytest_failed" msgid="5410270329114212041">"Testarea de fabrică nu a reușit"</string> <string name="factorytest_not_system" msgid="4435201656767276723">"Acţiunea FACTORY_TEST este acceptată doar pentru pachetele instalate în /system/app."</string> <string name="factorytest_no_action" msgid="872991874799998561">"Nu s-a găsit niciun pachet care să ofere acțiunea FACTORY_TEST."</string> <string name="factorytest_reboot" msgid="6320168203050791643">"Reporniți"</string> @@ -799,7 +799,7 @@ <string name="permdesc_addVoicemail" msgid="6604508651428252437">"Permite aplicației să adauge mesaje în Mesaje primite în mesageria vocală."</string> <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"modificare permisiuni pentru locația geografică a browserului"</string> <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"Permite aplicației să modifice permisiunile privind locația geografică a browserului. Aplicaţiile rău intenţionate pot utiliza această permisiune pentru a permite trimiterea informaţiilor privind locația către site-uri web arbitrare."</string> - <string name="save_password_message" msgid="767344687139195790">"Doriți ca browserul să reţină această parolă?"</string> + <string name="save_password_message" msgid="767344687139195790">"Doriți ca browserul să rețină această parolă?"</string> <string name="save_password_notnow" msgid="6389675316706699758">"Nu acum"</string> <string name="save_password_remember" msgid="6491879678996749466">"Reţineţi"</string> <string name="save_password_never" msgid="8274330296785855105">"Niciodată"</string> @@ -917,32 +917,24 @@ <string name="noApplications" msgid="2991814273936504689">"Această acţiune nu poate fi efectuată de nicio aplicație."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> s-a oprit"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> s-a oprit"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> se oprește încontinuu"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> se oprește încontinuu"</string> <string name="aerr_restart" msgid="9001379185665886595">"Reporniți aplicația"</string> <string name="aerr_reset" msgid="7645427603514220451">"Resetați și reporniți aplicația"</string> <string name="aerr_report" msgid="5371800241488400617">"Trimiteți feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Închideți"</string> <string name="aerr_mute" msgid="7698966346654789433">"Dezactivați"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Așteptați"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Închideți aplicația"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> nu răspunde"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> nu răspunde"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> nu răspunde"</string> + <string name="anr_process" msgid="6156880875555921105">"Procesul <xliff:g id="PROCESS">%1$s</xliff:g> nu răspunde"</string> <string name="force_close" msgid="8346072094521265605">"OK"</string> - <string name="report" msgid="4060218260984795706">"Raportaţi"</string> + <string name="report" msgid="4060218260984795706">"Raportați"</string> <string name="wait" msgid="7147118217226317732">"Aşteptaţi"</string> - <string name="webpage_unresponsive" msgid="3272758351138122503">"Pagina a devenit inactivă.\n\nDoriți să o închideţi?"</string> + <string name="webpage_unresponsive" msgid="3272758351138122503">"Pagina a devenit inactivă.\n\nDoriți să o închideți?"</string> <string name="launch_warning_title" msgid="1547997780506713581">"Aplicaţie redirecţionată"</string> <string name="launch_warning_replace" msgid="6202498949970281412">"<xliff:g id="APP_NAME">%1$s</xliff:g> funcţionează acum."</string> <string name="launch_warning_original" msgid="188102023021668683">"<xliff:g id="APP_NAME">%1$s</xliff:g> a fost lansată iniţial."</string> @@ -1037,7 +1029,7 @@ <string name="sms_premium_short_code_details" msgid="7869234868023975"><b>"Acest lucru va genera costuri în contul dvs. mobil."</b></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Trimiteți"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Anulați"</string> - <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Doresc să se reţină opțiunea"</string> + <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Doresc să se rețină opțiunea"</string> <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Puteți modifica ulterior în Setări > Aplicații"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Permiteți întotdeauna"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Nu permiteți niciodată"</string> @@ -1047,6 +1039,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Card SIM adăugat"</string> <string name="sim_added_message" msgid="7797975656153714319">"Reporniți dispozitivul pentru a accesa rețeaua mobilă."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Reporniţi"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Pentru ca noul SIM să funcționeze corect, va trebui să instalați și să deschideți o aplicație de la operatorul dvs."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"DESCĂRCAȚI APLICAȚIA"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"NU ACUM"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"S-a introdus un card SIM nou"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Atingeți pentru a-l configura"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Setaţi ora"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Setaţi data"</string> <string name="date_time_set" msgid="5777075614321087758">"Setați"</string> @@ -1170,7 +1167,7 @@ <string name="next_button_label" msgid="1080555104677992408">"Înainte"</string> <string name="skip_button_label" msgid="1275362299471631819">"Omiteţi"</string> <string name="no_matches" msgid="8129421908915840737">"Nicio potrivire"</string> - <string name="find_on_page" msgid="1946799233822820384">"Găsiţi pe pagină"</string> + <string name="find_on_page" msgid="1946799233822820384">"Găsiți pe pagină"</string> <plurals name="matches_found" formatted="false" msgid="1210884353962081884"> <item quantity="few"><xliff:g id="INDEX">%d</xliff:g> din <xliff:g id="TOTAL">%d</xliff:g></item> <item quantity="other"><xliff:g id="INDEX">%d</xliff:g> din <xliff:g id="TOTAL">%d</xliff:g></item> @@ -1179,8 +1176,8 @@ <string name="action_mode_done" msgid="7217581640461922289">"Terminat"</string> <string name="progress_erasing" product="nosdcard" msgid="4521573321524340058">"Se șterge stocarea USB..."</string> <string name="progress_erasing" product="default" msgid="6596988875507043042">"Se șterge cardul SD..."</string> - <string name="share" msgid="1778686618230011964">"Distribuiţi"</string> - <string name="find" msgid="4808270900322985960">"Găsiţi"</string> + <string name="share" msgid="1778686618230011964">"Distribuiți"</string> + <string name="find" msgid="4808270900322985960">"Găsiți"</string> <string name="websearch" msgid="4337157977400211589">"Căutare pe web"</string> <string name="find_next" msgid="5742124618942193978">"Următorul rezultat"</string> <string name="find_previous" msgid="2196723669388360506">"Rezultatul anterior"</string> @@ -1190,7 +1187,7 @@ <string name="gpsVerifYes" msgid="2346566072867213563">"Da"</string> <string name="gpsVerifNo" msgid="1146564937346454865">"Nu"</string> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Limita pentru ştergere a fost depăşită"</string> - <string name="sync_too_many_deletes_desc" msgid="496551671008694245">"Există <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> (de) elemente şterse pentru <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, contul <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Ce doriți să faceţi?"</string> + <string name="sync_too_many_deletes_desc" msgid="496551671008694245">"Există <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> (de) elemente şterse pentru <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, contul <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Ce doriți să faceți?"</string> <string name="sync_really_delete" msgid="2572600103122596243">"Ștergeți elementele"</string> <string name="sync_undo_deletes" msgid="2941317360600338602">"Anulați aceste ştergeri"</string> <string name="sync_do_nothing" msgid="3743764740430821845">"Nu trebuie să luați nicio măsură deocamdată"</string> @@ -1243,7 +1240,7 @@ <string name="storage_usb" msgid="3017954059538517278">"Dsipozitiv de stocare USB"</string> <string name="extract_edit_menu_button" msgid="8940478730496610137">"Editați"</string> <string name="data_usage_warning_title" msgid="1955638862122232342">"Avertisment de utiliz. a datelor"</string> - <string name="data_usage_warning_body" msgid="2814673551471969954">"Atingeți pt. a afişa utiliz./set."</string> + <string name="data_usage_warning_body" msgid="2814673551471969954">"Atingeți pt. a afișa utiliz./set."</string> <string name="data_usage_3g_limit_title" msgid="4361523876818447683">"Ați atins limita de date 2G-3G"</string> <string name="data_usage_4g_limit_title" msgid="4609566827219442376">"Ați atins limita de date 4G"</string> <string name="data_usage_mobile_limit_title" msgid="557158376602636112">"Ați atins limita de date mobile"</string> @@ -1270,11 +1267,11 @@ <string name="fingerprints" msgid="4516019619850763049">"Amprente:"</string> <string name="sha256_fingerprint" msgid="4391271286477279263">"Amprentă SHA-256:"</string> <string name="sha1_fingerprint" msgid="7930330235269404581">"Amprentă SHA-1:"</string> - <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Afişaţi-le pe toate"</string> + <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Afișați-le pe toate"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Alegeți activitatea"</string> - <string name="share_action_provider_share_with" msgid="5247684435979149216">"Distribuiţi pentru"</string> + <string name="share_action_provider_share_with" msgid="5247684435979149216">"Distribuiți pentru"</string> <string name="sending" msgid="3245653681008218030">"Se trimite..."</string> - <string name="launchBrowserDefault" msgid="2057951947297614725">"Lansaţi browserul?"</string> + <string name="launchBrowserDefault" msgid="2057951947297614725">"Lansați browserul?"</string> <string name="SetupCallDefault" msgid="5834948469253758575">"Acceptați apelul?"</string> <string name="activity_resolver_use_always" msgid="8017770747801494933">"Întotdeauna"</string> <string name="activity_resolver_use_once" msgid="2404644797149173758">"Numai o dată"</string> @@ -1306,7 +1303,7 @@ <string name="display_manager_overlay_display_secure_suffix" msgid="6022119702628572080">", securizat"</string> <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Model uitat"</string> <string name="kg_wrong_pattern" msgid="1850806070801358830">"Model greşit"</string> - <string name="kg_wrong_password" msgid="2333281762128113157">"Parolă greşită"</string> + <string name="kg_wrong_password" msgid="2333281762128113157">"Parolă greșită"</string> <string name="kg_wrong_pin" msgid="1131306510833563801">"Cod PIN greşit"</string> <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Încercați din nou peste <xliff:g id="NUMBER">%1$d</xliff:g> (de) secunde."</string> <string name="kg_pattern_instructions" msgid="398978611683075868">"Desenaţi modelul"</string> @@ -1339,13 +1336,13 @@ <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="2072996269148483637">"Aţi efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a tabletei. Tableta va fi acum resetată la setările prestabilite din fabrică."</string> <string name="kg_failed_attempts_now_wiping" product="tv" msgid="4987878286750741463">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a televizorului. Televizorul va reveni acum la setările prestabilite din fabrică."</string> <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"Aţi efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a telefonului. Telefonul va fi acum resetat la setările prestabilite din fabrică."</string> - <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați televizorul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> - <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> <string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"Eliminaţi"</string> <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"Ridicați volumul mai sus de nivelul recomandat?\n\nAscultarea la volum ridicat pe perioade lungi de timp vă poate afecta auzul."</string> - <string name="continue_to_enable_accessibility" msgid="1626427372316070258">"Menţineţi două degete pe ecran pentru a activa accesibilitatea."</string> + <string name="continue_to_enable_accessibility" msgid="1626427372316070258">"Mențineți două degete pe ecran pentru a activa accesibilitatea."</string> <string name="accessibility_enabled" msgid="1381972048564547685">"S-a activat accesibilitatea."</string> <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accesibilitatea a fost anulată"</string> <string name="user_switched" msgid="3768006783166984410">"Utilizator curent: <xliff:g id="NAME">%1$s</xliff:g>."</string> @@ -1480,10 +1477,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Solicită codul PIN înainte de a anula fixarea"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicită modelul pentru deblocare înainte de a anula fixarea"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Solicită parola înainte de a anula fixarea"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Aplicația nu poate fi redimensionată. Derulați în ea cu două degete."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Aplicația nu acceptă ecranul împărțit."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Instalat de administrator"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Actualizat de un administrator"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Șters de administrator"</string> @@ -1582,8 +1577,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Este posibil ca unele funcții să nu fie disponibile"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Atingeți pentru a continua"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil utilizator: blocat"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Conectat la <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Atingeți pentru a vedea fișierele"</string> + <string name="pin_target" msgid="3052256031352291362">"Fixați"</string> + <string name="unpin_target" msgid="3556545602439143442">"Anulați fixarea"</string> + <string name="app_info" msgid="6856026610594615344">"Informații despre aplicație"</string> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 5806ed8c8aa5..bdbeb545d20c 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1047,6 +1047,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-карта добавлена"</string> <string name="sim_added_message" msgid="7797975656153714319">"Перезагрузите устройство, чтобы подключиться к мобильной сети."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Перезапуск"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Настройка времени"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Настройка даты"</string> <string name="date_time_set" msgid="5777075614321087758">"Установить"</string> @@ -1591,8 +1601,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Некоторые функции недоступны"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Нажмите, чтобы продолжить"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Профиль заблокирован"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Подключено к <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Нажмите, чтобы просмотреть файлы"</string> + <string name="pin_target" msgid="3052256031352291362">"Закрепить"</string> + <string name="unpin_target" msgid="3556545602439143442">"Открепить"</string> + <string name="app_info" msgid="6856026610594615344">"О приложении"</string> </resources> diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml index 663fed832806..9bbab5609c5a 100644 --- a/core/res/res/values-si-rLK/strings.xml +++ b/core/res/res/values-si-rLK/strings.xml @@ -1033,6 +1033,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM පතක් එකතු කරන ලදි"</string> <string name="sim_added_message" msgid="7797975656153714319">"සෙලියුලර් ජාලයට ප්රවේශ වීමට ඔබගේ උපාංගය නැවත අරඹන්න."</string> <string name="sim_restart_button" msgid="4722407842815232347">"යළි අරඹන්න"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"ඔබේ නව SIM නිසි ලෙස වැඩ කිරීමට, ඔබ ඔබේ වාහකය වෙතින් යෙදුමක් ස්ථාපනය කර විවෘත කිරීම අවශ්යය."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"යෙදුම ලබා ගන්න"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"දැන්ම නොවේ"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"දිනය සැකසීම"</string> <string name="date_time_set" msgid="5777075614321087758">"සකසන්න"</string> @@ -1555,8 +1560,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"සමහර කාර්ය නොතිබිය හැකිය"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"දිගටම කරගෙන යාමට ස්පර්ශ කරන්න"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"පරිශීලක පැතිකඩ අගුලු දමා ඇත"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> වෙත සම්බන්ධ විය"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ගොනු බැලීමට තට්ටු කරන්න"</string> + <string name="pin_target" msgid="3052256031352291362">"අමුණන්න"</string> + <string name="unpin_target" msgid="3556545602439143442">"ගලවන්න"</string> + <string name="app_info" msgid="6856026610594615344">"යෙදුම් තොරතුරු"</string> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 850a959acffb..4369374fc85b 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1047,6 +1047,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Bola pridaná SIM karta"</string> <string name="sim_added_message" msgid="7797975656153714319">"Ak chcete získať prístup k mobilnej sieti, reštartujte svoje zariadenie."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Reštartovať"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Ak chcete, aby vaša nová SIM karta fungovala správne, musíte nainštalovať a spustiť aplikáciu od operátora."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"ZÍSKAŤ APLIKÁCIU"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"TERAZ NIE"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Bola vložená nová SIM karta"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Nastavte ju klepnutím"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Nastaviť čas"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nastaviť dátum"</string> <string name="date_time_set" msgid="5777075614321087758">"Nastaviť"</string> @@ -1591,8 +1596,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Niektoré funkcie nemusia byť dostupné"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Pokračujte klepnutím"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil používateľa je zamknutý"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Pripojené k zariadeniu <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Klepnutím zobrazíte súbory"</string> + <string name="pin_target" msgid="3052256031352291362">"Pripnúť"</string> + <string name="unpin_target" msgid="3556545602439143442">"Uvoľniť"</string> + <string name="app_info" msgid="6856026610594615344">"Info o aplikácii"</string> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 342dc4e04baf..00c47e78b828 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1047,6 +1047,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"Kartica SIM dodana"</string> <string name="sim_added_message" msgid="7797975656153714319">"Za dostop do mobilnega omrežja znova zaženite napravo."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Vnovičen zagon"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Nastavi uro"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Nastavi datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Nastavi"</string> @@ -1591,8 +1601,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Nek. funk. morda niso na voljo"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Dotaknite se za nadaljevanje"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profil uporabnika zaklenjen"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Vzpostavljena povezava z napravo <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Dotaknite se, če si želite ogledati datoteke"</string> + <string name="pin_target" msgid="3052256031352291362">"Pripenjanje"</string> + <string name="unpin_target" msgid="3556545602439143442">"Odpenjanje"</string> + <string name="app_info" msgid="6856026610594615344">"Podatki o aplikaciji"</string> </resources> diff --git a/core/res/res/values-sq-rAL/strings.xml b/core/res/res/values-sq-rAL/strings.xml index 499ef155cb0e..70164bebd0ec 100644 --- a/core/res/res/values-sq-rAL/strings.xml +++ b/core/res/res/values-sq-rAL/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Karta SIM u shtua"</string> <string name="sim_added_message" msgid="7797975656153714319">"Rinise pajisjen për të pasur qasje në rrjetin celular."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Rifillo"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Që karta e re SIM të funksionojë siç duhet, duhet të instalosh dhe të hapësh një aplikacion nga operatori yt."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"MERR APLIKACIONIN"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"JO TANI"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Është futur kartë e re SIM"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Trokit për ta konfiguruar"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Cakto kohën"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Vendos datën"</string> <string name="date_time_set" msgid="5777075614321087758">"Cakto"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Disa funksione mund të mos jenë të disponueshme"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Preke për të vazhduar"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Profili i përdoruesit i kyçur"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"U lidh me <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Trokit për të parë skedarët"</string> + <string name="pin_target" msgid="3052256031352291362">"Gozhdo"</string> + <string name="unpin_target" msgid="3556545602439143442">"Zhgozhdo"</string> + <string name="app_info" msgid="6856026610594615344">"Informacioni mbi aplikacionin"</string> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 35139d1afe71..cb1712337471 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1039,6 +1039,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM картица је додата"</string> <string name="sim_added_message" msgid="7797975656153714319">"Поново покрените уређај да бисте приступили мобилној мрежи."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Поново покрени"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Подешавање времена"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Подешавање датума"</string> <string name="date_time_set" msgid="5777075614321087758">"Подеси"</string> @@ -1572,8 +1582,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Неке функције нису доступне"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Додирните да бисте наставили"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Профил корисника је закључан"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Повезано је са производом <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Додирните за преглед датотека"</string> + <string name="pin_target" msgid="3052256031352291362">"Закачи"</string> + <string name="unpin_target" msgid="3556545602439143442">"Откачи"</string> + <string name="app_info" msgid="6856026610594615344">"Информације о апликацији"</string> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 0eb3165d445c..f90f95c91261 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-kort lades till"</string> <string name="sim_added_message" msgid="7797975656153714319">"Starta om enheten om du vill få tillgång till mobilnätet."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Starta om"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Du måste installera och öppna en app från operatören om SIM-kortet ska fungera korrekt."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"HÄMTA APPEN"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"INTE NU"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Nytt SIM-kort har satts in"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tryck om du vill konfigurera"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Ange tid"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Ange datum"</string> <string name="date_time_set" msgid="5777075614321087758">"Ställ in"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Vissa funktioner är inte tillgängliga"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Tryck om du vill fortsätta"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Användarprofilen är låst"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Ansluten till <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Filerna visas om du trycker här"</string> + <string name="pin_target" msgid="3052256031352291362">"Fäst"</string> + <string name="unpin_target" msgid="3556545602439143442">"Lossa"</string> + <string name="app_info" msgid="6856026610594615344">"Info om appen"</string> </resources> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index b1e35953b066..1c7f2e24acd4 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1033,6 +1033,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM kadi imeongezwa"</string> <string name="sim_added_message" msgid="7797975656153714319">"Zima na uwashe kifaa chako tena ili ufikie mitandao ya simu za mkononi."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Anza upya"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Weka muda"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Weka tarehe"</string> <string name="date_time_set" msgid="5777075614321087758">"Weka"</string> @@ -1555,8 +1565,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Huenda baadhi ya vipengele visipatikane"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Gusa ili uendelee"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Wasifu wa mtumiaji umefungwa"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Imeunganishwa na <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Gonga ili uangalie faili"</string> + <string name="pin_target" msgid="3052256031352291362">"Bandika"</string> + <string name="unpin_target" msgid="3556545602439143442">"Bandua"</string> + <string name="app_info" msgid="6856026610594615344">"Maelezo ya programu"</string> </resources> diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml index d1a00d97e3d5..8366985b591a 100644 --- a/core/res/res/values-ta-rIN/strings.xml +++ b/core/res/res/values-ta-rIN/strings.xml @@ -909,8 +909,8 @@ <string name="chooseActivity" msgid="7486876147751803333">"செயலைத் தேர்ந்தெடுக்கவும்"</string> <string name="chooseUsbActivity" msgid="6894748416073583509">"USB சாதனத்திற்கான பயன்பாட்டைத் தேர்வுசெய்க"</string> <string name="noApplications" msgid="2991814273936504689">"இந்தச் செயலைச் செய்ய பயன்பாடுகள் எதுவுமில்லை."</string> - <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> நிறுத்தப்பட்டது"</string> - <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> நிறுத்தப்பட்டது"</string> + <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> செயலிழந்தது"</string> + <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> செயலிழந்தது"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> தொடர்ந்து நிறுத்தப்படுகிறது"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> தொடர்ந்து நிறுத்தப்படுகிறது"</string> <string name="aerr_restart" msgid="9001379185665886595">"பயன்பாட்டை மீண்டும் தொடங்கு"</string> @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"சிம் கார்டு சேர்க்கப்பட்டது"</string> <string name="sim_added_message" msgid="7797975656153714319">"செல்லுலார் நெட்வொர்க்கை அணுக உங்கள் சாதனத்தை மறுதொடக்கம் செய்யவும்."</string> <string name="sim_restart_button" msgid="4722407842815232347">"மறுதொடக்கம்"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"புதிய சிம் சரியாக இயங்குவதற்கு, நீங்கள் பயன்படுத்தும் மொபைல் நிறுவனத்திலிருந்து பயன்பாட்டை நிறுவி, திறக்கவும்."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"பயன்பாட்டைப் பெறுக"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"இப்போது வேண்டாம்"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"புதிய சிம் செருகப்பட்டது"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"அமைக்க, தட்டவும்"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"நேரத்தை அமை"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"தேதியை அமை"</string> <string name="date_time_set" msgid="5777075614321087758">"அமை"</string> @@ -1544,7 +1549,7 @@ <string name="language_picker_section_all" msgid="3097279199511617537">"எல்லா மொழிகளும்"</string> <string name="locale_search_menu" msgid="2560710726687249178">"தேடு"</string> <string name="work_mode_off_title" msgid="8954725060677558855">"பணிப் பயன்முறை முடக்கப்பட்டது"</string> - <string name="work_mode_off_message" msgid="3286169091278094476">"செயல்பட, பணி சுயவிவரத்தை அனுமதி. இதில் பயன்பாடுகள், பின்புல ஒத்திசைவு மற்றும் தொடர்புடைய அம்சங்கள் அடங்கும்."</string> + <string name="work_mode_off_message" msgid="3286169091278094476">"செயல்பட, பணி சுயவிவரத்தை அனுமதி. இதில் பயன்பாடுகள், பின்னணி ஒத்திசைவு மற்றும் தொடர்புடைய அம்சங்கள் அடங்கும்."</string> <string name="work_mode_turn_on" msgid="2062544985670564875">"இயக்கு"</string> <string name="suspended_package_title" msgid="3408150347778524435">"%1$s முடக்கப்பட்டது"</string> <string name="suspended_package_message" msgid="6341091587106868601">"%1$s நிர்வாகி முடக்கியுள்ளார். மேலும் அறிய, அவரைத் தொடர்புகொள்ளவும்."</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"சில செயல்பாடு கிடைக்காமல் போகலாம்"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"தொடர, தொடவும்"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"பயனர் சுயவிவரம் பூட்டப்பட்டது"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> உடன் இணைக்கப்பட்டது"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"கோப்புகளைப் பார்க்க, தட்டவும்"</string> + <string name="pin_target" msgid="3052256031352291362">"பின் செய்"</string> + <string name="unpin_target" msgid="3556545602439143442">"பின்னை அகற்று"</string> + <string name="app_info" msgid="6856026610594615344">"பயன்பாட்டுத் தகவல்"</string> </resources> diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml index d26794af05fb..6d42955553d5 100644 --- a/core/res/res/values-te-rIN/strings.xml +++ b/core/res/res/values-te-rIN/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"సిమ్ కార్డు జోడించబడింది"</string> <string name="sim_added_message" msgid="7797975656153714319">"సెల్యులార్ నెట్వర్క్ను ప్రాప్యత చేయడానికి మీ పరికరాన్ని పునఃప్రారంభించండి."</string> <string name="sim_restart_button" msgid="4722407842815232347">"పునఃప్రారంభించు"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"మీ SIM సక్రమంగా పని చేస్తుండటానికి, మీరు మీ క్యారియర్ నుండి ఒక అనువర్తనాన్ని ఇన్స్టాల్ చేసుకొని, తెరవాలి."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"అనువర్తనాన్ని పొందండి"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"ఇప్పుడు కాదు"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"తేదీని సెట్ చేయండి"</string> <string name="date_time_set" msgid="5777075614321087758">"సెట్ చేయి"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"కొన్ని విధులు ఉండకపోవచ్చు"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"కొనసాగడానికి తాకండి"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"వినియోగ. ప్రొఫైల్ లాక్ అయింది"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g>కి కనెక్ట్ చేయబడింది"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"ఫైల్లను వీక్షించడానికి నొక్కండి"</string> + <string name="pin_target" msgid="3052256031352291362">"పిన్ చేయి"</string> + <string name="unpin_target" msgid="3556545602439143442">"అన్పిన్ చేయి"</string> + <string name="app_info" msgid="6856026610594615344">"అనువర్తన సమాచారం"</string> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 04e04bb027e0..6aa3b8ab6719 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"ไม่มีแอปพลิเคชันใดทำงานนี้ได้"</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> หยุดทำงาน"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> หยุดทำงาน"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> หยุดทำงานอยู่เรื่อยๆ"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> หยุดทำงานอยู่เรื่อยๆ"</string> <string name="aerr_restart" msgid="9001379185665886595">"เปิดแอปใหม่"</string> <string name="aerr_reset" msgid="7645427603514220451">"รีเซ็ตแอปและเปิดใหม่"</string> <string name="aerr_report" msgid="5371800241488400617">"ส่งความคิดเห็น"</string> <string name="aerr_close" msgid="2991640326563991340">"ปิด"</string> <string name="aerr_mute" msgid="7698966346654789433">"ปิด"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"รอ"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"ปิดแอป"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> ไม่ตอบสนอง"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> ไม่ตอบสนอง"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> ไม่ตอบสนอง"</string> + <string name="anr_process" msgid="6156880875555921105">"กระบวนการ <xliff:g id="PROCESS">%1$s</xliff:g> ไม่ตอบสนอง"</string> <string name="force_close" msgid="8346072094521265605">"ตกลง"</string> <string name="report" msgid="4060218260984795706">"รายงาน"</string> <string name="wait" msgid="7147118217226317732">"รอ"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"เพิ่มซิมการ์ดแล้ว"</string> <string name="sim_added_message" msgid="7797975656153714319">"รีสตาร์ทอุปกรณ์เพื่อเข้าถึงเครือข่ายมือถือ"</string> <string name="sim_restart_button" msgid="4722407842815232347">"รีสตาร์ท"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"ตั้งเวลา"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"ตั้งวันที่"</string> <string name="date_time_set" msgid="5777075614321087758">"ตั้งค่า"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ขอ PIN ก่อนเลิกตรึง"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ขอรูปแบบการปลดล็อกก่อนเลิกตรึง"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ขอรหัสผ่านก่อนเลิกตรึง"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"แอปไม่สามารถปรับขนาดได้ เลื่อนแอปด้วยนิ้ว 2 นิ้ว"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"แอปไม่สนับสนุนการแยกหน้าจอ"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"ติดตั้งโดยผู้ดูแลระบบของคุณ"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"อัปเดตโดยผู้ดูแลระบบ"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"ลบโดยผู้ดูแลระบบของคุณ"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"บางฟังก์ชันอาจไม่พร้อมใช้งาน"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"แตะเพื่อดำเนินการต่อ"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"โปรไฟล์ผู้ใช้ถูกล็อก"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"เชื่อมต่อ <xliff:g id="PRODUCT_NAME">%1$s</xliff:g> แล้ว"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"แตะเพื่อดูไฟล์"</string> + <string name="pin_target" msgid="3052256031352291362">"ปักหมุด"</string> + <string name="unpin_target" msgid="3556545602439143442">"เลิกปักหมุด"</string> + <string name="app_info" msgid="6856026610594615344">"ข้อมูลแอป"</string> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index bf06b97126e5..9be3b2b79471 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"Walang apps ang makakapagsagawa ng pagkilos na ito."</string> <string name="aerr_application" msgid="250320989337856518">"Huminto ang <xliff:g id="APPLICATION">%1$s</xliff:g>"</string> <string name="aerr_process" msgid="6201597323218674729">"Huminto ang <xliff:g id="PROCESS">%1$s</xliff:g>"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"Paulit-ulit na humihinto ang <xliff:g id="APPLICATION">%1$s</xliff:g>"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"Paulit-ulit na humihinto ang <xliff:g id="PROCESS">%1$s</xliff:g>"</string> <string name="aerr_restart" msgid="9001379185665886595">"I-restart ang app"</string> <string name="aerr_reset" msgid="7645427603514220451">"I-reset at i-restart ang app"</string> <string name="aerr_report" msgid="5371800241488400617">"Magpadala ng feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Isara"</string> <string name="aerr_mute" msgid="7698966346654789433">"I-mute"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Maghintay"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Isara ang app"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"Hindi tumutugon ang <xliff:g id="APPLICATION">%2$s</xliff:g>"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"Hindi tumutugon ang <xliff:g id="ACTIVITY">%1$s</xliff:g>"</string> + <string name="anr_application_process" msgid="6417199034861140083">"Hindi tumutugon ang <xliff:g id="APPLICATION">%1$s</xliff:g>"</string> + <string name="anr_process" msgid="6156880875555921105">"Hindi tumutugon ang prosesong <xliff:g id="PROCESS">%1$s</xliff:g>"</string> <string name="force_close" msgid="8346072094521265605">"OK"</string> <string name="report" msgid="4060218260984795706">"Ulat"</string> <string name="wait" msgid="7147118217226317732">"Maghintay"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"Idinagdag ang SIM card"</string> <string name="sim_added_message" msgid="7797975656153714319">"I-restart ang iyong device upang ma-access ang cellular network."</string> <string name="sim_restart_button" msgid="4722407842815232347">"I-restart"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Magtakda ng oras"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Itakda ang petsa"</string> <string name="date_time_set" msgid="5777075614321087758">"Itakda"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Humingi ng PIN bago mag-unpin"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Humingi ng pattern sa pag-unlock bago mag-unpin"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Humingi ng password bago mag-unpin"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Hindi nare-resize ang app, mag-scroll dito gamit ang dalawang daliri."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Hindi sinusuportahan ng app ang split-screen."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Na-install ng iyong administrator"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Na-update ng iyong administrator"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Na-delete ng iyong administrator"</string> @@ -1567,4 +1567,7 @@ <skip /> <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> <skip /> + <string name="pin_target" msgid="3052256031352291362">"I-pin"</string> + <string name="unpin_target" msgid="3556545602439143442">"I-unpin"</string> + <string name="app_info" msgid="6856026610594615344">"Impormasyon ng app"</string> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index afef03eba50b..60e1b89768ec 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"Bu eylemi hiçbir uygulama gerçekleştiremez."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> durdu"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> durdu"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> sürekli olarak duruyor"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> sürekli olarak duruyor"</string> <string name="aerr_restart" msgid="9001379185665886595">"Uygulamayı yeniden başlat"</string> <string name="aerr_reset" msgid="7645427603514220451">"Uygulamayı sıfırla ve yeniden başlat"</string> <string name="aerr_report" msgid="5371800241488400617">"Geri bildirim gönder"</string> <string name="aerr_close" msgid="2991640326563991340">"Kapat"</string> <string name="aerr_mute" msgid="7698966346654789433">"Yok say"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Bekle"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Uygulamayı kapat"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> yanıt vermiyor"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> yanıt vermiyor"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> yanıt vermiyor"</string> + <string name="anr_process" msgid="6156880875555921105">"<xliff:g id="PROCESS">%1$s</xliff:g> işlemi yanıt vermiyor"</string> <string name="force_close" msgid="8346072094521265605">"Tamam"</string> <string name="report" msgid="4060218260984795706">"Bildir"</string> <string name="wait" msgid="7147118217226317732">"Bekle"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM kart eklendi"</string> <string name="sim_added_message" msgid="7797975656153714319">"Hücresel ağa erişmek için cihazınızı yeniden başlatın."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Yeniden başlat"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Saati ayarlayın"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Tarihi ayarlayın"</string> <string name="date_time_set" msgid="5777075614321087758">"Ayarla"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Sabitlemeyi kaldırmadan önce PIN\'i sor"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Sabitlemeyi kaldırmadan önce kilit açma desenini sor"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Sabitlemeyi kaldırmadan önce şifre sor"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Uygulama yeniden boyutlandırılamaz. İki parmağınızla kaydırın."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Uygulama bölünmüş ekranı desteklemiyor."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Yöneticiniz tarafından yüklendi"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Yöneticiniz tarafından güncellendi"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Yöneticiniz tarafından silindi"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Bazı işlevler kullanılamayabilir"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Devam etmek için dokunun"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Kullanıcı profili kilitli"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> cihazına bağlandı"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Dosyaları görüntülemek için hafifçe dokunun"</string> + <string name="pin_target" msgid="3052256031352291362">"Sabitle"</string> + <string name="unpin_target" msgid="3556545602439143442">"Sabitlemeyi kaldır"</string> + <string name="app_info" msgid="6856026610594615344">"Uygulama bilgileri"</string> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 888a083d9243..3eb3fd837ee6 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1047,6 +1047,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM-карту додано"</string> <string name="sim_added_message" msgid="7797975656153714319">"Щоб з’єднатися з мобільною мережею, перезавантажте пристрій."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Перезапуск"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Щоб ваша нова SIM-карта працювала правильно, установіть і відкрийте додаток від оператора."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"ЗАВАНТАЖИТИ ДОДАТОК"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"НЕ ЗАРАЗ"</string> + <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> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Установити дату"</string> <string name="date_time_set" msgid="5777075614321087758">"Застосувати"</string> @@ -1591,8 +1596,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Деякі функції можуть бути недоступні"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Торкніться, щоб продовжити"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Профіль користувача блокується"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Під’єднано до пристрою <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Торкніться, щоб переглянути файли"</string> + <string name="pin_target" msgid="3052256031352291362">"Закріпити"</string> + <string name="unpin_target" msgid="3556545602439143442">"Відкріпити"</string> + <string name="app_info" msgid="6856026610594615344">"Про додаток"</string> </resources> diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml index 3b316862b4b4..7b32a3cf46b5 100644 --- a/core/res/res/values-ur-rPK/strings.xml +++ b/core/res/res/values-ur-rPK/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"کوئی ایپس یہ کارروائی نہیں کر سکتی ہیں۔"</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> بند ہو گئی ہے"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> بند ہو گیا ہے"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> بار بار بند ہوتی ہے"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> بار بار بند ہوتی ہے"</string> <string name="aerr_restart" msgid="9001379185665886595">"ایپ دوبارہ شروع کریں"</string> <string name="aerr_reset" msgid="7645427603514220451">"ایپ کو دوبارہ ترتیب دیں اور دوبارہ شروع کریں"</string> <string name="aerr_report" msgid="5371800241488400617">"تاثرات بھیجیں"</string> <string name="aerr_close" msgid="2991640326563991340">"بند کریں"</string> <string name="aerr_mute" msgid="7698966346654789433">"خاموش کریں"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"انتظار کریں"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"ایپ بند کریں"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> جواب نہیں دے رہی ہے"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> جواب نہیں دے رہی ہے"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> جواب نہیں دے رہی ہے"</string> + <string name="anr_process" msgid="6156880875555921105">"کارروائی <xliff:g id="PROCESS">%1$s</xliff:g> جواب نہیں دے رہی ہے"</string> <string name="force_close" msgid="8346072094521265605">"ٹھیک ہے"</string> <string name="report" msgid="4060218260984795706">"اطلاع دیں"</string> <string name="wait" msgid="7147118217226317732">"انتظار کریں"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM شامل کیا گیا"</string> <string name="sim_added_message" msgid="7797975656153714319">"سیلولر نیٹ ورک تک رسائی کیلئے اپنا آلہ دوبارہ سٹارٹ کریں۔"</string> <string name="sim_restart_button" msgid="4722407842815232347">"دوبارہ شروع کریں"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"وقت سیٹ کریں"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"تاریخ سیٹ کریں"</string> <string name="date_time_set" msgid="5777075614321087758">"سیٹ کریں"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"پن ہٹانے سے پہلے PIN طلب کریں"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"پن ہٹانے سے پہلے غیر مقفل کرنے کا پیٹرن طلب کریں"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"پن ہٹانے سے پہلے پاس ورڈ طلب کریں"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"ایپ ری سائز ایبل نہیں ہے، اسے دو انگلیوں کے ساتھ سکرول کریں۔"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"ایپ سپلٹ اسکرین کو سپورٹ نہیں کرتی۔"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"آپ کے منتظم کی جانب سے انسٹال کر دیا گیا"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"آپ کے منتظم نے اپ ڈيٹ کر دیا"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"آپ کے منتظم کی جانب سے حذف کر دیا گیا"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"ممکن ہے کچھ فنکشز دستیاب نہ ہوں"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"جاری رکھنے کیلئے تھپتھپائیں"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"صارف پروفائل مقفل ہو گئی"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> سے منسلک"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"فائلوں کو دیکھنے کیلئے تھپتھپائیں"</string> + <string name="pin_target" msgid="3052256031352291362">"پن کریں"</string> + <string name="unpin_target" msgid="3556545602439143442">"پن ہٹائیں"</string> + <string name="app_info" msgid="6856026610594615344">"ایپ کی معلومات"</string> </resources> diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml index c944c0cd0744..d69df0422f39 100644 --- a/core/res/res/values-uz-rUZ/strings.xml +++ b/core/res/res/values-uz-rUZ/strings.xml @@ -313,7 +313,7 @@ <string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"Ilovaga o‘zining komponentlarini xotirada doimiy saqlashga ruxsat beradi. Bu mavjud xotirani cheklashi va telefonni sekin ishlashiga sabab bo‘lishi mumkin."</string> <string name="permlab_getPackageSize" msgid="7472921768357981986">"ilovalar egallagan xotira joyini hisoblash"</string> <string name="permdesc_getPackageSize" msgid="3921068154420738296">"Ilova o‘zining kodi, ma’lumotlari va kesh o‘lchami to‘g‘risidagi ma’lumotlarni olishi mumkin"</string> - <string name="permlab_writeSettings" msgid="2226195290955224730">"tizim moslamalarini o‘zgartirish"</string> + <string name="permlab_writeSettings" msgid="2226195290955224730">"tizim sozlamalarini o‘zgartirish"</string> <string name="permdesc_writeSettings" msgid="7775723441558907181">"Ilova tizim sozlamalarini o‘zgartirishi mumkin. Zararli dasturlar uning yordamida tizimni ishdan chiqarishi mumkin."</string> <string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"tizim ishga tushganda bajarish"</string> <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"Ilova tizim qayta yoqilganidan so‘ng o‘zini ishga tushirishi mumkin. Bu planshetning yonish vaqtini uzaytirishi va doimiy ishlab turivchi ilova tufayli uning tezkor ishlashini kamaytirishi mumkin."</string> @@ -351,7 +351,7 @@ <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"Ilovaga telefoningizda o‘zgartirishingiz mumkin bo‘lgan, shuningdek, do‘stlaringiz va hamkasblaringizning tadbirlarini qo‘shish, o‘chirish va o‘zgartirish uchun ruxsat beradi. Bu ilovaga go‘yoki taqvim egalari nomidan kelgan xabarlarni jo‘natishga yoki egasiga bildirmasdan tadbirlarni o‘zgartirishga ruxsat berishi mumkin."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"qo‘shimcha manzillarga kirish buyruqlari"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Ilovaga qo‘shimcha joylashuv xizmati buyruqlaridan foydalanishga ruxsat beradi. Uning yordamida ilova GPS yoki boshqa joylashuv ma’lumoti manbalarining ishlashiga xalaqit qilishi mumkin."</string> - <string name="permlab_accessFineLocation" msgid="251034415460950944">"aniq joylashuv (GPS va tarmoqqa asoslanib) ma’lumotlaridan foydalanishga ruxsat"</string> + <string name="permlab_accessFineLocation" msgid="251034415460950944">"aniq joylashuv ma’lumotiga kirish (GPS va tarmoq asosida)"</string> <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"Ilovaga global joylashuvni aniqlash tizimi (GPS) yoki Wi-Fi va uyali tarmoq antennalari kabi tarmoq joylashuv manbalaridan foydalanib, aniq joylashuvingizni topishga ruxsat beradi. Ushbu joylashuv xizmatlari yoqib qo‘yilgan bo‘lishi va qurilmangizdagi ilovaga ulardan foydalanish uchun mavjud bo‘lishi kerak. Ilovalar bundan foydalanib, sizning joylashuvingizni aniqlaydi. Bu batareya quvvatini ko‘proq sarflaydi."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"taxminiy joylashuv (tarmoq asosida) ma’lumotlaridan foydalanishga ruxsat"</string> <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"Ilovaga sizning taxminiy joylashuvingizni topishga ruxsat beradi. Ushbu joylashuv Wi-Fi va uyali tarmoq antennalari kabi tarmoq joylashuv manbalaridan foydlanuvchi joylashuv xizmatlari orqali aniqlanadi. Ushbu joylashuv xizmatlari yoqib qo‘yilgan bo‘lishi va qurilmangizdagi ilovaga ulardan foydalanish uchun mavjud bo‘lishi kerak. Ilovalar bundan foydalanib, sizning taxminiy joylashuvingizni aniqlaydi."</string> @@ -389,7 +389,7 @@ <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"Iloba planshetdagi vaqt zonasini o‘zgartirishi mumkin."</string> <string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"Ilovaga televizorning vaqt zonasini o‘zgartirish huquqini beradi."</string> <string name="permdesc_setTimeZone" product="default" msgid="4499943488436633398">"Ilova telefondagi vaqt zonasini o‘zgartirishi mumkin."</string> - <string name="permlab_getAccounts" msgid="1086795467760122114">"qurilmadagi hisoblarni topish"</string> + <string name="permlab_getAccounts" msgid="1086795467760122114">"qurilmadagi hisoblarni qidirish"</string> <string name="permdesc_getAccounts" product="tablet" msgid="2741496534769660027">"Ilovaga planshetdagi hisoblar ro‘yxatini olishga ruxsat beradi. Bunga siz o‘rnatgan ilovalar tomonidan yaratilgan har qanday hisoblar kirishi mumkin."</string> <string name="permdesc_getAccounts" product="tv" msgid="4190633395633907543">"Ilovaga televizor tomonidan aniqlangan hisoblar ro‘yxatini olish huquqini beradi. Bunga siz o‘rnatgan ilovalar tomonidan yaratilgan har qanday hisoblar kiradi."</string> <string name="permdesc_getAccounts" product="default" msgid="3448316822451807382">"Ilovaga telefondagi hisoblar ro‘yxatini olishga ruxsat beradi. Bunga siz o‘rnatgan ilovalar tomonidan yaratilgan har qanday hisoblar kirishi mumkin."</string> @@ -454,7 +454,7 @@ <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"Ilovaga hisobning sinxronlash sozlamalarini o‘zgartirish uchun ruxsat beradi. Masalan, bundan \"Odamlar\" ilovasini hisob bilan sinxronlanlash uchun foydalanish mumkin."</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"sinxronlash statistikasini o‘qish"</string> <string name="permdesc_readSyncStats" msgid="1510143761757606156">"Ilovaga hisobning sinxronlash statistikasini, shu jumladan, sinxronlangan hodisalar tarixi va qancha ma’lumot sinxronlanganligi haqidagi ma’lumotni o‘qishga ruxsat beradi."</string> - <string name="permlab_sdcardRead" product="nosdcard" msgid="367275095159405468">"USB xotirasi tarkibidagilarni o‘qish"</string> + <string name="permlab_sdcardRead" product="nosdcard" msgid="367275095159405468">"USB xotiradagi ma’lumotlarni ko‘rish"</string> <string name="permlab_sdcardRead" product="default" msgid="2188156462934977940">"SD xotira kartasi tarkibidagilarni o‘qish"</string> <string name="permdesc_sdcardRead" product="nosdcard" msgid="3446988712598386079">"Dasturga USB xotiradagi ma’lumotlarini ko‘rib chiqish uchun ruxsat beradi."</string> <string name="permdesc_sdcardRead" product="default" msgid="2607362473654975411">"Dasturga SD kartadagi ma’lumotlarni ko‘rib chiqishga ruxsat berish."</string> @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"Hech qaysi ilova ushbu amalni bajara olmaydi."</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> ilovasi ishdan chiqdi"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> jarayoni ishdan chiqdi"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> yana ishdan chiqdi"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> yana ishdan chiqdi"</string> <string name="aerr_restart" msgid="9001379185665886595">"Ilovani qayta ishga tushirish"</string> <string name="aerr_reset" msgid="7645427603514220451">"Ilovani qayta tiklash va qayta ishga tushirish"</string> <string name="aerr_report" msgid="5371800241488400617">"Fikr-mulohaza yuborish"</string> <string name="aerr_close" msgid="2991640326563991340">"Yopish"</string> <string name="aerr_mute" msgid="7698966346654789433">"E’tiborsiz qoldirish"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"Kuting"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Ilovani yopish"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> javob bermayapti"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> javob bermayapti"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> javob bermayapti"</string> + <string name="anr_process" msgid="6156880875555921105">"<xliff:g id="PROCESS">%1$s</xliff:g> ilovasi javob bermayapti"</string> <string name="force_close" msgid="8346072094521265605">"OK"</string> <string name="report" msgid="4060218260984795706">"Xabar berish"</string> <string name="wait" msgid="7147118217226317732">"Kuting"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM karta qo‘shildi"</string> <string name="sim_added_message" msgid="7797975656153714319">"Mobil tarmoqqa ulanish uchun qurilmangizni o‘chirib yoqing."</string> <string name="sim_restart_button" msgid="4722407842815232347">"O‘chirib-yoqish"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Vaqtni o‘rnatish"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Sanani kiritish"</string> <string name="date_time_set" msgid="5777075614321087758">"O‘rnatish"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Yechishda PIN-kod so‘ralsin"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Bo‘shatishdan oldin chizmali parol so‘ralsin"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Bo‘shatishdan oldin parol so‘ralsin"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"Oyna o‘lchamini o‘zgartirib bo‘lmaydi. Sahifani ikkita barmoq bilan aylantiring."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Bu ilova ekranni bo‘lish xususiyatini qo‘llab-quvvatlamaydi."</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Administratoringiz tomonidan o‘rnatilgan"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Administratoringiz tomonidan yangilandi"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Administratoringiz tomonidan o‘chirilgan"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Ayrim funksiyalar mavjud bo‘lmasligi mumkin"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Davom etish uchun bosing"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Foydalanuvchi profili yopiq"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> mahsulotiga ulandi"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Fayllarni ko‘rish uchun bosing"</string> + <string name="pin_target" msgid="3052256031352291362">"Qadash"</string> + <string name="unpin_target" msgid="3556545602439143442">"Olib tashlash"</string> + <string name="app_info" msgid="6856026610594615344">"Ilova haqida"</string> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 6dc6017699ee..bbfef63199f4 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1031,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"Đã thêm thẻ SIM"</string> <string name="sim_added_message" msgid="7797975656153714319">"Khởi động lại thiết bị của bạn để truy cập mạng di động."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Khởi động lại"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Đặt giờ"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Đặt ngày"</string> <string name="date_time_set" msgid="5777075614321087758">"Đặt"</string> @@ -1557,4 +1567,7 @@ <skip /> <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> <skip /> + <string name="pin_target" msgid="3052256031352291362">"Ghim"</string> + <string name="unpin_target" msgid="3556545602439143442">"Bỏ ghim"</string> + <string name="app_info" msgid="6856026610594615344">"Thông tin ứng dụng"</string> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 12bd179f506c..938571ed92a5 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -232,8 +232,7 @@ <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_children_count_bracketed" msgid="1769425473168347839">"（<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g> 条）"</string> <string name="notification_hidden_text" msgid="1135169301897151909">"内容已隐藏"</string> - <!-- no translation found for notification_hidden_by_policy_text (9004631276932584600) --> - <skip /> + <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"内容已隐藏（根据政策规定）"</string> <string name="safeMode" msgid="2788228061547930246">"安全模式"</string> <string name="android_system_label" msgid="6577375335728551336">"Android 系统"</string> <string name="user_owner_label" msgid="2804351898001038951">"个人"</string> @@ -912,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"没有应用可执行此操作。"</string> <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g>已停止运行"</string> <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g>已停止运行"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g>屡次停止运行"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g>屡次停止运行"</string> <string name="aerr_restart" msgid="9001379185665886595">"重启应用"</string> <string name="aerr_reset" msgid="7645427603514220451">"重置并重启应用"</string> <string name="aerr_report" msgid="5371800241488400617">"发送反馈"</string> <string name="aerr_close" msgid="2991640326563991340">"关闭"</string> <string name="aerr_mute" msgid="7698966346654789433">"忽略"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"等待"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"关闭应用"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g>没有响应"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g>没有响应"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g>没有响应"</string> + <string name="anr_process" msgid="6156880875555921105">"进程“<xliff:g id="PROCESS">%1$s</xliff:g>”没有响应"</string> <string name="force_close" msgid="8346072094521265605">"确定"</string> <string name="report" msgid="4060218260984795706">"报告"</string> <string name="wait" msgid="7147118217226317732">"等待"</string> @@ -1040,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"已添加SIM卡"</string> <string name="sim_added_message" msgid="7797975656153714319">"请重新启动您的设备，以便使用移动网络。"</string> <string name="sim_restart_button" msgid="4722407842815232347">"重新启动"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"设置时间"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"设置日期"</string> <string name="date_time_set" msgid="5777075614321087758">"设置"</string> @@ -1471,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"取消时要求输入PIN码"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"取消时要求绘制解锁图案"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"取消时要求输入密码"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"无法调整该应用的大小，请用双指滚动该应用。"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"应用不支持分屏。"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"已由管理员安装"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"由您单位的管理员更新"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"已被管理员删除"</string> @@ -1546,10 +1545,8 @@ <string name="default_notification_topic_label" msgid="227586145791870829">"其他"</string> <string name="importance_from_topic" msgid="3572280439880023233">"这些通知的重要性由您来设置。"</string> <string name="importance_from_person" msgid="9160133597262938296">"这条通知涉及特定的人，因此被归为重要通知。"</string> - <!-- no translation found for user_creation_account_exists (1942606193570143289) --> - <skip /> - <!-- no translation found for user_creation_adding (4482658054622099197) --> - <skip /> + <string name="user_creation_account_exists" msgid="1942606193570143289">"允许<xliff:g id="APP">%1$s</xliff:g>使用 <xliff:g id="ACCOUNT">%2$s</xliff:g> 创建新用户吗？"</string> + <string name="user_creation_adding" msgid="4482658054622099197">"允许<xliff:g id="APP">%1$s</xliff:g>使用 <xliff:g id="ACCOUNT">%2$s</xliff:g>（目前已有用户使用此帐号）创建新用户吗？"</string> <string name="language_selection_title" msgid="7181332986330337171">"语言偏好设置"</string> <string name="country_selection_title" msgid="2954859441620215513">"区域偏好设置"</string> <string name="search_language_hint" msgid="7042102592055108574">"输入语言名称"</string> @@ -1563,14 +1560,14 @@ <string name="suspended_package_message" msgid="6341091587106868601">"该软件包已被%1$s管理员禁用。请与管理员联系以了解详情。"</string> <string name="new_sms_notification_title" msgid="8442817549127555977">"您有新消息"</string> <string name="new_sms_notification_content" msgid="7002938807812083463">"打开短信应用查看"</string> - <!-- no translation found for user_encrypted_title (7664361246988454307) --> - <skip /> - <!-- no translation found for user_encrypted_message (7504541494700807850) --> - <skip /> - <!-- no translation found for user_encrypted_detail (979981584766912935) --> - <skip /> + <string name="user_encrypted_title" msgid="7664361246988454307">"部分功能可能无法使用"</string> + <string name="user_encrypted_message" msgid="7504541494700807850">"触摸即可继续"</string> + <string name="user_encrypted_detail" msgid="979981584766912935">"用户个人资料已锁定"</string> <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> <skip /> <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> <skip /> + <string name="pin_target" msgid="3052256031352291362">"固定"</string> + <string name="unpin_target" msgid="3556545602439143442">"取消固定"</string> + <string name="app_info" msgid="6856026610594615344">"应用信息"</string> </resources> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index efa55f11f7e8..620458ca3c64 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"沒有應用程式可執行這項操作。"</string> <string name="aerr_application" msgid="250320989337856518">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」已經停止運作"</string> <string name="aerr_process" msgid="6201597323218674729">"「<xliff:g id="PROCESS">%1$s</xliff:g>」已經停止運作"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」不斷停止運作"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"「<xliff:g id="PROCESS">%1$s</xliff:g>」不斷停止運作"</string> <string name="aerr_restart" msgid="9001379185665886595">"重新啟動應用程式"</string> <string name="aerr_reset" msgid="7645427603514220451">"重設並重新啟動應用程式"</string> <string name="aerr_report" msgid="5371800241488400617">"傳送意見反映"</string> <string name="aerr_close" msgid="2991640326563991340">"關閉"</string> <string name="aerr_mute" msgid="7698966346654789433">"忽略"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"等一下"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"關閉應用程式"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"「<xliff:g id="APPLICATION">%2$s</xliff:g>」沒有回應"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"「<xliff:g id="ACTIVITY">%1$s</xliff:g>」沒有回應"</string> + <string name="anr_application_process" msgid="6417199034861140083">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」沒有回應"</string> + <string name="anr_process" msgid="6156880875555921105">"處理程序「<xliff:g id="PROCESS">%1$s</xliff:g>」沒有回應"</string> <string name="force_close" msgid="8346072094521265605">"確定"</string> <string name="report" msgid="4060218260984795706">"報告"</string> <string name="wait" msgid="7147118217226317732">"等待"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM 卡已新增"</string> <string name="sim_added_message" msgid="7797975656153714319">"重新啟動裝置，才能使用流動網絡。"</string> <string name="sim_restart_button" msgid="4722407842815232347">"重新啟動"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"設定時間"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"日期設定"</string> <string name="date_time_set" msgid="5777075614321087758">"設定"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"取消固定時必須輸入 PIN"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"取消固定時必須畫出解鎖圖案"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"取消固定時必須輸入密碼"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"無法調整應用程式的大小，請用兩隻手指捲動此應用程式。"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"應用程式不支援分割畫面。"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"已由管理員安裝"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"已由您的管理員更新"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"已由管理員刪除"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"部分功能可能無法使用"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"輕觸即可繼續"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"使用者個人檔案目前處於鎖定狀態"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"已連線至 <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"輕按即可查看檔案"</string> + <string name="pin_target" msgid="3052256031352291362">"固定"</string> + <string name="unpin_target" msgid="3556545602439143442">"取消固定"</string> + <string name="app_info" msgid="6856026610594615344">"應用程式資料"</string> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 5f968fd58528..f56bc14c1cf7 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -911,28 +911,20 @@ <string name="noApplications" msgid="2991814273936504689">"沒有應用程式可執行這項操作。"</string> <string name="aerr_application" msgid="250320989337856518">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」已停止運作"</string> <string name="aerr_process" msgid="6201597323218674729">"「<xliff:g id="PROCESS">%1$s</xliff:g>」已停止運作"</string> - <!-- no translation found for aerr_application_repeated (3146328699537439573) --> - <skip /> - <!-- no translation found for aerr_process_repeated (6235302956890402259) --> - <skip /> + <string name="aerr_application_repeated" msgid="3146328699537439573">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」屢次停止運作"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"「<xliff:g id="PROCESS">%1$s</xliff:g>」屢次停止運作"</string> <string name="aerr_restart" msgid="9001379185665886595">"重新啟動應用程式"</string> <string name="aerr_reset" msgid="7645427603514220451">"重設並重新啟動應用程式"</string> <string name="aerr_report" msgid="5371800241488400617">"提供意見"</string> <string name="aerr_close" msgid="2991640326563991340">"關閉"</string> <string name="aerr_mute" msgid="7698966346654789433">"忽略"</string> - <!-- no translation found for aerr_wait (3199956902437040261) --> - <skip /> - <!-- no translation found for aerr_close_app (3269334853724920302) --> - <skip /> + <string name="aerr_wait" msgid="3199956902437040261">"等一下"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"關閉應用程式"</string> <string name="anr_title" msgid="4351948481459135709"></string> - <!-- no translation found for anr_activity_application (8493290105678066167) --> - <skip /> - <!-- no translation found for anr_activity_process (1622382268908620314) --> - <skip /> - <!-- no translation found for anr_application_process (6417199034861140083) --> - <skip /> - <!-- no translation found for anr_process (6156880875555921105) --> - <skip /> + <string name="anr_activity_application" msgid="8493290105678066167">"「<xliff:g id="APPLICATION">%2$s</xliff:g>」沒有回應"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"「<xliff:g id="ACTIVITY">%1$s</xliff:g>」沒有回應"</string> + <string name="anr_application_process" msgid="6417199034861140083">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」沒有回應"</string> + <string name="anr_process" msgid="6156880875555921105">"「<xliff:g id="PROCESS">%1$s</xliff:g>」程序沒有回應"</string> <string name="force_close" msgid="8346072094521265605">"確定"</string> <string name="report" msgid="4060218260984795706">"回報"</string> <string name="wait" msgid="7147118217226317732">"等待"</string> @@ -1039,6 +1031,16 @@ <string name="sim_added_title" msgid="3719670512889674693">"SIM 卡已新增"</string> <string name="sim_added_message" msgid="7797975656153714319">"請重新啟動裝置，才能使用行動網路。"</string> <string name="sim_restart_button" msgid="4722407842815232347">"重新啟動"</string> + <!-- no translation found for carrier_app_dialog_message (7066156088266319533) --> + <skip /> + <!-- no translation found for carrier_app_dialog_button (7900235513678617329) --> + <skip /> + <!-- no translation found for carrier_app_dialog_not_now (6361378684292268027) --> + <skip /> + <!-- no translation found for carrier_app_notification_title (8921767385872554621) --> + <skip /> + <!-- no translation found for carrier_app_notification_text (1132487343346050225) --> + <skip /> <string name="time_picker_dialog_title" msgid="8349362623068819295">"設定時間"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"日期設定"</string> <string name="date_time_set" msgid="5777075614321087758">"設定"</string> @@ -1470,10 +1472,8 @@ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"取消固定時必須輸入 PIN"</string> <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"取消固定時必須畫出解鎖圖案"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"取消固定時必須輸入密碼"</string> - <!-- no translation found for dock_cropped_windows_text (6378424064779004428) --> - <skip /> - <!-- no translation found for dock_non_resizeble_failed_to_dock_text (3871617304250207291) --> - <skip /> + <string name="dock_cropped_windows_text" msgid="6378424064779004428">"無法調整這個應用程式的大小，請用雙指捲動該應用程式。"</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"這個應用程式不支援分割畫面。"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"已由管理員安裝"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"由您的管理員更新"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"已遭管理員刪除"</string> @@ -1563,8 +1563,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"部分功能可能無法使用"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"輕觸即可繼續作業"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"使用者個人資料目前處於鎖定狀態"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"已連線至 <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"輕按即可查看檔案"</string> + <string name="pin_target" msgid="3052256031352291362">"固定"</string> + <string name="unpin_target" msgid="3556545602439143442">"取消固定"</string> + <string name="app_info" msgid="6856026610594615344">"應用程式資訊"</string> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 217249ef6c83..9fd47254f5de 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1031,6 +1031,11 @@ <string name="sim_added_title" msgid="3719670512889674693">"Ikhadi le-SIM lengeziwe"</string> <string name="sim_added_message" msgid="7797975656153714319">"Qala kabusha idivayisi yakho ukuze ufinyelele inethiwekhi yeselula."</string> <string name="sim_restart_button" msgid="4722407842815232347">"Qala phansi"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Ukuze wenze i-SIM yakho entsha isebenze kahle, kuzomele ufake uphinde uvule uhlelo lokusebenza kusukela kunkampani yakho yenethiwekhi."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"THOLA UHLELO LOKUSEBENZA"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"HHAYI MANJE"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Kufakwe i-SIM entsha"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Thepha ukuze uyisethe"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Hlela isikhathi"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Setha idethi"</string> <string name="date_time_set" msgid="5777075614321087758">"Hlela"</string> @@ -1553,8 +1558,9 @@ <string name="user_encrypted_title" msgid="7664361246988454307">"Eminye imisebenzi ingahle ingatholakali"</string> <string name="user_encrypted_message" msgid="7504541494700807850">"Thinta ukuze uqhubeke"</string> <string name="user_encrypted_detail" msgid="979981584766912935">"Iphrofayela yomsebenzisi ikhiyiwe"</string> - <!-- no translation found for usb_mtp_launch_notification_title (8359219638312208932) --> - <skip /> - <!-- no translation found for usb_mtp_launch_notification_description (8541876176425411358) --> - <skip /> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Kuxhumekile ku-<xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Thepha ukuze ubuke onke amafayela"</string> + <string name="pin_target" msgid="3052256031352291362">"Phina"</string> + <string name="unpin_target" msgid="3556545602439143442">"Susa ukuphina"</string> + <string name="app_info" msgid="6856026610594615344">"Ulwazi lohlelo lokusebenza"</string> </resources> diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index a6a456415689..c083a5eb9ae9 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -402,4 +402,15 @@ <item>@color/Red_700</item> </array> + <!-- Used in ResolverTargetActionsDialogFragment --> + <string-array name="resolver_target_actions_pin"> + <item>@string/pin_target</item> + <item>@string/app_info</item> + </string-array> + + <string-array name="resolver_target_actions_unpin"> + <item>@string/unpin_target</item> + <item>@string/app_info</item> + </string-array> + </resources> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index c744bbdd7495..3a5336cd05f1 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -429,6 +429,9 @@ sets. --> <attr name="multiArch" format ="boolean" /> + <!-- Specify abiOverride for multiArch application. --> + <attr name="abiOverride" /> + <!-- Specify whether a component is allowed to have multiple instances of itself running in different processes. Use with the activity and provider tags. diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index bbbb963f4dff..5c5aff0998fa 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2696,6 +2696,10 @@ <public type="attr" name="endX" /> <public type="attr" name="endY" /> <public type="attr" name="offset" /> + <public type="attr" name="abiOverride" /> + <public type="attr" name="bitmap" /> + <public type="attr" name="hotSpotX" /> + <public type="attr" name="hotSpotY" /> <public type="style" name="Theme.Material.Light.DialogWhenLarge.DarkActionBar" /> <public type="style" name="Widget.Material.SeekBar.Discrete" /> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 523826bf79ec..4e10d39e0005 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2869,6 +2869,14 @@ <string name="sim_added_message">Restart your device to access the cellular network.</string> <!-- See SIM_ADDED_DIALOG. This is the button of that dialog. --> <string name="sim_restart_button">Restart</string> + <!-- See Carrier_App_Dialog. This is the message of that dialog. --> + <string name="carrier_app_dialog_message">To get your new SIM working properly, you\'ll need to install and open an app from your carrier.</string> + <!-- See Carrier_App_Dialog. This is the button of that dialog. --> + <string name="carrier_app_dialog_button">GET THE APP</string> + <string name="carrier_app_dialog_not_now">NOT NOW</string> + <!-- See carrier_app_notification. This is the headline. --> + <string name="carrier_app_notification_title">New SIM inserted</string> + <string name="carrier_app_notification_text">Tap to set it up</string> <!-- Date/Time picker dialogs strings --> @@ -4168,7 +4176,7 @@ <string name="language_selection_title">Language preference</string> <!-- Title for the region selection screen [CHAR LIMIT=25] --> <string name="country_selection_title">Region preference</string> - <!-- Hint text in a search edit box (used to filter long language / country lists) [CHAR LIMIT=20] --> + <!-- Hint text in a search edit box (used to filter long language / country lists) [CHAR LIMIT=25] --> <string name="search_language_hint">Type language name</string> <!-- List section subheader for the language picker, containing a list of suggested languages determined by the default region [CHAR LIMIT=30] --> @@ -4206,4 +4214,15 @@ <string name="usb_mtp_launch_notification_title">Connected to <xliff:g id="product_name">%1$s</xliff:g></string> <!-- Description of notification shown after a MTP device is connected to Android. --> <string name="usb_mtp_launch_notification_description">Tap to view files</string> + + <!-- Resolver target actions strings --> + + <!-- Pin (as in to a bulletin board with a pushpin) a resolver + target to the front of the list. --> + <string name="pin_target">Pin</string> + <!-- Unpin a resolver target such that it sorts normally. --> + <string name="unpin_target">Unpin</string> + <!-- View application info for a target. --> + <string name="app_info">App info</string> + </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1f0e21ecd7fe..f75f023b8c31 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2522,7 +2522,18 @@ <java-symbol type="string" name="user_encrypted_title" /> <java-symbol type="string" name="user_encrypted_message" /> <java-symbol type="string" name="user_encrypted_detail" /> + <java-symbol type="drawable" name="ic_user_secure" /> <java-symbol type="string" name="usb_mtp_launch_notification_title" /> <java-symbol type="string" name="usb_mtp_launch_notification_description" /> + + <!-- Resolver target actions --> + <java-symbol type="array" name="resolver_target_actions_pin" /> + <java-symbol type="array" name="resolver_target_actions_unpin" /> + + <java-symbol type="string" name="carrier_app_dialog_message" /> + <java-symbol type="string" name="carrier_app_dialog_button" /> + <java-symbol type="string" name="carrier_app_dialog_not_now" /> + <java-symbol type="string" name="carrier_app_notification_title" /> + <java-symbol type="string" name="carrier_app_notification_text" /> </resources> diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd index 8c392aac2545..cfd94671604f 100644 --- a/docs/html/preview/support.jd +++ b/docs/html/preview/support.jd @@ -160,21 +160,20 @@ page.image=images/cards/card-support_16-9_2x.png still perform BTLE and WiFi scans, but only when they are in the foreground. While in the background, those apps will get no results from BTLE and WiFi scans.</li> </ul> </li> - <li>Accessing accounts + <li>Permission changes <ul> - <li>Updated the behavior of {@link android.accounts.AccountManager} account - discovery methods. + <li>Updated the user interface for permissions and enhanced some of the permissions + behaviors.</li> + <li>The {@link android.Manifest.permission#GET_ACCOUNTS} permission is now a member of the + {@link android.Manifest.permission_group#CONTACTS} permission group and it has a + {@code android:protectionLevel} of {@code dangerous}. This change means that when + targeting Android 6.0 (API level 23), you must check for and request this permission if + your app requires it. </li> - <li>The GET_ACCOUNTS permission has been deprecated. - </li> - <li>Apps targeting API level 24 should start the intent returned by - newChooseAccountIntent(...) and await the result to acquire a reference - to the user's selected account. AccountManager methods like getAccounts and - related methods will only return those accounts managed by - authenticators that match the signatures of the calling app. - </li> - <li>Apps targeting API level 23 or earlier will continue to behave as - before. + + <li>The {@code android.permission.READ_PROFILE} and {@code android.permission.WRITE_PROFILE} + permissions have been removed from the {@link android.Manifest.permission_group#CONTACTS} + permission group. </li> </ul> </li> diff --git a/docs/html/training/id-auth/identify.jd b/docs/html/training/id-auth/identify.jd index 4c399f9abf39..db9ab3a671e5 100644 --- a/docs/html/training/id-auth/identify.jd +++ b/docs/html/training/id-auth/identify.jd @@ -15,7 +15,8 @@ next.link=authenticate.html <ol> <li><a href="#ForYou">Determine if AccountManager is for You</a></li> <li><a href="#TaskTwo">Decide What Type of Account to Use</a></li> - <li><a href="#QueryAccounts">Query the user for an Account</a></li> + <li><a href="#GetPermission">Request GET_ACCOUNT permission</a></li> + <li><a href="#TaskFive">Query AccountManager for a List of Accounts</a></li> <li><a href="#IdentifyUser">Use the Account Object to Personalize Your App</a></li> <li><a href="#IdIsEnough">Decide Whether an Account Name is Enough</a></li> </ol> @@ -70,46 +71,48 @@ UI.</p> <h2 id="TaskTwo">Decide What Type of Account to Use</h2> <p>Android devices can store multiple accounts from many different providers. -When you query {@link android.accounts.AccountManager} for account names, you -can choose to filter by account type. The account type is a string that -uniquely identifies the entity that issued the account. For instance, Google -accounts have type "com.google," while Twitter uses -"com.twitter.android.auth.login."</p> +When you query {@link android.accounts.AccountManager} for account names, you can choose to filter +by +account type. The account type is a string that uniquely identifies the entity +that issued the account. For instance, Google accounts have type "com.google," +while Twitter uses "com.twitter.android.auth.login."</p> -<h2 id="QueryAccounts">Query the user for an Account</h2> -<p>Once an account type has been determined, you can prompt the user with an -account chooser as follows: +<h2 id="GetPermission">Request GET_ACCOUNT permission</h2> + +<p>In order to get a list of accounts on the device, your app needs the {@link +android.Manifest.permission#GET_ACCOUNTS} +permission. Add a <a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">{@code +<uses-permission>}</a> tag in your manifest file to request +this permission:</p> <pre> -AccountManager am = AccountManager.get(this); // "this" reference the current Context -Intent chooserIntent = am.newChooseAccountIntent( - null, // currently select account - null, // list of accounts that are allowed to be shown - new String[] { "com.google" }, // Only allow the user to select Google accounts - false, - null, // description text - null, // add account auth token type - null, // required features for added accounts - null); // options for adding an account -this.startActivityForResult(chooserIntent, MY_REQUEST_CODE); +<manifest ... > + <uses-permission android:name="android.permission.GET_ACCOUNTS" /> + ... +</manifest> </pre> -<p>Once the chooser intent is started, the user will be presented with a list of -appropriately typed accounts. From this list they will select one which will be -returned to your app upon onActivityResult as follows: + +<h2 id="TaskFive">Query AccountManager for a List of Accounts</h2> + +<p>Once you decide what account type you're interested in, you need to query for accounts of that +type. Get an instance of {@link android.accounts.AccountManager} by calling {@link +android.accounts.AccountManager#get(android.content.Context) AccountManager.get()}. Then use that +instance to call {@link android.accounts.AccountManager#getAccountsByType(java.lang.String) +getAccountsByType()}.</p> <pre> -protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == MY_REQUEST_CODE && resultCode == RESULT_OK) { - String name = data.getStringExtra(AccountManage.KEY_ACCOUNT_NAME); - String type = data.getStringExtra(AccountManage.KEY_ACCOUNT_TYPE); - Account selectedAccount = new Account(name, type); - doSomethingWithSelectedAccount(selectedAccount); - } -} +AccountManager am = AccountManager.get(this); // "this" references the current Context + +Account[] accounts = am.getAccountsByType("com.google"); </pre> +<p>This returns an array of {@link android.accounts.Account} objects. If there's more than one +{@link android.accounts.Account} in +the array, you should present a dialog asking the user to select one.</p> + + <h2 id="IdentifyUser">Use the Account Object to Personalize Your App</h2> <p>The {@link android.accounts.Account} object contains an account name, which for Google accounts diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 1857345968fd..21ed7dd0099e 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -19,6 +19,10 @@ import android.animation.AnimatorInflater; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.Animator.AnimatorListener; +import android.animation.PropertyValuesHolder; +import android.animation.TimeInterpolator; +import android.animation.ValueAnimator; +import android.animation.ObjectAnimator; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.res.ColorStateList; @@ -34,14 +38,23 @@ import android.graphics.Rect; import android.util.ArrayMap; import android.util.AttributeSet; import android.util.Log; +import android.util.LongArray; +import android.util.PathParser; +import android.util.TimeUtils; +import android.view.Choreographer; +import android.view.DisplayListCanvas; +import android.view.RenderNode; +import android.view.RenderNodeAnimatorSetHelper; import android.view.View; import com.android.internal.R; +import com.android.internal.util.VirtualRefBasePtr; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import java.lang.ref.WeakReference; import java.util.ArrayList; /** @@ -138,7 +151,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { private static final boolean DBG_ANIMATION_VECTOR_DRAWABLE = false; /** Local, mutable animator set. */ - private final AnimatorSet mAnimatorSet = new AnimatorSet(); + private final VectorDrawableAnimator mAnimatorSet = new VectorDrawableAnimator(); /** * The resources against which this drawable was created. Used to attempt @@ -200,6 +213,9 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { @Override public void draw(Canvas canvas) { + if (canvas.isHardwareAccelerated()) { + mAnimatorSet.recordLastSeenTarget((DisplayListCanvas) canvas); + } mAnimatedVectorState.mVectorDrawable.draw(canvas); if (isStarted()) { invalidateSelf(); @@ -582,9 +598,8 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { * Resets the AnimatedVectorDrawable to the start state as specified in the animators. */ public void reset() { - // TODO: Use reverse or seek to implement reset, when AnimatorSet supports them. - start(); - mAnimatorSet.cancel(); + mAnimatorSet.reset(); + invalidateSelf(); } @Override @@ -603,8 +618,12 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { @NonNull private void ensureAnimatorSet() { if (!mHasAnimatorSet) { - mAnimatedVectorState.prepareLocalAnimators(mAnimatorSet, mRes); + // TODO: Skip the AnimatorSet creation and init the VectorDrawableAnimator directly + // with a list of LocalAnimators. + AnimatorSet set = new AnimatorSet(); + mAnimatedVectorState.prepareLocalAnimators(set, mRes); mHasAnimatorSet = true; + mAnimatorSet.initWithAnimatorSet(set); mRes = null; } } @@ -694,13 +713,13 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { } }; } - mAnimatorSet.addListener(mAnimatorListener); + mAnimatorSet.setListener(mAnimatorListener); } // A helper function to clean up the animator listener in the mAnimatorSet. private void removeAnimatorSetListener() { if (mAnimatorListener != null) { - mAnimatorSet.removeListener(mAnimatorListener); + mAnimatorSet.removeListener(); mAnimatorListener = null; } } @@ -730,4 +749,406 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { mAnimationCallbacks.clear(); } -}
\ No newline at end of file + /** + * @hide + */ + public static class VectorDrawableAnimator { + private AnimatorListener mListener = null; + private final LongArray mStartDelays = new LongArray(); + private PropertyValuesHolder.PropertyValues mTmpValues = + new PropertyValuesHolder.PropertyValues(); + private long mSetPtr = 0; + private boolean mContainsSequentialAnimators = false; + private boolean mStarted = false; + private boolean mInitialized = false; + private boolean mAnimationPending = false; + private boolean mIsReversible = false; + // TODO: Consider using NativeAllocationRegistery to track native allocation + private final VirtualRefBasePtr mSetRefBasePtr; + private WeakReference<RenderNode> mTarget = null; + private WeakReference<RenderNode> mLastSeenTarget = null; + + + VectorDrawableAnimator() { + mSetPtr = nCreateAnimatorSet(); + // Increment ref count on native AnimatorSet, so it doesn't get released before Java + // side is done using it. + mSetRefBasePtr = new VirtualRefBasePtr(mSetPtr); + } + + private void initWithAnimatorSet(AnimatorSet set) { + if (mInitialized) { + // Already initialized + throw new UnsupportedOperationException("VectorDrawableAnimator cannot be " + + "re-initialized"); + } + parseAnimatorSet(set, 0); + mInitialized = true; + + // Check reversible. + if (mContainsSequentialAnimators) { + mIsReversible = false; + } else { + // Check if there's any start delay set on child + for (int i = 0; i < mStartDelays.size(); i++) { + if (mStartDelays.get(i) > 0) { + mIsReversible = false; + return; + } + } + } + mIsReversible = true; + } + + private void parseAnimatorSet(AnimatorSet set, long startTime) { + ArrayList<Animator> animators = set.getChildAnimations(); + + boolean playTogether = set.shouldPlayTogether(); + // Convert AnimatorSet to VectorDrawableAnimator + for (int i = 0; i < animators.size(); i++) { + Animator animator = animators.get(i); + // Here we only support ObjectAnimator + if (animator instanceof AnimatorSet) { + parseAnimatorSet((AnimatorSet) animator, startTime); + } else if (animator instanceof ObjectAnimator) { + createRTAnimator((ObjectAnimator) animator, startTime); + } // ignore ValueAnimators and others because they don't directly modify VD + // therefore will be useless to AVD. + + if (!playTogether) { + // Assume not play together means play sequentially + startTime += animator.getTotalDuration(); + mContainsSequentialAnimators = true; + } + } + } + + // TODO: This method reads animation data from already parsed Animators. We need to move + // this step further up the chain in the parser to avoid the detour. + private void createRTAnimator(ObjectAnimator animator, long startTime) { + PropertyValuesHolder[] values = animator.getValues(); + Object target = animator.getTarget(); + if (target instanceof VectorDrawable.VGroup) { + createRTAnimatorForGroup(values, animator, (VectorDrawable.VGroup) target, + startTime); + } else if (target instanceof VectorDrawable.VPath) { + for (int i = 0; i < values.length; i++) { + values[i].getPropertyValues(mTmpValues); + if (mTmpValues.endValue instanceof PathParser.PathData && + mTmpValues.propertyName.equals("pathData")) { + createRTAnimatorForPath(animator, (VectorDrawable.VPath) target, + startTime); + } else if (target instanceof VectorDrawable.VFullPath) { + createRTAnimatorForFullPath(animator, (VectorDrawable.VFullPath) target, + startTime); + } else { + throw new IllegalArgumentException("ClipPath only supports PathData " + + "property"); + } + + } + } else if (target instanceof VectorDrawable.VectorDrawableState) { + createRTAnimatorForRootGroup(values, animator, + (VectorDrawable.VectorDrawableState) target, startTime); + } else { + // Should never get here + throw new UnsupportedOperationException("Target should be group, path or vector. " + + target == null ? "Null target" : target.getClass() + " is not supported"); + } + } + + private void createRTAnimatorForGroup(PropertyValuesHolder[] values, + ObjectAnimator animator, VectorDrawable.VGroup target, + long startTime) { + + long nativePtr = target.getNativePtr(); + int propertyId; + for (int i = 0; i < values.length; i++) { + // TODO: We need to support the rare case in AVD where no start value is provided + values[i].getPropertyValues(mTmpValues); + propertyId = VectorDrawable.VGroup.getPropertyIndex(mTmpValues.propertyName); + if (mTmpValues.type != Float.class && mTmpValues.type != float.class) { + if (DBG_ANIMATION_VECTOR_DRAWABLE) { + Log.e(LOGTAG, "Unsupported type: " + + mTmpValues.type + ". Only float value is supported for Groups."); + } + continue; + } + if (propertyId < 0) { + if (DBG_ANIMATION_VECTOR_DRAWABLE) { + Log.e(LOGTAG, "Unsupported property: " + + mTmpValues.propertyName + " for Vector Drawable Group"); + } + continue; + } + long propertyPtr = nCreateGroupPropertyHolder(nativePtr, propertyId, + (Float) mTmpValues.startValue, (Float) mTmpValues.endValue); + if (mTmpValues.dataSource != null) { + float[] dataPoints = createDataPoints(mTmpValues.dataSource, animator + .getDuration()); + nSetPropertyHolderData(propertyPtr, dataPoints, dataPoints.length); + } + createNativeChildAnimator(propertyPtr, startTime, animator); + } + } + private void createRTAnimatorForPath( ObjectAnimator animator, VectorDrawable.VPath target, + long startTime) { + + long nativePtr = target.getNativePtr(); + long startPathDataPtr = ((PathParser.PathData) mTmpValues.startValue) + .getNativePtr(); + long endPathDataPtr = ((PathParser.PathData) mTmpValues.endValue) + .getNativePtr(); + long propertyPtr = nCreatePathDataPropertyHolder(nativePtr, startPathDataPtr, + endPathDataPtr); + createNativeChildAnimator(propertyPtr, startTime, animator); + } + + private void createRTAnimatorForFullPath(ObjectAnimator animator, + VectorDrawable.VFullPath target, long startTime) { + + int propertyId = target.getPropertyIndex(mTmpValues.propertyName); + long propertyPtr; + long nativePtr = target.getNativePtr(); + if (mTmpValues.type == Float.class || mTmpValues.type == float.class) { + if (propertyId < 0) { + throw new IllegalArgumentException("Property: " + mTmpValues + .propertyName + " is not supported for FullPath"); + } + propertyPtr = nCreatePathPropertyHolder(nativePtr, propertyId, + (Float) mTmpValues.startValue, (Float) mTmpValues.endValue); + + } else if (mTmpValues.type == Integer.class || mTmpValues.type == int.class) { + propertyPtr = nCreatePathColorPropertyHolder(nativePtr, propertyId, + (Integer) mTmpValues.startValue, (Integer) mTmpValues.endValue); + } else { + throw new UnsupportedOperationException("Unsupported type: " + + mTmpValues.type + ". Only float, int or PathData value is " + + "supported for Paths."); + } + if (mTmpValues.dataSource != null) { + float[] dataPoints = createDataPoints(mTmpValues.dataSource, animator + .getDuration()); + nSetPropertyHolderData(propertyPtr, dataPoints, dataPoints.length); + } + createNativeChildAnimator(propertyPtr, startTime, animator); + } + + private void createRTAnimatorForRootGroup(PropertyValuesHolder[] values, + ObjectAnimator animator, VectorDrawable.VectorDrawableState target, + long startTime) { + long nativePtr = target.getNativeRenderer(); + if (!animator.getPropertyName().equals("alpha")) { + throw new UnsupportedOperationException("Only alpha is supported for root " + + "group"); + } + Float startValue = null; + Float endValue = null; + for (int i = 0; i < values.length; i++) { + values[i].getPropertyValues(mTmpValues); + if (mTmpValues.propertyName.equals("alpha")) { + startValue = (Float) mTmpValues.startValue; + endValue = (Float) mTmpValues.endValue; + break; + } + } + if (startValue == null && endValue == null) { + throw new UnsupportedOperationException("No alpha values are specified"); + } + long propertyPtr = nCreateRootAlphaPropertyHolder(nativePtr, startValue, endValue); + createNativeChildAnimator(propertyPtr, startTime, animator); + } + + // These are the data points that define the value of the animating properties. + // e.g. translateX and translateY can animate along a Path, at any fraction in [0, 1] + // a point on the path corresponds to the values of translateX and translateY. + // TODO: (Optimization) We should pass the path down in native and chop it into segments + // in native. + private static float[] createDataPoints( + PropertyValuesHolder.PropertyValues.DataSource dataSource, long duration) { + long frameIntervalNanos = Choreographer.getInstance().getFrameIntervalNanos(); + int animIntervalMs = (int) (frameIntervalNanos / TimeUtils.NANOS_PER_MS); + int numAnimFrames = (int) Math.ceil(((double) duration) / animIntervalMs); + float values[] = new float[numAnimFrames]; + float lastFrame = numAnimFrames - 1; + for (int i = 0; i < numAnimFrames; i++) { + float fraction = i / lastFrame; + values[i] = (Float) dataSource.getValueAtFraction(fraction); + } + return values; + } + + private void createNativeChildAnimator(long propertyPtr, long extraDelay, + ObjectAnimator animator) { + long duration = animator.getDuration(); + int repeatCount = animator.getRepeatCount(); + long startDelay = extraDelay + animator.getStartDelay(); + TimeInterpolator interpolator = animator.getInterpolator(); + long nativeInterpolator = + RenderNodeAnimatorSetHelper.createNativeInterpolator(interpolator, duration); + + startDelay *= ValueAnimator.getDurationScale(); + duration *= ValueAnimator.getDurationScale(); + + mStartDelays.add(startDelay); + nAddAnimator(mSetPtr, propertyPtr, nativeInterpolator, startDelay, duration, + repeatCount); + } + + /** + * Holds a weak reference to the target that was last seen (through the DisplayListCanvas + * in the last draw call), so that when animator set needs to start, we can add the animator + * to the last seen RenderNode target and start right away. + */ + protected void recordLastSeenTarget(DisplayListCanvas canvas) { + if (mAnimationPending) { + mLastSeenTarget = new WeakReference<RenderNode>( + RenderNodeAnimatorSetHelper.getTarget(canvas)); + if (DBG_ANIMATION_VECTOR_DRAWABLE) { + Log.d(LOGTAG, "Target is set in the next frame"); + } + mAnimationPending = false; + start(); + } else { + mLastSeenTarget = new WeakReference<RenderNode>( + RenderNodeAnimatorSetHelper.getTarget(canvas)); + } + + } + + private boolean setTarget(RenderNode node) { + if (mTarget != null && mTarget.get() != null) { + // TODO: Maybe we want to support target change. + throw new IllegalStateException("Target already set!"); + } + + node.addAnimator(this); + mTarget = new WeakReference<RenderNode>(node); + return true; + } + + private boolean useLastSeenTarget() { + if (mLastSeenTarget != null && mLastSeenTarget.get() != null) { + setTarget(mLastSeenTarget.get()); + return true; + } + return false; + } + + public void start() { + if (!mInitialized) { + return; + } + + if (mStarted) { + return; + } + + if (!useLastSeenTarget()) { + mAnimationPending = true; + return; + } + + if (DBG_ANIMATION_VECTOR_DRAWABLE) { + Log.d(LOGTAG, "Target is set. Starting VDAnimatorSet from java"); + } + + nStart(mSetPtr, this); + if (mListener != null) { + mListener.onAnimationStart(null); + } + mStarted = true; + } + + public void end() { + if (mInitialized && mStarted) { + nEnd(mSetPtr); + onAnimationEnd(); + } + } + + void reset() { + if (!mInitialized) { + return; + } + // TODO: Need to implement reset. + Log.w(LOGTAG, "Reset is yet to be implemented"); + nReset(mSetPtr); + } + + // Current (imperfect) Java AnimatorSet cannot be reversed when the set contains sequential + // animators or when the animator set has a start delay + void reverse() { + if (!mIsReversible) { + return; + } + // TODO: Need to support reverse (non-public API) + Log.w(LOGTAG, "Reverse is yet to be implemented"); + nReverse(mSetPtr, this); + } + + public long getAnimatorNativePtr() { + return mSetPtr; + } + + boolean canReverse() { + return mIsReversible; + } + + boolean isStarted() { + return mStarted; + } + + boolean isRunning() { + if (!mInitialized) { + return false; + } + return mStarted; + } + + void setListener(AnimatorListener listener) { + mListener = listener; + } + + void removeListener() { + mListener = null; + } + + private void onAnimationEnd() { + mStarted = false; + if (mListener != null) { + mListener.onAnimationEnd(null); + } + mTarget = null; + } + + // onFinished: should be called from native + private static void callOnFinished(VectorDrawableAnimator set) { + if (DBG_ANIMATION_VECTOR_DRAWABLE) { + Log.d(LOGTAG, "on finished called from native"); + } + set.onAnimationEnd(); + } + } + + private static native long nCreateAnimatorSet(); + private static native void nAddAnimator(long setPtr, long propertyValuesHolder, + long nativeInterpolator, long startDelay, long duration, int repeatCount); + + private static native long nCreateGroupPropertyHolder(long nativePtr, int propertyId, + float startValue, float endValue); + + private static native long nCreatePathDataPropertyHolder(long nativePtr, long startValuePtr, + long endValuePtr); + private static native long nCreatePathColorPropertyHolder(long nativePtr, int propertyId, + int startValue, int endValue); + private static native long nCreatePathPropertyHolder(long nativePtr, int propertyId, + float startValue, float endValue); + private static native long nCreateRootAlphaPropertyHolder(long nativePtr, float startValue, + float endValue); + private static native void nSetPropertyHolderData(long nativePtr, float[] data, int length); + private static native void nStart(long animatorSetPtr, VectorDrawableAnimator set); + private static native void nReverse(long animatorSetPtr, VectorDrawableAnimator set); + private static native void nEnd(long animatorSetPtr); + private static native void nReset(long animatorSetPtr); +} diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index 1fc1b83f7a6c..f4bbc8c43d08 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -39,6 +39,7 @@ import android.util.PathParser; import android.util.Xml; import com.android.internal.R; +import com.android.internal.util.VirtualRefBasePtr; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -47,6 +48,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.ArrayList; +import java.util.HashMap; import java.util.Stack; /** @@ -522,13 +524,13 @@ public class VectorDrawable extends Drawable { public void inflate(@NonNull Resources r, @NonNull XmlPullParser parser, @NonNull AttributeSet attrs, @Nullable Theme theme) throws XmlPullParserException, IOException { - if (mVectorState.mRootGroup != null || mVectorState.mNativeRendererPtr != 0) { + if (mVectorState.mRootGroup != null || mVectorState.mNativeRendererRefBase != null) { // This VD has been used to display other VD resource content, clean up. mVectorState.mRootGroup = new VGroup(); - if (mVectorState.mNativeRendererPtr != 0) { - nDestroyRenderer(mVectorState.mNativeRendererPtr); + if (mVectorState.mNativeRendererRefBase != null) { + mVectorState.mNativeRendererRefBase.release(); } - mVectorState.mNativeRendererPtr = nCreateRenderer(mVectorState.mRootGroup.mNativePtr); + mVectorState.createNativeRenderer(mVectorState.mRootGroup.mNativePtr); } final VectorDrawableState state = mVectorState; state.setDensity(Drawable.resolveDensity(r, 0)); @@ -707,7 +709,7 @@ public class VectorDrawable extends Drawable { return mVectorState.mAutoMirrored; } - private static class VectorDrawableState extends ConstantState { + static class VectorDrawableState extends ConstantState { // Variables below need to be copied (deep copy if applicable) for mutation. int[] mThemeAttrs; int mChangingConfigurations; @@ -722,7 +724,7 @@ public class VectorDrawable extends Drawable { Insets mOpticalInsets = Insets.NONE; String mRootName = null; VGroup mRootGroup; - long mNativeRendererPtr; + VirtualRefBasePtr mNativeRendererRefBase = null; int mDensity = DisplayMetrics.DENSITY_DEFAULT; final ArrayMap<String, Object> mVGTargetsMap = new ArrayMap<>(); @@ -743,7 +745,7 @@ public class VectorDrawable extends Drawable { mTintMode = copy.mTintMode; mAutoMirrored = copy.mAutoMirrored; mRootGroup = new VGroup(copy.mRootGroup, mVGTargetsMap); - mNativeRendererPtr = nCreateRenderer(mRootGroup.mNativePtr); + createNativeRenderer(mRootGroup.mNativePtr); mBaseWidth = copy.mBaseWidth; mBaseHeight = copy.mBaseHeight; @@ -758,18 +760,15 @@ public class VectorDrawable extends Drawable { } } - @Override - public void finalize() throws Throwable { - if (mNativeRendererPtr != 0) { - nDestroyRenderer(mNativeRendererPtr); - mNativeRendererPtr = 0; - } - super.finalize(); + private void createNativeRenderer(long rootGroupPtr) { + mNativeRendererRefBase = new VirtualRefBasePtr(nCreateRenderer(rootGroupPtr)); } - long getNativeRenderer() { - return mNativeRendererPtr; + if (mNativeRendererRefBase == null) { + return 0; + } + return mNativeRendererRefBase.get(); } public boolean canReuseCache() { @@ -808,7 +807,7 @@ public class VectorDrawable extends Drawable { public VectorDrawableState() { mRootGroup = new VGroup(); - mNativeRendererPtr = nCreateRenderer(mRootGroup.mNativePtr); + createNativeRenderer(mRootGroup.mNativePtr); } @Override @@ -872,16 +871,16 @@ public class VectorDrawable extends Drawable { * has changed. */ public boolean setAlpha(float alpha) { - return nSetRootAlpha(mNativeRendererPtr, alpha); + return nSetRootAlpha(mNativeRendererRefBase.get(), alpha); } @SuppressWarnings("unused") public float getAlpha() { - return nGetRootAlpha(mNativeRendererPtr); + return nGetRootAlpha(mNativeRendererRefBase.get()); } } - private static class VGroup implements VObject { + static class VGroup implements VObject { private static final int ROTATE_INDEX = 0; private static final int PIVOT_X_INDEX = 1; private static final int PIVOT_Y_INDEX = 2; @@ -891,6 +890,28 @@ public class VectorDrawable extends Drawable { private static final int TRANSLATE_Y_INDEX = 6; private static final int TRANSFORM_PROPERTY_COUNT = 7; + private static final HashMap<String, Integer> sPropertyMap = + new HashMap<String, Integer>() { + { + put("translateX", TRANSLATE_X_INDEX); + put("translateY", TRANSLATE_Y_INDEX); + put("scaleX", SCALE_X_INDEX); + put("scaleY", SCALE_Y_INDEX); + put("pivotX", PIVOT_X_INDEX); + put("pivotY", PIVOT_Y_INDEX); + put("rotation", ROTATE_INDEX); + } + }; + + static int getPropertyIndex(String propertyName) { + if (sPropertyMap.containsKey(propertyName)) { + return sPropertyMap.get(propertyName); + } else { + // property not found + return -1; + } + } + // Temp array to store transform values obtained from native. private float[] mTransform; ///////////////////////////////////////////////////// @@ -1149,7 +1170,7 @@ public class VectorDrawable extends Drawable { /** * Common Path information for clip path and normal path. */ - private static abstract class VPath implements VObject { + static abstract class VPath implements VObject { protected PathParser.PathData mPathData = null; String mPathName; @@ -1260,7 +1281,7 @@ public class VectorDrawable extends Drawable { /** * Normal path, which contains all the fill / paint information. */ - private static class VFullPath extends VPath { + static class VFullPath extends VPath { private static final int STROKE_WIDTH_INDEX = 0; private static final int STROKE_COLOR_INDEX = 1; private static final int STROKE_ALPHA_INDEX = 2; @@ -1274,6 +1295,20 @@ public class VectorDrawable extends Drawable { private static final int STROKE_MITER_LIMIT_INDEX = 10; private static final int TOTAL_PROPERTY_COUNT = 11; + private final static HashMap<String, Integer> sPropertyMap + = new HashMap<String, Integer> () { + { + put("strokeWidth", STROKE_WIDTH_INDEX); + put("strokeColor", STROKE_COLOR_INDEX); + put("strokeAlpha", STROKE_ALPHA_INDEX); + put("fillColor", FILL_COLOR_INDEX); + put("fillAlpha", FILL_ALPHA_INDEX); + put("trimPathStart", TRIM_PATH_START_INDEX); + put("trimPathEnd", TRIM_PATH_END_INDEX); + put("trimPathOffset", TRIM_PATH_OFFSET_INDEX); + } + }; + // Temp array to store property data obtained from native getter. private byte[] mPropertyData; ///////////////////////////////////////////////////// @@ -1297,6 +1332,14 @@ public class VectorDrawable extends Drawable { mFillColors = copy.mFillColors; } + int getPropertyIndex(String propertyName) { + if (!sPropertyMap.containsKey(propertyName)) { + return -1; + } else { + return sPropertyMap.get(propertyName); + } + } + @Override public boolean onStateChange(int[] stateSet) { boolean changed = false; @@ -1595,7 +1638,6 @@ public class VectorDrawable extends Drawable { } private static native long nCreateRenderer(long rootGroupPtr); - private static native void nDestroyRenderer(long rendererPtr); private static native void nSetRendererViewportSize(long rendererPtr, float viewportWidth, float viewportHeight); private static native boolean nSetRootAlpha(long rendererPtr, float alpha); diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 587a366730c2..c232bd1101a3 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -78,6 +78,8 @@ hwui_src_files := \ Program.cpp \ ProgramCache.cpp \ Properties.cpp \ + PropertyValuesHolder.cpp \ + PropertyValuesAnimatorSet.cpp \ RenderBufferCache.cpp \ RenderNode.cpp \ RenderProperties.cpp \ @@ -236,6 +238,7 @@ LOCAL_CFLAGS := \ LOCAL_SRC_FILES += \ $(hwui_test_common_src_files) \ + tests/unit/BufferPoolTests.cpp \ tests/unit/CanvasStateTests.cpp \ tests/unit/ClipAreaTests.cpp \ tests/unit/CrashHandlerInjector.cpp \ @@ -245,11 +248,11 @@ LOCAL_SRC_FILES += \ tests/unit/GpuMemoryTrackerTests.cpp \ tests/unit/LayerUpdateQueueTests.cpp \ tests/unit/LinearAllocatorTests.cpp \ - tests/unit/VectorDrawableTests.cpp \ tests/unit/OffscreenBufferPoolTests.cpp \ + tests/unit/SkiaBehaviorTests.cpp \ tests/unit/StringUtilsTests.cpp \ - tests/unit/BufferPoolTests.cpp \ - tests/unit/TextDropShadowCacheTests.cpp + tests/unit/TextDropShadowCacheTests.cpp \ + tests/unit/VectorDrawableTests.cpp ifeq (true, $(HWUI_NEW_OPS)) LOCAL_SRC_FILES += \ diff --git a/libs/hwui/Animator.cpp b/libs/hwui/Animator.cpp index 5ca2a2fa37ab..7bd2b24bf56b 100644 --- a/libs/hwui/Animator.cpp +++ b/libs/hwui/Animator.cpp @@ -90,6 +90,9 @@ void BaseRenderNodeAnimator::pushStaging(AnimationContext& context) { doSetStartValue(getValue(mTarget)); } if (mStagingPlayState > mPlayState) { + if (mStagingPlayState == PlayState::Restarted) { + mStagingPlayState = PlayState::Running; + } mPlayState = mStagingPlayState; // Oh boy, we're starting! Man the battle stations! if (mPlayState == PlayState::Running) { @@ -131,6 +134,11 @@ bool BaseRenderNodeAnimator::animate(AnimationContext& context) { return true; } + // This should be set before setValue() so animators can query this time when setValue + // is called. + nsecs_t currentFrameTime = context.frameTimeMs(); + onPlayTimeChanged(currentFrameTime - mStartTime); + // If BaseRenderNodeAnimator is handling the delay (not typical), then // because the staging properties reflect the final value, we always need // to call setValue even if the animation isn't yet running or is still @@ -141,8 +149,9 @@ bool BaseRenderNodeAnimator::animate(AnimationContext& context) { } float fraction = 1.0f; + if (mPlayState == PlayState::Running && mDuration > 0) { - fraction = (float)(context.frameTimeMs() - mStartTime) / mDuration; + fraction = (float)(currentFrameTime - mStartTime) / mDuration; } if (fraction >= 1.0f) { fraction = 1.0f; diff --git a/libs/hwui/Animator.h b/libs/hwui/Animator.h index aea95bfc1c0e..2c9c9c3fe0f9 100644 --- a/libs/hwui/Animator.h +++ b/libs/hwui/Animator.h @@ -59,7 +59,13 @@ public: mMayRunAsync = mayRunAsync; } bool mayRunAsync() { return mMayRunAsync; } - ANDROID_API void start() { mStagingPlayState = PlayState::Running; onStagingPlayStateChanged(); } + ANDROID_API void start() { + if (mStagingPlayState == PlayState::NotStarted) { + mStagingPlayState = PlayState::Running; + } else { + mStagingPlayState = PlayState::Restarted; + } + onStagingPlayStateChanged(); } ANDROID_API void end() { mStagingPlayState = PlayState::Finished; onStagingPlayStateChanged(); } void attach(RenderNode* target); @@ -77,10 +83,27 @@ public: void forceEndNow(AnimationContext& context); protected: + // PlayState is used by mStagingPlayState and mPlayState to track the state initiated from UI + // thread and Render Thread animation state, respectively. + // From the UI thread, mStagingPlayState transition looks like + // NotStarted -> Running -> Finished + // ^ | + // | | + // Restarted <------ + // Note: For mStagingState, the Finished state (optional) is only set when the animation is + // terminated by user. + // + // On Render Thread, mPlayState transition: + // NotStart -> Running -> Finished + // ^ | + // | | + // ------------- + enum class PlayState { NotStarted, Running, Finished, + Restarted, }; BaseRenderNodeAnimator(float finalValue); @@ -93,6 +116,7 @@ protected: void callOnFinishedListener(AnimationContext& context); virtual void onStagingPlayStateChanged() {} + virtual void onPlayTimeChanged(nsecs_t playTime) {} RenderNode* mTarget; diff --git a/libs/hwui/BakedOpDispatcher.cpp b/libs/hwui/BakedOpDispatcher.cpp index 7ecc743b700c..e3a5f3eeeac1 100644 --- a/libs/hwui/BakedOpDispatcher.cpp +++ b/libs/hwui/BakedOpDispatcher.cpp @@ -663,13 +663,7 @@ static void renderShadow(BakedOpRenderer& renderer, const BakedOpState& state, f } void BakedOpDispatcher::onShadowOp(BakedOpRenderer& renderer, const ShadowOp& op, const BakedOpState& state) { - TessellationCache::vertexBuffer_pair_t buffers; - renderer.caches().tessellationCache.getShadowBuffers(&state.computedState.transform, - op.localClipRect, op.casterAlpha >= 1.0f, op.casterPath, - &op.shadowMatrixXY, &op.shadowMatrixZ, - op.lightCenter, renderer.getLightInfo().lightRadius, - buffers); - + TessellationCache::vertexBuffer_pair_t buffers = op.shadowTask->getResult(); renderShadow(renderer, state, op.casterAlpha, buffers.first, buffers.second); } @@ -734,23 +728,34 @@ void BakedOpDispatcher::onTextureLayerOp(BakedOpRenderer& renderer, const Textur } void BakedOpDispatcher::onLayerOp(BakedOpRenderer& renderer, const LayerOp& op, const BakedOpState& state) { + // Note that we don't use op->paint in this function - it's never set on a LayerOp OffscreenBuffer* buffer = *op.layerHandle; - // Note that we don't use op->paint here - it's never set on a LayerOp - float layerAlpha = op.alpha * state.alpha; - Glop glop; - GlopBuilder(renderer.renderState(), renderer.caches(), &glop) - .setRoundRectClipState(state.roundRectClipState) - .setMeshTexturedIndexedVbo(buffer->vbo, buffer->elementCount) - .setFillLayer(buffer->texture, op.colorFilter, layerAlpha, op.mode, Blend::ModeOrderSwap::NoSwap) - .setTransform(state.computedState.transform, TransformFlags::None) - .setModelViewOffsetRectSnap(op.unmappedBounds.left, op.unmappedBounds.top, - Rect(op.unmappedBounds.getWidth(), op.unmappedBounds.getHeight())) - .build(); - renderer.renderGlop(state, glop); + if (CC_UNLIKELY(!buffer)) { + // Layer was not allocated, which can occur if there were no draw ops inside. We draw the + // equivalent by drawing a rect with the same layer properties (alpha/xfer/filter). + SkPaint paint; + paint.setAlpha(op.alpha * 255); + paint.setXfermodeMode(op.mode); + paint.setColorFilter(op.colorFilter); + RectOp rectOp(op.unmappedBounds, op.localMatrix, op.localClip, &paint); + BakedOpDispatcher::onRectOp(renderer, rectOp, state); + } else { + float layerAlpha = op.alpha * state.alpha; + Glop glop; + GlopBuilder(renderer.renderState(), renderer.caches(), &glop) + .setRoundRectClipState(state.roundRectClipState) + .setMeshTexturedIndexedVbo(buffer->vbo, buffer->elementCount) + .setFillLayer(buffer->texture, op.colorFilter, layerAlpha, op.mode, Blend::ModeOrderSwap::NoSwap) + .setTransform(state.computedState.transform, TransformFlags::None) + .setModelViewOffsetRectSnap(op.unmappedBounds.left, op.unmappedBounds.top, + Rect(op.unmappedBounds.getWidth(), op.unmappedBounds.getHeight())) + .build(); + renderer.renderGlop(state, glop); - if (op.destroy) { - renderer.renderState().layerPool().putOrDelete(buffer); + if (op.destroy) { + renderer.renderState().layerPool().putOrDelete(buffer); + } } } diff --git a/libs/hwui/BakedOpRenderer.h b/libs/hwui/BakedOpRenderer.h index 10c469875150..55ea93531bc7 100644 --- a/libs/hwui/BakedOpRenderer.h +++ b/libs/hwui/BakedOpRenderer.h @@ -45,13 +45,11 @@ public: * Position agnostic shadow lighting info. Used with all shadow ops in scene. */ struct LightInfo { - LightInfo() : LightInfo(0, 0, 0) {} - LightInfo(float lightRadius, uint8_t ambientShadowAlpha, + LightInfo() : LightInfo(0, 0) {} + LightInfo(uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) - : lightRadius(lightRadius) - , ambientShadowAlpha(ambientShadowAlpha) + : ambientShadowAlpha(ambientShadowAlpha) , spotShadowAlpha(spotShadowAlpha) {} - float lightRadius; uint8_t ambientShadowAlpha; uint8_t spotShadowAlpha; }; diff --git a/libs/hwui/BakedOpState.cpp b/libs/hwui/BakedOpState.cpp index 87844f9840d7..a542c26b41b8 100644 --- a/libs/hwui/BakedOpState.cpp +++ b/libs/hwui/BakedOpState.cpp @@ -63,16 +63,11 @@ ResolvedRenderState::ResolvedRenderState(LinearAllocator& allocator, Snapshot& s } } -ResolvedRenderState::ResolvedRenderState(LinearAllocator& allocator, Snapshot& snapshot) { - transform = *snapshot.transform; - - // Since the op doesn't have known bounds, we conservatively set the mapped bounds - // to the current clipRect, and clipSideFlags to Full. - clipState = snapshot.mutateClipArea().serializeClip(allocator); - LOG_ALWAYS_FATAL_IF(!clipState, "clipState required"); - clippedBounds = clipState->rect; - clipSideFlags = OpClipSideFlags::Full; -} +ResolvedRenderState::ResolvedRenderState(LinearAllocator& allocator, Snapshot& snapshot) + : transform(*snapshot.transform) + , clipState(snapshot.mutateClipArea().serializeClip(allocator)) + , clippedBounds(clipState->rect) + , clipSideFlags(OpClipSideFlags::Full) {} ResolvedRenderState::ResolvedRenderState(const ClipRect* viewportRect, const Rect& dstRect) : transform(Matrix4::identity()) diff --git a/libs/hwui/Canvas.cpp b/libs/hwui/Canvas.cpp index bc88c817ffc8..11ae1a137e2e 100644 --- a/libs/hwui/Canvas.cpp +++ b/libs/hwui/Canvas.cpp @@ -16,10 +16,20 @@ #include "Canvas.h" +#include "DisplayListCanvas.h" +#include "RecordingCanvas.h" #include <SkDrawFilter.h> namespace android { +Canvas* Canvas::create_recording_canvas(int width, int height) { +#if HWUI_NEW_OPS + return new uirenderer::RecordingCanvas(width, height); +#else + return new uirenderer::DisplayListCanvas(width, height); +#endif +} + void Canvas::drawTextDecorations(float x, float y, float length, const SkPaint& paint) { uint32_t flags; SkDrawFilter* drawFilter = getDrawFilter(); diff --git a/libs/hwui/Canvas.h b/libs/hwui/Canvas.h index 9dfe454c7bc1..27facdf652cd 100644 --- a/libs/hwui/Canvas.h +++ b/libs/hwui/Canvas.h @@ -18,6 +18,7 @@ #define ANDROID_GRAPHICS_CANVAS_H #include <cutils/compiler.h> +#include <utils/Functor.h> #include "utils/NinePatch.h" @@ -27,6 +28,14 @@ namespace android { +namespace uirenderer { + class CanvasPropertyPaint; + class CanvasPropertyPrimitive; + class DeferredLayerUpdater; + class DisplayList; + class RenderNode; +} + namespace SaveFlags { // These must match the corresponding Canvas API constants. @@ -43,12 +52,21 @@ typedef uint32_t Flags; } // namespace SaveFlags +namespace uirenderer { +namespace VectorDrawable { +class Tree; +}; +}; +typedef uirenderer::VectorDrawable::Tree VectorDrawableRoot; + class ANDROID_API Canvas { public: virtual ~Canvas() {}; static Canvas* create_canvas(const SkBitmap& bitmap); + static Canvas* create_recording_canvas(int width, int height); + /** * Create a new Canvas object which delegates to an SkCanvas. * @@ -74,15 +92,36 @@ public: */ virtual SkCanvas* asSkCanvas() = 0; + virtual void setBitmap(const SkBitmap& bitmap) = 0; virtual bool isOpaque() = 0; virtual int width() = 0; virtual int height() = 0; +// ---------------------------------------------------------------------------- +// View System operations (not exposed in public Canvas API) +// ---------------------------------------------------------------------------- + + virtual void resetRecording(int width, int height) = 0; + virtual uirenderer::DisplayList* finishRecording() = 0; + virtual void insertReorderBarrier(bool enableReorder) = 0; + virtual void setHighContrastText(bool highContrastText) = 0; virtual bool isHighContrastText() = 0; + virtual void drawRoundRect(uirenderer::CanvasPropertyPrimitive* left, + uirenderer::CanvasPropertyPrimitive* top, uirenderer::CanvasPropertyPrimitive* right, + uirenderer::CanvasPropertyPrimitive* bottom, uirenderer::CanvasPropertyPrimitive* rx, + uirenderer::CanvasPropertyPrimitive* ry, uirenderer::CanvasPropertyPaint* paint) = 0; + virtual void drawCircle(uirenderer::CanvasPropertyPrimitive* x, + uirenderer::CanvasPropertyPrimitive* y, uirenderer::CanvasPropertyPrimitive* radius, + uirenderer::CanvasPropertyPaint* paint) = 0; + + virtual void drawLayer(uirenderer::DeferredLayerUpdater* layerHandle) = 0; + virtual void drawRenderNode(uirenderer::RenderNode* renderNode) = 0; + virtual void callDrawGLFunction(Functor* functor) = 0; + // ---------------------------------------------------------------------------- // Canvas state operations // ---------------------------------------------------------------------------- @@ -185,6 +224,11 @@ public: */ virtual bool drawTextAbsolutePos() const = 0; + /** + * Draws a VectorDrawable onto the canvas. + */ + virtual void drawVectorDrawable(VectorDrawableRoot* tree); + protected: void drawTextDecorations(float x, float y, float length, const SkPaint& paint); }; diff --git a/libs/hwui/DisplayListCanvas.cpp b/libs/hwui/DisplayListCanvas.cpp index 384e64d7700f..3db14b55cff6 100644 --- a/libs/hwui/DisplayListCanvas.cpp +++ b/libs/hwui/DisplayListCanvas.cpp @@ -16,11 +16,12 @@ #include "DisplayListCanvas.h" -#include "ResourceCache.h" #include "DeferredDisplayList.h" #include "DeferredLayerUpdater.h" #include "DisplayListOp.h" +#include "ResourceCache.h" #include "RenderNode.h" +#include "VectorDrawable.h" #include "utils/PaintUtils.h" #include <SkCamera.h> @@ -41,7 +42,7 @@ DisplayListCanvas::DisplayListCanvas(int width, int height) , mDeferredBarrierType(kBarrier_None) , mHighContrastText(false) , mRestoreSaveCount(-1) { - reset(width, height); + resetRecording(width, height); } DisplayListCanvas::~DisplayListCanvas() { @@ -49,7 +50,7 @@ DisplayListCanvas::~DisplayListCanvas() { "Destroyed a DisplayListCanvas during a record!"); } -void DisplayListCanvas::reset(int width, int height) { +void DisplayListCanvas::resetRecording(int width, int height) { LOG_ALWAYS_FATAL_IF(mDisplayList, "prepareDirty called a second time during a recording!"); mDisplayList = new DisplayList(); @@ -412,6 +413,16 @@ void DisplayListCanvas::drawPoints(const float* points, int count, const SkPaint addDrawOp(new (alloc()) DrawPointsOp(points, count, refPaint(&paint))); } +void DisplayListCanvas::drawVectorDrawable(VectorDrawableRoot* tree) { + mDisplayList->ref(tree); + const SkBitmap& bitmap = tree->getBitmapUpdateIfDirty(); + SkPaint* paint = tree->getPaint(); + const SkRect bounds = tree->getBounds(); + addDrawOp(new (alloc()) DrawBitmapRectOp(refBitmap(bitmap), + 0, 0, bitmap.width(), bitmap.height(), + bounds.left(), bounds.top(), bounds.right(), bounds.bottom(), refPaint(paint))); +} + void DisplayListCanvas::drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) { if (!glyphs || count <= 0) return; diff --git a/libs/hwui/DisplayListCanvas.h b/libs/hwui/DisplayListCanvas.h index f1cfa08b3ac2..06e72a06eaca 100644 --- a/libs/hwui/DisplayListCanvas.h +++ b/libs/hwui/DisplayListCanvas.h @@ -67,36 +67,33 @@ public: DisplayListCanvas(int width, int height); virtual ~DisplayListCanvas(); - void reset(int width, int height); - WARN_UNUSED_RESULT DisplayList* finishRecording(); + virtual void resetRecording(int width, int height) override; + virtual WARN_UNUSED_RESULT DisplayList* finishRecording() override; // ---------------------------------------------------------------------------- // HWUI Canvas state operations // ---------------------------------------------------------------------------- - void insertReorderBarrier(bool enableReorder); + virtual void insertReorderBarrier(bool enableReorder) override; // ---------------------------------------------------------------------------- // HWUI Canvas draw operations // ---------------------------------------------------------------------------- // Shapes - void drawRoundRect(CanvasPropertyPrimitive* left, CanvasPropertyPrimitive* top, + virtual void drawRoundRect(CanvasPropertyPrimitive* left, CanvasPropertyPrimitive* top, CanvasPropertyPrimitive* right, CanvasPropertyPrimitive* bottom, CanvasPropertyPrimitive* rx, CanvasPropertyPrimitive* ry, - CanvasPropertyPaint* paint); - void drawCircle(CanvasPropertyPrimitive* x, CanvasPropertyPrimitive* y, - CanvasPropertyPrimitive* radius, CanvasPropertyPaint* paint); - + CanvasPropertyPaint* paint) override; + virtual void drawCircle(CanvasPropertyPrimitive* x, CanvasPropertyPrimitive* y, + CanvasPropertyPrimitive* radius, CanvasPropertyPaint* paint) override; // ---------------------------------------------------------------------------- // HWUI Canvas draw operations - special // ---------------------------------------------------------------------------- - void drawLayer(DeferredLayerUpdater* layerHandle); - void drawRenderNode(RenderNode* renderNode); - - // TODO: rename for consistency - void callDrawGLFunction(Functor* functor); + virtual void drawLayer(DeferredLayerUpdater* layerHandle) override; + virtual void drawRenderNode(RenderNode* renderNode) override; + virtual void callDrawGLFunction(Functor* functor) override; // ---------------------------------------------------------------------------- // CanvasStateClient interface @@ -209,6 +206,8 @@ public: float dstLeft, float dstTop, float dstRight, float dstBottom, const SkPaint* paint) override; + virtual void drawVectorDrawable(VectorDrawableRoot* tree) override; + // Text virtual void drawText(const uint16_t* glyphs, const float* positions, int count, const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop, @@ -217,7 +216,6 @@ public: float hOffset, float vOffset, const SkPaint& paint) override; virtual bool drawTextAbsolutePos() const override { return false; } - private: CanvasState mState; diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp index 1c765f65eb8f..185accec1ef6 100644 --- a/libs/hwui/FrameBuilder.cpp +++ b/libs/hwui/FrameBuilder.cpp @@ -19,6 +19,7 @@ #include "Canvas.h" #include "LayerUpdateQueue.h" #include "RenderNode.h" +#include "VectorDrawable.h" #include "renderstate/OffscreenBufferPool.h" #include "utils/FatVector.h" #include "utils/PaintUtils.h" @@ -32,17 +33,11 @@ namespace uirenderer { FrameBuilder::FrameBuilder(const LayerUpdateQueue& layers, const SkRect& clip, uint32_t viewportWidth, uint32_t viewportHeight, - const std::vector< sp<RenderNode> >& nodes, const Vector3& lightCenter) - : FrameBuilder(layers, clip, viewportWidth, viewportHeight, nodes, lightCenter, - Rect(0, 0, 0, 0)) { -} - - -FrameBuilder::FrameBuilder(const LayerUpdateQueue& layers, const SkRect& clip, - uint32_t viewportWidth, uint32_t viewportHeight, - const std::vector< sp<RenderNode> >& nodes, const Vector3& lightCenter, - const Rect &contentDrawBounds) - : mCanvasState(*this) { + const std::vector< sp<RenderNode> >& nodes, + const LightGeometry& lightGeometry, const Rect &contentDrawBounds, Caches* caches) + : mCanvasState(*this) + , mCaches(caches) + , mLightRadius(lightGeometry.radius) { ATRACE_NAME("prepare drawing commands"); mLayerBuilders.reserve(layers.entries().size()); @@ -54,7 +49,7 @@ FrameBuilder::FrameBuilder(const LayerUpdateQueue& layers, const SkRect& clip, mLayerStack.push_back(0); mCanvasState.initializeSaveStack(viewportWidth, viewportHeight, clip.fLeft, clip.fTop, clip.fRight, clip.fBottom, - lightCenter); + lightGeometry.center); // Render all layers to be updated, in order. Defer in reverse order, so that they'll be // updated in the order they're passed in (mLayerBuilders are issued to Renderer in reverse) @@ -368,13 +363,28 @@ void FrameBuilder::deferShadow(const RenderNodeOp& casterNodeOp) { casterPath = frameAllocatedPath; } - ShadowOp* shadowOp = new (mAllocator) ShadowOp(casterNodeOp, casterAlpha, casterPath, - mCanvasState.getLocalClipBounds(), - mCanvasState.currentSnapshot()->getRelativeLightCenter()); - BakedOpState* bakedOpState = BakedOpState::tryShadowOpConstruct( - mAllocator, *mCanvasState.writableSnapshot(), shadowOp); - if (CC_LIKELY(bakedOpState)) { - currentLayer().deferUnmergeableOp(mAllocator, bakedOpState, OpBatchType::Shadow); + + if (CC_LIKELY(!mCanvasState.getRenderTargetClipBounds().isEmpty())) { + Matrix4 shadowMatrixXY(casterNodeOp.localMatrix); + Matrix4 shadowMatrixZ(casterNodeOp.localMatrix); + node.applyViewPropertyTransforms(shadowMatrixXY, false); + node.applyViewPropertyTransforms(shadowMatrixZ, true); + + LOG_ALWAYS_FATAL_IF(!mCaches, "Caches needed for shadows"); + sp<TessellationCache::ShadowTask> task = mCaches->tessellationCache.getShadowTask( + mCanvasState.currentTransform(), + mCanvasState.getLocalClipBounds(), + casterAlpha >= 1.0f, + casterPath, + &shadowMatrixXY, &shadowMatrixZ, + mCanvasState.currentSnapshot()->getRelativeLightCenter(), + mLightRadius); + ShadowOp* shadowOp = mAllocator.create<ShadowOp>(task, casterAlpha); + BakedOpState* bakedOpState = BakedOpState::tryShadowOpConstruct( + mAllocator, *mCanvasState.writableSnapshot(), shadowOp); + if (CC_LIKELY(bakedOpState)) { + currentLayer().deferUnmergeableOp(mAllocator, bakedOpState, OpBatchType::Shadow); + } } } @@ -536,6 +546,18 @@ void FrameBuilder::deferBitmapRectOp(const BitmapRectOp& op) { currentLayer().deferUnmergeableOp(mAllocator, bakedState, OpBatchType::Bitmap); } +void FrameBuilder::deferVectorDrawableOp(const VectorDrawableOp& op) { + const SkBitmap& bitmap = op.vectorDrawable->getBitmapUpdateIfDirty(); + SkPaint* paint = op.vectorDrawable->getPaint(); + const BitmapRectOp* resolvedOp = new (mAllocator) BitmapRectOp(op.unmappedBounds, + op.localMatrix, + op.localClip, + paint, + &bitmap, + Rect(bitmap.width(), bitmap.height())); + deferBitmapRectOp(*resolvedOp); +} + void FrameBuilder::deferCirclePropsOp(const CirclePropsOp& op) { // allocate a temporary oval op (with mAllocator, so it persists until render), so the // renderer doesn't have to handle the RoundRectPropsOp type, and so state baking is simple. diff --git a/libs/hwui/FrameBuilder.h b/libs/hwui/FrameBuilder.h index dea9934e9a1b..f44306a931bf 100644 --- a/libs/hwui/FrameBuilder.h +++ b/libs/hwui/FrameBuilder.h @@ -55,14 +55,24 @@ class Rect; */ class FrameBuilder : public CanvasStateClient { public: + struct LightGeometry { + Vector3 center; + float radius; + }; + + // TODO: remove FrameBuilder(const LayerUpdateQueue& layers, const SkRect& clip, uint32_t viewportWidth, uint32_t viewportHeight, - const std::vector< sp<RenderNode> >& nodes, const Vector3& lightCenter); + const std::vector< sp<RenderNode> >& nodes, + const LightGeometry& lightGeometry, + Caches* caches) + : FrameBuilder(layers, clip, viewportWidth, viewportHeight, nodes, lightGeometry, Rect(), caches) {} FrameBuilder(const LayerUpdateQueue& layers, const SkRect& clip, uint32_t viewportWidth, uint32_t viewportHeight, - const std::vector< sp<RenderNode> >& nodes, const Vector3& lightCenter, - const Rect &contentDrawBounds); + const std::vector< sp<RenderNode> >& nodes, + const LightGeometry& lightGeometry, + const Rect &contentDrawBounds, Caches* caches); virtual ~FrameBuilder() {} @@ -114,7 +124,8 @@ public: layer.replayBakedOpsImpl((void*)&renderer, unmergedReceivers, mergedReceivers); GL_CHECKPOINT(MODERATE); renderer.endLayer(); - } else if (!layer.empty()) { // save layer - skip entire layer if empty + } else if (!layer.empty()) { + // save layer - skip entire layer if empty (in which case, LayerOp has null layer). layer.offscreenBuffer = renderer.startTemporaryLayer(layer.width, layer.height); GL_CHECKPOINT(MODERATE); layer.replayBakedOpsImpl((void*)&renderer, unmergedReceivers, mergedReceivers); @@ -215,7 +226,11 @@ private: CanvasState mCanvasState; - // contains ResolvedOps and Batches + Caches* mCaches = nullptr; + + float mLightRadius; + + // contains single-frame objects, such as BakedOpStates, LayerBuilders, Batches LinearAllocator mAllocator; }; diff --git a/libs/hwui/PropertyValuesAnimatorSet.cpp b/libs/hwui/PropertyValuesAnimatorSet.cpp new file mode 100644 index 000000000000..eca1afcc54dc --- /dev/null +++ b/libs/hwui/PropertyValuesAnimatorSet.cpp @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2016 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. + */ + +#include "PropertyValuesAnimatorSet.h" +#include "RenderNode.h" + +namespace android { +namespace uirenderer { + +void PropertyValuesAnimatorSet::addPropertyAnimator(PropertyValuesHolder* propertyValuesHolder, + Interpolator* interpolator, nsecs_t startDelay, + nsecs_t duration, int repeatCount) { + + PropertyAnimator* animator = new PropertyAnimator(propertyValuesHolder, + interpolator, startDelay, duration, repeatCount); + mAnimators.emplace_back(animator); + setListener(new PropertyAnimatorSetListener(this)); +} + +PropertyValuesAnimatorSet::PropertyValuesAnimatorSet() + : BaseRenderNodeAnimator(1.0f) { + setStartValue(0); + mLastFraction = 0.0f; + setInterpolator(new LinearInterpolator()); +} + +void PropertyValuesAnimatorSet::onFinished(BaseRenderNodeAnimator* animator) { + if (mOneShotListener.get()) { + mOneShotListener->onAnimationFinished(animator); + mOneShotListener = nullptr; + } +} + +float PropertyValuesAnimatorSet::getValue(RenderNode* target) const { + return mLastFraction; +} + +void PropertyValuesAnimatorSet::setValue(RenderNode* target, float value) { + mLastFraction = value; +} + +void PropertyValuesAnimatorSet::onPlayTimeChanged(nsecs_t playTime) { + for (size_t i = 0; i < mAnimators.size(); i++) { + mAnimators[i]->setCurrentPlayTime(playTime); + } +} + +void PropertyValuesAnimatorSet::reset() { + // TODO: implement reset through adding a play state because we need to support reset() even + // during an animation run. +} + +void PropertyValuesAnimatorSet::start(AnimationListener* listener) { + init(); + mOneShotListener = listener; + BaseRenderNodeAnimator::start(); +} + +void PropertyValuesAnimatorSet::reverse(AnimationListener* listener) { +// TODO: implement reverse +} + +void PropertyValuesAnimatorSet::init() { + if (mInitialized) { + return; + } + nsecs_t maxDuration = 0; + for (size_t i = 0; i < mAnimators.size(); i++) { + if (maxDuration < mAnimators[i]->getTotalDuration()) { + maxDuration = mAnimators[i]->getTotalDuration(); + } + } + mDuration = maxDuration; + mInitialized = true; +} + +uint32_t PropertyValuesAnimatorSet::dirtyMask() { + return RenderNode::DISPLAY_LIST; +} + +PropertyAnimator::PropertyAnimator(PropertyValuesHolder* holder, Interpolator* interpolator, + nsecs_t startDelay, nsecs_t duration, int repeatCount) + : mPropertyValuesHolder(holder), mInterpolator(interpolator), mStartDelay(startDelay), + mDuration(duration) { + if (repeatCount < 0) { + mRepeatCount = UINT32_MAX; + } else { + mRepeatCount = repeatCount; + } + mTotalDuration = ((nsecs_t) mRepeatCount + 1) * mDuration + mStartDelay; +} + +void PropertyAnimator::setCurrentPlayTime(nsecs_t playTime) { + if (playTime >= mStartDelay && playTime < mTotalDuration) { + nsecs_t currentIterationPlayTime = (playTime - mStartDelay) % mDuration; + mLatestFraction = currentIterationPlayTime / (float) mDuration; + } else if (mLatestFraction < 1.0f && playTime >= mTotalDuration) { + mLatestFraction = 1.0f; + } else { + return; + } + + setFraction(mLatestFraction); +} + +void PropertyAnimator::setFraction(float fraction) { + float interpolatedFraction = mInterpolator->interpolate(mLatestFraction); + mPropertyValuesHolder->setFraction(interpolatedFraction); +} + +void PropertyAnimatorSetListener::onAnimationFinished(BaseRenderNodeAnimator* animator) { + mSet->onFinished(animator); +} + +} +} diff --git a/libs/hwui/PropertyValuesAnimatorSet.h b/libs/hwui/PropertyValuesAnimatorSet.h new file mode 100644 index 000000000000..4c7ce528bb20 --- /dev/null +++ b/libs/hwui/PropertyValuesAnimatorSet.h @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2016 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. + */ + +#pragma once + +#include "Animator.h" +#include "PropertyValuesHolder.h" +#include "Interpolator.h" + +namespace android { +namespace uirenderer { + +class PropertyAnimator { +public: + PropertyAnimator(PropertyValuesHolder* holder, Interpolator* interpolator, nsecs_t startDelay, + nsecs_t duration, int repeatCount); + void setCurrentPlayTime(nsecs_t playTime); + nsecs_t getTotalDuration() { + return mTotalDuration; + } + void setFraction(float fraction); + +private: + std::unique_ptr<PropertyValuesHolder> mPropertyValuesHolder; + std::unique_ptr<Interpolator> mInterpolator; + nsecs_t mStartDelay; + nsecs_t mDuration; + uint32_t mRepeatCount; + nsecs_t mTotalDuration; + float mLatestFraction = 0.0f; +}; + +class ANDROID_API PropertyValuesAnimatorSet : public BaseRenderNodeAnimator { +public: + friend class PropertyAnimatorSetListener; + PropertyValuesAnimatorSet(); + + void start(AnimationListener* listener); + void reverse(AnimationListener* listener); + void reset(); + + void addPropertyAnimator(PropertyValuesHolder* propertyValuesHolder, + Interpolator* interpolators, int64_t startDelays, + nsecs_t durations, int repeatCount); + virtual uint32_t dirtyMask(); + +protected: + virtual float getValue(RenderNode* target) const override; + virtual void setValue(RenderNode* target, float value) override; + virtual void onPlayTimeChanged(nsecs_t playTime) override; + +private: + void init(); + void onFinished(BaseRenderNodeAnimator* animator); + // Listener set from outside + sp<AnimationListener> mOneShotListener; + std::vector< std::unique_ptr<PropertyAnimator> > mAnimators; + float mLastFraction = 0.0f; + bool mInitialized = false; +}; + +class PropertyAnimatorSetListener : public AnimationListener { +public: + PropertyAnimatorSetListener(PropertyValuesAnimatorSet* set) : mSet(set) {} + virtual void onAnimationFinished(BaseRenderNodeAnimator* animator) override; + +private: + PropertyValuesAnimatorSet* mSet; +}; + +} // namespace uirenderer +} // namespace android diff --git a/libs/hwui/PropertyValuesHolder.cpp b/libs/hwui/PropertyValuesHolder.cpp new file mode 100644 index 000000000000..8f837f6048d6 --- /dev/null +++ b/libs/hwui/PropertyValuesHolder.cpp @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2016 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. + */ + +#include "PropertyValuesHolder.h" + +#include "utils/VectorDrawableUtils.h" + +#include <utils/Log.h> + +namespace android { +namespace uirenderer { + +using namespace VectorDrawable; + +float PropertyValuesHolder::getValueFromData(float fraction) { + if (mDataSource.size() == 0) { + LOG_ALWAYS_FATAL("No data source is defined"); + return 0; + } + if (fraction <= 0.0f) { + return mDataSource.front(); + } + if (fraction >= 1.0f) { + return mDataSource.back(); + } + + fraction *= mDataSource.size() - 1; + int lowIndex = floor(fraction); + fraction -= lowIndex; + + float value = mDataSource[lowIndex] * (1.0f - fraction) + + mDataSource[lowIndex + 1] * fraction; + return value; +} + +void GroupPropertyValuesHolder::setFraction(float fraction) { + float animatedValue; + if (mDataSource.size() > 0) { + animatedValue = getValueFromData(fraction); + } else { + animatedValue = mStartValue * (1 - fraction) + mEndValue * fraction; + } + mGroup->setPropertyValue(mPropertyId, animatedValue); +} + +inline U8CPU lerp(U8CPU fromValue, U8CPU toValue, float fraction) { + return (U8CPU) (fromValue * (1 - fraction) + toValue * fraction); +} + +// TODO: Add a test for this +SkColor FullPathColorPropertyValuesHolder::interpolateColors(SkColor fromColor, SkColor toColor, + float fraction) { + U8CPU alpha = lerp(SkColorGetA(fromColor), SkColorGetA(toColor), fraction); + U8CPU red = lerp(SkColorGetR(fromColor), SkColorGetR(toColor), fraction); + U8CPU green = lerp(SkColorGetG(fromColor), SkColorGetG(toColor), fraction); + U8CPU blue = lerp(SkColorGetB(fromColor), SkColorGetB(toColor), fraction); + return SkColorSetARGB(alpha, red, green, blue); +} + +void FullPathColorPropertyValuesHolder::setFraction(float fraction) { + SkColor animatedValue = interpolateColors(mStartValue, mEndValue, fraction); + mFullPath->setColorPropertyValue(mPropertyId, animatedValue); +} + +void FullPathPropertyValuesHolder::setFraction(float fraction) { + float animatedValue; + if (mDataSource.size() > 0) { + animatedValue = getValueFromData(fraction); + } else { + animatedValue = mStartValue * (1 - fraction) + mEndValue * fraction; + } + mFullPath->setPropertyValue(mPropertyId, animatedValue); +} + +void PathDataPropertyValuesHolder::setFraction(float fraction) { + VectorDrawableUtils::interpolatePaths(&mPathData, mStartValue, mEndValue, fraction); + mPath->setPathData(mPathData); +} + +void RootAlphaPropertyValuesHolder::setFraction(float fraction) { + float animatedValue = mStartValue * (1 - fraction) + mEndValue * fraction; + mTree->setRootAlpha(animatedValue); +} + +} // namepace uirenderer +} // namespace android diff --git a/libs/hwui/PropertyValuesHolder.h b/libs/hwui/PropertyValuesHolder.h new file mode 100644 index 000000000000..b905faef104c --- /dev/null +++ b/libs/hwui/PropertyValuesHolder.h @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2016 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. + */ + +#pragma once + +#include "VectorDrawable.h" + +#include <SkColor.h> + +namespace android { +namespace uirenderer { + +/** + * PropertyValues holder contains data needed to change a property of a Vector Drawable object. + * When a fraction in [0f, 1f] is provided, the holder will calculate an interpolated value based + * on its start and end value, and set the new value on the VectorDrawble's corresponding property. + */ +class ANDROID_API PropertyValuesHolder { +public: + virtual void setFraction(float fraction) = 0; + void setPropertyDataSource(float* dataSource, int length) { + mDataSource.insert(mDataSource.begin(), dataSource, dataSource + length); + } + float getValueFromData(float fraction); + virtual ~PropertyValuesHolder() {} +protected: + std::vector<float> mDataSource; +}; + +class ANDROID_API GroupPropertyValuesHolder : public PropertyValuesHolder { +public: + GroupPropertyValuesHolder(VectorDrawable::Group* ptr, int propertyId, float startValue, + float endValue) + : mGroup(ptr) + , mPropertyId(propertyId) + , mStartValue(startValue) + , mEndValue(endValue){ + } + void setFraction(float fraction) override; +private: + VectorDrawable::Group* mGroup; + int mPropertyId; + float mStartValue; + float mEndValue; +}; + +class ANDROID_API FullPathColorPropertyValuesHolder : public PropertyValuesHolder { +public: + FullPathColorPropertyValuesHolder(VectorDrawable::FullPath* ptr, int propertyId, int32_t startValue, + int32_t endValue) + : mFullPath(ptr) + , mPropertyId(propertyId) + , mStartValue(startValue) + , mEndValue(endValue) {}; + void setFraction(float fraction) override; + static SkColor interpolateColors(SkColor fromColor, SkColor toColor, float fraction); +private: + VectorDrawable::FullPath* mFullPath; + int mPropertyId; + int32_t mStartValue; + int32_t mEndValue; +}; + +class ANDROID_API FullPathPropertyValuesHolder : public PropertyValuesHolder { +public: + FullPathPropertyValuesHolder(VectorDrawable::FullPath* ptr, int propertyId, float startValue, + float endValue) + : mFullPath(ptr) + , mPropertyId(propertyId) + , mStartValue(startValue) + , mEndValue(endValue) {}; + void setFraction(float fraction) override; +private: + VectorDrawable::FullPath* mFullPath; + int mPropertyId; + float mStartValue; + float mEndValue; +}; + +class ANDROID_API PathDataPropertyValuesHolder : public PropertyValuesHolder { +public: + PathDataPropertyValuesHolder(VectorDrawable::Path* ptr, PathData* startValue, + PathData* endValue) + : mPath(ptr) + , mStartValue(*startValue) + , mEndValue(*endValue) {}; + void setFraction(float fraction) override; +private: + VectorDrawable::Path* mPath; + PathData mPathData; + PathData mStartValue; + PathData mEndValue; +}; + +class ANDROID_API RootAlphaPropertyValuesHolder : public PropertyValuesHolder { +public: + RootAlphaPropertyValuesHolder(VectorDrawable::Tree* tree, float startValue, float endValue) + : mTree(tree) + , mStartValue(startValue) + , mEndValue(endValue) {} + void setFraction(float fraction) override; +private: + VectorDrawable::Tree* mTree; + float mStartValue; + float mEndValue; +}; +} +} diff --git a/libs/hwui/RecordedOp.h b/libs/hwui/RecordedOp.h index 30d5c293c4bb..bb26e2ec67a8 100644 --- a/libs/hwui/RecordedOp.h +++ b/libs/hwui/RecordedOp.h @@ -17,10 +17,12 @@ #ifndef ANDROID_HWUI_RECORDED_OP_H #define ANDROID_HWUI_RECORDED_OP_H +#include "RecordedOp.h" #include "font/FontUtil.h" #include "Matrix.h" #include "Rect.h" #include "RenderNode.h" +#include "TessellationCache.h" #include "utils/LinearAllocator.h" #include "Vector.h" @@ -38,6 +40,10 @@ class OffscreenBuffer; class RenderNode; struct Vertex; +namespace VectorDrawable { +class Tree; +} + /** * Authoritative op list, used for generating the op ID enum, ID based LUTS, and * the functions to which they dispatch. Parameter macros are executed for each op, @@ -74,6 +80,7 @@ struct Vertex; PRE_RENDER_OP_FN(EndLayerOp) \ PRE_RENDER_OP_FN(BeginUnclippedLayerOp) \ PRE_RENDER_OP_FN(EndUnclippedLayerOp) \ + PRE_RENDER_OP_FN(VectorDrawableOp) \ \ RENDER_ONLY_OP_FN(ShadowOp) \ RENDER_ONLY_OP_FN(LayerOp) \ @@ -324,6 +331,13 @@ struct RoundRectPropsOp : RecordedOp { const float* ry; }; +struct VectorDrawableOp : RecordedOp { + VectorDrawableOp(VectorDrawable::Tree* tree, BASE_PARAMS_PAINTLESS) + : SUPER_PAINTLESS(VectorDrawableOp) + , vectorDrawable(tree) {} + VectorDrawable::Tree* vectorDrawable; +}; + /** * Real-time, dynamic-lit shadow. * @@ -333,25 +347,13 @@ struct RoundRectPropsOp : RecordedOp { * State construction handles these properties specially, ignoring matrix/bounds. */ struct ShadowOp : RecordedOp { - ShadowOp(const RenderNodeOp& casterOp, float casterAlpha, const SkPath* casterPath, - const Rect& localClipRect, const Vector3& lightCenter) + ShadowOp(sp<TessellationCache::ShadowTask>& shadowTask, float casterAlpha) : RecordedOp(RecordedOpId::ShadowOp, Rect(), Matrix4::identity(), nullptr, nullptr) - , shadowMatrixXY(casterOp.localMatrix) - , shadowMatrixZ(casterOp.localMatrix) - , casterAlpha(casterAlpha) - , casterPath(casterPath) - , localClipRect(localClipRect) - , lightCenter(lightCenter) { - const RenderNode& node = *casterOp.renderNode; - node.applyViewPropertyTransforms(shadowMatrixXY, false); - node.applyViewPropertyTransforms(shadowMatrixZ, true); + , shadowTask(shadowTask) + , casterAlpha(casterAlpha) { }; - Matrix4 shadowMatrixXY; - Matrix4 shadowMatrixZ; + sp<TessellationCache::ShadowTask> shadowTask; const float casterAlpha; - const SkPath* casterPath; - const Rect localClipRect; - const Vector3 lightCenter; }; struct SimpleRectsOp : RecordedOp { // Filled, no AA (TODO: better name?) diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp index 328e291a60af..16929b8ac8ee 100644 --- a/libs/hwui/RecordingCanvas.cpp +++ b/libs/hwui/RecordingCanvas.cpp @@ -19,6 +19,7 @@ #include "DeferredLayerUpdater.h" #include "RecordedOp.h" #include "RenderNode.h" +#include "VectorDrawable.h" namespace android { namespace uirenderer { @@ -26,7 +27,7 @@ namespace uirenderer { RecordingCanvas::RecordingCanvas(size_t width, size_t height) : mState(*this) , mResourceCache(ResourceCache::getInstance()) { - reset(width, height); + resetRecording(width, height); } RecordingCanvas::~RecordingCanvas() { @@ -34,7 +35,7 @@ RecordingCanvas::~RecordingCanvas() { "Destroyed a RecordingCanvas during a record!"); } -void RecordingCanvas::reset(int width, int height) { +void RecordingCanvas::resetRecording(int width, int height) { LOG_ALWAYS_FATAL_IF(mDisplayList, "prepareDirty called a second time during a recording!"); mDisplayList = new DisplayList(); @@ -395,7 +396,6 @@ void RecordingCanvas::drawCircle( &x->value, &y->value, &radius->value)); } - void RecordingCanvas::drawOval(float left, float top, float right, float bottom, const SkPaint& paint) { addOp(new (alloc()) OvalOp( Rect(left, top, right, bottom), @@ -422,6 +422,15 @@ void RecordingCanvas::drawPath(const SkPath& path, const SkPaint& paint) { refPaint(&paint), refPath(&path))); } +void RecordingCanvas::drawVectorDrawable(VectorDrawableRoot* tree) { + mDisplayList->ref(tree); + addOp(new (alloc()) VectorDrawableOp( + tree, + Rect(tree->getBounds()), + *(mState.currentSnapshot()->transform), + getRecordedClip())); +} + // Bitmap-based void RecordingCanvas::drawBitmap(const SkBitmap& bitmap, float left, float top, const SkPaint* paint) { save(SaveFlags::Matrix); diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h index 786f96e852ec..cc14e6111cec 100644 --- a/libs/hwui/RecordingCanvas.h +++ b/libs/hwui/RecordingCanvas.h @@ -50,22 +50,19 @@ public: RecordingCanvas(size_t width, size_t height); virtual ~RecordingCanvas(); - void reset(int width, int height); - WARN_UNUSED_RESULT DisplayList* finishRecording(); - + virtual void resetRecording(int width, int height) override; + virtual WARN_UNUSED_RESULT DisplayList* finishRecording() override; // ---------------------------------------------------------------------------- // MISC HWUI OPERATIONS - TODO: CATEGORIZE // ---------------------------------------------------------------------------- - void insertReorderBarrier(bool enableReorder) { + virtual void insertReorderBarrier(bool enableReorder) override { mDeferredBarrierType = enableReorder ? DeferredBarrierType::OutOfOrder : DeferredBarrierType::InOrder; } - void drawLayer(DeferredLayerUpdater* layerHandle); - void drawRenderNode(RenderNode* renderNode); - - // TODO: rename for consistency - void callDrawGLFunction(Functor* functor); + virtual void drawLayer(DeferredLayerUpdater* layerHandle) override; + virtual void drawRenderNode(RenderNode* renderNode) override; + virtual void callDrawGLFunction(Functor* functor) override; // ---------------------------------------------------------------------------- // CanvasStateClient interface @@ -78,12 +75,12 @@ public: // HWUI Canvas draw operations // ---------------------------------------------------------------------------- - void drawRoundRect(CanvasPropertyPrimitive* left, CanvasPropertyPrimitive* top, + virtual void drawRoundRect(CanvasPropertyPrimitive* left, CanvasPropertyPrimitive* top, CanvasPropertyPrimitive* right, CanvasPropertyPrimitive* bottom, CanvasPropertyPrimitive* rx, CanvasPropertyPrimitive* ry, - CanvasPropertyPaint* paint); - void drawCircle(CanvasPropertyPrimitive* x, CanvasPropertyPrimitive* y, - CanvasPropertyPrimitive* radius, CanvasPropertyPaint* paint); + CanvasPropertyPaint* paint) override; + virtual void drawCircle(CanvasPropertyPrimitive* x, CanvasPropertyPrimitive* y, + CanvasPropertyPrimitive* radius, CanvasPropertyPaint* paint) override; // ---------------------------------------------------------------------------- // android/graphics/Canvas interface @@ -178,6 +175,8 @@ public: const uint16_t* indices, int indexCount, const SkPaint& paint) override { /* RecordingCanvas does not support drawVertices(); ignore */ } + virtual void drawVectorDrawable(VectorDrawableRoot* tree) override; + // Bitmap-based virtual void drawBitmap(const SkBitmap& bitmap, float left, float top, const SkPaint* paint) override; virtual void drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix, diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp index 20e7c711a9ce..bd4442dc378d 100644 --- a/libs/hwui/SkiaCanvas.cpp +++ b/libs/hwui/SkiaCanvas.cpp @@ -15,18 +15,25 @@ */ #include "Canvas.h" +#include "CanvasProperty.h" +#include "Layer.h" +#include "RenderNode.h" #include <SkCanvas.h> #include <SkClipStack.h> +#include <SkDrawable.h> #include <SkDevice.h> #include <SkDeque.h> #include <SkDrawFilter.h> #include <SkGraphics.h> +#include <SkImage.h> #include <SkShader.h> #include <SkTArray.h> #include <SkTLazy.h> #include <SkTemplates.h> +#include "VectorDrawable.h" + #include <memory> namespace android { @@ -52,6 +59,18 @@ public: return mCanvas.get(); } + virtual void resetRecording(int width, int height) override { + LOG_ALWAYS_FATAL("SkiaCanvas cannot be reset as a recording canvas"); + } + + virtual uirenderer::DisplayList* finishRecording() override { + LOG_ALWAYS_FATAL("SkiaCanvas does not produce a DisplayList"); + return nullptr; + } + virtual void insertReorderBarrier(bool enableReorder) override { + LOG_ALWAYS_FATAL("SkiaCanvas does not support reordering barriers"); + } + virtual void setBitmap(const SkBitmap& bitmap) override; virtual bool isOpaque() override; @@ -136,6 +155,19 @@ public: float hOffset, float vOffset, const SkPaint& paint) override; virtual bool drawTextAbsolutePos() const override { return true; } + virtual void drawVectorDrawable(VectorDrawableRoot* vectorDrawable) override; + + virtual void drawRoundRect(uirenderer::CanvasPropertyPrimitive* left, + uirenderer::CanvasPropertyPrimitive* top, uirenderer::CanvasPropertyPrimitive* right, + uirenderer::CanvasPropertyPrimitive* bottom, uirenderer::CanvasPropertyPrimitive* rx, + uirenderer::CanvasPropertyPrimitive* ry, uirenderer::CanvasPropertyPaint* paint) override; + virtual void drawCircle(uirenderer::CanvasPropertyPrimitive* x, + uirenderer::CanvasPropertyPrimitive* y, uirenderer::CanvasPropertyPrimitive* radius, + uirenderer::CanvasPropertyPaint* paint) override; + + virtual void drawLayer(uirenderer::DeferredLayerUpdater* layerHandle) override; + virtual void drawRenderNode(uirenderer::RenderNode* renderNode) override; + virtual void callDrawGLFunction(Functor* functor) override; private: struct SaveRec { @@ -713,6 +745,14 @@ void SkiaCanvas::drawNinePatch(const SkBitmap& bitmap, const Res_png_9patch& chu NinePatch::Draw(mCanvas, bounds, bitmap, chunk, paint, nullptr); } +void SkiaCanvas::drawVectorDrawable(VectorDrawableRoot* vectorDrawable) { + const SkBitmap& bitmap = vectorDrawable->getBitmapUpdateIfDirty(); + SkRect bounds = vectorDrawable->getBounds(); + drawBitmap(bitmap, 0, 0, bitmap.width(), bitmap.height(), + bounds.fLeft, bounds.fTop, bounds.fRight, bounds.fBottom, + vectorDrawable->getPaint()); +} + // ---------------------------------------------------------------------------- // Canvas draw operations: Text // ---------------------------------------------------------------------------- @@ -737,4 +777,84 @@ void SkiaCanvas::drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& mCanvas->drawTextOnPathHV(glyphs, count << 1, path, hOffset, vOffset, paint); } +// ---------------------------------------------------------------------------- +// Canvas draw operations: Animations +// ---------------------------------------------------------------------------- + +class AnimatedRoundRect : public SkDrawable { + public: + AnimatedRoundRect(uirenderer::CanvasPropertyPrimitive* left, + uirenderer::CanvasPropertyPrimitive* top, uirenderer::CanvasPropertyPrimitive* right, + uirenderer::CanvasPropertyPrimitive* bottom, uirenderer::CanvasPropertyPrimitive* rx, + uirenderer::CanvasPropertyPrimitive* ry, uirenderer::CanvasPropertyPaint* p) : + mLeft(left), mTop(top), mRight(right), mBottom(bottom), mRx(rx), mRy(ry), mPaint(p) {} + + protected: + virtual SkRect onGetBounds() override { + return SkRect::MakeLTRB(mLeft->value, mTop->value, mRight->value, mBottom->value); + } + virtual void onDraw(SkCanvas* canvas) override { + SkRect rect = SkRect::MakeLTRB(mLeft->value, mTop->value, mRight->value, mBottom->value); + canvas->drawRoundRect(rect, mRx->value, mRy->value, mPaint->value); + } + + private: + sp<uirenderer::CanvasPropertyPrimitive> mLeft; + sp<uirenderer::CanvasPropertyPrimitive> mTop; + sp<uirenderer::CanvasPropertyPrimitive> mRight; + sp<uirenderer::CanvasPropertyPrimitive> mBottom; + sp<uirenderer::CanvasPropertyPrimitive> mRx; + sp<uirenderer::CanvasPropertyPrimitive> mRy; + sp<uirenderer::CanvasPropertyPaint> mPaint; +}; + +class AnimatedCircle : public SkDrawable { + public: + AnimatedCircle(uirenderer::CanvasPropertyPrimitive* x, uirenderer::CanvasPropertyPrimitive* y, + uirenderer::CanvasPropertyPrimitive* radius, uirenderer::CanvasPropertyPaint* paint) : + mX(x), mY(y), mRadius(radius), mPaint(paint) {} + + protected: + virtual SkRect onGetBounds() override { + const float x = mX->value; + const float y = mY->value; + const float radius = mRadius->value; + return SkRect::MakeLTRB(x - radius, y - radius, x + radius, y + radius); + } + virtual void onDraw(SkCanvas* canvas) override { + canvas->drawCircle(mX->value, mY->value, mRadius->value, mPaint->value); + } + + private: + sp<uirenderer::CanvasPropertyPrimitive> mX; + sp<uirenderer::CanvasPropertyPrimitive> mY; + sp<uirenderer::CanvasPropertyPrimitive> mRadius; + sp<uirenderer::CanvasPropertyPaint> mPaint; +}; + +void SkiaCanvas::drawRoundRect(uirenderer::CanvasPropertyPrimitive* left, + uirenderer::CanvasPropertyPrimitive* top, uirenderer::CanvasPropertyPrimitive* right, + uirenderer::CanvasPropertyPrimitive* bottom, uirenderer::CanvasPropertyPrimitive* rx, + uirenderer::CanvasPropertyPrimitive* ry, uirenderer::CanvasPropertyPaint* paint) { + SkAutoTUnref<AnimatedRoundRect> drawable( + new AnimatedRoundRect(left, top, right, bottom, rx, ry, paint)); + mCanvas->drawDrawable(drawable.get()); +} + +void SkiaCanvas::drawCircle(uirenderer::CanvasPropertyPrimitive* x, uirenderer::CanvasPropertyPrimitive* y, + uirenderer::CanvasPropertyPrimitive* radius, uirenderer::CanvasPropertyPaint* paint) { + SkAutoTUnref<AnimatedCircle> drawable(new AnimatedCircle(x, y, radius, paint)); + mCanvas->drawDrawable(drawable.get()); +} + +// ---------------------------------------------------------------------------- +// Canvas draw operations: View System +// ---------------------------------------------------------------------------- + +void SkiaCanvas::drawLayer(uirenderer::DeferredLayerUpdater* layer) { } + +void SkiaCanvas::drawRenderNode(uirenderer::RenderNode* renderNode) { } + +void SkiaCanvas::callDrawGLFunction(Functor* functor) { } + } // namespace android diff --git a/libs/hwui/TessellationCache.cpp b/libs/hwui/TessellationCache.cpp index 0835c29aee97..fd9fb852171c 100644 --- a/libs/hwui/TessellationCache.cpp +++ b/libs/hwui/TessellationCache.cpp @@ -160,45 +160,6 @@ private: // Shadow tessellation task processing /////////////////////////////////////////////////////////////////////////////// -class ShadowTask : public Task<TessellationCache::vertexBuffer_pair_t*> { -public: - ShadowTask(const Matrix4* drawTransform, const Rect& localClip, bool opaque, - const SkPath* casterPerimeter, const Matrix4* transformXY, const Matrix4* transformZ, - const Vector3& lightCenter, float lightRadius) - : drawTransform(*drawTransform) - , localClip(localClip) - , opaque(opaque) - , casterPerimeter(*casterPerimeter) - , transformXY(*transformXY) - , transformZ(*transformZ) - , lightCenter(lightCenter) - , lightRadius(lightRadius) { - } - - ~ShadowTask() { - TessellationCache::vertexBuffer_pair_t* bufferPair = getResult(); - delete bufferPair->getFirst(); - delete bufferPair->getSecond(); - delete bufferPair; - } - - /* Note - we deep copy all task parameters, because *even though* pointers into Allocator - * controlled objects (like the SkPath and Matrix4s) should be safe for the entire frame, - * certain Allocators are destroyed before trim() is called to flush incomplete tasks. - * - * These deep copies could be avoided, long term, by cancelling or flushing outstanding tasks - * before tearning down single-frame LinearAllocators. - */ - const Matrix4 drawTransform; - const Rect localClip; - bool opaque; - const SkPath casterPerimeter; - const Matrix4 transformXY; - const Matrix4 transformZ; - const Vector3 lightCenter; - const float lightRadius; -}; - static void mapPointFakeZ(Vector3& point, const mat4* transformXY, const mat4* transformZ) { // map z coordinate with true 3d matrix point.z = transformZ->mapZ(point); @@ -281,23 +242,21 @@ void tessellateShadows( spotBuffer); } -class ShadowProcessor : public TaskProcessor<TessellationCache::vertexBuffer_pair_t*> { +class ShadowProcessor : public TaskProcessor<TessellationCache::vertexBuffer_pair_t> { public: ShadowProcessor(Caches& caches) - : TaskProcessor<TessellationCache::vertexBuffer_pair_t*>(&caches.tasks) {} + : TaskProcessor<TessellationCache::vertexBuffer_pair_t>(&caches.tasks) {} ~ShadowProcessor() {} - virtual void onProcess(const sp<Task<TessellationCache::vertexBuffer_pair_t*> >& task) override { - ShadowTask* t = static_cast<ShadowTask*>(task.get()); + virtual void onProcess(const sp<Task<TessellationCache::vertexBuffer_pair_t> >& task) override { + TessellationCache::ShadowTask* t = static_cast<TessellationCache::ShadowTask*>(task.get()); ATRACE_NAME("shadow tessellation"); - VertexBuffer* ambientBuffer = new VertexBuffer; - VertexBuffer* spotBuffer = new VertexBuffer; tessellateShadows(&t->drawTransform, &t->localClip, t->opaque, &t->casterPerimeter, &t->transformXY, &t->transformZ, t->lightCenter, t->lightRadius, - *ambientBuffer, *spotBuffer); + t->ambientBuffer, t->spotBuffer); - t->setResult(new TessellationCache::vertexBuffer_pair_t(ambientBuffer, spotBuffer)); + t->setResult(TessellationCache::vertexBuffer_pair_t(&t->ambientBuffer, &t->spotBuffer)); } }; @@ -412,7 +371,23 @@ void TessellationCache::getShadowBuffers(const Matrix4* drawTransform, const Rec task = static_cast<ShadowTask*>(mShadowCache.get(key)); } LOG_ALWAYS_FATAL_IF(task == nullptr, "shadow not precached"); - outBuffers = *(task->getResult()); + outBuffers = task->getResult(); +} + +sp<TessellationCache::ShadowTask> TessellationCache::getShadowTask( + const Matrix4* drawTransform, const Rect& localClip, + bool opaque, const SkPath* casterPerimeter, + const Matrix4* transformXY, const Matrix4* transformZ, + const Vector3& lightCenter, float lightRadius) { + ShadowDescription key(casterPerimeter, drawTransform); + ShadowTask* task = static_cast<ShadowTask*>(mShadowCache.get(key)); + if (!task) { + precacheShadows(drawTransform, localClip, opaque, casterPerimeter, + transformXY, transformZ, lightCenter, lightRadius); + task = static_cast<ShadowTask*>(mShadowCache.get(key)); + } + LOG_ALWAYS_FATAL_IF(task == nullptr, "shadow not precached"); + return task; } /////////////////////////////////////////////////////////////////////////////// diff --git a/libs/hwui/TessellationCache.h b/libs/hwui/TessellationCache.h index 06e567e114e2..6dcc8120cf48 100644 --- a/libs/hwui/TessellationCache.h +++ b/libs/hwui/TessellationCache.h @@ -21,11 +21,13 @@ #include "Matrix.h" #include "Rect.h" #include "Vector.h" +#include "VertexBuffer.h" #include "thread/TaskProcessor.h" #include "utils/Macros.h" #include "utils/Pair.h" #include <SkPaint.h> +#include <SkPath.h> #include <utils/LruCache.h> #include <utils/Mutex.h> @@ -33,7 +35,6 @@ class SkBitmap; class SkCanvas; -class SkPath; struct SkRect; namespace android { @@ -89,6 +90,40 @@ public: hash_t hash() const; }; + class ShadowTask : public Task<vertexBuffer_pair_t> { + public: + ShadowTask(const Matrix4* drawTransform, const Rect& localClip, bool opaque, + const SkPath* casterPerimeter, const Matrix4* transformXY, const Matrix4* transformZ, + const Vector3& lightCenter, float lightRadius) + : drawTransform(*drawTransform) + , localClip(localClip) + , opaque(opaque) + , casterPerimeter(*casterPerimeter) + , transformXY(*transformXY) + , transformZ(*transformZ) + , lightCenter(lightCenter) + , lightRadius(lightRadius) { + } + + /* Note - we deep copy all task parameters, because *even though* pointers into Allocator + * controlled objects (like the SkPath and Matrix4s) should be safe for the entire frame, + * certain Allocators are destroyed before trim() is called to flush incomplete tasks. + * + * These deep copies could be avoided, long term, by canceling or flushing outstanding + * tasks before tearing down single-frame LinearAllocators. + */ + const Matrix4 drawTransform; + const Rect localClip; + bool opaque; + const SkPath casterPerimeter; + const Matrix4 transformXY; + const Matrix4 transformZ; + const Vector3 lightCenter; + const float lightRadius; + VertexBuffer ambientBuffer; + VertexBuffer spotBuffer; + }; + TessellationCache(); ~TessellationCache(); @@ -133,17 +168,22 @@ public: const VertexBuffer* getRoundRect(const Matrix4& transform, const SkPaint& paint, float width, float height, float rx, float ry); + // TODO: delete these when switching to HWUI_NEW_OPS void precacheShadows(const Matrix4* drawTransform, const Rect& localClip, bool opaque, const SkPath* casterPerimeter, const Matrix4* transformXY, const Matrix4* transformZ, const Vector3& lightCenter, float lightRadius); - void getShadowBuffers(const Matrix4* drawTransform, const Rect& localClip, bool opaque, const SkPath* casterPerimeter, const Matrix4* transformXY, const Matrix4* transformZ, const Vector3& lightCenter, float lightRadius, vertexBuffer_pair_t& outBuffers); + sp<ShadowTask> getShadowTask(const Matrix4* drawTransform, const Rect& localClip, + bool opaque, const SkPath* casterPerimeter, + const Matrix4* transformXY, const Matrix4* transformZ, + const Vector3& lightCenter, float lightRadius); + private: class Buffer; class TessellationTask; @@ -178,12 +218,12 @@ private: /////////////////////////////////////////////////////////////////////////////// // Shadow tessellation caching /////////////////////////////////////////////////////////////////////////////// - sp<TaskProcessor<vertexBuffer_pair_t*> > mShadowProcessor; + sp<TaskProcessor<vertexBuffer_pair_t> > mShadowProcessor; // holds a pointer, and implicit strong ref to each shadow task of the frame - LruCache<ShadowDescription, Task<vertexBuffer_pair_t*>*> mShadowCache; - class BufferPairRemovedListener : public OnEntryRemoved<ShadowDescription, Task<vertexBuffer_pair_t*>*> { - void operator()(ShadowDescription& description, Task<vertexBuffer_pair_t*>*& bufferPairTask) override { + LruCache<ShadowDescription, Task<vertexBuffer_pair_t>*> mShadowCache; + class BufferPairRemovedListener : public OnEntryRemoved<ShadowDescription, Task<vertexBuffer_pair_t>*> { + void operator()(ShadowDescription& description, Task<vertexBuffer_pair_t>*& bufferPairTask) override { bufferPairTask->decStrong(nullptr); } }; diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp index 1cf15ac01154..541c799f0149 100644 --- a/libs/hwui/VectorDrawable.cpp +++ b/libs/hwui/VectorDrawable.cpp @@ -138,18 +138,7 @@ void Path::setPath(const char* pathStr, size_t strLength) { } FullPath::FullPath(const FullPath& path) : Path(path) { - mStrokeWidth = path.mStrokeWidth; - mStrokeColor = path.mStrokeColor; - mStrokeAlpha = path.mStrokeAlpha; - mFillColor = path.mFillColor; - mFillAlpha = path.mFillAlpha; - mTrimPathStart = path.mTrimPathStart; - mTrimPathEnd = path.mTrimPathEnd; - mTrimPathOffset = path.mTrimPathOffset; - mStrokeMiterLimit = path.mStrokeMiterLimit; - mStrokeLineCap = path.mStrokeLineCap; - mStrokeLineJoin = path.mStrokeLineJoin; - + mProperties = path.mProperties; SkRefCnt_SafeAssign(mStrokeGradient, path.mStrokeGradient); SkRefCnt_SafeAssign(mFillGradient, path.mFillGradient); } @@ -159,7 +148,7 @@ const SkPath& FullPath::getUpdatedPath() { return mTrimmedSkPath; } Path::getUpdatedPath(); - if (mTrimPathStart != 0.0f || mTrimPathEnd != 1.0f) { + if (mProperties.trimPathStart != 0.0f || mProperties.trimPathEnd != 1.0f) { applyTrim(); return mTrimmedSkPath; } else { @@ -170,14 +159,14 @@ const SkPath& FullPath::getUpdatedPath() { void FullPath::updateProperties(float strokeWidth, SkColor strokeColor, float strokeAlpha, SkColor fillColor, float fillAlpha, float trimPathStart, float trimPathEnd, float trimPathOffset, float strokeMiterLimit, int strokeLineCap, int strokeLineJoin) { - mStrokeWidth = strokeWidth; - mStrokeColor = strokeColor; - mStrokeAlpha = strokeAlpha; - mFillColor = fillColor; - mFillAlpha = fillAlpha; - mStrokeMiterLimit = strokeMiterLimit; - mStrokeLineCap = SkPaint::Cap(strokeLineCap); - mStrokeLineJoin = SkPaint::Join(strokeLineJoin); + mProperties.strokeWidth = strokeWidth; + mProperties.strokeColor = strokeColor; + mProperties.strokeAlpha = strokeAlpha; + mProperties.fillColor = fillColor; + mProperties.fillAlpha = fillAlpha; + mProperties.strokeMiterLimit = strokeMiterLimit; + mProperties.strokeLineCap = strokeLineCap; + mProperties.strokeLineJoin = strokeLineJoin; // If any trim property changes, mark trim dirty and update the trim path setTrimPathStart(trimPathStart); @@ -195,12 +184,12 @@ void FullPath::drawPath(SkCanvas* outCanvas, const SkPath& renderPath, float str // Draw path's fill, if fill color or gradient is valid bool needsFill = false; if (mFillGradient != nullptr) { - mPaint.setColor(applyAlpha(SK_ColorBLACK, mFillAlpha)); + mPaint.setColor(applyAlpha(SK_ColorBLACK, mProperties.fillAlpha)); SkShader* newShader = mFillGradient->newWithLocalMatrix(matrix); mPaint.setShader(newShader); needsFill = true; - } else if (mFillColor != SK_ColorTRANSPARENT) { - mPaint.setColor(applyAlpha(mFillColor, mFillAlpha)); + } else if (mProperties.fillColor != SK_ColorTRANSPARENT) { + mPaint.setColor(applyAlpha(mProperties.fillColor, mProperties.fillAlpha)); needsFill = true; } @@ -213,21 +202,21 @@ void FullPath::drawPath(SkCanvas* outCanvas, const SkPath& renderPath, float str // Draw path's stroke, if stroke color or gradient is valid bool needsStroke = false; if (mStrokeGradient != nullptr) { - mPaint.setColor(applyAlpha(SK_ColorBLACK, mStrokeAlpha)); + mPaint.setColor(applyAlpha(SK_ColorBLACK, mProperties.strokeAlpha)); SkShader* newShader = mStrokeGradient->newWithLocalMatrix(matrix); mPaint.setShader(newShader); needsStroke = true; - } else if (mStrokeColor != SK_ColorTRANSPARENT) { - mPaint.setColor(applyAlpha(mStrokeColor, mStrokeAlpha)); + } else if (mProperties.strokeColor != SK_ColorTRANSPARENT) { + mPaint.setColor(applyAlpha(mProperties.strokeColor, mProperties.strokeAlpha)); needsStroke = true; } if (needsStroke) { mPaint.setStyle(SkPaint::Style::kStroke_Style); mPaint.setAntiAlias(true); - mPaint.setStrokeJoin(mStrokeLineJoin); - mPaint.setStrokeCap(mStrokeLineCap); - mPaint.setStrokeMiter(mStrokeMiterLimit); - mPaint.setStrokeWidth(mStrokeWidth * strokeScale); + mPaint.setStrokeJoin(SkPaint::Join(mProperties.strokeLineJoin)); + mPaint.setStrokeCap(SkPaint::Cap(mProperties.strokeLineCap)); + mPaint.setStrokeMiter(mProperties.strokeMiterLimit); + mPaint.setStrokeWidth(mProperties.strokeWidth * strokeScale); outCanvas->drawPath(renderPath, mPaint); } } @@ -236,14 +225,14 @@ void FullPath::drawPath(SkCanvas* outCanvas, const SkPath& renderPath, float str * Applies trimming to the specified path. */ void FullPath::applyTrim() { - if (mTrimPathStart == 0.0f && mTrimPathEnd == 1.0f) { + if (mProperties.trimPathStart == 0.0f && mProperties.trimPathEnd == 1.0f) { // No trimming necessary. return; } SkPathMeasure measure(mSkPath, false); float len = SkScalarToFloat(measure.getLength()); - float start = len * fmod((mTrimPathStart + mTrimPathOffset), 1.0f); - float end = len * fmod((mTrimPathEnd + mTrimPathOffset), 1.0f); + float start = len * fmod((mProperties.trimPathStart + mProperties.trimPathOffset), 1.0f); + float end = len * fmod((mProperties.trimPathEnd + mProperties.trimPathOffset), 1.0f); mTrimmedSkPath.reset(); if (start > end) { @@ -255,76 +244,69 @@ void FullPath::applyTrim() { mTrimDirty = false; } -inline int putData(int8_t* outBytes, int startIndex, float value) { - int size = sizeof(float); - memcpy(&outBytes[startIndex], &value, size); - return size; -} - -inline int putData(int8_t* outBytes, int startIndex, int value) { - int size = sizeof(int); - memcpy(&outBytes[startIndex], &value, size); - return size; -} - -struct FullPathProperties { - // TODO: Consider storing full path properties in this struct instead of the fields. - float strokeWidth; - SkColor strokeColor; - float strokeAlpha; - SkColor fillColor; - float fillAlpha; - float trimPathStart; - float trimPathEnd; - float trimPathOffset; - int32_t strokeLineCap; - int32_t strokeLineJoin; - float strokeMiterLimit; -}; - -REQUIRE_COMPATIBLE_LAYOUT(FullPathProperties); +REQUIRE_COMPATIBLE_LAYOUT(FullPath::Properties); static_assert(sizeof(float) == sizeof(int32_t), "float is not the same size as int32_t"); static_assert(sizeof(SkColor) == sizeof(int32_t), "SkColor is not the same size as int32_t"); bool FullPath::getProperties(int8_t* outProperties, int length) { - int propertyDataSize = sizeof(FullPathProperties); + int propertyDataSize = sizeof(Properties); if (length != propertyDataSize) { LOG_ALWAYS_FATAL("Properties needs exactly %d bytes, a byte array of size %d is provided", propertyDataSize, length); return false; } - // TODO: consider replacing the property fields with a FullPathProperties struct. - FullPathProperties properties; - properties.strokeWidth = mStrokeWidth; - properties.strokeColor = mStrokeColor; - properties.strokeAlpha = mStrokeAlpha; - properties.fillColor = mFillColor; - properties.fillAlpha = mFillAlpha; - properties.trimPathStart = mTrimPathStart; - properties.trimPathEnd = mTrimPathEnd; - properties.trimPathOffset = mTrimPathOffset; - properties.strokeLineCap = mStrokeLineCap; - properties.strokeLineJoin = mStrokeLineJoin; - properties.strokeMiterLimit = mStrokeMiterLimit; - - memcpy(outProperties, &properties, length); + Properties* out = reinterpret_cast<Properties*>(outProperties); + *out = mProperties; return true; } +void FullPath::setColorPropertyValue(int propertyId, int32_t value) { + Property currentProperty = static_cast<Property>(propertyId); + if (currentProperty == Property::StrokeColor) { + mProperties.strokeColor = value; + } else if (currentProperty == Property::FillColor) { + mProperties.fillColor = value; + } else { + LOG_ALWAYS_FATAL("Error setting color property on FullPath: No valid property with id: %d", + propertyId); + } +} + +void FullPath::setPropertyValue(int propertyId, float value) { + Property property = static_cast<Property>(propertyId); + switch (property) { + case Property::StrokeWidth: + setStrokeWidth(value); + break; + case Property::StrokeAlpha: + setStrokeAlpha(value); + break; + case Property::FillAlpha: + setFillAlpha(value); + break; + case Property::TrimPathStart: + setTrimPathStart(value); + break; + case Property::TrimPathEnd: + setTrimPathEnd(value); + break; + case Property::TrimPathOffset: + setTrimPathOffset(value); + break; + default: + LOG_ALWAYS_FATAL("Invalid property id: %d for animation", propertyId); + break; + } +} + void ClipPath::drawPath(SkCanvas* outCanvas, const SkPath& renderPath, float strokeScale, const SkMatrix& matrix){ outCanvas->clipPath(renderPath, SkRegion::kIntersect_Op); } Group::Group(const Group& group) : Node(group) { - mRotate = group.mRotate; - mPivotX = group.mPivotX; - mPivotY = group.mPivotY; - mScaleX = group.mScaleX; - mScaleY = group.mScaleY; - mTranslateX = group.mTranslateX; - mTranslateY = group.mTranslateY; + mProperties = group.mProperties; } void Group::draw(SkCanvas* outCanvas, const SkMatrix& currentMatrix, float scaleX, @@ -371,10 +353,11 @@ void Group::getLocalMatrix(SkMatrix* outMatrix) { outMatrix->reset(); // TODO: use rotate(mRotate, mPivotX, mPivotY) and scale with pivot point, instead of // translating to pivot for rotating and scaling, then translating back. - outMatrix->postTranslate(-mPivotX, -mPivotY); - outMatrix->postScale(mScaleX, mScaleY); - outMatrix->postRotate(mRotate, 0, 0); - outMatrix->postTranslate(mTranslateX + mPivotX, mTranslateY + mPivotY); + outMatrix->postTranslate(-mProperties.pivotX, -mProperties.pivotY); + outMatrix->postScale(mProperties.scaleX, mProperties.scaleY); + outMatrix->postRotate(mProperties.rotate, 0, 0); + outMatrix->postTranslate(mProperties.translateX + mProperties.pivotX, + mProperties.translateY + mProperties.pivotY); } void Group::addChild(Node* child) { @@ -388,38 +371,68 @@ bool Group::getProperties(float* outProperties, int length) { propertyCount, length); return false; } - for (int i = 0; i < propertyCount; i++) { - Property currentProperty = static_cast<Property>(i); - switch (currentProperty) { - case Property::Rotate_Property: - outProperties[i] = mRotate; - break; - case Property::PivotX_Property: - outProperties[i] = mPivotX; - break; - case Property::PivotY_Property: - outProperties[i] = mPivotY; - break; - case Property::ScaleX_Property: - outProperties[i] = mScaleX; - break; - case Property::ScaleY_Property: - outProperties[i] = mScaleY; - break; - case Property::TranslateX_Property: - outProperties[i] = mTranslateX; - break; - case Property::TranslateY_Property: - outProperties[i] = mTranslateY; - break; - default: - LOG_ALWAYS_FATAL("Invalid input index: %d", i); - return false; - } - } + Properties* out = reinterpret_cast<Properties*>(outProperties); + *out = mProperties; return true; } +// TODO: Consider animating the properties as float pointers +float Group::getPropertyValue(int propertyId) const { + Property currentProperty = static_cast<Property>(propertyId); + switch (currentProperty) { + case Property::Rotate: + return mProperties.rotate; + case Property::PivotX: + return mProperties.pivotX; + case Property::PivotY: + return mProperties.pivotY; + case Property::ScaleX: + return mProperties.scaleX; + case Property::ScaleY: + return mProperties.scaleY; + case Property::TranslateX: + return mProperties.translateX; + case Property::TranslateY: + return mProperties.translateY; + default: + LOG_ALWAYS_FATAL("Invalid property index: %d", propertyId); + return 0; + } +} + +void Group::setPropertyValue(int propertyId, float value) { + Property currentProperty = static_cast<Property>(propertyId); + switch (currentProperty) { + case Property::Rotate: + mProperties.rotate = value; + break; + case Property::PivotX: + mProperties.pivotX = value; + break; + case Property::PivotY: + mProperties.pivotY = value; + break; + case Property::ScaleX: + mProperties.scaleX = value; + break; + case Property::ScaleY: + mProperties.scaleY = value; + break; + case Property::TranslateX: + mProperties.translateX = value; + break; + case Property::TranslateY: + mProperties.translateY = value; + break; + default: + LOG_ALWAYS_FATAL("Invalid property index: %d", propertyId); + } +} + +bool Group::isValidProperty(int propertyId) { + return propertyId >= 0 && propertyId < static_cast<int>(Property::Count); +} + void Tree::draw(Canvas* outCanvas, SkColorFilter* colorFilter, const SkRect& bounds, bool needsMirroring, bool canReuseCache) { // The imageView can scale the canvas in different ways, in order to @@ -445,6 +458,8 @@ void Tree::draw(Canvas* outCanvas, SkColorFilter* colorFilter, return; } + mPaint.setColorFilter(colorFilter); + int saveCount = outCanvas->save(SaveFlags::MatrixClip); outCanvas->translate(mBounds.fLeft, mBounds.fTop); @@ -458,43 +473,33 @@ void Tree::draw(Canvas* outCanvas, SkColorFilter* colorFilter, // And we use this bound for the destination rect for the drawBitmap, so // we offset to (0, 0); mBounds.offsetTo(0, 0); - createCachedBitmapIfNeeded(scaledWidth, scaledHeight); - if (!mAllowCaching) { - updateCachedBitmap(scaledWidth, scaledHeight); - } else { - if (!canReuseCache || mCacheDirty) { - updateCachedBitmap(scaledWidth, scaledHeight); - } - } - drawCachedBitmapWithRootAlpha(outCanvas, colorFilter, mBounds); + + outCanvas->drawVectorDrawable(this); outCanvas->restoreToCount(saveCount); } -void Tree::drawCachedBitmapWithRootAlpha(Canvas* outCanvas, SkColorFilter* filter, - const SkRect& originalBounds) { +SkPaint* Tree::getPaint() { SkPaint* paint; - if (mRootAlpha == 1.0f && filter == NULL) { + if (mRootAlpha == 1.0f && mPaint.getColorFilter() == NULL) { paint = NULL; } else { mPaint.setFilterQuality(kLow_SkFilterQuality); mPaint.setAlpha(mRootAlpha * 255); - mPaint.setColorFilter(filter); paint = &mPaint; } - outCanvas->drawBitmap(mCachedBitmap, 0, 0, mCachedBitmap.width(), mCachedBitmap.height(), - originalBounds.fLeft, originalBounds.fTop, originalBounds.fRight, - originalBounds.fBottom, paint); + return paint; } -void Tree::updateCachedBitmap(int width, int height) { +const SkBitmap& Tree::getBitmapUpdateIfDirty() { mCachedBitmap.eraseColor(SK_ColorTRANSPARENT); SkCanvas outCanvas(mCachedBitmap); - float scaleX = width / mViewportWidth; - float scaleY = height / mViewportHeight; + float scaleX = (float) mCachedBitmap.width() / mViewportWidth; + float scaleY = (float) mCachedBitmap.height() / mViewportHeight; mRootNode->draw(&outCanvas, SkMatrix::I(), scaleX, scaleY); mCacheDirty = false; + return mCachedBitmap; } void Tree::createCachedBitmapIfNeeded(int width, int height) { diff --git a/libs/hwui/VectorDrawable.h b/libs/hwui/VectorDrawable.h index 09bdce596a21..f8f1ea62a624 100644 --- a/libs/hwui/VectorDrawable.h +++ b/libs/hwui/VectorDrawable.h @@ -18,6 +18,7 @@ #define ANDROID_HWUI_VPATH_H #include "Canvas.h" + #include <SkBitmap.h> #include <SkColor.h> #include <SkCanvas.h> @@ -104,6 +105,21 @@ protected: class ANDROID_API FullPath: public Path { public: + +struct Properties { + float strokeWidth = 0; + SkColor strokeColor = SK_ColorTRANSPARENT; + float strokeAlpha = 1; + SkColor fillColor = SK_ColorTRANSPARENT; + float fillAlpha = 1; + float trimPathStart = 0; + float trimPathEnd = 1; + float trimPathOffset = 0; + int32_t strokeLineCap = SkPaint::Cap::kButt_Cap; + int32_t strokeLineJoin = SkPaint::Join::kMiter_Join; + float strokeMiterLimit = 4; +}; + FullPath(const FullPath& path); // for cloning FullPath(const char* path, size_t strLength) : Path(path, strLength) {} FullPath() : Path() {} @@ -118,55 +134,58 @@ public: float strokeAlpha, SkColor fillColor, float fillAlpha, float trimPathStart, float trimPathEnd, float trimPathOffset, float strokeMiterLimit, int strokeLineCap, int strokeLineJoin); + // TODO: Cleanup: Remove the setter and getters below, and their counterparts in java and JNI float getStrokeWidth() { - return mStrokeWidth; + return mProperties.strokeWidth; } void setStrokeWidth(float strokeWidth) { - mStrokeWidth = strokeWidth; + mProperties.strokeWidth = strokeWidth; } SkColor getStrokeColor() { - return mStrokeColor; + return mProperties.strokeColor; } void setStrokeColor(SkColor strokeColor) { - mStrokeColor = strokeColor; + mProperties.strokeColor = strokeColor; } float getStrokeAlpha() { - return mStrokeAlpha; + return mProperties.strokeAlpha; } void setStrokeAlpha(float strokeAlpha) { - mStrokeAlpha = strokeAlpha; + mProperties.strokeAlpha = strokeAlpha; } SkColor getFillColor() { - return mFillColor; + return mProperties.fillColor; } void setFillColor(SkColor fillColor) { - mFillColor = fillColor; + mProperties.fillColor = fillColor; } float getFillAlpha() { - return mFillAlpha; + return mProperties.fillAlpha; } void setFillAlpha(float fillAlpha) { - mFillAlpha = fillAlpha; + mProperties.fillAlpha = fillAlpha; } float getTrimPathStart() { - return mTrimPathStart; + return mProperties.trimPathStart; } void setTrimPathStart(float trimPathStart) { - VD_SET_PROP_WITH_FLAG(mTrimPathStart, trimPathStart, mTrimDirty); + VD_SET_PROP_WITH_FLAG(mProperties.trimPathStart, trimPathStart, mTrimDirty); } float getTrimPathEnd() { - return mTrimPathEnd; + return mProperties.trimPathEnd; } void setTrimPathEnd(float trimPathEnd) { - VD_SET_PROP_WITH_FLAG(mTrimPathEnd, trimPathEnd, mTrimDirty); + VD_SET_PROP_WITH_FLAG(mProperties.trimPathEnd, trimPathEnd, mTrimDirty); } float getTrimPathOffset() { - return mTrimPathOffset; + return mProperties.trimPathOffset; } void setTrimPathOffset(float trimPathOffset) { - VD_SET_PROP_WITH_FLAG(mTrimPathOffset, trimPathOffset, mTrimDirty); + VD_SET_PROP_WITH_FLAG(mProperties.trimPathOffset, trimPathOffset, mTrimDirty); } bool getProperties(int8_t* outProperties, int length); + void setColorPropertyValue(int propertyId, int32_t value); + void setPropertyValue(int propertyId, float value); void setFillGradient(SkShader* fillGradient) { SkRefCnt_SafeAssign(mFillGradient, fillGradient); @@ -182,24 +201,28 @@ protected: float strokeScale, const SkMatrix& matrix) override; private: + enum class Property { + StrokeWidth = 0, + StrokeColor, + StrokeAlpha, + FillColor, + FillAlpha, + TrimPathStart, + TrimPathEnd, + TrimPathOffset, + StrokeLineCap, + StrokeLineJoin, + StrokeMiterLimit, + Count, + }; // Applies trimming to the specified path. void applyTrim(); - float mStrokeWidth = 0; - SkColor mStrokeColor = SK_ColorTRANSPARENT; - float mStrokeAlpha = 1; - SkColor mFillColor = SK_ColorTRANSPARENT; - SkShader* mStrokeGradient = nullptr; - SkShader* mFillGradient = nullptr; - float mFillAlpha = 1; - float mTrimPathStart = 0; - float mTrimPathEnd = 1; - float mTrimPathOffset = 0; + Properties mProperties; bool mTrimDirty = true; - SkPaint::Cap mStrokeLineCap = SkPaint::Cap::kButt_Cap; - SkPaint::Join mStrokeLineJoin = SkPaint::Join::kMiter_Join; - float mStrokeMiterLimit = 4; SkPath mTrimmedSkPath; SkPaint mPaint; + SkShader* mStrokeGradient = nullptr; + SkShader* mFillGradient = nullptr; }; class ANDROID_API ClipPath: public Path { @@ -216,49 +239,58 @@ protected: class ANDROID_API Group: public Node { public: + struct Properties { + float rotate = 0; + float pivotX = 0; + float pivotY = 0; + float scaleX = 1; + float scaleY = 1; + float translateX = 0; + float translateY = 0; + }; Group(const Group& group); Group() {} float getRotation() { - return mRotate; + return mProperties.rotate; } void setRotation(float rotation) { - mRotate = rotation; + mProperties.rotate = rotation; } float getPivotX() { - return mPivotX; + return mProperties.pivotX; } void setPivotX(float pivotX) { - mPivotX = pivotX; + mProperties.pivotX = pivotX; } float getPivotY() { - return mPivotY; + return mProperties.pivotY; } void setPivotY(float pivotY) { - mPivotY = pivotY; + mProperties.pivotY = pivotY; } float getScaleX() { - return mScaleX; + return mProperties.scaleX; } void setScaleX(float scaleX) { - mScaleX = scaleX; + mProperties.scaleX = scaleX; } float getScaleY() { - return mScaleY; + return mProperties.scaleY; } void setScaleY(float scaleY) { - mScaleY = scaleY; + mProperties.scaleY = scaleY; } float getTranslateX() { - return mTranslateX; + return mProperties.translateX; } void setTranslateX(float translateX) { - mTranslateX = translateX; + mProperties.translateX = translateX; } float getTranslateY() { - return mTranslateY; + return mProperties.translateY; } void setTranslateY(float translateY) { - mTranslateY = translateY; + mProperties.translateY = translateY; } virtual void draw(SkCanvas* outCanvas, const SkMatrix& currentMatrix, float scaleX, float scaleY) override; @@ -268,38 +300,33 @@ public: void addChild(Node* child); void dump() override; bool getProperties(float* outProperties, int length); + float getPropertyValue(int propertyId) const; + void setPropertyValue(int propertyId, float value); + static bool isValidProperty(int propertyId); private: enum class Property { - Rotate_Property = 0, - PivotX_Property, - PivotY_Property, - ScaleX_Property, - ScaleY_Property, - TranslateX_Property, - TranslateY_Property, + Rotate = 0, + PivotX, + PivotY, + ScaleX, + ScaleY, + TranslateX, + TranslateY, // Count of the properties, must be at the end. Count, }; - float mRotate = 0; - float mPivotX = 0; - float mPivotY = 0; - float mScaleX = 1; - float mScaleY = 1; - float mTranslateX = 0; - float mTranslateY = 0; std::vector<Node*> mChildren; + Properties mProperties; }; -class ANDROID_API Tree { +class ANDROID_API Tree : public VirtualLightRefBase { public: Tree(Group* rootNode) : mRootNode(rootNode) {} void draw(Canvas* outCanvas, SkColorFilter* colorFilter, const SkRect& bounds, bool needsMirroring, bool canReuseCache); - void drawCachedBitmapWithRootAlpha(Canvas* outCanvas, SkColorFilter* filter, - const SkRect& originalBounds); - void updateCachedBitmap(int width, int height); + const SkBitmap& getBitmapUpdateIfDirty(); void createCachedBitmapIfNeeded(int width, int height); bool canReuseBitmap(int width, int height); void setAllowCaching(bool allowCaching) { @@ -316,6 +343,10 @@ public: mViewportWidth = viewportWidth; mViewportHeight = viewportHeight; } + SkPaint* getPaint(); + const SkRect& getBounds() const { + return mBounds; + } private: // Cap the bitmap size, such that it won't hurt the performance too much diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index e7cf3ecd2b72..d4116218e5e1 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -33,10 +33,6 @@ #include "utils/GLUtils.h" #include "utils/TimeUtils.h" -#if HWUI_NEW_OPS -#include "FrameBuilder.h" -#endif - #include <cutils/properties.h> #include <google/protobuf/io/zero_copy_stream_impl.h> #include <private/hwui/DrawGlInfo.h> @@ -152,7 +148,7 @@ bool CanvasContext::pauseSurface(ANativeWindow* window) { void CanvasContext::setup(int width, int height, float lightRadius, uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) { #if HWUI_NEW_OPS - mLightInfo.lightRadius = lightRadius; + mLightGeometry.radius = lightRadius; mLightInfo.ambientShadowAlpha = ambientShadowAlpha; mLightInfo.spotShadowAlpha = spotShadowAlpha; #else @@ -163,7 +159,7 @@ void CanvasContext::setup(int width, int height, float lightRadius, void CanvasContext::setLightCenter(const Vector3& lightCenter) { #if HWUI_NEW_OPS - mLightCenter = lightCenter; + mLightGeometry.center = lightCenter; #else if (!mCanvas) return; mCanvas->setLightCenter(lightCenter); @@ -345,7 +341,7 @@ void CanvasContext::draw() { #if HWUI_NEW_OPS FrameBuilder frameBuilder(mLayerUpdateQueue, dirty, frame.width(), frame.height(), - mRenderNodes, mLightCenter, mContentDrawBounds); + mRenderNodes, mLightGeometry, mContentDrawBounds, &Caches::getInstance()); mLayerUpdateQueue.clear(); BakedOpRenderer renderer(Caches::getInstance(), mRenderThread.renderState(), mOpaque, mLightInfo); diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h index 270fb1fead83..63a7977f0cc9 100644 --- a/libs/hwui/renderthread/CanvasContext.h +++ b/libs/hwui/renderthread/CanvasContext.h @@ -31,6 +31,7 @@ #if HWUI_NEW_OPS #include "BakedOpDispatcher.h" #include "BakedOpRenderer.h" +#include "FrameBuilder.h" #endif #include <cutils/compiler.h> @@ -197,7 +198,7 @@ private: OpenGLRenderer* mCanvas = nullptr; #if HWUI_NEW_OPS BakedOpRenderer::LightInfo mLightInfo; - Vector3 mLightCenter = { 0, 0, 0 }; + FrameBuilder::LightGeometry mLightGeometry = { {0, 0, 0}, 0 }; #endif bool mHaveNewSurface = false; diff --git a/libs/hwui/tests/macrobench/TestSceneRunner.cpp b/libs/hwui/tests/macrobench/TestSceneRunner.cpp index a843e9265ef1..58c0876cb4cb 100644 --- a/libs/hwui/tests/macrobench/TestSceneRunner.cpp +++ b/libs/hwui/tests/macrobench/TestSceneRunner.cpp @@ -112,9 +112,9 @@ void run(const TestScene::Info& info, const TestScene::Options& opts) { scene->doFrame(i); proxy->syncAndDrawFrame(); } - proxy->fence(); - nsecs_t done = systemTime(CLOCK_MONOTONIC); if (opts.reportFrametimeWeight) { + proxy->fence(); + nsecs_t done = systemTime(CLOCK_MONOTONIC); avgMs.add((done - vsync) / 1000000.0); if (i % 10 == 9) { printf("Average frametime %.3fms\n", avgMs.average()); diff --git a/libs/hwui/tests/microbench/DisplayListCanvasBench.cpp b/libs/hwui/tests/microbench/DisplayListCanvasBench.cpp index 83af148d095e..b317c1292623 100644 --- a/libs/hwui/tests/microbench/DisplayListCanvasBench.cpp +++ b/libs/hwui/tests/microbench/DisplayListCanvasBench.cpp @@ -63,7 +63,7 @@ void BM_DisplayListCanvas_record_empty::Run(int iters) { StartBenchmarkTiming(); for (int i = 0; i < iters; ++i) { - canvas.reset(100, 100); + canvas.resetRecording(100, 100); MicroBench::DoNotOptimize(&canvas); delete canvas.finishRecording(); } @@ -77,7 +77,7 @@ void BM_DisplayListCanvas_record_saverestore::Run(int iters) { StartBenchmarkTiming(); for (int i = 0; i < iters; ++i) { - canvas.reset(100, 100); + canvas.resetRecording(100, 100); canvas.save(SaveFlags::MatrixClip); canvas.save(SaveFlags::MatrixClip); MicroBench::DoNotOptimize(&canvas); @@ -95,7 +95,7 @@ void BM_DisplayListCanvas_record_translate::Run(int iters) { StartBenchmarkTiming(); for (int i = 0; i < iters; ++i) { - canvas.reset(100, 100); + canvas.resetRecording(100, 100); canvas.scale(10, 10); MicroBench::DoNotOptimize(&canvas); delete canvas.finishRecording(); @@ -119,7 +119,7 @@ void BM_DisplayListCanvas_record_simpleBitmapView::Run(int iters) { StartBenchmarkTiming(); for (int i = 0; i < iters; ++i) { - canvas.reset(100, 100); + canvas.resetRecording(100, 100); { canvas.save(SaveFlags::MatrixClip); canvas.drawRect(0, 0, 100, 100, rectPaint); diff --git a/libs/hwui/tests/microbench/FrameBuilderBench.cpp b/libs/hwui/tests/microbench/FrameBuilderBench.cpp index f9c2b671fdf3..7845eb4fa8e2 100644 --- a/libs/hwui/tests/microbench/FrameBuilderBench.cpp +++ b/libs/hwui/tests/microbench/FrameBuilderBench.cpp @@ -37,7 +37,8 @@ using namespace android::uirenderer::renderthread; using namespace android::uirenderer::test; const LayerUpdateQueue sEmptyLayerUpdateQueue; -const Vector3 sLightCenter = {100, 100, 100}; +const FrameBuilder::LightGeometry sLightGeometry = { {100, 100, 100}, 50}; +const BakedOpRenderer::LightInfo sLightInfo = { 128, 128 }; static std::vector<sp<RenderNode>> createTestNodeList() { auto node = TestUtils::createNode(0, 0, 200, 200, @@ -67,7 +68,7 @@ void BM_FrameBuilder_defer::Run(int iters) { StartBenchmarkTiming(); for (int i = 0; i < iters; i++) { FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 200), 100, 200, - nodes, sLightCenter); + nodes, sLightGeometry, nullptr); MicroBench::DoNotOptimize(&frameBuilder); } StopBenchmarkTiming(); @@ -77,7 +78,6 @@ BENCHMARK_NO_ARG(BM_FrameBuilder_deferAndRender); void BM_FrameBuilder_deferAndRender::Run(int iters) { TestUtils::runOnRenderThread([this, iters](RenderThread& thread) { auto nodes = createTestNodeList(); - BakedOpRenderer::LightInfo lightInfo = {50.0f, 128, 128 }; RenderState& renderState = thread.renderState(); Caches& caches = Caches::getInstance(); @@ -85,9 +85,9 @@ void BM_FrameBuilder_deferAndRender::Run(int iters) { StartBenchmarkTiming(); for (int i = 0; i < iters; i++) { FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 200), 100, 200, - nodes, sLightCenter); + nodes, sLightGeometry, nullptr); - BakedOpRenderer renderer(caches, renderState, true, lightInfo); + BakedOpRenderer renderer(caches, renderState, true, sLightInfo); frameBuilder.replayBakedOps<BakedOpDispatcher>(renderer); MicroBench::DoNotOptimize(&renderer); } @@ -119,7 +119,7 @@ static void benchDeferScene(testing::Benchmark& benchmark, int iters, const char for (int i = 0; i < iters; i++) { FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(gDisplay.w, gDisplay.h), gDisplay.w, gDisplay.h, - nodes, sLightCenter); + nodes, sLightGeometry, nullptr); MicroBench::DoNotOptimize(&frameBuilder); } benchmark.StopBenchmarkTiming(); @@ -129,7 +129,6 @@ static void benchDeferAndRenderScene(testing::Benchmark& benchmark, int iters, const char* sceneName) { TestUtils::runOnRenderThread([&benchmark, iters, sceneName](RenderThread& thread) { auto nodes = getSyncedSceneNodes(sceneName); - BakedOpRenderer::LightInfo lightInfo = {50.0f, 128, 128 }; // TODO! RenderState& renderState = thread.renderState(); Caches& caches = Caches::getInstance(); @@ -138,9 +137,9 @@ static void benchDeferAndRenderScene(testing::Benchmark& benchmark, for (int i = 0; i < iters; i++) { FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(gDisplay.w, gDisplay.h), gDisplay.w, gDisplay.h, - nodes, sLightCenter); + nodes, sLightGeometry, nullptr); - BakedOpRenderer renderer(caches, renderState, true, lightInfo); + BakedOpRenderer renderer(caches, renderState, true, sLightInfo); frameBuilder.replayBakedOps<BakedOpDispatcher>(renderer); MicroBench::DoNotOptimize(&renderer); } diff --git a/libs/hwui/tests/unit/FrameBuilderTests.cpp b/libs/hwui/tests/unit/FrameBuilderTests.cpp index 618df140deda..f49dd3f6bc81 100644 --- a/libs/hwui/tests/unit/FrameBuilderTests.cpp +++ b/libs/hwui/tests/unit/FrameBuilderTests.cpp @@ -30,7 +30,8 @@ namespace android { namespace uirenderer { const LayerUpdateQueue sEmptyLayerUpdateQueue; -const Vector3 sLightCenter = {100, 100, 100}; +const FrameBuilder::LightGeometry sLightGeometry = { {100, 100, 100}, 50}; + /** * Virtual class implemented by each test to redirect static operation / state transitions to @@ -132,7 +133,7 @@ TEST(FrameBuilder, simple) { canvas.drawBitmap(bitmap, 10, 10, nullptr); }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 200), 100, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); SimpleTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(4, renderer.getIndex()); // 2 ops + start + end @@ -158,7 +159,7 @@ TEST(FrameBuilder, simpleStroke) { canvas.drawPoint(50, 50, strokedPaint); }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 200), 100, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); SimpleStrokeTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(1, renderer.getIndex()); @@ -173,7 +174,7 @@ TEST(FrameBuilder, simpleRejection) { canvas.restore(); }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); FailRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); @@ -208,7 +209,7 @@ TEST(FrameBuilder, simpleBatching) { }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); SimpleBatchingTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(2 * LOOPS, renderer.getIndex()) @@ -250,7 +251,7 @@ TEST(FrameBuilder, DISABLED_clippedMerging) { }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 100, 100, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); ClippedMergingTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(4, renderer.getIndex()); @@ -278,7 +279,7 @@ TEST(FrameBuilder, textMerging) { TestUtils::drawTextToCanvas(&canvas, "Test string1", paint, 100, 100); // not clipped }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(400, 400), 400, 400, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); TextMergingTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(2, renderer.getIndex()) << "Expect 2 ops"; @@ -309,7 +310,7 @@ TEST(FrameBuilder, textStrikethrough) { } }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 2000), 200, 2000, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); TextStrikethroughTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(2 * LOOPS, renderer.getIndex()) @@ -343,7 +344,7 @@ RENDERTHREAD_TEST(FrameBuilder, textureLayer) { canvas.restore(); }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); TextureLayerTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(1, renderer.getIndex()); @@ -388,7 +389,7 @@ TEST(FrameBuilder, renderNode) { }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(parent), sLightCenter); + TestUtils::createSyncedNodeList(parent), sLightGeometry, nullptr); RenderNodeTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); } @@ -412,7 +413,7 @@ TEST(FrameBuilder, clipped) { FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeLTRB(10, 20, 30, 40), // clip to small area, should see in receiver - 200, 200, TestUtils::createSyncedNodeList(node), sLightCenter); + 200, 200, TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); ClippedTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); } @@ -454,7 +455,7 @@ TEST(FrameBuilder, saveLayer_simple) { canvas.restore(); }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); SaveLayerSimpleTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(4, renderer.getIndex()); @@ -526,7 +527,7 @@ TEST(FrameBuilder, saveLayer_nested) { }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(800, 800), 800, 800, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); SaveLayerNestedTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(10, renderer.getIndex()); @@ -546,7 +547,7 @@ TEST(FrameBuilder, saveLayer_contentRejection) { canvas.restore(); }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); FailRenderer renderer; // should see no ops, even within the layer, since the layer should be rejected @@ -589,7 +590,7 @@ TEST(FrameBuilder, saveLayerUnclipped_simple) { canvas.restore(); }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); SaveLayerUnclippedSimpleTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(4, renderer.getIndex()); @@ -643,7 +644,7 @@ TEST(FrameBuilder, saveLayerUnclipped_mergedClears) { canvas.restoreToCount(restoreTo); }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); SaveLayerUnclippedMergedClearsTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(10, renderer.getIndex()) @@ -705,7 +706,7 @@ TEST(FrameBuilder, saveLayerUnclipped_complex) { canvas.restore(); }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(600, 600), 600, 600, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); SaveLayerUnclippedComplexTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(12, renderer.getIndex()); @@ -763,7 +764,7 @@ RENDERTHREAD_TEST(FrameBuilder, hwLayer_simple) { layerUpdateQueue.enqueueLayerWithDamage(node.get(), Rect(25, 25, 75, 75)); FrameBuilder frameBuilder(layerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - syncedNodeList, sLightCenter); + syncedNodeList, sLightGeometry, nullptr); HwLayerSimpleTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(6, renderer.getIndex()); @@ -864,7 +865,7 @@ RENDERTHREAD_TEST(FrameBuilder, hwLayer_complex) { layerUpdateQueue.enqueueLayerWithDamage(parent.get(), Rect(200, 200)); FrameBuilder frameBuilder(layerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - syncedList, sLightCenter); + syncedList, sLightGeometry, nullptr); HwLayerComplexTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(13, renderer.getIndex()); @@ -913,7 +914,7 @@ TEST(FrameBuilder, zReorder) { drawOrderedNode(&canvas, 9, -10.0f); // in reorder=false at this point, so played inorder }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 100, 100, - TestUtils::createSyncedNodeList(parent), sLightCenter); + TestUtils::createSyncedNodeList(parent), sLightGeometry, nullptr); ZReorderTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(10, renderer.getIndex()); @@ -996,7 +997,7 @@ TEST(FrameBuilder, projectionReorder) { }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 100, 100, - TestUtils::createSyncedNodeList(parent), sLightCenter); + TestUtils::createSyncedNodeList(parent), sLightGeometry, nullptr); ProjectionReorderTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(3, renderer.getIndex()); @@ -1014,18 +1015,18 @@ static sp<RenderNode> createWhiteRectShadowCaster(float translationZ) { }); } -TEST(FrameBuilder, shadow) { +RENDERTHREAD_TEST(FrameBuilder, shadow) { class ShadowTestRenderer : public TestRendererBase { public: void onShadowOp(const ShadowOp& op, const BakedOpState& state) override { EXPECT_EQ(0, mIndex++); EXPECT_FLOAT_EQ(1.0f, op.casterAlpha); - EXPECT_TRUE(op.casterPath->isRect(nullptr)); - EXPECT_MATRIX_APPROX_EQ(Matrix4::identity(), op.shadowMatrixXY); + EXPECT_TRUE(op.shadowTask->casterPerimeter.isRect(nullptr)); + EXPECT_MATRIX_APPROX_EQ(Matrix4::identity(), op.shadowTask->transformXY); Matrix4 expectedZ; expectedZ.loadTranslate(0, 0, 5); - EXPECT_MATRIX_APPROX_EQ(expectedZ, op.shadowMatrixZ); + EXPECT_MATRIX_APPROX_EQ(expectedZ, op.shadowTask->transformZ); } void onRectOp(const RectOp& op, const BakedOpState& state) override { EXPECT_EQ(1, mIndex++); @@ -1039,13 +1040,13 @@ TEST(FrameBuilder, shadow) { }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(parent), sLightCenter); + TestUtils::createSyncedNodeList(parent), sLightGeometry, &Caches::getInstance()); ShadowTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(2, renderer.getIndex()); } -TEST(FrameBuilder, shadowSaveLayer) { +RENDERTHREAD_TEST(FrameBuilder, shadowSaveLayer) { class ShadowSaveLayerTestRenderer : public TestRendererBase { public: OffscreenBuffer* startTemporaryLayer(uint32_t width, uint32_t height) override { @@ -1054,8 +1055,8 @@ TEST(FrameBuilder, shadowSaveLayer) { } void onShadowOp(const ShadowOp& op, const BakedOpState& state) override { EXPECT_EQ(1, mIndex++); - EXPECT_FLOAT_EQ(50, op.lightCenter.x); - EXPECT_FLOAT_EQ(40, op.lightCenter.y); + EXPECT_FLOAT_EQ(50, op.shadowTask->lightCenter.x); + EXPECT_FLOAT_EQ(40, op.shadowTask->lightCenter.y); } void onRectOp(const RectOp& op, const BakedOpState& state) override { EXPECT_EQ(2, mIndex++); @@ -1080,7 +1081,9 @@ TEST(FrameBuilder, shadowSaveLayer) { }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(parent), (Vector3) { 100, 100, 100 }); + TestUtils::createSyncedNodeList(parent), + (FrameBuilder::LightGeometry) {{ 100, 100, 100 }, 50}, + &Caches::getInstance()); ShadowSaveLayerTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(5, renderer.getIndex()); @@ -1094,8 +1097,9 @@ RENDERTHREAD_TEST(FrameBuilder, shadowHwLayer) { } void onShadowOp(const ShadowOp& op, const BakedOpState& state) override { EXPECT_EQ(1, mIndex++); - EXPECT_FLOAT_EQ(50, op.lightCenter.x); - EXPECT_FLOAT_EQ(40, op.lightCenter.y); + EXPECT_FLOAT_EQ(50, op.shadowTask->lightCenter.x); + EXPECT_FLOAT_EQ(40, op.shadowTask->lightCenter.y); + EXPECT_FLOAT_EQ(30, op.shadowTask->lightRadius); } void onRectOp(const RectOp& op, const BakedOpState& state) override { EXPECT_EQ(2, mIndex++); @@ -1130,7 +1134,9 @@ RENDERTHREAD_TEST(FrameBuilder, shadowHwLayer) { LayerUpdateQueue layerUpdateQueue; // Note: enqueue damage post-sync, so bounds are valid layerUpdateQueue.enqueueLayerWithDamage(parent.get(), Rect(100, 100)); FrameBuilder frameBuilder(layerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - syncedList, (Vector3) { 100, 100, 100 }); + syncedList, + (FrameBuilder::LightGeometry) {{ 100, 100, 100 }, 30}, + &Caches::getInstance()); ShadowHwLayerTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(5, renderer.getIndex()); @@ -1159,7 +1165,9 @@ TEST(FrameBuilder, shadowLayering) { }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(parent), sLightCenter); + TestUtils::createSyncedNodeList(parent), + (FrameBuilder::LightGeometry) {{ 100, 100, 100 }, 50}, + &Caches::getInstance()); ShadowLayeringTestRenderer renderer; frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(4, renderer.getIndex()); @@ -1187,7 +1195,7 @@ static void testProperty(std::function<void(RenderProperties&)> propSetupCallbac }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 200, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); + TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); PropertyTestRenderer renderer(opValidateCallback); frameBuilder.replayBakedOps<TestDispatcher>(renderer); EXPECT_EQ(1, renderer.getIndex()) << "Should have seen one op"; @@ -1328,7 +1336,8 @@ void testSaveLayerAlphaClip(SaveLayerAlphaData* outObservedData, }); auto nodes = TestUtils::createSyncedNodeList(node); // sync before querying height - FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, nodes, sLightCenter); + FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, + nodes, sLightGeometry, nullptr); SaveLayerAlphaClipTestRenderer renderer(outObservedData); frameBuilder.replayBakedOps<TestDispatcher>(renderer); diff --git a/libs/hwui/tests/unit/LeakCheckTests.cpp b/libs/hwui/tests/unit/LeakCheckTests.cpp index 4a635fb1b8c8..da786c7d9d46 100644 --- a/libs/hwui/tests/unit/LeakCheckTests.cpp +++ b/libs/hwui/tests/unit/LeakCheckTests.cpp @@ -27,7 +27,8 @@ using namespace android; using namespace android::uirenderer; const LayerUpdateQueue sEmptyLayerUpdateQueue; -const Vector3 sLightCenter = {100, 100, 100}; +const FrameBuilder::LightGeometry sLightGeometery = { {100, 100, 100}, 50}; +const BakedOpRenderer::LightInfo sLightInfo = { 128, 128 }; RENDERTHREAD_TEST(LeakCheck, saveLayerUnclipped_simple) { auto node = TestUtils::createNode(0, 0, 200, 200, @@ -36,12 +37,11 @@ RENDERTHREAD_TEST(LeakCheck, saveLayerUnclipped_simple) { canvas.drawRect(0, 0, 200, 200, SkPaint()); canvas.restore(); }); - BakedOpRenderer::LightInfo lightInfo = {50.0f, 128, 128}; RenderState& renderState = renderThread.renderState(); Caches& caches = Caches::getInstance(); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, - TestUtils::createSyncedNodeList(node), sLightCenter); - BakedOpRenderer renderer(caches, renderState, true, lightInfo); + TestUtils::createSyncedNodeList(node), sLightGeometery, nullptr); + BakedOpRenderer renderer(caches, renderState, true, sLightInfo); frameBuilder.replayBakedOps<BakedOpDispatcher>(renderer); } diff --git a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp new file mode 100644 index 000000000000..586625bf97cf --- /dev/null +++ b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2015 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. + */ + +#include "tests/common/TestUtils.h" + +#include <gtest/gtest.h> +#include <SkShader.h> + +using namespace android; +using namespace android::uirenderer; + +/** + * 1x1 bitmaps must not be optimized into solid color shaders, since HWUI can't + * compose/render color shaders + */ +TEST(SkiaBehavior, CreateBitmapShader1x1) { + SkBitmap origBitmap = TestUtils::createSkBitmap(1, 1); + std::unique_ptr<SkShader> s(SkShader::CreateBitmapShader( + origBitmap, + SkShader::kClamp_TileMode, + SkShader::kRepeat_TileMode)); + + SkBitmap bitmap; + SkShader::TileMode xy[2]; + ASSERT_TRUE(s->isABitmap(&bitmap, nullptr, xy)) + << "1x1 bitmap shader must query as bitmap shader"; + EXPECT_EQ(SkShader::kClamp_TileMode, xy[0]); + EXPECT_EQ(SkShader::kRepeat_TileMode, xy[1]); + EXPECT_EQ(origBitmap.pixelRef(), bitmap.pixelRef()); +} diff --git a/location/java/android/location/GnssClock.java b/location/java/android/location/GnssClock.java new file mode 100644 index 000000000000..37ef3df7990f --- /dev/null +++ b/location/java/android/location/GnssClock.java @@ -0,0 +1,532 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package android.location; + +import android.annotation.IntDef; +import android.os.Parcel; +import android.os.Parcelable; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * A class containing a GPS clock timestamp. + * It represents a measurement of the GPS receiver's clock. + */ +public final class GnssClock implements Parcelable { + + // The following enumerations must be in sync with the values declared in gps.h + + /** The type of the GPS Clock. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({CLOCK_TYPE_UNKNOWN, CLOCK_TYPE_LOCAL_HW_TIME, CLOCK_TYPE_GPS_TIME}) + public @interface GnssClockType {} + + /** + * The type of the time stored is not available or it is unknown. + */ + public static final byte CLOCK_TYPE_UNKNOWN = 0; + + /** + * The source of the time value reported by this class is the 'Local Hardware Clock'. + */ + public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; + + /** + * The source of the time value reported by this class is the 'GPS time' derived from + * satellites (epoch = Jan 6, 1980). + */ + public static final byte CLOCK_TYPE_GPS_TIME = 2; + + private static final short HAS_NO_FLAGS = 0; + private static final short HAS_LEAP_SECOND = (1<<0); + private static final short HAS_TIME_UNCERTAINTY = (1<<1); + private static final short HAS_FULL_BIAS = (1<<2); + private static final short HAS_BIAS = (1<<3); + private static final short HAS_BIAS_UNCERTAINTY = (1<<4); + private static final short HAS_DRIFT = (1<<5); + private static final short HAS_DRIFT_UNCERTAINTY = (1<<6); + + // End enumerations in sync with gps.h + + private short mFlags; + private short mLeapSecond; + private byte mType; + private long mTimeInNs; + private double mTimeUncertaintyInNs; + private long mFullBiasInNs; + private double mBiasInNs; + private double mBiasUncertaintyInNs; + private double mDriftInNsPerSec; + private double mDriftUncertaintyInNsPerSec; + private long mTimeOfLastHwClockDiscontinuityInNs; + + GnssClock() { + initialize(); + } + + /** + * Sets all contents to the values stored in the provided object. + */ + public void set(GnssClock clock) { + mFlags = clock.mFlags; + mLeapSecond = clock.mLeapSecond; + mType = clock.mType; + mTimeInNs = clock.mTimeInNs; + mTimeUncertaintyInNs = clock.mTimeUncertaintyInNs; + mFullBiasInNs = clock.mFullBiasInNs; + mBiasInNs = clock.mBiasInNs; + mBiasUncertaintyInNs = clock.mBiasUncertaintyInNs; + mDriftInNsPerSec = clock.mDriftInNsPerSec; + mDriftUncertaintyInNsPerSec = clock.mDriftUncertaintyInNsPerSec; + mTimeOfLastHwClockDiscontinuityInNs = clock.mTimeOfLastHwClockDiscontinuityInNs; + } + + /** + * Resets all the contents to its original state. + */ + public void reset() { + initialize(); + } + + /** + * Gets the type of time reported by {@link #getTimeInNs()}. + */ + @GnssClockType + public byte getType() { + return mType; + } + + /** + * Sets the type of time reported. + */ + public void setType(@GnssClockType byte value) { + mType = value; + } + + /** + * Gets a string representation of the 'type'. + * For internal and logging use only. + */ + private String getTypeString() { + switch (mType) { + case CLOCK_TYPE_UNKNOWN: + return "Unknown"; + case CLOCK_TYPE_GPS_TIME: + return "GpsTime"; + case CLOCK_TYPE_LOCAL_HW_TIME: + return "LocalHwClock"; + default: + return "<Invalid:" + mType + ">"; + } + } + + /** + * Returns true if {@link #getLeapSecond()} is available, false otherwise. + */ + public boolean hasLeapSecond() { + return isFlagSet(HAS_LEAP_SECOND); + } + + /** + * Gets the leap second associated with the clock's time. + * The sign of the value is defined by the following equation: + * utc_time_ns = time_ns + (full_bias_ns + bias_ns) - leap_second * 1,000,000,000 + * + * The value is only available if {@link #hasLeapSecond()} is true. + */ + public short getLeapSecond() { + return mLeapSecond; + } + + /** + * Sets the leap second associated with the clock's time. + */ + public void setLeapSecond(short leapSecond) { + setFlag(HAS_LEAP_SECOND); + mLeapSecond = leapSecond; + } + + /** + * Resets the leap second associated with the clock's time. + */ + public void resetLeapSecond() { + resetFlag(HAS_LEAP_SECOND); + mLeapSecond = Short.MIN_VALUE; + } + + /** + * Gets the GPS receiver internal clock value in nanoseconds. + * This can be either the 'local hardware clock' value ({@link #CLOCK_TYPE_LOCAL_HW_TIME}), or the + * current GPS time derived inside GPS receiver ({@link #CLOCK_TYPE_GPS_TIME}). + * {@link #getType()} defines the time reported. + * + * For 'local hardware clock' this value is expected to be monotonically increasing during the + * reporting session. The real GPS time can be derived by compensating + * {@link #getFullBiasInNs()} (when it is available) from this value. + * + * For 'GPS time' this value is expected to be the best estimation of current GPS time that GPS + * receiver can achieve. {@link #getTimeUncertaintyInNs()} should be available when GPS time is + * specified. + * + * Sub-nanosecond accuracy can be provided by means of {@link #getBiasInNs()}. + * The reported time includes {@link #getTimeUncertaintyInNs()}. + */ + public long getTimeInNs() { + return mTimeInNs; + } + + /** + * Sets the GPS receiver internal clock in nanoseconds. + */ + public void setTimeInNs(long timeInNs) { + mTimeInNs = timeInNs; + } + + /** + * Returns true if {@link #getTimeUncertaintyInNs()} is available, false otherwise. + */ + public boolean hasTimeUncertaintyInNs() { + return isFlagSet(HAS_TIME_UNCERTAINTY); + } + + /** + * Gets the clock's time Uncertainty (1-Sigma) in nanoseconds. + * The uncertainty is represented as an absolute (single sided) value. + * + * The value is only available if {@link #hasTimeUncertaintyInNs()} is true. + */ + public double getTimeUncertaintyInNs() { + return mTimeUncertaintyInNs; + } + + /** + * Sets the clock's Time Uncertainty (1-Sigma) in nanoseconds. + */ + public void setTimeUncertaintyInNs(double timeUncertaintyInNs) { + setFlag(HAS_TIME_UNCERTAINTY); + mTimeUncertaintyInNs = timeUncertaintyInNs; + } + + /** + * Resets the clock's Time Uncertainty (1-Sigma) in nanoseconds. + */ + public void resetTimeUncertaintyInNs() { + resetFlag(HAS_TIME_UNCERTAINTY); + mTimeUncertaintyInNs = Double.NaN; + } + + /** + * Returns true if {@link #getFullBiasInNs()} is available, false otherwise. + */ + public boolean hasFullBiasInNs() { + return isFlagSet(HAS_FULL_BIAS); + } + + /** + * Gets the difference between hardware clock ({@link #getTimeInNs()}) inside GPS receiver and + * the true GPS time since 0000Z, January 6, 1980, in nanoseconds. + * + * This value is available if {@link #CLOCK_TYPE_LOCAL_HW_TIME} is set, and GPS receiver has solved + * the clock for GPS time. + * {@link #getBiasUncertaintyInNs()} should be used for quality check. + * + * The sign of the value is defined by the following equation: + * true time (GPS time) = time_ns + (full_bias_ns + bias_ns) + * + * The reported full bias includes {@link #getBiasUncertaintyInNs()}. + * The value is onl available if {@link #hasFullBiasInNs()} is true. + */ + public long getFullBiasInNs() { + return mFullBiasInNs; + } + + /** + * Sets the full bias in nanoseconds. + */ + public void setFullBiasInNs(long value) { + setFlag(HAS_FULL_BIAS); + mFullBiasInNs = value; + } + + /** + * Resets the full bias in nanoseconds. + */ + public void resetFullBiasInNs() { + resetFlag(HAS_FULL_BIAS); + mFullBiasInNs = Long.MIN_VALUE; + } + + /** + * Returns true if {@link #getBiasInNs()} is available, false otherwise. + */ + public boolean hasBiasInNs() { + return isFlagSet(HAS_BIAS); + } + + /** + * Gets the clock's sub-nanosecond bias. + * The reported bias includes {@link #getBiasUncertaintyInNs()}. + * + * The value is only available if {@link #hasBiasInNs()} is true. + */ + public double getBiasInNs() { + return mBiasInNs; + } + + /** + * Sets the sub-nanosecond bias. + */ + public void setBiasInNs(double biasInNs) { + setFlag(HAS_BIAS); + mBiasInNs = biasInNs; + } + + /** + * Resets the clock's Bias in nanoseconds. + */ + public void resetBiasInNs() { + resetFlag(HAS_BIAS); + mBiasInNs = Double.NaN; + } + + /** + * Returns true if {@link #getBiasUncertaintyInNs()} is available, false otherwise. + */ + public boolean hasBiasUncertaintyInNs() { + return isFlagSet(HAS_BIAS_UNCERTAINTY); + } + + /** + * Gets the clock's Bias Uncertainty (1-Sigma) in nanoseconds. + * + * The value is only available if {@link #hasBiasUncertaintyInNs()} is true. + */ + public double getBiasUncertaintyInNs() { + return mBiasUncertaintyInNs; + } + + /** + * Sets the clock's Bias Uncertainty (1-Sigma) in nanoseconds. + */ + public void setBiasUncertaintyInNs(double biasUncertaintyInNs) { + setFlag(HAS_BIAS_UNCERTAINTY); + mBiasUncertaintyInNs = biasUncertaintyInNs; + } + + /** + * Resets the clock's Bias Uncertainty (1-Sigma) in nanoseconds. + */ + public void resetBiasUncertaintyInNs() { + resetFlag(HAS_BIAS_UNCERTAINTY); + mBiasUncertaintyInNs = Double.NaN; + } + + /** + * Returns true if {@link #getDriftInNsPerSec()} is available, false otherwise. + */ + public boolean hasDriftInNsPerSec() { + return isFlagSet(HAS_DRIFT); + } + + /** + * Gets the clock's Drift in nanoseconds per second. + * A positive value indicates that the frequency is higher than the nominal frequency. + * The reported drift includes {@link #getDriftUncertaintyInNsPerSec()}. + * + * The value is only available if {@link #hasDriftInNsPerSec()} is true. + */ + public double getDriftInNsPerSec() { + return mDriftInNsPerSec; + } + + /** + * Sets the clock's Drift in nanoseconds per second. + */ + public void setDriftInNsPerSec(double driftInNsPerSec) { + setFlag(HAS_DRIFT); + mDriftInNsPerSec = driftInNsPerSec; + } + + /** + * Resets the clock's Drift in nanoseconds per second. + */ + public void resetDriftInNsPerSec() { + resetFlag(HAS_DRIFT); + mDriftInNsPerSec = Double.NaN; + } + + /** + * Returns true if {@link #getDriftUncertaintyInNsPerSec()} is available, false otherwise. + */ + public boolean hasDriftUncertaintyInNsPerSec() { + return isFlagSet(HAS_DRIFT_UNCERTAINTY); + } + + /** + * Gets the clock's Drift Uncertainty (1-Sigma) in nanoseconds per second. + * + * The value is only available if {@link #hasDriftUncertaintyInNsPerSec()} is true. + */ + public double getDriftUncertaintyInNsPerSec() { + return mDriftUncertaintyInNsPerSec; + } + + /** + * Sets the clock's Drift Uncertainty (1-Sigma) in nanoseconds per second. + */ + public void setDriftUncertaintyInNsPerSec(double driftUncertaintyInNsPerSec) { + setFlag(HAS_DRIFT_UNCERTAINTY); + mDriftUncertaintyInNsPerSec = driftUncertaintyInNsPerSec; + } + + /** + * Gets time of last hardware clock discontinuity. + */ + public long getTimeOfLastHwClockDiscontinuityInNs() { + return mTimeOfLastHwClockDiscontinuityInNs; + } + + /** + * Sets time of last hardware clock discontinuity. + */ + public void setTimeOfLastHwClockDiscontinuityInNs(long timeOfLastHwClockDiscontinuityInNs) { + mTimeOfLastHwClockDiscontinuityInNs = timeOfLastHwClockDiscontinuityInNs; + } + + /** + * Resets the clock's Drift Uncertainty (1-Sigma) in nanoseconds per second. + */ + public void resetDriftUncertaintyInNsPerSec() { + resetFlag(HAS_DRIFT_UNCERTAINTY); + mDriftUncertaintyInNsPerSec = Double.NaN; + } + + public static final Creator<GnssClock> CREATOR = new Creator<GnssClock>() { + @Override + public GnssClock createFromParcel(Parcel parcel) { + GnssClock gpsClock = new GnssClock(); + + gpsClock.mFlags = (short) parcel.readInt(); + gpsClock.mLeapSecond = (short) parcel.readInt(); + gpsClock.mType = parcel.readByte(); + gpsClock.mTimeInNs = parcel.readLong(); + gpsClock.mTimeUncertaintyInNs = parcel.readDouble(); + gpsClock.mFullBiasInNs = parcel.readLong(); + gpsClock.mBiasInNs = parcel.readDouble(); + gpsClock.mBiasUncertaintyInNs = parcel.readDouble(); + gpsClock.mDriftInNsPerSec = parcel.readDouble(); + gpsClock.mDriftUncertaintyInNsPerSec = parcel.readDouble(); + gpsClock.mTimeOfLastHwClockDiscontinuityInNs = parcel.readLong(); + + return gpsClock; + } + + @Override + public GnssClock[] newArray(int size) { + return new GnssClock[size]; + } + }; + + public void writeToParcel(Parcel parcel, int flags) { + parcel.writeInt(mFlags); + parcel.writeInt(mLeapSecond); + parcel.writeByte(mType); + parcel.writeLong(mTimeInNs); + parcel.writeDouble(mTimeUncertaintyInNs); + parcel.writeLong(mFullBiasInNs); + parcel.writeDouble(mBiasInNs); + parcel.writeDouble(mBiasUncertaintyInNs); + parcel.writeDouble(mDriftInNsPerSec); + parcel.writeDouble(mDriftUncertaintyInNsPerSec); + parcel.writeLong(mTimeOfLastHwClockDiscontinuityInNs); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public String toString() { + final String format = " %-15s = %s\n"; + final String formatWithUncertainty = " %-15s = %-25s %-26s = %s\n"; + StringBuilder builder = new StringBuilder("GnssClock:\n"); + + builder.append(String.format(format, "Type", getTypeString())); + + builder.append(String.format(format, "LeapSecond", hasLeapSecond() ? mLeapSecond : null)); + + builder.append(String.format( + formatWithUncertainty, + "TimeInNs", + mTimeInNs, + "TimeUncertaintyInNs", + hasTimeUncertaintyInNs() ? mTimeUncertaintyInNs : null)); + + builder.append(String.format( + format, + "FullBiasInNs", + hasFullBiasInNs() ? mFullBiasInNs : null)); + + builder.append(String.format( + formatWithUncertainty, + "BiasInNs", + hasBiasInNs() ? mBiasInNs : null, + "BiasUncertaintyInNs", + hasBiasUncertaintyInNs() ? mBiasUncertaintyInNs : null)); + + builder.append(String.format( + formatWithUncertainty, + "DriftInNsPerSec", + hasDriftInNsPerSec() ? mDriftInNsPerSec : null, + "DriftUncertaintyInNsPerSec", + hasDriftUncertaintyInNsPerSec() ? mDriftUncertaintyInNsPerSec : null)); + + builder.append(String.format(format, "TimeOfLastHwClockDiscontinuityInNs", + getType() == CLOCK_TYPE_LOCAL_HW_TIME + ? mTimeOfLastHwClockDiscontinuityInNs : null)); + + return builder.toString(); + } + + private void initialize() { + mFlags = HAS_NO_FLAGS; + resetLeapSecond(); + setType(CLOCK_TYPE_UNKNOWN); + setTimeInNs(Long.MIN_VALUE); + resetTimeUncertaintyInNs(); + resetFullBiasInNs(); + resetBiasInNs(); + resetBiasUncertaintyInNs(); + resetDriftInNsPerSec(); + resetDriftUncertaintyInNsPerSec(); + setTimeOfLastHwClockDiscontinuityInNs(Long.MIN_VALUE); + } + + private void setFlag(short flag) { + mFlags |= flag; + } + + private void resetFlag(short flag) { + mFlags &= ~flag; + } + + private boolean isFlagSet(short flag) { + return (mFlags & flag) == flag; + } +} diff --git a/location/java/android/location/GnssMeasurement.java b/location/java/android/location/GnssMeasurement.java new file mode 100644 index 000000000000..d8f507c9b70e --- /dev/null +++ b/location/java/android/location/GnssMeasurement.java @@ -0,0 +1,1471 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package android.location; + +import android.annotation.IntDef; +import android.os.Parcel; +import android.os.Parcelable; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * A class representing a GPS satellite measurement, containing raw and computed information. + */ +public final class GnssMeasurement implements Parcelable { + private int mFlags; + private byte mPrn; + private double mTimeOffsetInNs; + private short mState; + private long mReceivedGpsTowInNs; + private long mReceivedGpsTowUncertaintyInNs; + private double mCn0InDbHz; + private double mPseudorangeRateInMetersPerSec; + private double mPseudorangeRateUncertaintyInMetersPerSec; + private short mAccumulatedDeltaRangeState; + private double mAccumulatedDeltaRangeInMeters; + private double mAccumulatedDeltaRangeUncertaintyInMeters; + private double mPseudorangeInMeters; + private double mPseudorangeUncertaintyInMeters; + private double mCodePhaseInChips; + private double mCodePhaseUncertaintyInChips; + private float mCarrierFrequencyInHz; + private long mCarrierCycles; + private double mCarrierPhase; + private double mCarrierPhaseUncertainty; + private byte mLossOfLock; + private int mBitNumber; + private short mTimeFromLastBitInMs; + private double mDopplerShiftInHz; + private double mDopplerShiftUncertaintyInHz; + private byte mMultipathIndicator; + private double mSnrInDb; + private double mElevationInDeg; + private double mElevationUncertaintyInDeg; + private double mAzimuthInDeg; + private double mAzimuthUncertaintyInDeg; + private boolean mUsedInFix; + private double mPseudorangeRateCarrierInMetersPerSec; + private double mPseudorangeRateCarrierUncertaintyInMetersPerSec; + + // The following enumerations must be in sync with the values declared in gps.h + + private static final int HAS_NO_FLAGS = 0; + private static final int HAS_SNR = (1<<0); + private static final int HAS_ELEVATION = (1<<1); + private static final int HAS_ELEVATION_UNCERTAINTY = (1<<2); + private static final int HAS_AZIMUTH = (1<<3); + private static final int HAS_AZIMUTH_UNCERTAINTY = (1<<4); + private static final int HAS_PSEUDORANGE = (1<<5); + private static final int HAS_PSEUDORANGE_UNCERTAINTY = (1<<6); + private static final int HAS_CODE_PHASE = (1<<7); + private static final int HAS_CODE_PHASE_UNCERTAINTY = (1<<8); + private static final int HAS_CARRIER_FREQUENCY = (1<<9); + private static final int HAS_CARRIER_CYCLES = (1<<10); + private static final int HAS_CARRIER_PHASE = (1<<11); + private static final int HAS_CARRIER_PHASE_UNCERTAINTY = (1<<12); + private static final int HAS_BIT_NUMBER = (1<<13); + private static final int HAS_TIME_FROM_LAST_BIT = (1<<14); + private static final int HAS_DOPPLER_SHIFT = (1<<15); + private static final int HAS_DOPPLER_SHIFT_UNCERTAINTY = (1<<16); + private static final int HAS_USED_IN_FIX = (1<<17); + private static final int GPS_MEASUREMENT_HAS_UNCORRECTED_PSEUDORANGE_RATE = (1<<18); + + /** The status of 'loss of lock'. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({LOSS_OF_LOCK_UNKNOWN, LOSS_OF_LOCK_OK, LOSS_OF_LOCK_CYCLE_SLIP}) + public @interface LossOfLockStatus {} + + /** + * The indicator is not available or it is unknown. + */ + public static final byte LOSS_OF_LOCK_UNKNOWN = 0; + + /** + * The measurement does not present any indication of 'loss of lock'. + */ + public static final byte LOSS_OF_LOCK_OK = 1; + + /** + * 'Loss of lock' detected between the previous and current observation: cycle slip possible. + */ + public static final byte LOSS_OF_LOCK_CYCLE_SLIP = 2; + + /** The status of multipath. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({MULTIPATH_INDICATOR_UNKNOWN, MULTIPATH_INDICATOR_DETECTED, + MULTIPATH_INDICATOR_NOT_USED}) + public @interface MultipathIndicator {} + + /** + * The indicator is not available or it is unknown. + */ + public static final byte MULTIPATH_INDICATOR_UNKNOWN = 0; + + /** + * The measurement has been indicated to use multi-path. + */ + public static final byte MULTIPATH_INDICATOR_DETECTED = 1; + + /** + * The measurement has been indicated not tu use multi-path. + */ + public static final byte MULTIPATH_INDICATOR_NOT_USED = 2; + + /** + * The state of GPS receiver the measurement is invalid or unknown. + */ + public static final short STATE_UNKNOWN = 0; + + /** + * The state of the GPS receiver is ranging code lock. + */ + public static final short STATE_CODE_LOCK = (1<<0); + + /** + * The state of the GPS receiver is in bit sync. + */ + public static final short STATE_BIT_SYNC = (1<<1); + + /** + *The state of the GPS receiver is in sub-frame sync. + */ + public static final short STATE_SUBFRAME_SYNC = (1<<2); + + /** + * The state of the GPS receiver has TOW decoded. + */ + public static final short STATE_TOW_DECODED = (1<<3); + + /** + * The state of the GPS receiver contains millisecond ambiguity. + */ + public static final short STATE_MSEC_AMBIGUOUS = (1<<4); + + /** + * All the GPS receiver state flags. + */ + private static final short STATE_ALL = STATE_CODE_LOCK | STATE_BIT_SYNC | STATE_SUBFRAME_SYNC + | STATE_TOW_DECODED | STATE_MSEC_AMBIGUOUS; + + /** + * The state of the 'Accumulated Delta Range' is invalid or unknown. + */ + public static final short ADR_STATE_UNKNOWN = 0; + + /** + * The state of the 'Accumulated Delta Range' is valid. + */ + public static final short ADR_STATE_VALID = (1<<0); + + /** + * The state of the 'Accumulated Delta Range' has detected a reset. + */ + public static final short ADR_STATE_RESET = (1<<1); + + /** + * The state of the 'Accumulated Delta Range' has a cycle slip detected. + */ + public static final short ADR_STATE_CYCLE_SLIP = (1<<2); + + /** + * All the 'Accumulated Delta Range' flags. + */ + private static final short ADR_ALL = ADR_STATE_VALID | ADR_STATE_RESET | ADR_STATE_CYCLE_SLIP; + + // End enumerations in sync with gps.h + + GnssMeasurement() { + initialize(); + } + + /** + * Sets all contents to the values stored in the provided object. + */ + public void set(GnssMeasurement measurement) { + mFlags = measurement.mFlags; + mPrn = measurement.mPrn; + mTimeOffsetInNs = measurement.mTimeOffsetInNs; + mState = measurement.mState; + mReceivedGpsTowInNs = measurement.mReceivedGpsTowInNs; + mReceivedGpsTowUncertaintyInNs = measurement.mReceivedGpsTowUncertaintyInNs; + mCn0InDbHz = measurement.mCn0InDbHz; + mPseudorangeRateInMetersPerSec = measurement.mPseudorangeRateInMetersPerSec; + mPseudorangeRateUncertaintyInMetersPerSec = + measurement.mPseudorangeRateUncertaintyInMetersPerSec; + mAccumulatedDeltaRangeState = measurement.mAccumulatedDeltaRangeState; + mAccumulatedDeltaRangeInMeters = measurement.mAccumulatedDeltaRangeInMeters; + mAccumulatedDeltaRangeUncertaintyInMeters = + measurement.mAccumulatedDeltaRangeUncertaintyInMeters; + mPseudorangeInMeters = measurement.mPseudorangeInMeters; + mPseudorangeUncertaintyInMeters = measurement.mPseudorangeUncertaintyInMeters; + mCodePhaseInChips = measurement.mCodePhaseInChips; + mCodePhaseUncertaintyInChips = measurement.mCodePhaseUncertaintyInChips; + mCarrierFrequencyInHz = measurement.mCarrierFrequencyInHz; + mCarrierCycles = measurement.mCarrierCycles; + mCarrierPhase = measurement.mCarrierPhase; + mCarrierPhaseUncertainty = measurement.mCarrierPhaseUncertainty; + mLossOfLock = measurement.mLossOfLock; + mBitNumber = measurement.mBitNumber; + mTimeFromLastBitInMs = measurement.mTimeFromLastBitInMs; + mDopplerShiftInHz = measurement.mDopplerShiftInHz; + mDopplerShiftUncertaintyInHz = measurement.mDopplerShiftUncertaintyInHz; + mMultipathIndicator = measurement.mMultipathIndicator; + mSnrInDb = measurement.mSnrInDb; + mElevationInDeg = measurement.mElevationInDeg; + mElevationUncertaintyInDeg = measurement.mElevationUncertaintyInDeg; + mAzimuthInDeg = measurement.mAzimuthInDeg; + mAzimuthUncertaintyInDeg = measurement.mAzimuthUncertaintyInDeg; + mUsedInFix = measurement.mUsedInFix; + mPseudorangeRateCarrierInMetersPerSec = + measurement.mPseudorangeRateCarrierInMetersPerSec; + mPseudorangeRateCarrierUncertaintyInMetersPerSec = + measurement.mPseudorangeRateCarrierUncertaintyInMetersPerSec; + } + + /** + * Resets all the contents to its original state. + */ + public void reset() { + initialize(); + } + + /** + * Gets the Pseudo-random number (PRN). + * Range: [1, 32] + */ + public byte getPrn() { + return mPrn; + } + + /** + * Sets the Pseud-random number (PRN). + */ + public void setPrn(byte value) { + mPrn = value; + } + + /** + * Gets the time offset at which the measurement was taken in nanoseconds. + * The reference receiver's time is specified by {@link GnssClock#getTimeInNs()} and should be + * interpreted in the same way as indicated by {@link GnssClock#getType()}. + * + * The sign of this value is given by the following equation: + * measurement time = time_ns + time_offset_ns + * + * The value provides an individual time-stamp for the measurement, and allows sub-nanosecond + * accuracy. + */ + public double getTimeOffsetInNs() { + return mTimeOffsetInNs; + } + + /** + * Sets the time offset at which the measurement was taken in nanoseconds. + */ + public void setTimeOffsetInNs(double value) { + mTimeOffsetInNs = value; + } + + /** + * Gets per-satellite sync state. + * It represents the current sync state for the associated satellite. + * + * This value helps interpret {@link #getReceivedGpsTowInNs()}. + */ + public short getState() { + return mState; + } + + /** + * Sets the sync state. + */ + public void setState(short value) { + mState = value; + } + + /** + * Gets a string representation of the 'sync state'. + * For internal and logging use only. + */ + private String getStateString() { + if (mState == STATE_UNKNOWN) { + return "Unknown"; + } + StringBuilder builder = new StringBuilder(); + if ((mState & STATE_CODE_LOCK) == STATE_CODE_LOCK) { + builder.append("CodeLock|"); + } + if ((mState & STATE_BIT_SYNC) == STATE_BIT_SYNC) { + builder.append("BitSync|"); + } + if ((mState & STATE_SUBFRAME_SYNC) == STATE_SUBFRAME_SYNC) { + builder.append("SubframeSync|"); + } + if ((mState & STATE_TOW_DECODED) == STATE_TOW_DECODED) { + builder.append("TowDecoded|"); + } + if ((mState & STATE_MSEC_AMBIGUOUS) == STATE_MSEC_AMBIGUOUS) { + builder.append("MsecAmbiguous"); + } + int remainingStates = mState & ~STATE_ALL; + if (remainingStates > 0) { + builder.append("Other("); + builder.append(Integer.toBinaryString(remainingStates)); + builder.append(")|"); + } + builder.deleteCharAt(builder.length() - 1); + return builder.toString(); + } + + /** + * Gets the received GPS Time-of-Week at the measurement time, in nanoseconds. + * The value is relative to the beginning of the current GPS week. + * + * Given {@link #getState()} of the GPS receiver, the range of this field can be: + * Searching : [ 0 ] : {@link #STATE_UNKNOWN} is set + * Ranging code lock : [ 0 1 ms ] : {@link #STATE_CODE_LOCK} is set + * Bit sync : [ 0 20 ms ] : {@link #STATE_BIT_SYNC} is set + * Subframe sync : [ 0 6 ms ] : {@link #STATE_SUBFRAME_SYNC} is set + * TOW decoded : [ 0 1 week ] : {@link #STATE_TOW_DECODED} is set + */ + public long getReceivedGpsTowInNs() { + return mReceivedGpsTowInNs; + } + + /** + * Sets the received GPS time-of-week in nanoseconds. + */ + public void setReceivedGpsTowInNs(long value) { + mReceivedGpsTowInNs = value; + } + + /** + * Gets the received GPS time-of-week's uncertainty (1-Sigma) in nanoseconds. + */ + public long getReceivedGpsTowUncertaintyInNs() { + return mReceivedGpsTowUncertaintyInNs; + } + + /** + * Sets the received GPS time-of-week's uncertainty (1-Sigma) in nanoseconds. + */ + public void setReceivedGpsTowUncertaintyInNs(long value) { + mReceivedGpsTowUncertaintyInNs = value; + } + + /** + * Gets the Carrier-to-noise density in dB-Hz. + * Range: [0, 63]. + * + * The value contains the measured C/N0 for the signal at the antenna input. + */ + public double getCn0InDbHz() { + return mCn0InDbHz; + } + + /** + * Sets the carrier-to-noise density in dB-Hz. + */ + public void setCn0InDbHz(double value) { + mCn0InDbHz = value; + } + + /** + * Gets the Pseudorange rate at the timestamp in m/s. + * The reported value includes {@link #getPseudorangeRateUncertaintyInMetersPerSec()}. + * + * The correction of a given Pseudorange Rate value includes corrections from receiver and + * satellite clock frequency errors. + * {@link #isPseudorangeRateCorrected()} identifies the type of value reported. + * + * A positive 'uncorrected' value indicates that the SV is moving away from the receiver. + * The sign of the 'uncorrected' Pseudorange Rate and its relation to the sign of + * {@link #getDopplerShiftInHz()} is given by the equation: + * pseudorange rate = -k * doppler shift (where k is a constant) + */ + public double getPseudorangeRateInMetersPerSec() { + return mPseudorangeRateInMetersPerSec; + } + + /** + * Sets the pseudorange rate at the timestamp in m/s. + */ + public void setPseudorangeRateInMetersPerSec(double value) { + mPseudorangeRateInMetersPerSec = value; + } + + /** + * See {@link #getPseudorangeRateInMetersPerSec()} for more details. + * + * @return {@code true} if {@link #getPseudorangeRateInMetersPerSec()} contains a corrected + * value, {@code false} if it contains an uncorrected value. + */ + public boolean isPseudorangeRateCorrected() { + return !isFlagSet(GPS_MEASUREMENT_HAS_UNCORRECTED_PSEUDORANGE_RATE); + } + + /** + * Gets the pseudorange's rate uncertainty (1-Sigma) in m/s. + * The uncertainty is represented as an absolute (single sided) value. + */ + public double getPseudorangeRateUncertaintyInMetersPerSec() { + return mPseudorangeRateUncertaintyInMetersPerSec; + } + + /** + * Sets the pseudorange's rate uncertainty (1-Sigma) in m/s. + */ + public void setPseudorangeRateUncertaintyInMetersPerSec(double value) { + mPseudorangeRateUncertaintyInMetersPerSec = value; + } + + /** + * Gets 'Accumulated Delta Range' state. + * It indicates whether {@link #getAccumulatedDeltaRangeInMeters()} is reset or there is a + * cycle slip (indicating 'loss of lock'). + */ + public short getAccumulatedDeltaRangeState() { + return mAccumulatedDeltaRangeState; + } + + /** + * Sets the 'Accumulated Delta Range' state. + */ + public void setAccumulatedDeltaRangeState(short value) { + mAccumulatedDeltaRangeState = value; + } + + /** + * Gets a string representation of the 'Accumulated Delta Range state'. + * For internal and logging use only. + */ + private String getAccumulatedDeltaRangeStateString() { + if (mAccumulatedDeltaRangeState == ADR_STATE_UNKNOWN) { + return "Unknown"; + } + StringBuilder builder = new StringBuilder(); + if ((mAccumulatedDeltaRangeState & ADR_STATE_VALID) == ADR_STATE_VALID) { + builder.append("Valid|"); + } + if ((mAccumulatedDeltaRangeState & ADR_STATE_RESET) == ADR_STATE_RESET) { + builder.append("Reset|"); + } + if ((mAccumulatedDeltaRangeState & ADR_STATE_CYCLE_SLIP) == ADR_STATE_CYCLE_SLIP) { + builder.append("CycleSlip|"); + } + int remainingStates = mAccumulatedDeltaRangeState & ~ADR_ALL; + if (remainingStates > 0) { + builder.append("Other("); + builder.append(Integer.toBinaryString(remainingStates)); + builder.append(")|"); + } + builder.deleteCharAt(builder.length() - 1); + return builder.toString(); + } + + /** + * Gets the accumulated delta range since the last channel reset, in meters. + * The reported value includes {@link #getAccumulatedDeltaRangeUncertaintyInMeters()}. + * + * The availability of the value is represented by {@link #getAccumulatedDeltaRangeState()}. + * + * A positive value indicates that the SV is moving away from the receiver. + * The sign of {@link #getAccumulatedDeltaRangeInMeters()} and its relation to the sign of + * {@link #getCarrierPhase()} is given by the equation: + * accumulated delta range = -k * carrier phase (where k is a constant) + */ + public double getAccumulatedDeltaRangeInMeters() { + return mAccumulatedDeltaRangeInMeters; + } + + /** + * Sets the accumulated delta range in meters. + */ + public void setAccumulatedDeltaRangeInMeters(double value) { + mAccumulatedDeltaRangeInMeters = value; + } + + /** + * Gets the accumulated delta range's uncertainty (1-Sigma) in meters. + * The uncertainty is represented as an absolute (single sided) value. + * + * The status of the value is represented by {@link #getAccumulatedDeltaRangeState()}. + */ + public double getAccumulatedDeltaRangeUncertaintyInMeters() { + return mAccumulatedDeltaRangeUncertaintyInMeters; + } + + /** + * Sets the accumulated delta range's uncertainty (1-sigma) in meters. + * + * The status of the value is represented by {@link #getAccumulatedDeltaRangeState()}. + */ + public void setAccumulatedDeltaRangeUncertaintyInMeters(double value) { + mAccumulatedDeltaRangeUncertaintyInMeters = value; + } + + /** + * Returns true if {@link #getPseudorangeInMeters()} is available, false otherwise. + */ + public boolean hasPseudorangeInMeters() { + return isFlagSet(HAS_PSEUDORANGE); + } + + /** + * Gets the best derived pseudorange by the chipset, in meters. + * The reported pseudorange includes {@link #getPseudorangeUncertaintyInMeters()}. + * + * The value is only available if {@link #hasPseudorangeInMeters()} is true. + */ + public double getPseudorangeInMeters() { + return mPseudorangeInMeters; + } + + /** + * Sets the Pseudo-range in meters. + */ + public void setPseudorangeInMeters(double value) { + setFlag(HAS_PSEUDORANGE); + mPseudorangeInMeters = value; + } + + /** + * Resets the Pseudo-range in meters. + */ + public void resetPseudorangeInMeters() { + resetFlag(HAS_PSEUDORANGE); + mPseudorangeInMeters = Double.NaN; + } + + /** + * Returns true if {@link #getPseudorangeUncertaintyInMeters()} is available, false otherwise. + */ + public boolean hasPseudorangeUncertaintyInMeters() { + return isFlagSet(HAS_PSEUDORANGE_UNCERTAINTY); + } + + /** + * Gets the pseudorange's uncertainty (1-Sigma) in meters. + * The value contains the 'pseudorange' and 'clock' uncertainty in it. + * The uncertainty is represented as an absolute (single sided) value. + * + * The value is only available if {@link #hasPseudorangeUncertaintyInMeters()} is true. + */ + public double getPseudorangeUncertaintyInMeters() { + return mPseudorangeUncertaintyInMeters; + } + + /** + * Sets the pseudo-range's uncertainty (1-Sigma) in meters. + */ + public void setPseudorangeUncertaintyInMeters(double value) { + setFlag(HAS_PSEUDORANGE_UNCERTAINTY); + mPseudorangeUncertaintyInMeters = value; + } + + /** + * Resets the pseudo-range's uncertainty (1-Sigma) in meters. + */ + public void resetPseudorangeUncertaintyInMeters() { + resetFlag(HAS_PSEUDORANGE_UNCERTAINTY); + mPseudorangeUncertaintyInMeters = Double.NaN; + } + + /** + * Returns true if {@link #getCodePhaseInChips()} is available, false otherwise. + */ + public boolean hasCodePhaseInChips() { + return isFlagSet(HAS_CODE_PHASE); + } + + /** + * Gets the fraction of the current C/A code cycle. + * Range: [0, 1023] + * The reference frequency is given by the value of {@link #getCarrierFrequencyInHz()}. + * The reported code-phase includes {@link #getCodePhaseUncertaintyInChips()}. + * + * The value is only available if {@link #hasCodePhaseInChips()} is true. + */ + public double getCodePhaseInChips() { + return mCodePhaseInChips; + } + + /** + * Sets the Code-phase in chips. + */ + public void setCodePhaseInChips(double value) { + setFlag(HAS_CODE_PHASE); + mCodePhaseInChips = value; + } + + /** + * Resets the Code-phase in chips. + */ + public void resetCodePhaseInChips() { + resetFlag(HAS_CODE_PHASE); + mCodePhaseInChips = Double.NaN; + } + + /** + * Returns true if {@link #getCodePhaseUncertaintyInChips()} is available, false otherwise. + */ + public boolean hasCodePhaseUncertaintyInChips() { + return isFlagSet(HAS_CODE_PHASE_UNCERTAINTY); + } + + /** + * Gets the code-phase's uncertainty (1-Sigma) as a fraction of chips. + * The uncertainty is represented as an absolute (single sided) value. + * + * The value is only available if {@link #hasCodePhaseUncertaintyInChips()} is true. + */ + public double getCodePhaseUncertaintyInChips() { + return mCodePhaseUncertaintyInChips; + } + + /** + * Sets the Code-phase's uncertainty (1-Sigma) in fractions of chips. + */ + public void setCodePhaseUncertaintyInChips(double value) { + setFlag(HAS_CODE_PHASE_UNCERTAINTY); + mCodePhaseUncertaintyInChips = value; + } + + /** + * Resets the Code-phase's uncertainty (1-Sigma) in fractions of chips. + */ + public void resetCodePhaseUncertaintyInChips() { + resetFlag(HAS_CODE_PHASE_UNCERTAINTY); + mCodePhaseUncertaintyInChips = Double.NaN; + } + + /** + * Returns true if {@link #getCarrierFrequencyInHz()} is available, false otherwise. + */ + public boolean hasCarrierFrequencyInHz() { + return isFlagSet(HAS_CARRIER_FREQUENCY); + } + + /** + * Gets the carrier frequency at which codes and messages are modulated, it can be L1 or L2. + * If the field is not set, the carrier frequency corresponds to L1. + * + * The value is only available if {@link #hasCarrierFrequencyInHz()} is true. + */ + public float getCarrierFrequencyInHz() { + return mCarrierFrequencyInHz; + } + + /** + * Sets the Carrier frequency (L1 or L2) in Hz. + */ + public void setCarrierFrequencyInHz(float carrierFrequencyInHz) { + setFlag(HAS_CARRIER_FREQUENCY); + mCarrierFrequencyInHz = carrierFrequencyInHz; + } + + /** + * Resets the Carrier frequency (L1 or L2) in Hz. + */ + public void resetCarrierFrequencyInHz() { + resetFlag(HAS_CARRIER_FREQUENCY); + mCarrierFrequencyInHz = Float.NaN; + } + + /** + * Returns true if {@link #getCarrierCycles()} is available, false otherwise. + */ + public boolean hasCarrierCycles() { + return isFlagSet(HAS_CARRIER_CYCLES); + } + + /** + * The number of full carrier cycles between the satellite and the receiver. + * The reference frequency is given by the value of {@link #getCarrierFrequencyInHz()}. + * + * The value is only available if {@link #hasCarrierCycles()} is true. + */ + public long getCarrierCycles() { + return mCarrierCycles; + } + + /** + * Sets the number of full carrier cycles between the satellite and the receiver. + */ + public void setCarrierCycles(long value) { + setFlag(HAS_CARRIER_CYCLES); + mCarrierCycles = value; + } + + /** + * Resets the number of full carrier cycles between the satellite and the receiver. + */ + public void resetCarrierCycles() { + resetFlag(HAS_CARRIER_CYCLES); + mCarrierCycles = Long.MIN_VALUE; + } + + /** + * Returns true if {@link #getCarrierPhase()} is available, false otherwise. + */ + public boolean hasCarrierPhase() { + return isFlagSet(HAS_CARRIER_PHASE); + } + + /** + * Gets the RF phase detected by the receiver. + * Range: [0.0, 1.0]. + * This is usually the fractional part of the complete carrier phase measurement. + * + * The reference frequency is given by the value of {@link #getCarrierFrequencyInHz()}. + * The reported carrier-phase includes {@link #getCarrierPhaseUncertainty()}. + * + * The value is only available if {@link #hasCarrierPhase()} is true. + */ + public double getCarrierPhase() { + return mCarrierPhase; + } + + /** + * Sets the RF phase detected by the receiver. + */ + public void setCarrierPhase(double value) { + setFlag(HAS_CARRIER_PHASE); + mCarrierPhase = value; + } + + /** + * Resets the RF phase detected by the receiver. + */ + public void resetCarrierPhase() { + resetFlag(HAS_CARRIER_PHASE); + mCarrierPhase = Double.NaN; + } + + /** + * Returns true if {@link #getCarrierPhaseUncertainty()} is available, false otherwise. + */ + public boolean hasCarrierPhaseUncertainty() { + return isFlagSet(HAS_CARRIER_PHASE_UNCERTAINTY); + } + + /** + * Gets the carrier-phase's uncertainty (1-Sigma). + * The uncertainty is represented as an absolute (single sided) value. + * + * The value is only available if {@link #hasCarrierPhaseUncertainty()} is true. + */ + public double getCarrierPhaseUncertainty() { + return mCarrierPhaseUncertainty; + } + + /** + * Sets the Carrier-phase's uncertainty (1-Sigma) in cycles. + */ + public void setCarrierPhaseUncertainty(double value) { + setFlag(HAS_CARRIER_PHASE_UNCERTAINTY); + mCarrierPhaseUncertainty = value; + } + + /** + * Resets the Carrier-phase's uncertainty (1-Sigma) in cycles. + */ + public void resetCarrierPhaseUncertainty() { + resetFlag(HAS_CARRIER_PHASE_UNCERTAINTY); + mCarrierPhaseUncertainty = Double.NaN; + } + + /** + * Gets a value indicating the 'loss of lock' state of the event. + */ + @LossOfLockStatus + public byte getLossOfLock() { + return mLossOfLock; + } + + /** + * Sets the 'loss of lock' status. + */ + public void setLossOfLock(@LossOfLockStatus byte value) { + mLossOfLock = value; + } + + /** + * Gets a string representation of the 'loss of lock'. + * For internal and logging use only. + */ + private String getLossOfLockString() { + switch (mLossOfLock) { + case LOSS_OF_LOCK_UNKNOWN: + return "Unknown"; + case LOSS_OF_LOCK_OK: + return "Ok"; + case LOSS_OF_LOCK_CYCLE_SLIP: + return "CycleSlip"; + default: + return "<Invalid:" + mLossOfLock + ">"; + } + } + + /** + * Returns true if {@link #getBitNumber()} is available, false otherwise. + */ + public boolean hasBitNumber() { + return isFlagSet(HAS_BIT_NUMBER); + } + + /** + * Gets the number of GPS bits transmitted since Sat-Sun midnight (GPS week). + * + * The value is only available if {@link #hasBitNumber()} is true. + */ + public int getBitNumber() { + return mBitNumber; + } + + /** + * Sets the bit number within the broadcast frame. + */ + public void setBitNumber(int bitNumber) { + setFlag(HAS_BIT_NUMBER); + mBitNumber = bitNumber; + } + + /** + * Resets the bit number within the broadcast frame. + */ + public void resetBitNumber() { + resetFlag(HAS_BIT_NUMBER); + mBitNumber = Integer.MIN_VALUE; + } + + /** + * Returns true if {@link #getTimeFromLastBitInMs()} is available, false otherwise. + */ + public boolean hasTimeFromLastBitInMs() { + return isFlagSet(HAS_TIME_FROM_LAST_BIT); + } + + /** + * Gets the elapsed time since the last received bit in milliseconds. + * Range: [0, 20]. + * + * The value is only available if {@link #hasTimeFromLastBitInMs()} is true. + */ + public short getTimeFromLastBitInMs() { + return mTimeFromLastBitInMs; + } + + /** + * Sets the elapsed time since the last received bit in milliseconds. + */ + public void setTimeFromLastBitInMs(short value) { + setFlag(HAS_TIME_FROM_LAST_BIT); + mTimeFromLastBitInMs = value; + } + + /** + * Resets the elapsed time since the last received bit in milliseconds. + */ + public void resetTimeFromLastBitInMs() { + resetFlag(HAS_TIME_FROM_LAST_BIT); + mTimeFromLastBitInMs = Short.MIN_VALUE; + } + + /** + * Returns true if {@link #getDopplerShiftInHz()} is available, false otherwise. + */ + public boolean hasDopplerShiftInHz() { + return isFlagSet(HAS_DOPPLER_SHIFT); + } + + /** + * Gets the Doppler Shift in Hz. + * A positive value indicates that the SV is moving toward the receiver. + * + * The reference frequency is given by the value of {@link #getCarrierFrequencyInHz()}. + * The reported doppler shift includes {@link #getDopplerShiftUncertaintyInHz()}. + * + * The value is only available if {@link #hasDopplerShiftInHz()} is true. + */ + public double getDopplerShiftInHz() { + return mDopplerShiftInHz; + } + + /** + * Sets the Doppler shift in Hz. + */ + public void setDopplerShiftInHz(double value) { + setFlag(HAS_DOPPLER_SHIFT); + mDopplerShiftInHz = value; + } + + /** + * Resets the Doppler shift in Hz. + */ + public void resetDopplerShiftInHz() { + resetFlag(HAS_DOPPLER_SHIFT); + mDopplerShiftInHz = Double.NaN; + } + + /** + * Returns true if {@link #getDopplerShiftUncertaintyInHz()} is available, false otherwise. + */ + public boolean hasDopplerShiftUncertaintyInHz() { + return isFlagSet(HAS_DOPPLER_SHIFT_UNCERTAINTY); + } + + /** + * Gets the Doppler's Shift uncertainty (1-Sigma) in Hz. + * The uncertainty is represented as an absolute (single sided) value. + * + * The value is only available if {@link #hasDopplerShiftUncertaintyInHz()} is true. + */ + public double getDopplerShiftUncertaintyInHz() { + return mDopplerShiftUncertaintyInHz; + } + + /** + * Sets the Doppler's shift uncertainty (1-Sigma) in Hz. + */ + public void setDopplerShiftUncertaintyInHz(double value) { + setFlag(HAS_DOPPLER_SHIFT_UNCERTAINTY); + mDopplerShiftUncertaintyInHz = value; + } + + /** + * Resets the Doppler's shift uncertainty (1-Sigma) in Hz. + */ + public void resetDopplerShiftUncertaintyInHz() { + resetFlag(HAS_DOPPLER_SHIFT_UNCERTAINTY); + mDopplerShiftUncertaintyInHz = Double.NaN; + } + + /** + * Gets a value indicating the 'multipath' state of the event. + */ + @MultipathIndicator + public byte getMultipathIndicator() { + return mMultipathIndicator; + } + + /** + * Sets the 'multi-path' indicator. + */ + public void setMultipathIndicator(@MultipathIndicator byte value) { + mMultipathIndicator = value; + } + + /** + * Gets a string representation of the 'multi-path indicator'. + * For internal and logging use only. + */ + private String getMultipathIndicatorString() { + switch(mMultipathIndicator) { + case MULTIPATH_INDICATOR_UNKNOWN: + return "Unknown"; + case MULTIPATH_INDICATOR_DETECTED: + return "Detected"; + case MULTIPATH_INDICATOR_NOT_USED: + return "NotUsed"; + default: + return "<Invalid:" + mMultipathIndicator + ">"; + } + } + + /** + * Returns true if {@link #getSnrInDb()} is available, false otherwise. + */ + public boolean hasSnrInDb() { + return isFlagSet(HAS_SNR); + } + + /** + * Gets the Signal-to-Noise ratio (SNR) in dB. + * + * The value is only available if {@link #hasSnrInDb()} is true. + */ + public double getSnrInDb() { + return mSnrInDb; + } + + /** + * Sets the Signal-to-noise ratio (SNR) in dB. + */ + public void setSnrInDb(double snrInDb) { + setFlag(HAS_SNR); + mSnrInDb = snrInDb; + } + + /** + * Resets the Signal-to-noise ratio (SNR) in dB. + */ + public void resetSnrInDb() { + resetFlag(HAS_SNR); + mSnrInDb = Double.NaN; + } + + /** + * Returns true if {@link #getElevationInDeg()} is available, false otherwise. + */ + public boolean hasElevationInDeg() { + return isFlagSet(HAS_ELEVATION); + } + + /** + * Gets the Elevation in degrees. + * Range: [-90, 90] + * The reported elevation includes {@link #getElevationUncertaintyInDeg()}. + * + * The value is only available if {@link #hasElevationInDeg()} is true. + */ + public double getElevationInDeg() { + return mElevationInDeg; + } + + /** + * Sets the Elevation in degrees. + */ + public void setElevationInDeg(double elevationInDeg) { + setFlag(HAS_ELEVATION); + mElevationInDeg = elevationInDeg; + } + + /** + * Resets the Elevation in degrees. + */ + public void resetElevationInDeg() { + resetFlag(HAS_ELEVATION); + mElevationInDeg = Double.NaN; + } + + /** + * Returns true if {@link #getElevationUncertaintyInDeg()} is available, false otherwise. + */ + public boolean hasElevationUncertaintyInDeg() { + return isFlagSet(HAS_ELEVATION_UNCERTAINTY); + } + + /** + * Gets the elevation's uncertainty (1-Sigma) in degrees. + * Range: [0, 90] + * + * The uncertainty is represented as an absolute (single sided) value. + * + * The value is only available if {@link #hasElevationUncertaintyInDeg()} is true. + */ + public double getElevationUncertaintyInDeg() { + return mElevationUncertaintyInDeg; + } + + /** + * Sets the elevation's uncertainty (1-Sigma) in degrees. + */ + public void setElevationUncertaintyInDeg(double value) { + setFlag(HAS_ELEVATION_UNCERTAINTY); + mElevationUncertaintyInDeg = value; + } + + /** + * Resets the elevation's uncertainty (1-Sigma) in degrees. + */ + public void resetElevationUncertaintyInDeg() { + resetFlag(HAS_ELEVATION_UNCERTAINTY); + mElevationUncertaintyInDeg = Double.NaN; + } + + /** + * Returns true if {@link #getAzimuthInDeg()} is available, false otherwise. + */ + public boolean hasAzimuthInDeg() { + return isFlagSet(HAS_AZIMUTH); + } + + /** + * Gets the azimuth in degrees. + * Range: [0, 360). + * + * The reported azimuth includes {@link #getAzimuthUncertaintyInDeg()}. + * + * The value is only available if {@link #hasAzimuthInDeg()} is true. + */ + public double getAzimuthInDeg() { + return mAzimuthInDeg; + } + + /** + * Sets the Azimuth in degrees. + */ + public void setAzimuthInDeg(double value) { + setFlag(HAS_AZIMUTH); + mAzimuthInDeg = value; + } + + /** + * Resets the Azimuth in degrees. + */ + public void resetAzimuthInDeg() { + resetFlag(HAS_AZIMUTH); + mAzimuthInDeg = Double.NaN; + } + + /** + * Returns true if {@link #getAzimuthUncertaintyInDeg()} is available, false otherwise. + */ + public boolean hasAzimuthUncertaintyInDeg() { + return isFlagSet(HAS_AZIMUTH_UNCERTAINTY); + } + + /** + * Gets the azimuth's uncertainty (1-Sigma) in degrees. + * Range: [0, 180]. + * + * The uncertainty is represented as an absolute (single sided) value. + * + * The value is only available if {@link #hasAzimuthUncertaintyInDeg()} is true. + */ + public double getAzimuthUncertaintyInDeg() { + return mAzimuthUncertaintyInDeg; + } + + /** + * Sets the Azimuth's uncertainty (1-Sigma) in degrees. + */ + public void setAzimuthUncertaintyInDeg(double value) { + setFlag(HAS_AZIMUTH_UNCERTAINTY); + mAzimuthUncertaintyInDeg = value; + } + + /** + * Resets the Azimuth's uncertainty (1-Sigma) in degrees. + */ + public void resetAzimuthUncertaintyInDeg() { + resetFlag(HAS_AZIMUTH_UNCERTAINTY); + mAzimuthUncertaintyInDeg = Double.NaN; + } + + /** + * Gets a flag indicating whether the GPS represented by the measurement was used for computing + * the most recent fix. + * + * @return A non-null value if the data is available, null otherwise. + */ + public boolean isUsedInFix() { + return mUsedInFix; + } + + /** + * Sets the Used-in-Fix flag. + */ + public void setUsedInFix(boolean value) { + mUsedInFix = value; + } + + /** + * Gets pseudorange rate (based on carrier phase changes) at the timestamp in m/s. + */ + public double getPseudorangeRateCarrierInMetersPerSec() { + return mPseudorangeRateCarrierInMetersPerSec; + } + + /** + * Sets pseudorange rate (based on carrier phase changes) at the timestamp in m/s. + */ + public void setPseudorangeRateCarrierInMetersPerSec(double value) { + mPseudorangeRateCarrierInMetersPerSec = value; + } + + /** + * Gets 1-Sigma uncertainty of the pseudorange rate carrier. + */ + public double getPseudorangeRateCarrierUncertaintyInMetersPerSec() { + return mPseudorangeRateCarrierUncertaintyInMetersPerSec; + } + + /** + * Sets 1-Sigma uncertainty of the pseudorange rate carrier. + */ + public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double value) { + mPseudorangeRateCarrierUncertaintyInMetersPerSec = value; + } + + public static final Creator<GnssMeasurement> CREATOR = new Creator<GnssMeasurement>() { + @Override + public GnssMeasurement createFromParcel(Parcel parcel) { + GnssMeasurement gnssMeasurement = new GnssMeasurement(); + + gnssMeasurement.mFlags = parcel.readInt(); + gnssMeasurement.mPrn = parcel.readByte(); + gnssMeasurement.mTimeOffsetInNs = parcel.readDouble(); + gnssMeasurement.mState = (short) parcel.readInt(); + gnssMeasurement.mReceivedGpsTowInNs = parcel.readLong(); + gnssMeasurement.mReceivedGpsTowUncertaintyInNs = parcel.readLong(); + gnssMeasurement.mCn0InDbHz = parcel.readDouble(); + gnssMeasurement.mPseudorangeRateInMetersPerSec = parcel.readDouble(); + gnssMeasurement.mPseudorangeRateUncertaintyInMetersPerSec = parcel.readDouble(); + gnssMeasurement.mAccumulatedDeltaRangeState = (short) parcel.readInt(); + gnssMeasurement.mAccumulatedDeltaRangeInMeters = parcel.readDouble(); + gnssMeasurement.mAccumulatedDeltaRangeUncertaintyInMeters = parcel.readDouble(); + gnssMeasurement.mPseudorangeInMeters = parcel.readDouble(); + gnssMeasurement.mPseudorangeUncertaintyInMeters = parcel.readDouble(); + gnssMeasurement.mCodePhaseInChips = parcel.readDouble(); + gnssMeasurement.mCodePhaseUncertaintyInChips = parcel.readDouble(); + gnssMeasurement.mCarrierFrequencyInHz = parcel.readFloat(); + gnssMeasurement.mCarrierCycles = parcel.readLong(); + gnssMeasurement.mCarrierPhase = parcel.readDouble(); + gnssMeasurement.mCarrierPhaseUncertainty = parcel.readDouble(); + gnssMeasurement.mLossOfLock = parcel.readByte(); + gnssMeasurement.mBitNumber = parcel.readInt(); + gnssMeasurement.mTimeFromLastBitInMs = (short) parcel.readInt(); + gnssMeasurement.mDopplerShiftInHz = parcel.readDouble(); + gnssMeasurement.mDopplerShiftUncertaintyInHz = parcel.readDouble(); + gnssMeasurement.mMultipathIndicator = parcel.readByte(); + gnssMeasurement.mSnrInDb = parcel.readDouble(); + gnssMeasurement.mElevationInDeg = parcel.readDouble(); + gnssMeasurement.mElevationUncertaintyInDeg = parcel.readDouble(); + gnssMeasurement.mAzimuthInDeg = parcel.readDouble(); + gnssMeasurement.mAzimuthUncertaintyInDeg = parcel.readDouble(); + gnssMeasurement.mUsedInFix = parcel.readInt() != 0; + gnssMeasurement.mPseudorangeRateCarrierInMetersPerSec = parcel.readDouble(); + gnssMeasurement.mPseudorangeRateCarrierUncertaintyInMetersPerSec = parcel.readDouble(); + + return gnssMeasurement; + } + + @Override + public GnssMeasurement[] newArray(int i) { + return new GnssMeasurement[i]; + } + }; + + public void writeToParcel(Parcel parcel, int flags) { + parcel.writeInt(mFlags); + parcel.writeByte(mPrn); + parcel.writeDouble(mTimeOffsetInNs); + parcel.writeInt(mState); + parcel.writeLong(mReceivedGpsTowInNs); + parcel.writeLong(mReceivedGpsTowUncertaintyInNs); + parcel.writeDouble(mCn0InDbHz); + parcel.writeDouble(mPseudorangeRateInMetersPerSec); + parcel.writeDouble(mPseudorangeRateUncertaintyInMetersPerSec); + parcel.writeInt(mAccumulatedDeltaRangeState); + parcel.writeDouble(mAccumulatedDeltaRangeInMeters); + parcel.writeDouble(mAccumulatedDeltaRangeUncertaintyInMeters); + parcel.writeDouble(mPseudorangeInMeters); + parcel.writeDouble(mPseudorangeUncertaintyInMeters); + parcel.writeDouble(mCodePhaseInChips); + parcel.writeDouble(mCodePhaseUncertaintyInChips); + parcel.writeFloat(mCarrierFrequencyInHz); + parcel.writeLong(mCarrierCycles); + parcel.writeDouble(mCarrierPhase); + parcel.writeDouble(mCarrierPhaseUncertainty); + parcel.writeByte(mLossOfLock); + parcel.writeInt(mBitNumber); + parcel.writeInt(mTimeFromLastBitInMs); + parcel.writeDouble(mDopplerShiftInHz); + parcel.writeDouble(mDopplerShiftUncertaintyInHz); + parcel.writeByte(mMultipathIndicator); + parcel.writeDouble(mSnrInDb); + parcel.writeDouble(mElevationInDeg); + parcel.writeDouble(mElevationUncertaintyInDeg); + parcel.writeDouble(mAzimuthInDeg); + parcel.writeDouble(mAzimuthUncertaintyInDeg); + parcel.writeInt(mUsedInFix ? 1 : 0); + parcel.writeDouble(mPseudorangeRateCarrierInMetersPerSec); + parcel.writeDouble(mPseudorangeRateCarrierUncertaintyInMetersPerSec); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public String toString() { + final String format = " %-29s = %s\n"; + final String formatWithUncertainty = " %-29s = %-25s %-40s = %s\n"; + StringBuilder builder = new StringBuilder("GnssMeasurement:\n"); + + builder.append(String.format(format, "Prn", mPrn)); + + builder.append(String.format(format, "TimeOffsetInNs", mTimeOffsetInNs)); + + builder.append(String.format(format, "State", getStateString())); + + builder.append(String.format( + formatWithUncertainty, + "ReceivedGpsTowInNs", + mReceivedGpsTowInNs, + "ReceivedGpsTowUncertaintyInNs", + mReceivedGpsTowUncertaintyInNs)); + + builder.append(String.format(format, "Cn0InDbHz", mCn0InDbHz)); + + builder.append(String.format( + formatWithUncertainty, + "PseudorangeRateInMetersPerSec", + mPseudorangeRateInMetersPerSec, + "PseudorangeRateUncertaintyInMetersPerSec", + mPseudorangeRateUncertaintyInMetersPerSec)); + builder.append(String.format( + format, + "PseudorangeRateIsCorrected", + isPseudorangeRateCorrected())); + + builder.append(String.format( + format, + "AccumulatedDeltaRangeState", + getAccumulatedDeltaRangeStateString())); + + builder.append(String.format( + formatWithUncertainty, + "AccumulatedDeltaRangeInMeters", + mAccumulatedDeltaRangeInMeters, + "AccumulatedDeltaRangeUncertaintyInMeters", + mAccumulatedDeltaRangeUncertaintyInMeters)); + + builder.append(String.format( + formatWithUncertainty, + "PseudorangeInMeters", + hasPseudorangeInMeters() ? mPseudorangeInMeters : null, + "PseudorangeUncertaintyInMeters", + hasPseudorangeUncertaintyInMeters() ? mPseudorangeUncertaintyInMeters : null)); + + builder.append(String.format( + formatWithUncertainty, + "CodePhaseInChips", + hasCodePhaseInChips() ? mCodePhaseInChips : null, + "CodePhaseUncertaintyInChips", + hasCodePhaseUncertaintyInChips() ? mCodePhaseUncertaintyInChips : null)); + + builder.append(String.format( + format, + "CarrierFrequencyInHz", + hasCarrierFrequencyInHz() ? mCarrierFrequencyInHz : null)); + + builder.append(String.format( + format, + "CarrierCycles", + hasCarrierCycles() ? mCarrierCycles : null)); + + builder.append(String.format( + formatWithUncertainty, + "CarrierPhase", + hasCarrierPhase() ? mCarrierPhase : null, + "CarrierPhaseUncertainty", + hasCarrierPhaseUncertainty() ? mCarrierPhaseUncertainty : null)); + + builder.append(String.format(format, "LossOfLock", getLossOfLockString())); + + builder.append(String.format( + format, + "BitNumber", + hasBitNumber() ? mBitNumber : null)); + + builder.append(String.format( + format, + "TimeFromLastBitInMs", + hasTimeFromLastBitInMs() ? mTimeFromLastBitInMs : null)); + + builder.append(String.format( + formatWithUncertainty, + "DopplerShiftInHz", + hasDopplerShiftInHz() ? mDopplerShiftInHz : null, + "DopplerShiftUncertaintyInHz", + hasDopplerShiftUncertaintyInHz() ? mDopplerShiftUncertaintyInHz : null)); + + builder.append(String.format(format, "MultipathIndicator", getMultipathIndicatorString())); + + builder.append(String.format( + format, + "SnrInDb", + hasSnrInDb() ? mSnrInDb : null)); + + builder.append(String.format( + formatWithUncertainty, + "ElevationInDeg", + hasElevationInDeg() ? mElevationInDeg : null, + "ElevationUncertaintyInDeg", + hasElevationUncertaintyInDeg() ? mElevationUncertaintyInDeg : null)); + + builder.append(String.format( + formatWithUncertainty, + "AzimuthInDeg", + hasAzimuthInDeg() ? mAzimuthInDeg : null, + "AzimuthUncertaintyInDeg", + hasAzimuthUncertaintyInDeg() ? mAzimuthUncertaintyInDeg : null)); + + builder.append(String.format(format, "UsedInFix", mUsedInFix)); + + builder.append(String.format(format, "PseudorangeRateCarrierInMetersPerSec", + mPseudorangeRateCarrierInMetersPerSec)); + builder.append(String.format(format, "PseudorangeRateCarrierUncertaintyInMetersPerSec", + mPseudorangeRateCarrierUncertaintyInMetersPerSec)); + + return builder.toString(); + } + + private void initialize() { + mFlags = HAS_NO_FLAGS; + setPrn(Byte.MIN_VALUE); + setTimeOffsetInNs(Long.MIN_VALUE); + setState(STATE_UNKNOWN); + setReceivedGpsTowInNs(Long.MIN_VALUE); + setReceivedGpsTowUncertaintyInNs(Long.MAX_VALUE); + setCn0InDbHz(Double.MIN_VALUE); + setPseudorangeRateInMetersPerSec(Double.MIN_VALUE); + setPseudorangeRateUncertaintyInMetersPerSec(Double.MIN_VALUE); + setAccumulatedDeltaRangeState(ADR_STATE_UNKNOWN); + setAccumulatedDeltaRangeInMeters(Double.MIN_VALUE); + setAccumulatedDeltaRangeUncertaintyInMeters(Double.MIN_VALUE); + resetPseudorangeInMeters(); + resetPseudorangeUncertaintyInMeters(); + resetCodePhaseInChips(); + resetCodePhaseUncertaintyInChips(); + resetCarrierFrequencyInHz(); + resetCarrierCycles(); + resetCarrierPhase(); + resetCarrierPhaseUncertainty(); + setLossOfLock(LOSS_OF_LOCK_UNKNOWN); + resetBitNumber(); + resetTimeFromLastBitInMs(); + resetDopplerShiftInHz(); + resetDopplerShiftUncertaintyInHz(); + setMultipathIndicator(MULTIPATH_INDICATOR_UNKNOWN); + resetSnrInDb(); + resetElevationInDeg(); + resetElevationUncertaintyInDeg(); + resetAzimuthInDeg(); + resetAzimuthUncertaintyInDeg(); + setUsedInFix(false); + setPseudorangeRateCarrierInMetersPerSec(Double.MIN_VALUE); + setPseudorangeRateCarrierUncertaintyInMetersPerSec(Double.MIN_VALUE); + } + + private void setFlag(int flag) { + mFlags |= flag; + } + + private void resetFlag(int flag) { + mFlags &= ~flag; + } + + private boolean isFlagSet(int flag) { + return (mFlags & flag) == flag; + } +} diff --git a/location/java/android/location/GpsMeasurementCallbackTransport.java b/location/java/android/location/GnssMeasurementCallbackTransport.java index 02d9026de6ce..21f63068084e 100644 --- a/location/java/android/location/GpsMeasurementCallbackTransport.java +++ b/location/java/android/location/GnssMeasurementCallbackTransport.java @@ -20,41 +20,42 @@ import android.content.Context; import android.os.RemoteException; /** - * A handler class to manage transport callbacks for {@link GpsMeasurementsEvent.Callback}. + * A handler class to manage transport callbacks for {@link GnssMeasurementsEvent.Callback}. * * @hide */ -class GpsMeasurementCallbackTransport - extends LocalListenerHelper<GpsMeasurementsEvent.Callback> { +class GnssMeasurementCallbackTransport + extends LocalListenerHelper<GnssMeasurementsEvent.Callback> { private final ILocationManager mLocationManager; - private final IGpsMeasurementsListener mListenerTransport = new ListenerTransport(); + private final IGnssMeasurementsListener mListenerTransport = new ListenerTransport(); - public GpsMeasurementCallbackTransport(Context context, ILocationManager locationManager) { - super(context, "GpsMeasurementListenerTransport"); + public GnssMeasurementCallbackTransport(Context context, ILocationManager locationManager) { + super(context, "GnssMeasurementListenerTransport"); mLocationManager = locationManager; } @Override protected boolean registerWithServer() throws RemoteException { - return mLocationManager.addGpsMeasurementsListener( + return mLocationManager.addGnssMeasurementsListener( mListenerTransport, getContext().getPackageName()); } @Override protected void unregisterFromServer() throws RemoteException { - mLocationManager.removeGpsMeasurementsListener(mListenerTransport); + mLocationManager.removeGnssMeasurementsListener(mListenerTransport); } - private class ListenerTransport extends IGpsMeasurementsListener.Stub { + private class ListenerTransport extends IGnssMeasurementsListener.Stub { @Override - public void onGpsMeasurementsReceived(final GpsMeasurementsEvent event) { - ListenerOperation<GpsMeasurementsEvent.Callback> operation = - new ListenerOperation<GpsMeasurementsEvent.Callback>() { + public void onGnssMeasurementsReceived(final GnssMeasurementsEvent event) { + ListenerOperation<GnssMeasurementsEvent.Callback> operation = + new ListenerOperation<GnssMeasurementsEvent.Callback>() { @Override - public void execute(GpsMeasurementsEvent.Callback callback) throws RemoteException { - callback.onGpsMeasurementsReceived(event); + public void execute(GnssMeasurementsEvent.Callback callback) + throws RemoteException { + callback.onGnssMeasurementsReceived(event); } }; foreach(operation); @@ -62,10 +63,11 @@ class GpsMeasurementCallbackTransport @Override public void onStatusChanged(final int status) { - ListenerOperation<GpsMeasurementsEvent.Callback> operation = - new ListenerOperation<GpsMeasurementsEvent.Callback>() { + ListenerOperation<GnssMeasurementsEvent.Callback> operation = + new ListenerOperation<GnssMeasurementsEvent.Callback>() { @Override - public void execute(GpsMeasurementsEvent.Callback callback) throws RemoteException { + public void execute(GnssMeasurementsEvent.Callback callback) + throws RemoteException { callback.onStatusChanged(status); } }; diff --git a/location/java/android/location/GpsMeasurementsEvent.aidl b/location/java/android/location/GnssMeasurementsEvent.aidl index 2c4626238dae..5ce594da372f 100644 --- a/location/java/android/location/GpsMeasurementsEvent.aidl +++ b/location/java/android/location/GnssMeasurementsEvent.aidl @@ -16,4 +16,4 @@ package android.location; -parcelable GpsMeasurementsEvent; +parcelable GnssMeasurementsEvent; diff --git a/location/java/android/location/GnssMeasurementsEvent.java b/location/java/android/location/GnssMeasurementsEvent.java new file mode 100644 index 000000000000..b744a0381b76 --- /dev/null +++ b/location/java/android/location/GnssMeasurementsEvent.java @@ -0,0 +1,160 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package android.location; + +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.security.InvalidParameterException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; + +/** + * A class implementing a container for data associated with a measurement event. + * Events are delivered to registered instances of {@link Callback}. + */ +public final class GnssMeasurementsEvent implements Parcelable { + /** The status of GPS measurements event. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GPS_LOCATION_DISABLED}) + public @interface GnssMeasurementsStatus {} + + /** + * The system does not support tracking of GPS Measurements. This status will not change in the + * future. + */ + public static final int STATUS_NOT_SUPPORTED = 0; + + /** + * GPS Measurements are successfully being tracked, it will receive updates once they are + * available. + */ + public static final int STATUS_READY = 1; + + /** + * GPS provider or Location is disabled, updates will not be received until they are enabled. + */ + public static final int STATUS_GPS_LOCATION_DISABLED = 2; + + private final GnssClock mClock; + private final Collection<GnssMeasurement> mReadOnlyMeasurements; + + /** + * Used for receiving GPS satellite measurements from the GPS engine. + * Each measurement contains raw and computed data identifying a satellite. + * You can implement this interface and call + * {@link LocationManager#registerGnssMeasurementCallback}. + */ + public static abstract class Callback { + + /** + * Returns the latest collected GPS Measurements. + */ + public void onGnssMeasurementsReceived(GnssMeasurementsEvent eventArgs) {} + + /** + * Returns the latest status of the GPS Measurements sub-system. + */ + public void onStatusChanged(@GnssMeasurementsStatus int status) {} + } + + public GnssMeasurementsEvent(GnssClock clock, GnssMeasurement[] measurements) { + if (clock == null) { + throw new InvalidParameterException("Parameter 'clock' must not be null."); + } + if (measurements == null || measurements.length == 0) { + throw new InvalidParameterException( + "Parameter 'measurements' must not be null or empty."); + } + + mClock = clock; + Collection<GnssMeasurement> measurementCollection = Arrays.asList(measurements); + mReadOnlyMeasurements = Collections.unmodifiableCollection(measurementCollection); + } + + @NonNull + public GnssClock getClock() { + return mClock; + } + + /** + * Gets a read-only collection of measurements associated with the current event. + */ + @NonNull + public Collection<GnssMeasurement> getMeasurements() { + return mReadOnlyMeasurements; + } + + public static final Creator<GnssMeasurementsEvent> CREATOR = + new Creator<GnssMeasurementsEvent>() { + @Override + public GnssMeasurementsEvent createFromParcel(Parcel in) { + ClassLoader classLoader = getClass().getClassLoader(); + + GnssClock clock = in.readParcelable(classLoader); + + int measurementsLength = in.readInt(); + GnssMeasurement[] measurementsArray = new GnssMeasurement[measurementsLength]; + in.readTypedArray(measurementsArray, GnssMeasurement.CREATOR); + + return new GnssMeasurementsEvent(clock, measurementsArray); + } + + @Override + public GnssMeasurementsEvent[] newArray(int size) { + return new GnssMeasurementsEvent[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel parcel, int flags) { + parcel.writeParcelable(mClock, flags); + + int measurementsCount = mReadOnlyMeasurements.size(); + GnssMeasurement[] measurementsArray = + mReadOnlyMeasurements.toArray(new GnssMeasurement[measurementsCount]); + parcel.writeInt(measurementsArray.length); + parcel.writeTypedArray(measurementsArray, flags); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder("[ GnssMeasurementsEvent:\n\n"); + + builder.append(mClock.toString()); + builder.append("\n"); + + for (GnssMeasurement measurement : mReadOnlyMeasurements) { + builder.append(measurement.toString()); + builder.append("\n"); + } + + builder.append("]"); + + return builder.toString(); + } +} diff --git a/location/java/android/location/GnssNavigationMessage.java b/location/java/android/location/GnssNavigationMessage.java new file mode 100644 index 000000000000..0e011d5c98a8 --- /dev/null +++ b/location/java/android/location/GnssNavigationMessage.java @@ -0,0 +1,330 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package android.location; + +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.security.InvalidParameterException; + +/** + * A class containing a GPS satellite Navigation Message. + */ +public final class GnssNavigationMessage implements Parcelable { + + private static final byte[] EMPTY_ARRAY = new byte[0]; + + /** The type of the GPS Clock. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({MESSAGE_TYPE_UNKNOWN, MESSAGE_TYPE_L1CA, MESSAGE_TYPE_L2CNAV, MESSAGE_TYPE_L5CNAV, + MESSAGE_TYPE_CNAV2}) + public @interface GnssNavigationMessageType {} + + // The following enumerations must be in sync with the values declared in gps.h + + /** + * The type of the navigation message is not available or unknown. + */ + public static final byte MESSAGE_TYPE_UNKNOWN = 0; + + /** + * The Navigation Message is of type L1 C/A. + */ + public static final byte MESSAGE_TYPE_L1CA = 1; + + /** + * The Navigation Message is of type L1-CNAV. + */ + public static final byte MESSAGE_TYPE_L2CNAV = 2; + + /** + * The Navigation Message is of type L5-CNAV. + */ + public static final byte MESSAGE_TYPE_L5CNAV = 3; + + /** + * The Navigation Message is of type CNAV-2. + */ + public static final byte MESSAGE_TYPE_CNAV2 = 4; + + /** + * The Navigation Message Status is 'unknown'. + */ + public static final short STATUS_UNKNOWN = 0; + + /** + * The Navigation Message was received without any parity error in its navigation words. + */ + public static final short STATUS_PARITY_PASSED = (1<<0); + + /** + * The Navigation Message was received with words that failed parity check, but the receiver was + * able to correct those words. + */ + public static final short STATUS_PARITY_REBUILT = (1<<1); + + // End enumerations in sync with gps.h + + private byte mType; + private byte mPrn; + private short mMessageId; + private short mSubmessageId; + private byte[] mData; + private short mStatus; + + GnssNavigationMessage() { + initialize(); + } + + /** + * Sets all contents to the values stored in the provided object. + */ + public void set(GnssNavigationMessage navigationMessage) { + mType = navigationMessage.mType; + mPrn = navigationMessage.mPrn; + mMessageId = navigationMessage.mMessageId; + mSubmessageId = navigationMessage.mSubmessageId; + mData = navigationMessage.mData; + mStatus = navigationMessage.mStatus; + } + + /** + * Resets all the contents to its original state. + */ + public void reset() { + initialize(); + } + + /** + * Gets the type of the navigation message contained in the object. + */ + @GnssNavigationMessageType + public byte getType() { + return mType; + } + + /** + * Sets the type of the navigation message. + */ + public void setType(@GnssNavigationMessageType byte value) { + mType = value; + } + + /** + * Gets a string representation of the 'type'. + * For internal and logging use only. + */ + private String getTypeString() { + switch (mType) { + case MESSAGE_TYPE_UNKNOWN: + return "Unknown"; + case MESSAGE_TYPE_L1CA: + return "L1 C/A"; + case MESSAGE_TYPE_L2CNAV: + return "L2-CNAV"; + case MESSAGE_TYPE_L5CNAV: + return "L5-CNAV"; + case MESSAGE_TYPE_CNAV2: + return "CNAV-2"; + default: + return "<Invalid:" + mType + ">"; + } + } + + /** + * Gets the Pseudo-random number. + * Range: [1, 32]. + */ + public byte getPrn() { + return mPrn; + } + + /** + * Sets the Pseud-random number. + */ + public void setPrn(byte value) { + mPrn = value; + } + + /** + * Gets the Message Identifier. + * It provides an index so the complete Navigation Message can be assembled. i.e. for L1 C/A + * subframe 4 and 5, this value corresponds to the 'frame id' of the navigation message. + * Subframe 1, 2, 3 does not contain a 'frame id' and this might be reported as -1. + */ + public short getMessageId() { + return mMessageId; + } + + /** + * Sets the Message Identifier. + */ + public void setMessageId(short value) { + mMessageId = value; + } + + /** + * Gets the Sub-message Identifier. + * If required by {@link #getType()}, this value contains a sub-index within the current message + * (or frame) that is being transmitted. i.e. for L1 C/A the sub-message identifier corresponds + * to the sub-frame Id of the navigation message. + */ + public short getSubmessageId() { + return mSubmessageId; + } + + /** + * Sets the Sub-message identifier. + */ + public void setSubmessageId(short value) { + mSubmessageId = value; + } + + /** + * Gets the data associated with the Navigation Message. + * The bytes (or words) specified using big endian format (MSB first). + */ + @NonNull + public byte[] getData() { + return mData; + } + + /** + * Sets the data associated with the Navigation Message. + */ + public void setData(byte[] value) { + if (value == null) { + throw new InvalidParameterException("Data must be a non-null array"); + } + + mData = value; + } + + /** + * Gets the Status of the navigation message contained in the object. + */ + public short getStatus() { + return mStatus; + } + + /** + * Sets the status of the navigation message. + */ + public void setStatus(short value) { + mStatus = value; + } + + /** + * Gets a string representation of the 'status'. + * For internal and logging use only. + */ + private String getStatusString() { + switch (mStatus) { + case STATUS_UNKNOWN: + return "Unknown"; + case STATUS_PARITY_PASSED: + return "ParityPassed"; + case STATUS_PARITY_REBUILT: + return "ParityRebuilt"; + default: + return "<Invalid:" + mStatus + ">"; + } + } + + public static final Creator<GnssNavigationMessage> CREATOR = + new Creator<GnssNavigationMessage>() { + @Override + public GnssNavigationMessage createFromParcel(Parcel parcel) { + GnssNavigationMessage navigationMessage = new GnssNavigationMessage(); + + navigationMessage.setType(parcel.readByte()); + navigationMessage.setPrn(parcel.readByte()); + navigationMessage.setMessageId((short) parcel.readInt()); + navigationMessage.setSubmessageId((short) parcel.readInt()); + + int dataLength = parcel.readInt(); + byte[] data = new byte[dataLength]; + parcel.readByteArray(data); + navigationMessage.setData(data); + + if (parcel.dataAvail() >= Integer.SIZE) { + int status = parcel.readInt(); + navigationMessage.setStatus((short) status); + } else { + navigationMessage.setStatus(STATUS_UNKNOWN); + } + + return navigationMessage; + } + + @Override + public GnssNavigationMessage[] newArray(int size) { + return new GnssNavigationMessage[size]; + } + }; + + public void writeToParcel(Parcel parcel, int flags) { + parcel.writeByte(mType); + parcel.writeByte(mPrn); + parcel.writeInt(mMessageId); + parcel.writeInt(mSubmessageId); + parcel.writeInt(mData.length); + parcel.writeByteArray(mData); + parcel.writeInt(mStatus); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public String toString() { + final String format = " %-15s = %s\n"; + StringBuilder builder = new StringBuilder("GnssNavigationMessage:\n"); + + builder.append(String.format(format, "Type", getTypeString())); + builder.append(String.format(format, "Prn", mPrn)); + builder.append(String.format(format, "Status", getStatusString())); + builder.append(String.format(format, "MessageId", mMessageId)); + builder.append(String.format(format, "SubmessageId", mSubmessageId)); + + builder.append(String.format(format, "Data", "{")); + String prefix = " "; + for(byte value : mData) { + builder.append(prefix); + builder.append(value); + prefix = ", "; + } + builder.append(" }"); + + return builder.toString(); + } + + private void initialize() { + mType = MESSAGE_TYPE_UNKNOWN; + mPrn = 0; + mMessageId = -1; + mSubmessageId = -1; + mData = EMPTY_ARRAY; + mStatus = STATUS_UNKNOWN; + } +} diff --git a/location/java/android/location/GpsNavigationMessageCallbackTransport.java b/location/java/android/location/GnssNavigationMessageCallbackTransport.java index 155d96dce35e..4204b99b3ee0 100644 --- a/location/java/android/location/GpsNavigationMessageCallbackTransport.java +++ b/location/java/android/location/GnssNavigationMessageCallbackTransport.java @@ -20,44 +20,44 @@ import android.content.Context; import android.os.RemoteException; /** - * A handler class to manage transport callback for {@link GpsNavigationMessageEvent.Callback}. + * A handler class to manage transport callback for {@link GnssNavigationMessageEvent.Callback}. * * @hide */ -class GpsNavigationMessageCallbackTransport - extends LocalListenerHelper<GpsNavigationMessageEvent.Callback> { +class GnssNavigationMessageCallbackTransport + extends LocalListenerHelper<GnssNavigationMessageEvent.Callback> { private final ILocationManager mLocationManager; - private final IGpsNavigationMessageListener mListenerTransport = new ListenerTransport(); + private final IGnssNavigationMessageListener mListenerTransport = new ListenerTransport(); - public GpsNavigationMessageCallbackTransport( + public GnssNavigationMessageCallbackTransport( Context context, ILocationManager locationManager) { - super(context, "GpsNavigationMessageCallbackTransport"); + super(context, "GnssNavigationMessageCallbackTransport"); mLocationManager = locationManager; } @Override protected boolean registerWithServer() throws RemoteException { - return mLocationManager.addGpsNavigationMessageListener( + return mLocationManager.addGnssNavigationMessageListener( mListenerTransport, getContext().getPackageName()); } @Override protected void unregisterFromServer() throws RemoteException { - mLocationManager.removeGpsNavigationMessageListener(mListenerTransport); + mLocationManager.removeGnssNavigationMessageListener(mListenerTransport); } - private class ListenerTransport extends IGpsNavigationMessageListener.Stub { + private class ListenerTransport extends IGnssNavigationMessageListener.Stub { @Override - public void onGpsNavigationMessageReceived(final GpsNavigationMessageEvent event) { - ListenerOperation<GpsNavigationMessageEvent.Callback> operation = - new ListenerOperation<GpsNavigationMessageEvent.Callback>() { + public void onGnssNavigationMessageReceived(final GnssNavigationMessageEvent event) { + ListenerOperation<GnssNavigationMessageEvent.Callback> operation = + new ListenerOperation<GnssNavigationMessageEvent.Callback>() { @Override - public void execute(GpsNavigationMessageEvent.Callback callback) + public void execute(GnssNavigationMessageEvent.Callback callback) throws RemoteException { - callback.onGpsNavigationMessageReceived(event); + callback.onGnssNavigationMessageReceived(event); } }; foreach(operation); @@ -65,10 +65,10 @@ class GpsNavigationMessageCallbackTransport @Override public void onStatusChanged(final int status) { - ListenerOperation<GpsNavigationMessageEvent.Callback> operation = - new ListenerOperation<GpsNavigationMessageEvent.Callback>() { + ListenerOperation<GnssNavigationMessageEvent.Callback> operation = + new ListenerOperation<GnssNavigationMessageEvent.Callback>() { @Override - public void execute(GpsNavigationMessageEvent.Callback callback) + public void execute(GnssNavigationMessageEvent.Callback callback) throws RemoteException { callback.onStatusChanged(status); } diff --git a/location/java/android/location/GpsNavigationMessageEvent.aidl b/location/java/android/location/GnssNavigationMessageEvent.aidl index f84c2f72ca17..e765739942bf 100644 --- a/location/java/android/location/GpsNavigationMessageEvent.aidl +++ b/location/java/android/location/GnssNavigationMessageEvent.aidl @@ -16,4 +16,4 @@ package android.location; -parcelable GpsNavigationMessageEvent; +parcelable GnssNavigationMessageEvent; diff --git a/location/java/android/location/GnssNavigationMessageEvent.java b/location/java/android/location/GnssNavigationMessageEvent.java new file mode 100644 index 000000000000..19c82e9175f2 --- /dev/null +++ b/location/java/android/location/GnssNavigationMessageEvent.java @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package android.location; + +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.security.InvalidParameterException; + +/** + * A class implementing a container for data associated with a navigation message event. + * Events are delivered to registered instances of {@link Callback}. + */ +public final class GnssNavigationMessageEvent implements Parcelable { + /** The status of GPS measurements event. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GPS_LOCATION_DISABLED}) + public @interface GnssNavigationMessageStatus {} + + /** + * The system does not support tracking of GPS Navigation Messages. This status will not change + * in the future. + */ + public static final int STATUS_NOT_SUPPORTED = 0; + + /** + * GPS Navigation Messages are successfully being tracked, it will receive updates once they are + * available. + */ + public static final int STATUS_READY = 1; + + /** + * GPS provider or Location is disabled, updated will not be received until they are enabled. + */ + public static final int STATUS_GPS_LOCATION_DISABLED = 2; + + private final GnssNavigationMessage mNavigationMessage; + + /** + * Used for receiving GPS satellite Navigation Messages from the GPS engine. + * You can implement this interface and call + * {@link LocationManager#registerGnssNavigationMessageCallback}. + */ + public static abstract class Callback { + + /** + * Returns the latest collected GPS Navigation Message. + */ + public void onGnssNavigationMessageReceived(GnssNavigationMessageEvent event) {} + + /** + * Returns the latest status of the GPS Navigation Messages sub-system. + */ + public void onStatusChanged(@GnssNavigationMessageStatus int status) {} + } + + public GnssNavigationMessageEvent(GnssNavigationMessage message) { + if (message == null) { + throw new InvalidParameterException("Parameter 'message' must not be null."); + } + mNavigationMessage = message; + } + + @NonNull + public GnssNavigationMessage getNavigationMessage() { + return mNavigationMessage; + } + + public static final Creator<GnssNavigationMessageEvent> CREATOR = + new Creator<GnssNavigationMessageEvent>() { + @Override + public GnssNavigationMessageEvent createFromParcel(Parcel in) { + ClassLoader classLoader = getClass().getClassLoader(); + GnssNavigationMessage navigationMessage = in.readParcelable(classLoader); + return new GnssNavigationMessageEvent(navigationMessage); + } + + @Override + public GnssNavigationMessageEvent[] newArray(int size) { + return new GnssNavigationMessageEvent[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel parcel, int flags) { + parcel.writeParcelable(mNavigationMessage, flags); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder("[ GnssNavigationMessageEvent:\n\n"); + builder.append(mNavigationMessage.toString()); + builder.append("\n]"); + return builder.toString(); + } +} diff --git a/location/java/android/location/GpsClock.java b/location/java/android/location/GpsClock.java index 719e56f9dcce..4135a1c949bb 100644 --- a/location/java/android/location/GpsClock.java +++ b/location/java/android/location/GpsClock.java @@ -16,41 +16,36 @@ package android.location; -import android.annotation.IntDef; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - /** * A class containing a GPS clock timestamp. * It represents a measurement of the GPS receiver's clock. + * + * @hide */ -public final class GpsClock implements Parcelable { +@SystemApi +public class GpsClock implements Parcelable { // The following enumerations must be in sync with the values declared in gps.h - /** The type of the GPS Clock. */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({CLOCK_TYPE_UNKNOWN, CLOCK_TYPE_LOCAL_HW_TIME, CLOCK_TYPE_GPS_TIME}) - public @interface GpsClockType {} - /** * The type of the time stored is not available or it is unknown. */ - public static final byte CLOCK_TYPE_UNKNOWN = 0; + public static final byte TYPE_UNKNOWN = 0; /** * The source of the time value reported by this class is the 'Local Hardware Clock'. */ - public static final byte CLOCK_TYPE_LOCAL_HW_TIME = 1; + public static final byte TYPE_LOCAL_HW_TIME = 1; /** * The source of the time value reported by this class is the 'GPS time' derived from * satellites (epoch = Jan 6, 1980). */ - public static final byte CLOCK_TYPE_GPS_TIME = 2; + public static final byte TYPE_GPS_TIME = 2; private static final short HAS_NO_FLAGS = 0; private static final short HAS_LEAP_SECOND = (1<<0); @@ -73,7 +68,6 @@ public final class GpsClock implements Parcelable { private double mBiasUncertaintyInNs; private double mDriftInNsPerSec; private double mDriftUncertaintyInNsPerSec; - private long mTimeOfLastHwClockDiscontinuityInNs; GpsClock() { initialize(); @@ -93,7 +87,6 @@ public final class GpsClock implements Parcelable { mBiasUncertaintyInNs = clock.mBiasUncertaintyInNs; mDriftInNsPerSec = clock.mDriftInNsPerSec; mDriftUncertaintyInNsPerSec = clock.mDriftUncertaintyInNsPerSec; - mTimeOfLastHwClockDiscontinuityInNs = clock.mTimeOfLastHwClockDiscontinuityInNs; } /** @@ -106,7 +99,6 @@ public final class GpsClock implements Parcelable { /** * Gets the type of time reported by {@link #getTimeInNs()}. */ - @GpsClockType public byte getType() { return mType; } @@ -114,7 +106,7 @@ public final class GpsClock implements Parcelable { /** * Sets the type of time reported. */ - public void setType(@GpsClockType byte value) { + public void setType(byte value) { mType = value; } @@ -124,11 +116,11 @@ public final class GpsClock implements Parcelable { */ private String getTypeString() { switch (mType) { - case CLOCK_TYPE_UNKNOWN: + case TYPE_UNKNOWN: return "Unknown"; - case CLOCK_TYPE_GPS_TIME: + case TYPE_GPS_TIME: return "GpsTime"; - case CLOCK_TYPE_LOCAL_HW_TIME: + case TYPE_LOCAL_HW_TIME: return "LocalHwClock"; default: return "<Invalid:" + mType + ">"; @@ -171,8 +163,8 @@ public final class GpsClock implements Parcelable { /** * Gets the GPS receiver internal clock value in nanoseconds. - * This can be either the 'local hardware clock' value ({@link #CLOCK_TYPE_LOCAL_HW_TIME}), or the - * current GPS time derived inside GPS receiver ({@link #CLOCK_TYPE_GPS_TIME}). + * This can be either the 'local hardware clock' value ({@link #TYPE_LOCAL_HW_TIME}), or the + * current GPS time derived inside GPS receiver ({@link #TYPE_GPS_TIME}). * {@link #getType()} defines the time reported. * * For 'local hardware clock' this value is expected to be monotonically increasing during the @@ -231,7 +223,7 @@ public final class GpsClock implements Parcelable { } /** - * Returns true if {@link #getFullBiasInNs()} is available, false otherwise. + * Returns true if {@link @getFullBiasInNs()} is available, false otherwise. */ public boolean hasFullBiasInNs() { return isFlagSet(HAS_FULL_BIAS); @@ -241,7 +233,7 @@ public final class GpsClock implements Parcelable { * Gets the difference between hardware clock ({@link #getTimeInNs()}) inside GPS receiver and * the true GPS time since 0000Z, January 6, 1980, in nanoseconds. * - * This value is available if {@link #CLOCK_TYPE_LOCAL_HW_TIME} is set, and GPS receiver has solved + * This value is available if {@link #TYPE_LOCAL_HW_TIME} is set, and GPS receiver has solved * the clock for GPS time. * {@link #getBiasUncertaintyInNs()} should be used for quality check. * @@ -395,20 +387,6 @@ public final class GpsClock implements Parcelable { } /** - * Gets time of last hardware clock discontinuity. - */ - public long getTimeOfLastHwClockDiscontinuityInNs() { - return mTimeOfLastHwClockDiscontinuityInNs; - } - - /** - * Sets time of last hardware clock discontinuity. - */ - public void setTimeOfLastHwClockDiscontinuityInNs(long timeOfLastHwClockDiscontinuityInNs) { - mTimeOfLastHwClockDiscontinuityInNs = timeOfLastHwClockDiscontinuityInNs; - } - - /** * Resets the clock's Drift Uncertainty (1-Sigma) in nanoseconds per second. */ public void resetDriftUncertaintyInNsPerSec() { @@ -431,7 +409,6 @@ public final class GpsClock implements Parcelable { gpsClock.mBiasUncertaintyInNs = parcel.readDouble(); gpsClock.mDriftInNsPerSec = parcel.readDouble(); gpsClock.mDriftUncertaintyInNsPerSec = parcel.readDouble(); - gpsClock.mTimeOfLastHwClockDiscontinuityInNs = parcel.readLong(); return gpsClock; } @@ -453,7 +430,6 @@ public final class GpsClock implements Parcelable { parcel.writeDouble(mBiasUncertaintyInNs); parcel.writeDouble(mDriftInNsPerSec); parcel.writeDouble(mDriftUncertaintyInNsPerSec); - parcel.writeLong(mTimeOfLastHwClockDiscontinuityInNs); } @Override @@ -497,17 +473,13 @@ public final class GpsClock implements Parcelable { "DriftUncertaintyInNsPerSec", hasDriftUncertaintyInNsPerSec() ? mDriftUncertaintyInNsPerSec : null)); - builder.append(String.format(format, "TimeOfLastHwClockDiscontinuityInNs", - getType() == CLOCK_TYPE_LOCAL_HW_TIME - ? mTimeOfLastHwClockDiscontinuityInNs : null)); - return builder.toString(); } private void initialize() { mFlags = HAS_NO_FLAGS; resetLeapSecond(); - setType(CLOCK_TYPE_UNKNOWN); + setType(TYPE_UNKNOWN); setTimeInNs(Long.MIN_VALUE); resetTimeUncertaintyInNs(); resetFullBiasInNs(); @@ -515,7 +487,6 @@ public final class GpsClock implements Parcelable { resetBiasUncertaintyInNs(); resetDriftInNsPerSec(); resetDriftUncertaintyInNsPerSec(); - setTimeOfLastHwClockDiscontinuityInNs(Long.MIN_VALUE); } private void setFlag(short flag) { diff --git a/location/java/android/location/GpsMeasurement.java b/location/java/android/location/GpsMeasurement.java index 366ad61f4188..f13a440f411a 100644 --- a/location/java/android/location/GpsMeasurement.java +++ b/location/java/android/location/GpsMeasurement.java @@ -16,17 +16,17 @@ package android.location; -import android.annotation.IntDef; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - /** * A class representing a GPS satellite measurement, containing raw and computed information. + * + * @hide */ -public final class GpsMeasurement implements Parcelable { +@SystemApi +public class GpsMeasurement implements Parcelable { private int mFlags; private byte mPrn; private double mTimeOffsetInNs; @@ -59,8 +59,6 @@ public final class GpsMeasurement implements Parcelable { private double mAzimuthInDeg; private double mAzimuthUncertaintyInDeg; private boolean mUsedInFix; - private double mPseudorangeRateCarrierInMetersPerSec; - private double mPseudorangeRateCarrierUncertaintyInMetersPerSec; // The following enumerations must be in sync with the values declared in gps.h @@ -85,11 +83,6 @@ public final class GpsMeasurement implements Parcelable { private static final int HAS_USED_IN_FIX = (1<<17); private static final int GPS_MEASUREMENT_HAS_UNCORRECTED_PSEUDORANGE_RATE = (1<<18); - /** The status of 'loss of lock'. */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({LOSS_OF_LOCK_UNKNOWN, LOSS_OF_LOCK_OK, LOSS_OF_LOCK_CYCLE_SLIP}) - public @interface LossOfLockStatus {} - /** * The indicator is not available or it is unknown. */ @@ -105,12 +98,6 @@ public final class GpsMeasurement implements Parcelable { */ public static final byte LOSS_OF_LOCK_CYCLE_SLIP = 2; - /** The status of multipath. */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({MULTIPATH_INDICATOR_UNKNOWN, MULTIPATH_INDICATOR_DETECTED, - MULTIPATH_INDICATOR_NOT_USED}) - public @interface MultipathIndicator {} - /** * The indicator is not available or it is unknown. */ @@ -231,10 +218,6 @@ public final class GpsMeasurement implements Parcelable { mAzimuthInDeg = measurement.mAzimuthInDeg; mAzimuthUncertaintyInDeg = measurement.mAzimuthUncertaintyInDeg; mUsedInFix = measurement.mUsedInFix; - mPseudorangeRateCarrierInMetersPerSec = - measurement.mPseudorangeRateCarrierInMetersPerSec; - mPseudorangeRateCarrierUncertaintyInMetersPerSec = - measurement.mPseudorangeRateCarrierUncertaintyInMetersPerSec; } /** @@ -793,7 +776,6 @@ public final class GpsMeasurement implements Parcelable { /** * Gets a value indicating the 'loss of lock' state of the event. */ - @LossOfLockStatus public byte getLossOfLock() { return mLossOfLock; } @@ -801,7 +783,7 @@ public final class GpsMeasurement implements Parcelable { /** * Sets the 'loss of lock' status. */ - public void setLossOfLock(@LossOfLockStatus byte value) { + public void setLossOfLock(byte value) { mLossOfLock = value; } @@ -959,7 +941,6 @@ public final class GpsMeasurement implements Parcelable { /** * Gets a value indicating the 'multipath' state of the event. */ - @MultipathIndicator public byte getMultipathIndicator() { return mMultipathIndicator; } @@ -967,7 +948,7 @@ public final class GpsMeasurement implements Parcelable { /** * Sets the 'multi-path' indicator. */ - public void setMultipathIndicator(@MultipathIndicator byte value) { + public void setMultipathIndicator(byte value) { mMultipathIndicator = value; } @@ -1176,34 +1157,6 @@ public final class GpsMeasurement implements Parcelable { mUsedInFix = value; } - /** - * Gets pseudorange rate (based on carrier phase changes) at the timestamp in m/s. - */ - public double getPseudorangeRateCarrierInMetersPerSec() { - return mPseudorangeRateCarrierInMetersPerSec; - } - - /** - * Sets pseudorange rate (based on carrier phase changes) at the timestamp in m/s. - */ - public void setPseudorangeRateCarrierInMetersPerSec(double value) { - mPseudorangeRateCarrierInMetersPerSec = value; - } - - /** - * Gets 1-Sigma uncertainty of the pseudorange rate carrier. - */ - public double getPseudorangeRateCarrierUncertaintyInMetersPerSec() { - return mPseudorangeRateCarrierUncertaintyInMetersPerSec; - } - - /** - * Sets 1-Sigma uncertainty of the pseudorange rate carrier. - */ - public void setPseudorangeRateCarrierUncertaintyInMetersPerSec(double value) { - mPseudorangeRateCarrierUncertaintyInMetersPerSec = value; - } - public static final Creator<GpsMeasurement> CREATOR = new Creator<GpsMeasurement>() { @Override public GpsMeasurement createFromParcel(Parcel parcel) { @@ -1241,8 +1194,6 @@ public final class GpsMeasurement implements Parcelable { gpsMeasurement.mAzimuthInDeg = parcel.readDouble(); gpsMeasurement.mAzimuthUncertaintyInDeg = parcel.readDouble(); gpsMeasurement.mUsedInFix = parcel.readInt() != 0; - gpsMeasurement.mPseudorangeRateCarrierInMetersPerSec = parcel.readDouble(); - gpsMeasurement.mPseudorangeRateCarrierUncertaintyInMetersPerSec = parcel.readDouble(); return gpsMeasurement; } @@ -1286,8 +1237,6 @@ public final class GpsMeasurement implements Parcelable { parcel.writeDouble(mAzimuthInDeg); parcel.writeDouble(mAzimuthUncertaintyInDeg); parcel.writeInt(mUsedInFix ? 1 : 0); - parcel.writeDouble(mPseudorangeRateCarrierInMetersPerSec); - parcel.writeDouble(mPseudorangeRateCarrierUncertaintyInMetersPerSec); } @Override @@ -1412,11 +1361,6 @@ public final class GpsMeasurement implements Parcelable { builder.append(String.format(format, "UsedInFix", mUsedInFix)); - builder.append(String.format(format, "PseudorangeRateCarrierInMetersPerSec", - mPseudorangeRateCarrierInMetersPerSec)); - builder.append(String.format(format, "PseudorangeRateCarrierUncertaintyInMetersPerSec", - mPseudorangeRateCarrierUncertaintyInMetersPerSec)); - return builder.toString(); } @@ -1453,8 +1397,6 @@ public final class GpsMeasurement implements Parcelable { resetAzimuthInDeg(); resetAzimuthUncertaintyInDeg(); setUsedInFix(false); - setPseudorangeRateCarrierInMetersPerSec(Double.MIN_VALUE); - setPseudorangeRateCarrierUncertaintyInMetersPerSec(Double.MIN_VALUE); } private void setFlag(int flag) { diff --git a/location/java/android/location/GpsMeasurementsEvent.java b/location/java/android/location/GpsMeasurementsEvent.java index ef9edeb7692d..136687337861 100644 --- a/location/java/android/location/GpsMeasurementsEvent.java +++ b/location/java/android/location/GpsMeasurementsEvent.java @@ -16,13 +16,11 @@ package android.location; -import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.security.InvalidParameterException; import java.util.Arrays; import java.util.Collection; @@ -30,13 +28,12 @@ import java.util.Collections; /** * A class implementing a container for data associated with a measurement event. - * Events are delivered to registered instances of {@link Callback}. + * Events are delivered to registered instances of {@link Listener}. + * + * @hide */ -public final class GpsMeasurementsEvent implements Parcelable { - /** The status of GPS measurements event. */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GPS_LOCATION_DISABLED}) - public @interface GpsMeasurementsStatus {} +@SystemApi +public class GpsMeasurementsEvent implements Parcelable { /** * The system does not support tracking of GPS Measurements. This status will not change in the @@ -61,20 +58,22 @@ public final class GpsMeasurementsEvent implements Parcelable { /** * Used for receiving GPS satellite measurements from the GPS engine. * Each measurement contains raw and computed data identifying a satellite. - * You can implement this interface and call - * {@link LocationManager#registerGpsMeasurementCallback}. + * You can implement this interface and call {@link LocationManager#addGpsMeasurementListener}. + * + * @hide */ - public static abstract class Callback { + @SystemApi + public interface Listener { /** * Returns the latest collected GPS Measurements. */ - public void onGpsMeasurementsReceived(GpsMeasurementsEvent eventArgs) {} + void onGpsMeasurementsReceived(GpsMeasurementsEvent eventArgs); /** * Returns the latest status of the GPS Measurements sub-system. */ - public void onStatusChanged(@GpsMeasurementsStatus int status) {} + void onStatusChanged(int status); } public GpsMeasurementsEvent(GpsClock clock, GpsMeasurement[] measurements) { diff --git a/location/java/android/location/GpsNavigationMessage.java b/location/java/android/location/GpsNavigationMessage.java index d79957243676..5c3c71012cdd 100644 --- a/location/java/android/location/GpsNavigationMessage.java +++ b/location/java/android/location/GpsNavigationMessage.java @@ -16,54 +16,49 @@ package android.location; -import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.security.InvalidParameterException; /** * A class containing a GPS satellite Navigation Message. + * + * @hide */ -public final class GpsNavigationMessage implements Parcelable { +@SystemApi +public class GpsNavigationMessage implements Parcelable { private static final byte[] EMPTY_ARRAY = new byte[0]; - /** The type of the GPS Clock. */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({MESSAGE_TYPE_UNKNOWN, MESSAGE_TYPE_L1CA, MESSAGE_TYPE_L2CNAV, MESSAGE_TYPE_L5CNAV, - MESSAGE_TYPE_CNAV2}) - public @interface GpsNavigationMessageType {} - // The following enumerations must be in sync with the values declared in gps.h /** * The type of the navigation message is not available or unknown. */ - public static final byte MESSAGE_TYPE_UNKNOWN = 0; + public static final byte TYPE_UNKNOWN = 0; /** * The Navigation Message is of type L1 C/A. */ - public static final byte MESSAGE_TYPE_L1CA = 1; + public static final byte TYPE_L1CA = 1; /** * The Navigation Message is of type L1-CNAV. */ - public static final byte MESSAGE_TYPE_L2CNAV = 2; + public static final byte TYPE_L2CNAV = 2; /** * The Navigation Message is of type L5-CNAV. */ - public static final byte MESSAGE_TYPE_L5CNAV = 3; + public static final byte TYPE_L5CNAV = 3; /** * The Navigation Message is of type CNAV-2. */ - public static final byte MESSAGE_TYPE_CNAV2 = 4; + public static final byte TYPE_CNAV2 = 4; /** * The Navigation Message Status is 'unknown'. @@ -116,7 +111,6 @@ public final class GpsNavigationMessage implements Parcelable { /** * Gets the type of the navigation message contained in the object. */ - @GpsNavigationMessageType public byte getType() { return mType; } @@ -124,7 +118,7 @@ public final class GpsNavigationMessage implements Parcelable { /** * Sets the type of the navigation message. */ - public void setType(@GpsNavigationMessageType byte value) { + public void setType(byte value) { mType = value; } @@ -134,15 +128,15 @@ public final class GpsNavigationMessage implements Parcelable { */ private String getTypeString() { switch (mType) { - case MESSAGE_TYPE_UNKNOWN: + case TYPE_UNKNOWN: return "Unknown"; - case MESSAGE_TYPE_L1CA: + case TYPE_L1CA: return "L1 C/A"; - case MESSAGE_TYPE_L2CNAV: + case TYPE_L2CNAV: return "L2-CNAV"; - case MESSAGE_TYPE_L5CNAV: + case TYPE_L5CNAV: return "L5-CNAV"; - case MESSAGE_TYPE_CNAV2: + case TYPE_CNAV2: return "CNAV-2"; default: return "<Invalid:" + mType + ">"; @@ -320,7 +314,7 @@ public final class GpsNavigationMessage implements Parcelable { } private void initialize() { - mType = MESSAGE_TYPE_UNKNOWN; + mType = TYPE_UNKNOWN; mPrn = 0; mMessageId = -1; mSubmessageId = -1; diff --git a/location/java/android/location/GpsNavigationMessageEvent.java b/location/java/android/location/GpsNavigationMessageEvent.java index b16a4855f389..bd6921c74152 100644 --- a/location/java/android/location/GpsNavigationMessageEvent.java +++ b/location/java/android/location/GpsNavigationMessageEvent.java @@ -16,60 +16,60 @@ package android.location; -import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.security.InvalidParameterException; /** * A class implementing a container for data associated with a navigation message event. - * Events are delivered to registered instances of {@link Callback}. + * Events are delivered to registered instances of {@link Listener}. + * + * @hide */ -public final class GpsNavigationMessageEvent implements Parcelable { - /** The status of GPS measurements event. */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GPS_LOCATION_DISABLED}) - public @interface GpsNavigationMessageStatus {} +@SystemApi +public class GpsNavigationMessageEvent implements Parcelable { /** * The system does not support tracking of GPS Navigation Messages. This status will not change * in the future. */ - public static final int STATUS_NOT_SUPPORTED = 0; + public static int STATUS_NOT_SUPPORTED = 0; /** * GPS Navigation Messages are successfully being tracked, it will receive updates once they are * available. */ - public static final int STATUS_READY = 1; + public static int STATUS_READY = 1; /** * GPS provider or Location is disabled, updated will not be received until they are enabled. */ - public static final int STATUS_GPS_LOCATION_DISABLED = 2; + public static int STATUS_GPS_LOCATION_DISABLED = 2; private final GpsNavigationMessage mNavigationMessage; /** * Used for receiving GPS satellite Navigation Messages from the GPS engine. * You can implement this interface and call - * {@link LocationManager#registerGpsNavigationMessageCallback}. + * {@link LocationManager#addGpsNavigationMessageListener}. + * + * @hide */ - public static abstract class Callback { + @SystemApi + public interface Listener { /** * Returns the latest collected GPS Navigation Message. */ - public void onGpsNavigationMessageReceived(GpsNavigationMessageEvent event) {} + void onGpsNavigationMessageReceived(GpsNavigationMessageEvent event); /** * Returns the latest status of the GPS Navigation Messages sub-system. */ - public void onStatusChanged(@GpsNavigationMessageStatus int status) {} + void onStatusChanged(int status); } public GpsNavigationMessageEvent(GpsNavigationMessage message) { diff --git a/location/java/android/location/IGpsMeasurementsListener.aidl b/location/java/android/location/IGnssMeasurementsListener.aidl index cbd31000094d..69fa48a0fb63 100644 --- a/location/java/android/location/IGpsMeasurementsListener.aidl +++ b/location/java/android/location/IGnssMeasurementsListener.aidl @@ -16,12 +16,12 @@ package android.location; -import android.location.GpsMeasurementsEvent; +import android.location.GnssMeasurementsEvent; /** * {@hide} */ -oneway interface IGpsMeasurementsListener { - void onGpsMeasurementsReceived(in GpsMeasurementsEvent event); +oneway interface IGnssMeasurementsListener { + void onGnssMeasurementsReceived(in GnssMeasurementsEvent event); void onStatusChanged(in int status); } diff --git a/location/java/android/location/IGpsNavigationMessageListener.aidl b/location/java/android/location/IGnssNavigationMessageListener.aidl index a708ea6a78d6..de6129c96e56 100644 --- a/location/java/android/location/IGpsNavigationMessageListener.aidl +++ b/location/java/android/location/IGnssNavigationMessageListener.aidl @@ -16,12 +16,12 @@ package android.location; -import android.location.GpsNavigationMessageEvent; +import android.location.GnssNavigationMessageEvent; /** * {@hide} */ -oneway interface IGpsNavigationMessageListener { - void onGpsNavigationMessageReceived(in GpsNavigationMessageEvent event); +oneway interface IGnssNavigationMessageListener { + void onGnssNavigationMessageReceived(in GnssNavigationMessageEvent event); void onStatusChanged(in int status); } diff --git a/location/java/android/location/ILocationManager.aidl b/location/java/android/location/ILocationManager.aidl index 49d841fb1116..4f1e0397abd0 100644 --- a/location/java/android/location/ILocationManager.aidl +++ b/location/java/android/location/ILocationManager.aidl @@ -21,9 +21,9 @@ import android.location.Address; import android.location.Criteria; import android.location.GeocoderParams; import android.location.Geofence; +import android.location.IGnssMeasurementsListener; import android.location.IGnssStatusListener; -import android.location.IGpsMeasurementsListener; -import android.location.IGpsNavigationMessageListener; +import android.location.IGnssNavigationMessageListener; import android.location.ILocationListener; import android.location.Location; import android.location.LocationRequest; @@ -61,13 +61,13 @@ interface ILocationManager boolean sendNiResponse(int notifId, int userResponse); - boolean addGpsMeasurementsListener(in IGpsMeasurementsListener listener, in String packageName); - void removeGpsMeasurementsListener(in IGpsMeasurementsListener listener); + boolean addGnssMeasurementsListener(in IGnssMeasurementsListener listener, in String packageName); + void removeGnssMeasurementsListener(in IGnssMeasurementsListener listener); - boolean addGpsNavigationMessageListener( - in IGpsNavigationMessageListener listener, + boolean addGnssNavigationMessageListener( + in IGnssNavigationMessageListener listener, in String packageName); - void removeGpsNavigationMessageListener(in IGpsNavigationMessageListener listener); + void removeGnssNavigationMessageListener(in IGnssNavigationMessageListener listener); int getGpsYearOfHardware(); diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 5447bb13707f..30cf101397db 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -64,8 +64,8 @@ public class LocationManager { private final Context mContext; private final ILocationManager mService; - private final GpsMeasurementCallbackTransport mGpsMeasurementCallbackTransport; - private final GpsNavigationMessageCallbackTransport mGpsNavigationMessageCallbackTransport; + private final GnssMeasurementCallbackTransport mGnssMeasurementCallbackTransport; + private final GnssNavigationMessageCallbackTransport mGnssNavigationMessageCallbackTransport; private final HashMap<GpsStatus.Listener, GnssStatusListenerTransport> mGpsStatusListeners = new HashMap<>(); private final HashMap<GpsStatus.NmeaListener, GnssStatusListenerTransport> mGpsNmeaListeners = @@ -321,9 +321,9 @@ public class LocationManager { public LocationManager(Context context, ILocationManager service) { mService = service; mContext = context; - mGpsMeasurementCallbackTransport = new GpsMeasurementCallbackTransport(mContext, mService); - mGpsNavigationMessageCallbackTransport = - new GpsNavigationMessageCallbackTransport(mContext, mService); + mGnssMeasurementCallbackTransport = new GnssMeasurementCallbackTransport(mContext, mService); + mGnssNavigationMessageCallbackTransport = + new GnssNavigationMessageCallbackTransport(mContext, mService); } private LocationProvider createProvider(String name, ProviderProperties properties) { @@ -1817,73 +1817,119 @@ public class LocationManager { } /** + * No-op method to keep backward-compatibility. + * Don't use it. Use {@link #registerGnssMeasurementCallback} instead. + * @hide + * @deprecated + */ + @Deprecated + @SystemApi + public boolean addGpsMeasurementListener(GpsMeasurementsEvent.Listener listener) { + return false; + } + + /** * Registers a GPS Measurement callback. * - * @param callback a {@link GpsMeasurementsEvent.Callback} object to register. + * @param callback a {@link GnssMeasurementsEvent.Callback} object to register. * @return {@code true} if the callback was added successfully, {@code false} otherwise. */ @RequiresPermission(ACCESS_FINE_LOCATION) - public boolean registerGpsMeasurementCallback(GpsMeasurementsEvent.Callback callback) { - return registerGpsMeasurementCallback(callback, null); + public boolean registerGnssMeasurementCallback(GnssMeasurementsEvent.Callback callback) { + return registerGnssMeasurementCallback(callback, null); } /** * Registers a GPS Measurement callback. * - * @param callback a {@link GpsMeasurementsEvent.Callback} object to register. + * @param callback a {@link GnssMeasurementsEvent.Callback} object to register. * @param handler the handler that the callback runs on. * @return {@code true} if the callback was added successfully, {@code false} otherwise. */ @RequiresPermission(ACCESS_FINE_LOCATION) - public boolean registerGpsMeasurementCallback(GpsMeasurementsEvent.Callback callback, + public boolean registerGnssMeasurementCallback(GnssMeasurementsEvent.Callback callback, Handler handler) { - return mGpsMeasurementCallbackTransport.add(callback, handler); + return mGnssMeasurementCallbackTransport.add(callback, handler); + } + + /** + * No-op method to keep backward-compatibility. + * Don't use it. Use {@link #unregisterGnssMeasurementCallback} instead. + * @hide + * @deprecated + */ + @Deprecated + @SystemApi + public void removeGpsMeasurementListener(GpsMeasurementsEvent.Listener listener) { } /** * Unregisters a GPS Measurement callback. * - * @param callback a {@link GpsMeasurementsEvent.Callback} object to remove. + * @param callback a {@link GnssMeasurementsEvent.Callback} object to remove. */ - public void unregisterGpsMeasurementCallback(GpsMeasurementsEvent.Callback callback) { - mGpsMeasurementCallbackTransport.remove(callback); + public void unregisterGnssMeasurementCallback(GnssMeasurementsEvent.Callback callback) { + mGnssMeasurementCallbackTransport.remove(callback); + } + + /** + * No-op method to keep backward-compatibility. + * Don't use it. Use {@link #registerGnssNavigationMessageCallback} instead. + * @hide + * @deprecated + */ + @Deprecated + @SystemApi + public boolean addGpsNavigationMessageListener(GpsNavigationMessageEvent.Listener listener) { + return false; } /** * Registers a GPS Navigation Message callback. * - * @param callback a {@link GpsNavigationMessageEvent.Callback} object to register. + * @param callback a {@link GnssNavigationMessageEvent.Callback} object to register. * @return {@code true} if the callback was added successfully, {@code false} otherwise. */ - public boolean registerGpsNavigationMessageCallback( - GpsNavigationMessageEvent.Callback callback) { - return registerGpsNavigationMessageCallback(callback, null); + public boolean registerGnssNavigationMessageCallback( + GnssNavigationMessageEvent.Callback callback) { + return registerGnssNavigationMessageCallback(callback, null); } /** * Registers a GPS Navigation Message callback. * - * @param callback a {@link GpsNavigationMessageEvent.Callback} object to register. + * @param callback a {@link GnssNavigationMessageEvent.Callback} object to register. * @param handler the handler that the callback runs on. * @return {@code true} if the callback was added successfully, {@code false} otherwise. */ @RequiresPermission(ACCESS_FINE_LOCATION) - public boolean registerGpsNavigationMessageCallback( - GpsNavigationMessageEvent.Callback callback, Handler handler) { - return mGpsNavigationMessageCallbackTransport.add(callback, handler); + public boolean registerGnssNavigationMessageCallback( + GnssNavigationMessageEvent.Callback callback, Handler handler) { + return mGnssNavigationMessageCallbackTransport.add(callback, handler); } /** * Unregisters a GPS Navigation Message callback. * - * @param callback a {@link GpsNavigationMessageEvent.Callback} object to remove. + * @param callback a {@link GnssNavigationMessageEvent.Callback} object to remove. + */ + public void unregisterGnssNavigationMessageCallback( + GnssNavigationMessageEvent.Callback callback) { + mGnssNavigationMessageCallbackTransport.remove(callback); + } + + /** + * No-op method to keep backward-compatibility. + * Don't use it. Use {@link #unregisterGnssNavigationMessageCallback} instead. + * @hide + * @deprecated */ - public void unregisterGpsNavigationMessageCallback( - GpsNavigationMessageEvent.Callback callback) { - mGpsNavigationMessageCallbackTransport.remove(callback); + @Deprecated + @SystemApi + public void removeGpsNavigationMessageListener(GpsNavigationMessageEvent.Listener listener) { } - /** + /** * Retrieves information about the current status of the GPS engine. * This should only be called from the {@link GpsStatus.Listener#onGpsStatusChanged} * callback to ensure that the data is copied atomically. diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java index 93e6dacdd98c..80b3ffc23e31 100644 --- a/media/java/android/media/browse/MediaBrowser.java +++ b/media/java/android/media/browse/MediaBrowser.java @@ -115,7 +115,7 @@ public final class MediaBrowser { * @param callback The connection callback. * @param rootHints An optional bundle of service-specific arguments to send * to the media browse service when connecting and retrieving the root id - * for browsing, or null if none. The contents of this bundle may affect + * for browsing, or null if none. The contents of this bundle may affect * the information returned when browsing. */ public MediaBrowser(Context context, ComponentName serviceComponent, @@ -178,9 +178,9 @@ public final class MediaBrowser { } if (!bound) { - // Tell them that it didn't work. We are already on the main thread, - // but we don't want to do callbacks inside of connect(). So post it, - // and then check that we are on the same ServiceConnection. We know + // Tell them that it didn't work. We are already on the main thread, + // but we don't want to do callbacks inside of connect(). So post it, + // and then check that we are on the same ServiceConnection. We know // we won't also get an onServiceConnected or onServiceDisconnected, // so we won't be doing double callbacks. mHandler.post(new Runnable() { @@ -207,13 +207,13 @@ public final class MediaBrowser { */ public void disconnect() { // It's ok to call this any state, because allowing this lets apps not have - // to check isConnected() unnecessarily. They won't appreciate the extra - // assertions for this. We do everything we can here to go back to a sane state. + // to check isConnected() unnecessarily. They won't appreciate the extra + // assertions for this. We do everything we can here to go back to a sane state. if (mServiceCallbacks != null) { try { mServiceBinder.disconnect(mServiceCallbacks); } catch (RemoteException ex) { - // We are disconnecting anyway. Log, just for posterity but it's not + // We are disconnecting anyway. Log, just for posterity but it's not // a big problem. Log.w(TAG, "RemoteException during connect for " + mServiceComponent); } @@ -227,12 +227,12 @@ public final class MediaBrowser { } /** - * Null out the variables and unbind from the service. This doesn't include + * Null out the variables and unbind from the service. This doesn't include * calling disconnect on the service, because we only try to do that in the * clean shutdown cases. * <p> * Everywhere that calls this EXCEPT for disconnect() should follow it with - * a call to mCallback.onConnectionFailed(). Disconnect doesn't do that callback + * a call to mCallback.onConnectionFailed(). Disconnect doesn't do that callback * for a clean shutdown, but everywhere else is a dirty shutdown and should * notify the app. */ @@ -455,8 +455,8 @@ public final class MediaBrowser { private void subscribeInternal(String parentId, Bundle options, SubscriptionCallback callback) { // Check arguments. - if (parentId == null) { - throw new IllegalArgumentException("parentId is null"); + if (TextUtils.isEmpty(parentId)) { + throw new IllegalArgumentException("parentId is empty."); } if (callback == null) { throw new IllegalArgumentException("callback is null"); @@ -659,7 +659,7 @@ public final class MediaBrowser { } /** - * Return true if {@code callback} is the current ServiceCallbacks. Also logs if it's not. + * Return true if {@code callback} is the current ServiceCallbacks. Also logs if it's not. */ private boolean isCurrent(IMediaBrowserServiceCallbacks callback, String funcName) { if (mServiceCallbacks != callback) { @@ -955,8 +955,8 @@ public final class MediaBrowser { mServiceCallbacks); } catch (RemoteException ex) { // Connect failed, which isn't good. But the auto-reconnect on the service - // will take over and we will come back. We will also get the - // onServiceDisconnected, which has all the cleanup code. So let that do + // will take over and we will come back. We will also get the + // onServiceDisconnected, which has all the cleanup code. So let that do // it. Log.w(TAG, "RemoteException during connect for " + mServiceComponent); if (DBG) { @@ -1005,7 +1005,7 @@ public final class MediaBrowser { } /** - * Return true if this is the current ServiceConnection. Also logs if it's not. + * Return true if this is the current ServiceConnection. Also logs if it's not. */ private boolean isCurrent(String funcName) { if (mServiceConnection != this) { @@ -1031,7 +1031,7 @@ public final class MediaBrowser { } /** - * The other side has acknowledged our connection. The parameters to this function + * The other side has acknowledged our connection. The parameters to this function * are the initial data as requested. */ @Override @@ -1044,7 +1044,7 @@ public final class MediaBrowser { } /** - * The other side does not like us. Tell the app via onConnectionFailed. + * The other side does not like us. Tell the app via onConnectionFailed. */ @Override public void onConnectFailed() { diff --git a/media/java/android/media/browse/MediaBrowserUtils.java b/media/java/android/media/browse/MediaBrowserUtils.java index 4f198aca96ab..b06e598a63d1 100644 --- a/media/java/android/media/browse/MediaBrowserUtils.java +++ b/media/java/android/media/browse/MediaBrowserUtils.java @@ -40,10 +40,10 @@ public class MediaBrowserUtils { } public static boolean hasDuplicatedItems(Bundle options1, Bundle options2) { - int page1 = options1.getInt(MediaBrowser.EXTRA_PAGE, -1); - int page2 = options2.getInt(MediaBrowser.EXTRA_PAGE, -1); - int pageSize1 = options1.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1); - int pageSize2 = options2.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1); + int page1 = options1 == null ? -1 : options1.getInt(MediaBrowser.EXTRA_PAGE, -1); + int page2 = options2 == null ? -1 : options2.getInt(MediaBrowser.EXTRA_PAGE, -1); + int pageSize1 = options1 == null ? -1 : options1.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1); + int pageSize2 = options2 == null ? -1 : options2.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1); int startIndex1, startIndex2, endIndex1, endIndex2; if (page1 == -1 || pageSize1 == -1) { diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index 20491e4baa70..f9a23f9cab04 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -32,6 +32,7 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.hardware.hdmi.HdmiDeviceInfo; import android.net.Uri; +import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -114,6 +115,7 @@ public final class TvInputInfo implements Parcelable { private final int mTunerCount; private final boolean mCanRecord; private final boolean mIsHardwareInput; + private final Bundle mExtras; // Attributes from XML meta data. private String mSetupActivity; @@ -252,7 +254,7 @@ public final class TvInputInfo implements Parcelable { */ private TvInputInfo(ResolveInfo service, String id, String parentId, int type, boolean isHardwareInput, boolean isConnectedToHdmiSwitch, int tunerCount, - boolean canRecord) { + boolean canRecord, Bundle extras) { mService = service; mId = id; mParentId = parentId; @@ -261,6 +263,7 @@ public final class TvInputInfo implements Parcelable { mIsConnectedToHdmiSwitch = isConnectedToHdmiSwitch; mTunerCount = tunerCount; mCanRecord = canRecord; + mExtras = extras; } /** @@ -362,6 +365,14 @@ public final class TvInputInfo implements Parcelable { } /** + * Returns the extras associated with this TV input. + * @hide + */ + public Bundle getExtras() { + return mExtras; + } + + /** * Returns the HDMI device information of this TV input. * @hide */ @@ -524,6 +535,7 @@ public final class TvInputInfo implements Parcelable { dest.writeInt(mLabelResId); dest.writeString(mLabel); dest.writeByte(mIsConnectedToHdmiSwitch ? (byte) 1 : 0); + dest.writeBundle(mExtras); } private Drawable loadServiceIcon(Context context) { @@ -563,6 +575,7 @@ public final class TvInputInfo implements Parcelable { mLabelResId = in.readInt(); mLabel = in.readString(); mIsConnectedToHdmiSwitch = in.readByte() == 1; + mExtras = in.readBundle(); } /** @@ -604,6 +617,7 @@ public final class TvInputInfo implements Parcelable { private HdmiDeviceInfo mHdmiDeviceInfo; private String mParentId; private TvInputHardwareInfo mTvInputHardwareInfo; + private Bundle mExtras; /** * Constructs a new builder for {@link TvInputInfo}. @@ -732,6 +746,18 @@ public final class TvInputInfo implements Parcelable { } /** + * Sets the extras associated with this TV input. + * + * @param extras The extras associated with this TV input. + * @return This Builder object to allow for chaining of calls to builder methods. + * @hide + */ + public Builder setExtras(Bundle extras) { + this.mExtras = extras; + return this; + } + + /** * Creates a {@link TvInputInfo} instance with the specified fields. Most of the information * is obtained by parsing the AndroidManifest and {@link TvInputService#SERVICE_META_DATA} * for the {@link TvInputService} this TV input implements. @@ -765,7 +791,7 @@ public final class TvInputInfo implements Parcelable { } TvInputInfo info = new TvInputInfo(mResolveInfo, id, mParentId, type, isHardwareInput, - isConnectedToHdmiSwitch, mTunerCount, mCanRecord); + isConnectedToHdmiSwitch, mTunerCount, mCanRecord, mExtras); return parseServiceMetadata(type, info); } diff --git a/media/java/android/media/tv/TvRecordingClient.java b/media/java/android/media/tv/TvRecordingClient.java index 73f1e32d3f02..1d80068fbdf8 100644 --- a/media/java/android/media/tv/TvRecordingClient.java +++ b/media/java/android/media/tv/TvRecordingClient.java @@ -285,6 +285,18 @@ public class TvRecordingClient { } @Override + void onConnected(TvInputManager.Session session) { + if (DEBUG) { + Log.d(TAG, "onConnected()"); + } + if (this != mSessionCallback) { + Log.w(TAG, "onConnected - session not created"); + return; + } + mCallback.onConnected(); + } + + @Override public void onSessionReleased(TvInputManager.Session session) { if (DEBUG) { Log.d(TAG, "onSessionReleased()"); diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java index 299b77071c55..0393c943784d 100644 --- a/media/java/android/service/media/MediaBrowserService.java +++ b/media/java/android/service/media/MediaBrowserService.java @@ -16,6 +16,7 @@ package android.service.media; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SdkConstant; @@ -41,6 +42,8 @@ import android.util.Log; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -49,7 +52,7 @@ import java.util.List; * Base class for media browse services. * <p> * Media browse services enable applications to browse media content provided by an application - * and ask the application to start playing it. They may also be used to control content that + * and ask the application to start playing it. They may also be used to control content that * is already playing by way of a {@link MediaSession}. * </p> * @@ -86,6 +89,11 @@ public abstract class MediaBrowserService extends Service { private static final int RESULT_FLAG_OPTION_NOT_HANDLED = 0x00000001; + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(flag=true, value = { RESULT_FLAG_OPTION_NOT_HANDLED }) + private @interface ResultFlags { } + private final ArrayMap<IBinder, ConnectionRecord> mConnections = new ArrayMap<>(); private final Handler mHandler = new Handler(); private ServiceBinder mBinder; @@ -106,10 +114,10 @@ public abstract class MediaBrowserService extends Service { * Completion handler for asynchronous callback methods in {@link MediaBrowserService}. * <p> * Each of the methods that takes one of these to send the result must call - * {@link #sendResult} to respond to the caller with the given results. If those + * {@link #sendResult} to respond to the caller with the given results. If those * functions return without calling {@link #sendResult}, they must instead call * {@link #detach} before returning, and then may call {@link #sendResult} when - * they are done. If more than one of those methods is called, an exception will + * they are done. If more than one of those methods is called, an exception will * be thrown. * * @see MediaBrowserService#onLoadChildren @@ -119,7 +127,7 @@ public abstract class MediaBrowserService extends Service { private Object mDebug; private boolean mDetachCalled; private boolean mSendResultCalled; - private int mFlag; + private int mFlags; Result(Object debug) { mDebug = debug; @@ -133,7 +141,7 @@ public abstract class MediaBrowserService extends Service { throw new IllegalStateException("sendResult() called twice for: " + mDebug); } mSendResultCalled = true; - onResultSent(result, mFlag); + onResultSent(result, mFlags); } /** @@ -156,15 +164,15 @@ public abstract class MediaBrowserService extends Service { return mDetachCalled || mSendResultCalled; } - void setFlag(int flag) { - mFlag = flag; + void setFlags(@ResultFlags int flags) { + mFlags = flags; } /** * Called when the result is sent, after assertions about not being called twice * have happened. */ - void onResultSent(T result, int flag) { + void onResultSent(T result, @ResultFlags int flags) { } } @@ -184,7 +192,7 @@ public abstract class MediaBrowserService extends Service { public void run() { final IBinder b = callbacks.asBinder(); - // Clear out the old subscriptions. We are getting new ones. + // Clear out the old subscriptions. We are getting new ones. mConnections.remove(b); final ConnectionRecord connection = new ConnectionRecord(); @@ -228,7 +236,7 @@ public abstract class MediaBrowserService extends Service { public void run() { final IBinder b = callbacks.asBinder(); - // Clear out the old subscriptions. We are getting new ones. + // Clear out the old subscriptions. We are getting new ones. final ConnectionRecord old = mConnections.remove(b); if (old != null) { // TODO @@ -388,7 +396,7 @@ public abstract class MediaBrowserService extends Service { // To support backward compatibility, when the implementation of MediaBrowserService doesn't // override onLoadChildren() with options, onLoadChildren() without options will be used // instead, and the options will be applied in the implementation of result.onResultSent(). - result.setFlag(RESULT_FLAG_OPTION_NOT_HANDLED); + result.setFlags(RESULT_FLAG_OPTION_NOT_HANDLED); onLoadChildren(parentId, result); } @@ -574,7 +582,7 @@ public abstract class MediaBrowserService extends Service { final Result<List<MediaBrowser.MediaItem>> result = new Result<List<MediaBrowser.MediaItem>>(parentId) { @Override - void onResultSent(List<MediaBrowser.MediaItem> list, int flag) { + void onResultSent(List<MediaBrowser.MediaItem> list, @ResultFlags int flag) { if (mConnections.get(connection.callbacks.asBinder()) != connection) { if (DBG) { Log.d(TAG, "Not sending onLoadChildren result for connection that has" @@ -639,7 +647,7 @@ public abstract class MediaBrowserService extends Service { final Result<MediaBrowser.MediaItem> result = new Result<MediaBrowser.MediaItem>(itemId) { @Override - void onResultSent(MediaBrowser.MediaItem item, int flag) { + void onResultSent(MediaBrowser.MediaItem item, @ResultFlags int flag) { Bundle bundle = new Bundle(); bundle.putParcelable(KEY_MEDIA_ITEM, item); receiver.send(0, bundle); diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java index 74da2c9b1955..e718742d5a67 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java @@ -90,7 +90,7 @@ public class Camera2SurfaceViewTestCase extends private static final int WAIT_FOR_SURFACE_CHANGE_TIMEOUT_MS = 1000; // Instrumentation arguments - protected static final String ARG_KEY_REPEAT = "repeat"; + protected static final String ARG_KEY_ITERATIONS = "iterations"; protected static final String ARG_KEY_WAIT_INTERVAL_MS = "waitIntervalMs"; protected static final String ARG_KEY_RESULT_TO_FILE = "resultToFile"; @@ -126,8 +126,8 @@ public class Camera2SurfaceViewTestCase extends protected WindowManager mWindowManager; - // Repeat tests a given times. Default to 1. - protected int mRepeat = 1; + // Set the number of iterations to run stress testing. Default to 1. + protected int mIterations = 1; // The interval between test iterations used for stress test. protected long mTestWaitIntervalMs = 1 * 1000; // 1 sec protected boolean mWriteToFile = true; @@ -165,10 +165,10 @@ public class Camera2SurfaceViewTestCase extends mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE); - mRepeat = getArgumentsAsNumber(ARG_KEY_REPEAT, 1).intValue(); + mIterations = getArgumentsAsNumber(ARG_KEY_ITERATIONS, 1).intValue(); mTestWaitIntervalMs = getArgumentsAsNumber(ARG_KEY_WAIT_INTERVAL_MS, 1000).longValue(); mWriteToFile = getArgumentsAsBoolean(ARG_KEY_RESULT_TO_FILE, true); - Log.i(TAG, "Argument: repeat count=" + mRepeat); + Log.i(TAG, "Argument: iteration count=" + mIterations); Log.i(TAG, "Argument: interval (ms)=" + mTestWaitIntervalMs); Log.i(TAG, "Argument: result to file=" + (mWriteToFile ? "true" : "false")); mResultPrinter = new CameraTestResultPrinter(getInstrumentation(), mWriteToFile); @@ -790,8 +790,8 @@ public class Camera2SurfaceViewTestCase extends return defaultValue; } - protected int getRepeatCount() { - return mRepeat; + protected int getIterationCount() { + return mIterations; } protected long getTestWaitIntervalMs() { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2CaptureRequestTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2CaptureRequestTest.java index b1529756c8fe..ebfd92eec073 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2CaptureRequestTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2CaptureRequestTest.java @@ -24,7 +24,6 @@ import android.hardware.camera2.CameraDevice; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.CaptureResult; import android.util.Log; -import android.util.Rational; import android.util.Size; import java.util.Arrays; @@ -47,7 +46,7 @@ import static com.android.mediaframeworktest.helpers.CameraTestUtils.getValueNot * * adb shell am instrument \ * -e class com.android.mediaframeworktest.stress.Camera2CaptureRequestTest#testAeModeAndLock \ - * -e repeat 10 \ + * -e iterations 10 \ * -e waitIntervalMs 1000 \ * -e resultToFile false \ * -r -w com.android.mediaframeworktest/.Camera2InstrumentationTestRunner @@ -100,16 +99,16 @@ public class Camera2CaptureRequestTest extends Camera2SurfaceViewTestCase { updatePreviewSurface(maxPreviewSz); // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { - Log.v(TAG, String.format("AE mode and lock: %d/%d", repeat + 1, - getRepeatCount())); + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { + Log.v(TAG, String.format("AE mode and lock: %d/%d", iteration + 1, + getIterationCount())); // Test aeMode and lock int[] aeModes = mStaticInfo.getAeAvailableModesChecked(); for (int mode : aeModes) { aeModeAndLockTestByMode(mode); } - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, mCameraIds[i]); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, mCameraIds[i]); Thread.sleep(getTestWaitIntervalMs()); } } finally { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2RecordingTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2RecordingTest.java index e7c91cf2bc98..a9b6bfd783f6 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2RecordingTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2RecordingTest.java @@ -67,7 +67,7 @@ import static com.android.mediaframeworktest.helpers.CameraTestUtils.getValueNot * * adb shell am instrument \ * -e class com.android.mediaframeworktest.stress.Camera2RecordingTest#testBasicRecording \ - * -e repeat 10 \ + * -e iterations 10 \ * -e waitIntervalMs 1000 \ * -e resultToFile false \ * -r -w com.android.mediaframeworktest/.Camera2InstrumentationTestRunner @@ -142,11 +142,12 @@ public class Camera2RecordingTest extends Camera2SurfaceViewTestCase { initSupportedVideoSize(mCameraIds[i]); // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { - Log.v(TAG, String.format("Recording video: %d/%d", repeat + 1, - getRepeatCount())); + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { + Log.v(TAG, String.format("Recording video: %d/%d", iteration + 1, + getIterationCount())); basicRecordingTestByCamera(mCamcorderProfileList, useVideoStab); - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, mCameraIds[i]); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, + mCameraIds[i]); Thread.sleep(getTestWaitIntervalMs()); } } finally { @@ -206,9 +207,9 @@ public class Camera2RecordingTest extends Camera2SurfaceViewTestCase { } // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { - Log.v(TAG, String.format("Constrained high speed recording: %d/%d", repeat + 1, - getRepeatCount())); + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { + Log.v(TAG, String.format("Constrained high speed recording: %d/%d", + iteration + 1, getIterationCount())); StreamConfigurationMap config = mStaticInfo.getValueFromKeyNonNull( @@ -257,7 +258,7 @@ public class Camera2RecordingTest extends Camera2SurfaceViewTestCase { validateRecording(size, durationMs); } - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, id); Thread.sleep(getTestWaitIntervalMs()); } } @@ -481,11 +482,11 @@ public class Camera2RecordingTest extends Camera2SurfaceViewTestCase { initSupportedVideoSize(id); // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { - Log.v(TAG, String.format("Video snapshot: %d/%d", repeat + 1, - getRepeatCount())); + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { + Log.v(TAG, String.format("Video snapshot: %d/%d", iteration + 1, + getIterationCount())); videoSnapshotTestByCamera(burstTest); - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, id); Thread.sleep(getTestWaitIntervalMs()); } } finally { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2ReprocessCaptureTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2ReprocessCaptureTest.java index 2dac37128ae9..8f9489790bdb 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2ReprocessCaptureTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2ReprocessCaptureTest.java @@ -58,7 +58,7 @@ import static com.android.mediaframeworktest.helpers.CameraTestUtils.verifyJpegK * adb shell am instrument \ * -e class \ * com.android.mediaframeworktest.stress.Camera2StillCaptureTest#Camera2ReprocessCaptureTest \ - * -e repeat 1 \ + * -e iterations 1 \ * -e waitIntervalMs 1000 \ * -e resultToFile false \ * -r -w com.android.mediaframeworktest/.Camera2InstrumentationTestRunner @@ -110,12 +110,12 @@ public class Camera2ReprocessCaptureTest extends Camera2SurfaceViewTestCase { } // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { - Log.v(TAG, String.format("Reprocessing YUV to JPEG: %d/%d", repeat + 1, - getRepeatCount())); + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { + Log.v(TAG, String.format("Reprocessing YUV to JPEG: %d/%d", iteration + 1, + getIterationCount())); // YUV_420_888 -> JPEG must be supported. testBasicReprocessing(id, ImageFormat.YUV_420_888, ImageFormat.JPEG); - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, id); Thread.sleep(getTestWaitIntervalMs()); } } @@ -131,12 +131,12 @@ public class Camera2ReprocessCaptureTest extends Camera2SurfaceViewTestCase { } // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { - Log.v(TAG, String.format("Reprocessing OPAQUE to JPEG: %d/%d", repeat + 1, - getRepeatCount())); + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { + Log.v(TAG, String.format("Reprocessing OPAQUE to JPEG: %d/%d", iteration + 1, + getIterationCount())); // OPAQUE -> JPEG must be supported. testBasicReprocessing(id, ImageFormat.PRIVATE, ImageFormat.JPEG); - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, id); Thread.sleep(getTestWaitIntervalMs()); } @@ -157,12 +157,12 @@ public class Camera2ReprocessCaptureTest extends Camera2SurfaceViewTestCase { openDevice(id); // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { Log.v(TAG, String.format("Reprocessing size format with preview: %d/%d", - repeat + 1, getRepeatCount())); + iteration + 1, getIterationCount())); testReprocessingAllCombinations(id, mOrderedPreviewSizes.get(0), CaptureTestCase.SINGLE_SHOT); - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, id); Thread.sleep(getTestWaitIntervalMs()); } } finally { @@ -185,16 +185,16 @@ public class Camera2ReprocessCaptureTest extends Camera2SurfaceViewTestCase { openDevice(id); // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { Log.v(TAG, String.format("Reprocessing mixed burst with or without preview: " - + "%d/%d", repeat + 1, getRepeatCount())); + + "%d/%d", iteration + 1, getIterationCount())); // no preview testReprocessingAllCombinations(id, /*previewSize*/null, CaptureTestCase.MIXED_BURST); // with preview testReprocessingAllCombinations(id, mOrderedPreviewSizes.get(0), CaptureTestCase.MIXED_BURST); - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, id); Thread.sleep(getTestWaitIntervalMs()); } } finally { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java index 16dfb2bbd3e7..812543b3fe41 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java @@ -59,7 +59,7 @@ import static com.android.mediaframeworktest.helpers.CameraTestUtils.makeImageRe * * adb shell am instrument \ * -e class com.android.mediaframeworktest.stress.Camera2StillCaptureTest#testTakePicture \ - * -e repeat 200 \ + * -e iterations 200 \ * -e waitIntervalMs 1000 \ * -e resultToFile false \ * -r -w com.android.mediaframeworktest/.Camera2InstrumentationTestRunner @@ -108,12 +108,12 @@ public class Camera2StillCaptureTest extends Camera2SurfaceViewTestCase { } // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { - Log.v(TAG, String.format("Taking pictures: %d/%d", repeat + 1, - getRepeatCount())); + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { + Log.v(TAG, String.format("Taking pictures: %d/%d", iteration + 1, + getIterationCount())); takePictureTestByCamera(/*aeRegions*/null, /*awbRegions*/null, /*afRegions*/null); - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, id); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, id); Thread.sleep(getTestWaitIntervalMs()); } } finally { @@ -144,11 +144,12 @@ public class Camera2StillCaptureTest extends Camera2SurfaceViewTestCase { } // Test iteration starts... - for (int repeat = 0; repeat < getRepeatCount(); ++repeat) { - Log.v(TAG, String.format("Taking full RAW pictures: %d/%d", repeat + 1, - getRepeatCount())); + for (int iteration = 0; iteration < getIterationCount(); ++iteration) { + Log.v(TAG, String.format("Taking full RAW pictures: %d/%d", iteration + 1, + getIterationCount())); fullRawCaptureTestByCamera(); - getResultPrinter().printStatus(getRepeatCount(), repeat + 1, mCameraIds[i]); + getResultPrinter().printStatus(getIterationCount(), iteration + 1, + mCameraIds[i]); Thread.sleep(getTestWaitIntervalMs()); } } finally { diff --git a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml index b5731f0918dc..c80617cdea22 100644 --- a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml @@ -18,10 +18,10 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="backup_confirm_title" msgid="827563724209303345">"Copiere de rezervă completă"</string> <string name="restore_confirm_title" msgid="5469365809567486602">"Restabilire completă"</string> - <string name="backup_confirm_text" msgid="1878021282758896593">"S-a solicitat crearea unei copii de rezervă complete a tuturor datelor pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu aţi solicitat dvs. copierea de rezervă, nu permiteți ca operațiunea să continue."</string> + <string name="backup_confirm_text" msgid="1878021282758896593">"S-a solicitat crearea unei copii de rezervă complete a tuturor datelor pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu ați solicitat dvs. copierea de rezervă, nu permiteți ca operațiunea să continue."</string> <string name="allow_backup_button_label" msgid="4217228747769644068">"Creați copii de rezervă pentru datele dvs."</string> <string name="deny_backup_button_label" msgid="6009119115581097708">"Nu creați copii de rezervă"</string> - <string name="restore_confirm_text" msgid="7499866728030461776">"S-a solicitat o restabilire completă a tuturor datelor de pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu dvs. aţi solicitat această restabilire, nu permiteți continuarea operațiunii. Acest proces va înlocui toate datele existente în prezent pe dispozitiv!"</string> + <string name="restore_confirm_text" msgid="7499866728030461776">"S-a solicitat o restabilire completă a tuturor datelor de pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu dvs. ați solicitat această restabilire, nu permiteți continuarea operațiunii. Acest proces va înlocui toate datele existente în prezent pe dispozitiv!"</string> <string name="allow_restore_button_label" msgid="3081286752277127827">"Restabiliţi datele dvs."</string> <string name="deny_restore_button_label" msgid="1724367334453104378">"Nu restabiliţi"</string> <string name="current_password_text" msgid="8268189555578298067">"Introduceţi mai jos parola actuală pentru copia de rezervă:"</string> diff --git a/packages/DocumentsUI/AndroidManifest.xml b/packages/DocumentsUI/AndroidManifest.xml index fa9ff0153c87..9ac929ba9b28 100644 --- a/packages/DocumentsUI/AndroidManifest.xml +++ b/packages/DocumentsUI/AndroidManifest.xml @@ -75,6 +75,19 @@ <category android:name="android.intent.category.DEFAULT" /> <data android:mimeType="vnd.android.document/root" /> </intent-filter> + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:mimeType="application/zip" + android:host="com.android.providers.downloads.documents" + android:scheme="content" /> + <data android:mimeType="application/x-zip" + android:host="com.android.providers.downloads.documents" + android:scheme="content" /> + <data android:mimeType="application/x-zip-compressed" + android:host="com.android.providers.downloads.documents" + android:scheme="content" /> + </intent-filter> </activity> <activity diff --git a/packages/DocumentsUI/lint.xml b/packages/DocumentsUI/lint.xml new file mode 100644 index 000000000000..09661bab67fc --- /dev/null +++ b/packages/DocumentsUI/lint.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<lint> + <!-- + Lint configuration for the framework-lint tool (go/fwlint). See + http://tools.android.com/tips/lint for full docs on the lint tool. + --> + + <!-- min-sdk doesn't apply to platform apps. --> + <issue id="UsesMinSdkAttributes" severity="ignore" /> + + <!-- Protected permissions don't apply to system apps. --> + <issue id="ProtectedPermissions" severity="ignore" /> + + <!-- Other recommended suppressions copied from go/fwlint. --> + <issue id="Assert" severity="ignore" /> + <issue id="ClickableViewAccessibility" severity="ignore" /> + <issue id="GoogleAppIndexingWarning" severity="ignore" /> + <issue id="MissingPermission" severity="ignore" /> + <issue id="ParcelClassLoader" severity="ignore" /> + <issue id="ParcelCreator" severity="ignore" /> + <issue id="Registered" severity="ignore" /> + <issue id="RtlHardcoded" severity="ignore" /> + <issue id="ShiftFlags" severity="ignore" /> + <issue id="SuspiciousImport" severity="ignore" /> + + <!-- Don't lint automatically translated strings. --> + <issue id="all"> + <ignore path="res/values-*/strings.xml" /> + </issue> + + <!-- Don't warn about missing translations. --> + <issue id="MissingTranslation"> + <ignore path="res/values/strings.xml" /> + </issue> + +</lint> diff --git a/packages/DocumentsUI/res/animator-ldrtl/dir_down.xml b/packages/DocumentsUI/res/animator-ldrtl/dir_enter.xml index 6c7e2244c712..6c7e2244c712 100644 --- a/packages/DocumentsUI/res/animator-ldrtl/dir_down.xml +++ b/packages/DocumentsUI/res/animator-ldrtl/dir_enter.xml diff --git a/packages/DocumentsUI/res/animator-ldrtl/dir_up.xml b/packages/DocumentsUI/res/animator-ldrtl/dir_leave.xml index 8e2925c9760d..8e2925c9760d 100644 --- a/packages/DocumentsUI/res/animator-ldrtl/dir_up.xml +++ b/packages/DocumentsUI/res/animator-ldrtl/dir_leave.xml diff --git a/packages/DocumentsUI/res/animator/dir_down.xml b/packages/DocumentsUI/res/animator/dir_enter.xml index 7f547f135cd6..7f547f135cd6 100644 --- a/packages/DocumentsUI/res/animator/dir_down.xml +++ b/packages/DocumentsUI/res/animator/dir_enter.xml diff --git a/packages/DocumentsUI/res/animator/dir_up.xml b/packages/DocumentsUI/res/animator/dir_leave.xml index fda0faf4eff3..fda0faf4eff3 100644 --- a/packages/DocumentsUI/res/animator/dir_up.xml +++ b/packages/DocumentsUI/res/animator/dir_leave.xml diff --git a/packages/DocumentsUI/res/drawable/ic_sd_storage.xml b/packages/DocumentsUI/res/drawable/ic_sd_storage.xml new file mode 100644 index 000000000000..b0f3cc395bcd --- /dev/null +++ b/packages/DocumentsUI/res/drawable/ic_sd_storage.xml @@ -0,0 +1,24 @@ +<!-- +Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M18 2h-8L4.02 8 4 20c0 1.1.9 2 2 2h12c1.1 0 2,-.9 2,-2V4c0,-1.1,-.9,-2,-2,-2zm-6 6h-2V4h2v4zm3 0h-2V4h2v4zm3 0h-2V4h2v4z"/> +</vector> diff --git a/packages/DocumentsUI/res/layout/drawer_layout.xml b/packages/DocumentsUI/res/layout/drawer_layout.xml index 0146f142114f..e3def054fa0d 100644 --- a/packages/DocumentsUI/res/layout/drawer_layout.xml +++ b/packages/DocumentsUI/res/layout/drawer_layout.xml @@ -32,7 +32,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <com.android.documentsui.DocumentsToolBar + <com.android.documentsui.DocumentsToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" @@ -48,7 +48,7 @@ android:layout_marginStart="4dp" android:overlapAnchor="true" /> - </com.android.documentsui.DocumentsToolBar> + </com.android.documentsui.DocumentsToolbar> <include layout="@layout/directory_cluster"/> diff --git a/packages/DocumentsUI/res/layout/fixed_layout.xml b/packages/DocumentsUI/res/layout/fixed_layout.xml index 3135977e702c..8414febfb7ca 100644 --- a/packages/DocumentsUI/res/layout/fixed_layout.xml +++ b/packages/DocumentsUI/res/layout/fixed_layout.xml @@ -22,12 +22,12 @@ android:layout_height="match_parent" android:id="@+id/coordinator_layout"> - <LinearLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> - <com.android.documentsui.DocumentsToolBar + <com.android.documentsui.DocumentsToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" @@ -43,7 +43,7 @@ android:layout_marginStart="4dp" android:overlapAnchor="true" /> - </com.android.documentsui.DocumentsToolBar> + </com.android.documentsui.DocumentsToolbar> <LinearLayout android:layout_width="match_parent" @@ -59,7 +59,6 @@ <include layout="@layout/directory_cluster" android:layout_width="0dp" - android:layout_weight="1" android:elevation="8dp" /> </LinearLayout> diff --git a/packages/DocumentsUI/res/layout/single_pane_layout.xml b/packages/DocumentsUI/res/layout/single_pane_layout.xml index c5a574568db0..f53d69808929 100644 --- a/packages/DocumentsUI/res/layout/single_pane_layout.xml +++ b/packages/DocumentsUI/res/layout/single_pane_layout.xml @@ -27,7 +27,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <com.android.documentsui.DocumentsToolBar + <com.android.documentsui.DocumentsToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" @@ -43,7 +43,7 @@ android:layout_marginStart="4dp" android:overlapAnchor="true" /> - </com.android.documentsui.DocumentsToolBar> + </com.android.documentsui.DocumentsToolbar> <include layout="@layout/directory_cluster"/> diff --git a/packages/DocumentsUI/res/menu/activity.xml b/packages/DocumentsUI/res/menu/activity.xml index a3cfde825f47..b791ef12b6f3 100644 --- a/packages/DocumentsUI/res/menu/activity.xml +++ b/packages/DocumentsUI/res/menu/activity.xml @@ -29,7 +29,8 @@ android:icon="@drawable/ic_menu_search" android:showAsAction="always" android:actionViewClass="android.widget.SearchView" - android:imeOptions="actionSearch" /> + android:imeOptions="actionSearch" + android:visible="false" /> <item android:id="@+id/menu_sort" android:title="@string/menu_sort" @@ -51,12 +52,13 @@ android:id="@+id/menu_grid" android:title="@string/menu_grid" android:icon="@drawable/ic_menu_view_grid" - android:showAsAction="never" /> + android:showAsAction="always" /> <item android:id="@+id/menu_list" android:title="@string/menu_list" android:icon="@drawable/ic_menu_view_list" - android:showAsAction="never" /> + android:showAsAction="always" /> + <item android:id="@+id/menu_new_window" android:title="@string/menu_new_window" @@ -88,5 +90,6 @@ <item android:id="@+id/menu_settings" android:title="@string/menu_settings" - android:showAsAction="never" /> + android:showAsAction="never" + android:visible="false" /> </menu> diff --git a/packages/DocumentsUI/res/values-af/strings.xml b/packages/DocumentsUI/res/values-af/strings.xml index f0c48eca0024..458c309c83f2 100644 --- a/packages/DocumentsUI/res/values-af/strings.xml +++ b/packages/DocumentsUI/res/values-af/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Lysaansig"</string> <string name="menu_sort" msgid="7677740407158414452">"Sorteer volgens"</string> <string name="menu_search" msgid="3816712084502856974">"Soek"</string> - <string name="menu_settings" msgid="6008033148948428823">"Instellings"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Maak oop"</string> <string name="menu_save" msgid="2394743337684426338">"Stoor"</string> <string name="menu_share" msgid="3075149983979628146">"Deel"</string> diff --git a/packages/DocumentsUI/res/values-am/strings.xml b/packages/DocumentsUI/res/values-am/strings.xml index aa11af161aad..6e08df4907b2 100644 --- a/packages/DocumentsUI/res/values-am/strings.xml +++ b/packages/DocumentsUI/res/values-am/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"የዝርዝር እይታ"</string> <string name="menu_sort" msgid="7677740407158414452">"ደርድር በ"</string> <string name="menu_search" msgid="3816712084502856974">"ፈልግ"</string> - <string name="menu_settings" msgid="6008033148948428823">"ቅንብሮች"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"ክፈት"</string> <string name="menu_save" msgid="2394743337684426338">"አስቀምጥ"</string> <string name="menu_share" msgid="3075149983979628146">"አጋራ"</string> diff --git a/packages/DocumentsUI/res/values-ar/strings.xml b/packages/DocumentsUI/res/values-ar/strings.xml index 966fb17ada0d..4b7b4a86487c 100644 --- a/packages/DocumentsUI/res/values-ar/strings.xml +++ b/packages/DocumentsUI/res/values-ar/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"عرض القائمة"</string> <string name="menu_sort" msgid="7677740407158414452">"ترتيب بحسب"</string> <string name="menu_search" msgid="3816712084502856974">"بحث"</string> - <string name="menu_settings" msgid="6008033148948428823">"الإعدادات"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"فتح"</string> <string name="menu_save" msgid="2394743337684426338">"حفظ"</string> <string name="menu_share" msgid="3075149983979628146">"مشاركة"</string> diff --git a/packages/DocumentsUI/res/values-az-rAZ/strings.xml b/packages/DocumentsUI/res/values-az-rAZ/strings.xml index 8864a2792a45..9162b956c93b 100644 --- a/packages/DocumentsUI/res/values-az-rAZ/strings.xml +++ b/packages/DocumentsUI/res/values-az-rAZ/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"Siyahı görünüşü"</string> <string name="menu_sort" msgid="7677740407158414452">"Bunlardan biri üzrə sırala"</string> <string name="menu_search" msgid="3816712084502856974">"Axtarış"</string> - <string name="menu_settings" msgid="6008033148948428823">"Ayarlar"</string> + <string name="menu_settings" msgid="8239065133341597825">"Yaddaş parametrləri"</string> <string name="menu_open" msgid="432922957274920903">"Açın"</string> <string name="menu_save" msgid="2394743337684426338">"Yadda saxlayın"</string> <string name="menu_share" msgid="3075149983979628146">"Paylaşın"</string> diff --git a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml b/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml index 9e9dfb14e1a6..3252a4385853 100644 --- a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml +++ b/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Prikaz liste"</string> <string name="menu_sort" msgid="7677740407158414452">"Sortiraj prema"</string> <string name="menu_search" msgid="3816712084502856974">"Pretraži"</string> - <string name="menu_settings" msgid="6008033148948428823">"Podešavanja"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Otvori"</string> <string name="menu_save" msgid="2394743337684426338">"Sačuvaj"</string> <string name="menu_share" msgid="3075149983979628146">"Deli"</string> diff --git a/packages/DocumentsUI/res/values-bg/strings.xml b/packages/DocumentsUI/res/values-bg/strings.xml index 6544c57ea2a7..0d901cf4b437 100644 --- a/packages/DocumentsUI/res/values-bg/strings.xml +++ b/packages/DocumentsUI/res/values-bg/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Списъчен изглед"</string> <string name="menu_sort" msgid="7677740407158414452">"Сортиране по"</string> <string name="menu_search" msgid="3816712084502856974">"Търсене"</string> - <string name="menu_settings" msgid="6008033148948428823">"Настройки"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Отваряне"</string> <string name="menu_save" msgid="2394743337684426338">"Запазване"</string> <string name="menu_share" msgid="3075149983979628146">"Споделяне"</string> diff --git a/packages/DocumentsUI/res/values-bn-rBD/strings.xml b/packages/DocumentsUI/res/values-bn-rBD/strings.xml index 84328a82ea4a..a99028218cfe 100644 --- a/packages/DocumentsUI/res/values-bn-rBD/strings.xml +++ b/packages/DocumentsUI/res/values-bn-rBD/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"তালিকা দৃশ্য"</string> <string name="menu_sort" msgid="7677740407158414452">"এই অনুসারে বাছুন"</string> <string name="menu_search" msgid="3816712084502856974">"অনুসন্ধান করুন"</string> - <string name="menu_settings" msgid="6008033148948428823">"সেটিংস"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"খুলুন"</string> <string name="menu_save" msgid="2394743337684426338">"সংরক্ষণ করুন"</string> <string name="menu_share" msgid="3075149983979628146">"ভাগ করুন"</string> diff --git a/packages/DocumentsUI/res/values-bs-rBA/strings.xml b/packages/DocumentsUI/res/values-bs-rBA/strings.xml index d8797a389bba..9d75ddc0683f 100644 --- a/packages/DocumentsUI/res/values-bs-rBA/strings.xml +++ b/packages/DocumentsUI/res/values-bs-rBA/strings.xml @@ -36,7 +36,7 @@ <skip /> <!-- no translation found for menu_search (3816712084502856974) --> <skip /> - <!-- no translation found for menu_settings (6008033148948428823) --> + <!-- no translation found for menu_settings (8239065133341597825) --> <skip /> <!-- no translation found for menu_open (432922957274920903) --> <skip /> diff --git a/packages/DocumentsUI/res/values-ca/strings.xml b/packages/DocumentsUI/res/values-ca/strings.xml index 3cf069b5e1dc..25029e9cfc98 100644 --- a/packages/DocumentsUI/res/values-ca/strings.xml +++ b/packages/DocumentsUI/res/values-ca/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Visualització de llista"</string> <string name="menu_sort" msgid="7677740407158414452">"Ordena per"</string> <string name="menu_search" msgid="3816712084502856974">"Cerca"</string> - <string name="menu_settings" msgid="6008033148948428823">"Configuració"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Obre"</string> <string name="menu_save" msgid="2394743337684426338">"Desa"</string> <string name="menu_share" msgid="3075149983979628146">"Comparteix"</string> diff --git a/packages/DocumentsUI/res/values-cs/strings.xml b/packages/DocumentsUI/res/values-cs/strings.xml index b6b9a8854f95..bcb1748f235c 100644 --- a/packages/DocumentsUI/res/values-cs/strings.xml +++ b/packages/DocumentsUI/res/values-cs/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Zobrazení seznamu"</string> <string name="menu_sort" msgid="7677740407158414452">"Řadit podle"</string> <string name="menu_search" msgid="3816712084502856974">"Hledat"</string> - <string name="menu_settings" msgid="6008033148948428823">"Nastavení"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Otevřít"</string> <string name="menu_save" msgid="2394743337684426338">"Uložit"</string> <string name="menu_share" msgid="3075149983979628146">"Sdílet"</string> diff --git a/packages/DocumentsUI/res/values-da/strings.xml b/packages/DocumentsUI/res/values-da/strings.xml index 2c45d3bf2af6..03f488126551 100644 --- a/packages/DocumentsUI/res/values-da/strings.xml +++ b/packages/DocumentsUI/res/values-da/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Listevisning"</string> <string name="menu_sort" msgid="7677740407158414452">"Sortér efter"</string> <string name="menu_search" msgid="3816712084502856974">"Søg"</string> - <string name="menu_settings" msgid="6008033148948428823">"Indstillinger"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Åbn"</string> <string name="menu_save" msgid="2394743337684426338">"Gem"</string> <string name="menu_share" msgid="3075149983979628146">"Del"</string> diff --git a/packages/DocumentsUI/res/values-de/strings.xml b/packages/DocumentsUI/res/values-de/strings.xml index 37ed4df22ed2..0abdd57cc94f 100644 --- a/packages/DocumentsUI/res/values-de/strings.xml +++ b/packages/DocumentsUI/res/values-de/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Listenansicht"</string> <string name="menu_sort" msgid="7677740407158414452">"Sortieren nach"</string> <string name="menu_search" msgid="3816712084502856974">"Suchen"</string> - <string name="menu_settings" msgid="6008033148948428823">"Einstellungen"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Öffnen"</string> <string name="menu_save" msgid="2394743337684426338">"Speichern"</string> <string name="menu_share" msgid="3075149983979628146">"Teilen"</string> diff --git a/packages/DocumentsUI/res/values-el/strings.xml b/packages/DocumentsUI/res/values-el/strings.xml index 396fa12b66ec..819cb5b0f2eb 100644 --- a/packages/DocumentsUI/res/values-el/strings.xml +++ b/packages/DocumentsUI/res/values-el/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Προβολή λίστας"</string> <string name="menu_sort" msgid="7677740407158414452">"Ταξινόμηση κατά"</string> <string name="menu_search" msgid="3816712084502856974">"Αναζήτηση"</string> - <string name="menu_settings" msgid="6008033148948428823">"Ρυθμίσεις"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Άνοιγμα"</string> <string name="menu_save" msgid="2394743337684426338">"Αποθήκευση"</string> <string name="menu_share" msgid="3075149983979628146">"Κοινή χρήση"</string> diff --git a/packages/DocumentsUI/res/values-en-rAU/strings.xml b/packages/DocumentsUI/res/values-en-rAU/strings.xml index e96fef9a14b1..f4cd4791d13b 100644 --- a/packages/DocumentsUI/res/values-en-rAU/strings.xml +++ b/packages/DocumentsUI/res/values-en-rAU/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"List view"</string> <string name="menu_sort" msgid="7677740407158414452">"Sort by"</string> <string name="menu_search" msgid="3816712084502856974">"Search"</string> - <string name="menu_settings" msgid="6008033148948428823">"Settings"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Open"</string> <string name="menu_save" msgid="2394743337684426338">"Save"</string> <string name="menu_share" msgid="3075149983979628146">"Share"</string> diff --git a/packages/DocumentsUI/res/values-en-rGB/strings.xml b/packages/DocumentsUI/res/values-en-rGB/strings.xml index e96fef9a14b1..f4cd4791d13b 100644 --- a/packages/DocumentsUI/res/values-en-rGB/strings.xml +++ b/packages/DocumentsUI/res/values-en-rGB/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"List view"</string> <string name="menu_sort" msgid="7677740407158414452">"Sort by"</string> <string name="menu_search" msgid="3816712084502856974">"Search"</string> - <string name="menu_settings" msgid="6008033148948428823">"Settings"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Open"</string> <string name="menu_save" msgid="2394743337684426338">"Save"</string> <string name="menu_share" msgid="3075149983979628146">"Share"</string> diff --git a/packages/DocumentsUI/res/values-en-rIN/strings.xml b/packages/DocumentsUI/res/values-en-rIN/strings.xml index e96fef9a14b1..f4cd4791d13b 100644 --- a/packages/DocumentsUI/res/values-en-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-en-rIN/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"List view"</string> <string name="menu_sort" msgid="7677740407158414452">"Sort by"</string> <string name="menu_search" msgid="3816712084502856974">"Search"</string> - <string name="menu_settings" msgid="6008033148948428823">"Settings"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Open"</string> <string name="menu_save" msgid="2394743337684426338">"Save"</string> <string name="menu_share" msgid="3075149983979628146">"Share"</string> diff --git a/packages/DocumentsUI/res/values-es-rUS/strings.xml b/packages/DocumentsUI/res/values-es-rUS/strings.xml index 9f777329e2a9..92eb69784ff9 100644 --- a/packages/DocumentsUI/res/values-es-rUS/strings.xml +++ b/packages/DocumentsUI/res/values-es-rUS/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string> <string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string> <string name="menu_search" msgid="3816712084502856974">"Buscar"</string> - <string name="menu_settings" msgid="6008033148948428823">"Configuración"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Abrir"</string> <string name="menu_save" msgid="2394743337684426338">"Guardar"</string> <string name="menu_share" msgid="3075149983979628146">"Compartir"</string> diff --git a/packages/DocumentsUI/res/values-es/strings.xml b/packages/DocumentsUI/res/values-es/strings.xml index 2010f8c90a71..5368145dd8d2 100644 --- a/packages/DocumentsUI/res/values-es/strings.xml +++ b/packages/DocumentsUI/res/values-es/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string> <string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string> <string name="menu_search" msgid="3816712084502856974">"Buscar"</string> - <string name="menu_settings" msgid="6008033148948428823">"Ajustes"</string> + <string name="menu_settings" msgid="8239065133341597825">"Ajustes de almacenamiento"</string> <string name="menu_open" msgid="432922957274920903">"Abrir"</string> <string name="menu_save" msgid="2394743337684426338">"Guardar"</string> <string name="menu_share" msgid="3075149983979628146">"Compartir"</string> diff --git a/packages/DocumentsUI/res/values-et-rEE/strings.xml b/packages/DocumentsUI/res/values-et-rEE/strings.xml index 97577e68e57a..982a9495a24d 100644 --- a/packages/DocumentsUI/res/values-et-rEE/strings.xml +++ b/packages/DocumentsUI/res/values-et-rEE/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Loendikuva"</string> <string name="menu_sort" msgid="7677740407158414452">"Sortimisalus:"</string> <string name="menu_search" msgid="3816712084502856974">"Otsing"</string> - <string name="menu_settings" msgid="6008033148948428823">"Seaded"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Ava"</string> <string name="menu_save" msgid="2394743337684426338">"Salvesta"</string> <string name="menu_share" msgid="3075149983979628146">"Jaga"</string> diff --git a/packages/DocumentsUI/res/values-eu-rES/strings.xml b/packages/DocumentsUI/res/values-eu-rES/strings.xml index 036c361d762a..8c13368c961e 100644 --- a/packages/DocumentsUI/res/values-eu-rES/strings.xml +++ b/packages/DocumentsUI/res/values-eu-rES/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Zerrenda-ikuspegia"</string> <string name="menu_sort" msgid="7677740407158414452">"Ordenatzeko irizpidea"</string> <string name="menu_search" msgid="3816712084502856974">"Bilatu"</string> - <string name="menu_settings" msgid="6008033148948428823">"Ezarpenak"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Ireki"</string> <string name="menu_save" msgid="2394743337684426338">"Gorde"</string> <string name="menu_share" msgid="3075149983979628146">"Partekatu"</string> diff --git a/packages/DocumentsUI/res/values-fa/strings.xml b/packages/DocumentsUI/res/values-fa/strings.xml index 7367e25dcdb3..b7d09f8e0b36 100644 --- a/packages/DocumentsUI/res/values-fa/strings.xml +++ b/packages/DocumentsUI/res/values-fa/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"نمای فهرستی"</string> <string name="menu_sort" msgid="7677740407158414452">"مرتبسازی براساس"</string> <string name="menu_search" msgid="3816712084502856974">"جستجو"</string> - <string name="menu_settings" msgid="6008033148948428823">"تنظیمات"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"باز کردن"</string> <string name="menu_save" msgid="2394743337684426338">"ذخیره"</string> <string name="menu_share" msgid="3075149983979628146">"اشتراکگذاری"</string> diff --git a/packages/DocumentsUI/res/values-fi/strings.xml b/packages/DocumentsUI/res/values-fi/strings.xml index 2d65899de4e8..c9517f9e31da 100644 --- a/packages/DocumentsUI/res/values-fi/strings.xml +++ b/packages/DocumentsUI/res/values-fi/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Luettelonäkymä"</string> <string name="menu_sort" msgid="7677740407158414452">"Lajitteluperuste"</string> <string name="menu_search" msgid="3816712084502856974">"Haku"</string> - <string name="menu_settings" msgid="6008033148948428823">"Asetukset"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Avaa"</string> <string name="menu_save" msgid="2394743337684426338">"Tallenna"</string> <string name="menu_share" msgid="3075149983979628146">"Jaa"</string> diff --git a/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/packages/DocumentsUI/res/values-fr-rCA/strings.xml index baa963ac4105..ace072bb6a91 100644 --- a/packages/DocumentsUI/res/values-fr-rCA/strings.xml +++ b/packages/DocumentsUI/res/values-fr-rCA/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Liste"</string> <string name="menu_sort" msgid="7677740407158414452">"Trier par"</string> <string name="menu_search" msgid="3816712084502856974">"Rechercher"</string> - <string name="menu_settings" msgid="6008033148948428823">"Paramètres"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Ouvrir"</string> <string name="menu_save" msgid="2394743337684426338">"Enregistrer"</string> <string name="menu_share" msgid="3075149983979628146">"Partager"</string> diff --git a/packages/DocumentsUI/res/values-fr/strings.xml b/packages/DocumentsUI/res/values-fr/strings.xml index d30a1300bd43..b1e482722633 100644 --- a/packages/DocumentsUI/res/values-fr/strings.xml +++ b/packages/DocumentsUI/res/values-fr/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Liste"</string> <string name="menu_sort" msgid="7677740407158414452">"Trier par"</string> <string name="menu_search" msgid="3816712084502856974">"Rechercher"</string> - <string name="menu_settings" msgid="6008033148948428823">"Paramètres"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Ouvrir"</string> <string name="menu_save" msgid="2394743337684426338">"Enregistrer"</string> <string name="menu_share" msgid="3075149983979628146">"Partager"</string> diff --git a/packages/DocumentsUI/res/values-gl-rES/strings.xml b/packages/DocumentsUI/res/values-gl-rES/strings.xml index 7c69698f063e..9275557e03f5 100644 --- a/packages/DocumentsUI/res/values-gl-rES/strings.xml +++ b/packages/DocumentsUI/res/values-gl-rES/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string> <string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string> <string name="menu_search" msgid="3816712084502856974">"Buscar"</string> - <string name="menu_settings" msgid="6008033148948428823">"Configuración"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Abrir"</string> <string name="menu_save" msgid="2394743337684426338">"Gardar"</string> <string name="menu_share" msgid="3075149983979628146">"Compartir"</string> diff --git a/packages/DocumentsUI/res/values-gu-rIN/strings.xml b/packages/DocumentsUI/res/values-gu-rIN/strings.xml index c650d931fd45..5dceac2d724d 100644 --- a/packages/DocumentsUI/res/values-gu-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-gu-rIN/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"સૂચિ દૃશ્ય"</string> <string name="menu_sort" msgid="7677740407158414452">"આ પ્રમાણે સૉર્ટ કરો"</string> <string name="menu_search" msgid="3816712084502856974">"શોધો"</string> - <string name="menu_settings" msgid="6008033148948428823">"સેટિંગ્સ"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"ખોલો"</string> <string name="menu_save" msgid="2394743337684426338">"સાચવો"</string> <string name="menu_share" msgid="3075149983979628146">"શેર કરો"</string> diff --git a/packages/DocumentsUI/res/values-hi/strings.xml b/packages/DocumentsUI/res/values-hi/strings.xml index 4ab246db0be1..a6eeb9ff183b 100644 --- a/packages/DocumentsUI/res/values-hi/strings.xml +++ b/packages/DocumentsUI/res/values-hi/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"सूची दृश्य"</string> <string name="menu_sort" msgid="7677740407158414452">"इससे क्रमित करें"</string> <string name="menu_search" msgid="3816712084502856974">"खोजें"</string> - <string name="menu_settings" msgid="6008033148948428823">"सेटिंग"</string> + <string name="menu_settings" msgid="8239065133341597825">"मेमोरी सेटिंग"</string> <string name="menu_open" msgid="432922957274920903">"खोलें"</string> <string name="menu_save" msgid="2394743337684426338">"जोड़ें"</string> <string name="menu_share" msgid="3075149983979628146">"साझा करें"</string> diff --git a/packages/DocumentsUI/res/values-hr/strings.xml b/packages/DocumentsUI/res/values-hr/strings.xml index e5d04f7d17d7..888cf32e3176 100644 --- a/packages/DocumentsUI/res/values-hr/strings.xml +++ b/packages/DocumentsUI/res/values-hr/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Prikaz popisa"</string> <string name="menu_sort" msgid="7677740407158414452">"Poredano po"</string> <string name="menu_search" msgid="3816712084502856974">"Pretraživanje"</string> - <string name="menu_settings" msgid="6008033148948428823">"Postavke"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Otvaranje"</string> <string name="menu_save" msgid="2394743337684426338">"Spremi"</string> <string name="menu_share" msgid="3075149983979628146">"Dijeli"</string> diff --git a/packages/DocumentsUI/res/values-hu/strings.xml b/packages/DocumentsUI/res/values-hu/strings.xml index 7a68a19ea642..910eb0c1d09e 100644 --- a/packages/DocumentsUI/res/values-hu/strings.xml +++ b/packages/DocumentsUI/res/values-hu/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Lista"</string> <string name="menu_sort" msgid="7677740407158414452">"Rendezés"</string> <string name="menu_search" msgid="3816712084502856974">"Keresés"</string> - <string name="menu_settings" msgid="6008033148948428823">"Beállítások"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Megnyitás"</string> <string name="menu_save" msgid="2394743337684426338">"Mentés"</string> <string name="menu_share" msgid="3075149983979628146">"Megosztás"</string> diff --git a/packages/DocumentsUI/res/values-hy-rAM/strings.xml b/packages/DocumentsUI/res/values-hy-rAM/strings.xml index e28c7116adcd..1471a6af8740 100644 --- a/packages/DocumentsUI/res/values-hy-rAM/strings.xml +++ b/packages/DocumentsUI/res/values-hy-rAM/strings.xml @@ -26,10 +26,11 @@ <string name="menu_list" msgid="7279285939892417279">"Ցուցակի տեսք"</string> <string name="menu_sort" msgid="7677740407158414452">"Դասավորել ըստ"</string> <string name="menu_search" msgid="3816712084502856974">"Որոնել"</string> - <string name="menu_settings" msgid="6008033148948428823">"Կարգավորումներ"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Բացել"</string> <string name="menu_save" msgid="2394743337684426338">"Պահել"</string> - <string name="menu_share" msgid="3075149983979628146">"Համօգտագործել"</string> + <string name="menu_share" msgid="3075149983979628146">"Կիսվել"</string> <string name="menu_delete" msgid="8138799623850614177">"Ջնջել"</string> <string name="menu_select_all" msgid="8323579667348729928">"Ընտրել բոլորը"</string> <string name="menu_copy" msgid="3612326052677229148">"Պատճենել…"</string> diff --git a/packages/DocumentsUI/res/values-in/strings.xml b/packages/DocumentsUI/res/values-in/strings.xml index a89d99d236d3..29f118eca4ab 100644 --- a/packages/DocumentsUI/res/values-in/strings.xml +++ b/packages/DocumentsUI/res/values-in/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"Tampilan daftar"</string> <string name="menu_sort" msgid="7677740407158414452">"Urutkan menurut"</string> <string name="menu_search" msgid="3816712084502856974">"Telusuri"</string> - <string name="menu_settings" msgid="6008033148948428823">"Setelan"</string> + <string name="menu_settings" msgid="8239065133341597825">"Setelan penyimpanan"</string> <string name="menu_open" msgid="432922957274920903">"Buka"</string> <string name="menu_save" msgid="2394743337684426338">"Simpan"</string> <string name="menu_share" msgid="3075149983979628146">"Bagikan"</string> diff --git a/packages/DocumentsUI/res/values-is-rIS/strings.xml b/packages/DocumentsUI/res/values-is-rIS/strings.xml index 9c697413f1a6..c95189debb07 100644 --- a/packages/DocumentsUI/res/values-is-rIS/strings.xml +++ b/packages/DocumentsUI/res/values-is-rIS/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Listayfirlit"</string> <string name="menu_sort" msgid="7677740407158414452">"Raða eftir"</string> <string name="menu_search" msgid="3816712084502856974">"Leita"</string> - <string name="menu_settings" msgid="6008033148948428823">"Stillingar"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Opna"</string> <string name="menu_save" msgid="2394743337684426338">"Vista"</string> <string name="menu_share" msgid="3075149983979628146">"Deila"</string> diff --git a/packages/DocumentsUI/res/values-it/strings.xml b/packages/DocumentsUI/res/values-it/strings.xml index d06f732e6313..276c9371e31c 100644 --- a/packages/DocumentsUI/res/values-it/strings.xml +++ b/packages/DocumentsUI/res/values-it/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Visualizzazione elenco"</string> <string name="menu_sort" msgid="7677740407158414452">"Ordina per"</string> <string name="menu_search" msgid="3816712084502856974">"Cerca"</string> - <string name="menu_settings" msgid="6008033148948428823">"Impostazioni"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Apri"</string> <string name="menu_save" msgid="2394743337684426338">"Salva"</string> <string name="menu_share" msgid="3075149983979628146">"Condividi"</string> diff --git a/packages/DocumentsUI/res/values-iw/strings.xml b/packages/DocumentsUI/res/values-iw/strings.xml index 25d9b12c09d4..4fc561791c8b 100644 --- a/packages/DocumentsUI/res/values-iw/strings.xml +++ b/packages/DocumentsUI/res/values-iw/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"תצוגת רשימה"</string> <string name="menu_sort" msgid="7677740407158414452">"מיין לפי"</string> <string name="menu_search" msgid="3816712084502856974">"חפש"</string> - <string name="menu_settings" msgid="6008033148948428823">"הגדרות"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"פתח"</string> <string name="menu_save" msgid="2394743337684426338">"שמור"</string> <string name="menu_share" msgid="3075149983979628146">"שתף"</string> diff --git a/packages/DocumentsUI/res/values-ja/strings.xml b/packages/DocumentsUI/res/values-ja/strings.xml index d1156ff50b34..36a35f9ecdaa 100644 --- a/packages/DocumentsUI/res/values-ja/strings.xml +++ b/packages/DocumentsUI/res/values-ja/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"リスト表示"</string> <string name="menu_sort" msgid="7677740407158414452">"並べ替え"</string> <string name="menu_search" msgid="3816712084502856974">"検索"</string> - <string name="menu_settings" msgid="6008033148948428823">"設定"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"開く"</string> <string name="menu_save" msgid="2394743337684426338">"保存"</string> <string name="menu_share" msgid="3075149983979628146">"共有"</string> diff --git a/packages/DocumentsUI/res/values-ka-rGE/strings.xml b/packages/DocumentsUI/res/values-ka-rGE/strings.xml index e1a5be44c976..eea482834266 100644 --- a/packages/DocumentsUI/res/values-ka-rGE/strings.xml +++ b/packages/DocumentsUI/res/values-ka-rGE/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"სიის ხედი"</string> <string name="menu_sort" msgid="7677740407158414452">"სორტირება:"</string> <string name="menu_search" msgid="3816712084502856974">"ძიება"</string> - <string name="menu_settings" msgid="6008033148948428823">"პარამეტრები"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"გახსნა"</string> <string name="menu_save" msgid="2394743337684426338">"შენახვა"</string> <string name="menu_share" msgid="3075149983979628146">"გაზიარება"</string> diff --git a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml index 3aed2a02ead7..715db08863fa 100644 --- a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml +++ b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Тізім көрінісі"</string> <string name="menu_sort" msgid="7677740407158414452">"Белгіге қарай сұрыптау"</string> <string name="menu_search" msgid="3816712084502856974">"Іздеу"</string> - <string name="menu_settings" msgid="6008033148948428823">"Параметрлер"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Ашу"</string> <string name="menu_save" msgid="2394743337684426338">"Сақтау"</string> <string name="menu_share" msgid="3075149983979628146">"Бөлісу"</string> diff --git a/packages/DocumentsUI/res/values-km-rKH/strings.xml b/packages/DocumentsUI/res/values-km-rKH/strings.xml index 7e5851f2e9f6..efa7e889484f 100644 --- a/packages/DocumentsUI/res/values-km-rKH/strings.xml +++ b/packages/DocumentsUI/res/values-km-rKH/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"ទិដ្ឋភាពបញ្ជី"</string> <string name="menu_sort" msgid="7677740407158414452">"តម្រៀបតាម"</string> <string name="menu_search" msgid="3816712084502856974">"ស្វែងរក"</string> - <string name="menu_settings" msgid="6008033148948428823">"ការកំណត់"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"បើក"</string> <string name="menu_save" msgid="2394743337684426338">"រក្សាទុក"</string> <string name="menu_share" msgid="3075149983979628146">"ចែករំលែក"</string> diff --git a/packages/DocumentsUI/res/values-kn-rIN/strings.xml b/packages/DocumentsUI/res/values-kn-rIN/strings.xml index 41cdbc35eedd..dc644a84efc0 100644 --- a/packages/DocumentsUI/res/values-kn-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-kn-rIN/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"ಪಟ್ಟಿ ವೀಕ್ಷಣೆ"</string> <string name="menu_sort" msgid="7677740407158414452">"ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸು"</string> <string name="menu_search" msgid="3816712084502856974">"ಹುಡುಕು"</string> - <string name="menu_settings" msgid="6008033148948428823">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"ತೆರೆ"</string> <string name="menu_save" msgid="2394743337684426338">"ಉಳಿಸು"</string> <string name="menu_share" msgid="3075149983979628146">"ಹಂಚು"</string> diff --git a/packages/DocumentsUI/res/values-ko/strings.xml b/packages/DocumentsUI/res/values-ko/strings.xml index 58edec4d7e7f..f807eefa6e92 100644 --- a/packages/DocumentsUI/res/values-ko/strings.xml +++ b/packages/DocumentsUI/res/values-ko/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"목록 보기"</string> <string name="menu_sort" msgid="7677740407158414452">"정렬 기준"</string> <string name="menu_search" msgid="3816712084502856974">"검색"</string> - <string name="menu_settings" msgid="6008033148948428823">"설정"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"열기"</string> <string name="menu_save" msgid="2394743337684426338">"저장"</string> <string name="menu_share" msgid="3075149983979628146">"공유"</string> diff --git a/packages/DocumentsUI/res/values-ky-rKG/strings.xml b/packages/DocumentsUI/res/values-ky-rKG/strings.xml index fc5647853f05..bc1ea7ccfe27 100644 --- a/packages/DocumentsUI/res/values-ky-rKG/strings.xml +++ b/packages/DocumentsUI/res/values-ky-rKG/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Тизмек көрүнүшү"</string> <string name="menu_sort" msgid="7677740407158414452">"Ылгоо"</string> <string name="menu_search" msgid="3816712084502856974">"Издөө"</string> - <string name="menu_settings" msgid="6008033148948428823">"Тууралоолор"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Ачуу"</string> <string name="menu_save" msgid="2394743337684426338">"Сактоо"</string> <string name="menu_share" msgid="3075149983979628146">"Бөлүшүү"</string> diff --git a/packages/DocumentsUI/res/values-lo-rLA/strings.xml b/packages/DocumentsUI/res/values-lo-rLA/strings.xml index fba9244711d6..aa1c3dff0b78 100644 --- a/packages/DocumentsUI/res/values-lo-rLA/strings.xml +++ b/packages/DocumentsUI/res/values-lo-rLA/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"ມຸມມອງແບບລາຍຊື່"</string> <string name="menu_sort" msgid="7677740407158414452">"ຮຽງລຳດັບຕາມ"</string> <string name="menu_search" msgid="3816712084502856974">"ຊອກຫາ"</string> - <string name="menu_settings" msgid="6008033148948428823">"ການຕັ້ງຄ່າ"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"ເປີດ"</string> <string name="menu_save" msgid="2394743337684426338">"ບັນທຶກ"</string> <string name="menu_share" msgid="3075149983979628146">"ແບ່ງປັນ"</string> diff --git a/packages/DocumentsUI/res/values-lt/strings.xml b/packages/DocumentsUI/res/values-lt/strings.xml index 992d4da348e9..48339b9bbc32 100644 --- a/packages/DocumentsUI/res/values-lt/strings.xml +++ b/packages/DocumentsUI/res/values-lt/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Sąrašo rodinys"</string> <string name="menu_sort" msgid="7677740407158414452">"Rūšiuoti pagal"</string> <string name="menu_search" msgid="3816712084502856974">"Ieškoti"</string> - <string name="menu_settings" msgid="6008033148948428823">"Nustatymai"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Atidaryti"</string> <string name="menu_save" msgid="2394743337684426338">"Išsaugoti"</string> <string name="menu_share" msgid="3075149983979628146">"Bendrinti"</string> diff --git a/packages/DocumentsUI/res/values-lv/strings.xml b/packages/DocumentsUI/res/values-lv/strings.xml index 58e507dcfc2f..524febae6505 100644 --- a/packages/DocumentsUI/res/values-lv/strings.xml +++ b/packages/DocumentsUI/res/values-lv/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Saraksts"</string> <string name="menu_sort" msgid="7677740407158414452">"Kārtot pēc"</string> <string name="menu_search" msgid="3816712084502856974">"Meklēt"</string> - <string name="menu_settings" msgid="6008033148948428823">"Iestatījumi"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Atvērt"</string> <string name="menu_save" msgid="2394743337684426338">"Saglabāt"</string> <string name="menu_share" msgid="3075149983979628146">"Kopīgot"</string> diff --git a/packages/DocumentsUI/res/values-mk-rMK/strings.xml b/packages/DocumentsUI/res/values-mk-rMK/strings.xml index b1ea3077994d..15017e120244 100644 --- a/packages/DocumentsUI/res/values-mk-rMK/strings.xml +++ b/packages/DocumentsUI/res/values-mk-rMK/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Приказ на список"</string> <string name="menu_sort" msgid="7677740407158414452">"Подреди по"</string> <string name="menu_search" msgid="3816712084502856974">"Пребарај"</string> - <string name="menu_settings" msgid="6008033148948428823">"Поставки"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Отвори"</string> <string name="menu_save" msgid="2394743337684426338">"Зачувај"</string> <string name="menu_share" msgid="3075149983979628146">"Сподели"</string> diff --git a/packages/DocumentsUI/res/values-ml-rIN/strings.xml b/packages/DocumentsUI/res/values-ml-rIN/strings.xml index 9d1f35337575..9a79b723dd32 100644 --- a/packages/DocumentsUI/res/values-ml-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-ml-rIN/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"ലിസ്റ്റ് കാഴ്ച"</string> <string name="menu_sort" msgid="7677740407158414452">"ഇപ്രകാരം അടുക്കുക"</string> <string name="menu_search" msgid="3816712084502856974">"തിരയൽ"</string> - <string name="menu_settings" msgid="6008033148948428823">"ക്രമീകരണങ്ങൾ"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"തുറക്കുക"</string> <string name="menu_save" msgid="2394743337684426338">"സംരക്ഷിക്കുക"</string> <string name="menu_share" msgid="3075149983979628146">"പങ്കിടുക"</string> diff --git a/packages/DocumentsUI/res/values-mn-rMN/strings.xml b/packages/DocumentsUI/res/values-mn-rMN/strings.xml index 3cbdc5525c70..67b88ef4b328 100644 --- a/packages/DocumentsUI/res/values-mn-rMN/strings.xml +++ b/packages/DocumentsUI/res/values-mn-rMN/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Жагсааж харах"</string> <string name="menu_sort" msgid="7677740407158414452">"Эрэмбэлэх"</string> <string name="menu_search" msgid="3816712084502856974">"Хайх"</string> - <string name="menu_settings" msgid="6008033148948428823">"Тохиргоо"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Нээх"</string> <string name="menu_save" msgid="2394743337684426338">"Хадгалах"</string> <string name="menu_share" msgid="3075149983979628146">"Хуваалцах"</string> diff --git a/packages/DocumentsUI/res/values-mr-rIN/strings.xml b/packages/DocumentsUI/res/values-mr-rIN/strings.xml index ae7a48aabe77..53ca8581dd9f 100644 --- a/packages/DocumentsUI/res/values-mr-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-mr-rIN/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"सूची"</string> <string name="menu_sort" msgid="7677740407158414452">"नुसार क्रमवारी लावा"</string> <string name="menu_search" msgid="3816712084502856974">"शोध"</string> - <string name="menu_settings" msgid="6008033148948428823">"सेटिंग्ज"</string> + <string name="menu_settings" msgid="8239065133341597825">"संचयन सेटिंग्ज"</string> <string name="menu_open" msgid="432922957274920903">"उघडा"</string> <string name="menu_save" msgid="2394743337684426338">"जतन करा"</string> <string name="menu_share" msgid="3075149983979628146">"सामायिक करा"</string> diff --git a/packages/DocumentsUI/res/values-ms-rMY/strings.xml b/packages/DocumentsUI/res/values-ms-rMY/strings.xml index 7346dd5c9e29..24fe49cf1ef0 100644 --- a/packages/DocumentsUI/res/values-ms-rMY/strings.xml +++ b/packages/DocumentsUI/res/values-ms-rMY/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Paparan senarai"</string> <string name="menu_sort" msgid="7677740407158414452">"Isih mengikut"</string> <string name="menu_search" msgid="3816712084502856974">"Cari"</string> - <string name="menu_settings" msgid="6008033148948428823">"Tetapan"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Buka"</string> <string name="menu_save" msgid="2394743337684426338">"Simpan"</string> <string name="menu_share" msgid="3075149983979628146">"Kongsi"</string> diff --git a/packages/DocumentsUI/res/values-my-rMM/strings.xml b/packages/DocumentsUI/res/values-my-rMM/strings.xml index 2e7129971328..4c36bd30a7a3 100644 --- a/packages/DocumentsUI/res/values-my-rMM/strings.xml +++ b/packages/DocumentsUI/res/values-my-rMM/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"အစဉ်လိုက်မြင်ကွင်း"</string> <string name="menu_sort" msgid="7677740407158414452">"အစဉ်အလိုက် စီခြင်း"</string> <string name="menu_search" msgid="3816712084502856974">"ရှာဖွေရန်"</string> - <string name="menu_settings" msgid="6008033148948428823">"ဆက်တင်များ"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"ဖွင့်ရန်"</string> <string name="menu_save" msgid="2394743337684426338">"သိမ်းပါ"</string> <string name="menu_share" msgid="3075149983979628146">"မျှဝေခြင်း"</string> diff --git a/packages/DocumentsUI/res/values-nb/strings.xml b/packages/DocumentsUI/res/values-nb/strings.xml index 57a5a762b850..4ff395e8e1e2 100644 --- a/packages/DocumentsUI/res/values-nb/strings.xml +++ b/packages/DocumentsUI/res/values-nb/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Listevisning"</string> <string name="menu_sort" msgid="7677740407158414452">"Sortér etter"</string> <string name="menu_search" msgid="3816712084502856974">"Søk"</string> - <string name="menu_settings" msgid="6008033148948428823">"Innstillinger"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Åpne"</string> <string name="menu_save" msgid="2394743337684426338">"Lagre"</string> <string name="menu_share" msgid="3075149983979628146">"Del"</string> diff --git a/packages/DocumentsUI/res/values-ne-rNP/strings.xml b/packages/DocumentsUI/res/values-ne-rNP/strings.xml index 1f2f29c87feb..45934ad1d53e 100644 --- a/packages/DocumentsUI/res/values-ne-rNP/strings.xml +++ b/packages/DocumentsUI/res/values-ne-rNP/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"सूची दृश्य"</string> <string name="menu_sort" msgid="7677740407158414452">"यसद्वारा क्रमवद्घ गर्नुहोस्"</string> <string name="menu_search" msgid="3816712084502856974">"खोज्नुहोस्"</string> - <string name="menu_settings" msgid="6008033148948428823">"सेटिङहरू"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"खोल्नुहोस्"</string> <string name="menu_save" msgid="2394743337684426338">"सुरक्षित गर्नुहोस्"</string> <string name="menu_share" msgid="3075149983979628146">"साझेदारी गर्नुहोस्"</string> diff --git a/packages/DocumentsUI/res/values-nl/strings.xml b/packages/DocumentsUI/res/values-nl/strings.xml index 348c9cf1f820..b613da3dd089 100644 --- a/packages/DocumentsUI/res/values-nl/strings.xml +++ b/packages/DocumentsUI/res/values-nl/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"Lijstweergave"</string> <string name="menu_sort" msgid="7677740407158414452">"Sorteren op"</string> <string name="menu_search" msgid="3816712084502856974">"Zoeken"</string> - <string name="menu_settings" msgid="6008033148948428823">"Instellingen"</string> + <string name="menu_settings" msgid="8239065133341597825">"Instellingen voor opslag"</string> <string name="menu_open" msgid="432922957274920903">"Openen"</string> <string name="menu_save" msgid="2394743337684426338">"Opslaan"</string> <string name="menu_share" msgid="3075149983979628146">"Delen"</string> diff --git a/packages/DocumentsUI/res/values-pa-rIN/strings.xml b/packages/DocumentsUI/res/values-pa-rIN/strings.xml index add268f5c5db..d5eeb66f9064 100644 --- a/packages/DocumentsUI/res/values-pa-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-pa-rIN/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"ਸੂਚੀ ਦ੍ਰਿਸ਼"</string> <string name="menu_sort" msgid="7677740407158414452">"ਇਸ ਅਨੁਸਾਰ ਛਾਂਟੋ"</string> <string name="menu_search" msgid="3816712084502856974">"ਖੋਜੋ"</string> - <string name="menu_settings" msgid="6008033148948428823">"ਸੈਟਿੰਗਾਂ"</string> + <string name="menu_settings" msgid="8239065133341597825">"ਸਟੋਰੇਜ ਸੈਟਿੰਗਾਂ"</string> <string name="menu_open" msgid="432922957274920903">"ਖੋਲ੍ਹੋ"</string> <string name="menu_save" msgid="2394743337684426338">"ਸੁਰੱਖਿਅਤ ਕਰੋ"</string> <string name="menu_share" msgid="3075149983979628146">"ਸ਼ੇਅਰ ਕਰੋ"</string> diff --git a/packages/DocumentsUI/res/values-pl/strings.xml b/packages/DocumentsUI/res/values-pl/strings.xml index d30ed84c302a..90f2bdfc775e 100644 --- a/packages/DocumentsUI/res/values-pl/strings.xml +++ b/packages/DocumentsUI/res/values-pl/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Widok listy"</string> <string name="menu_sort" msgid="7677740407158414452">"Sortuj według"</string> <string name="menu_search" msgid="3816712084502856974">"Szukaj"</string> - <string name="menu_settings" msgid="6008033148948428823">"Ustawienia"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Otwórz"</string> <string name="menu_save" msgid="2394743337684426338">"Zapisz"</string> <string name="menu_share" msgid="3075149983979628146">"Udostępnij"</string> diff --git a/packages/DocumentsUI/res/values-pt-rBR/strings.xml b/packages/DocumentsUI/res/values-pt-rBR/strings.xml index 068a4e6f652a..f72f43c57848 100644 --- a/packages/DocumentsUI/res/values-pt-rBR/strings.xml +++ b/packages/DocumentsUI/res/values-pt-rBR/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Visualização em lista"</string> <string name="menu_sort" msgid="7677740407158414452">"Classificar por"</string> <string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string> - <string name="menu_settings" msgid="6008033148948428823">"Configurações"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Abrir"</string> <string name="menu_save" msgid="2394743337684426338">"Salvar"</string> <string name="menu_share" msgid="3075149983979628146">"Compartilhar"</string> diff --git a/packages/DocumentsUI/res/values-pt-rPT/strings.xml b/packages/DocumentsUI/res/values-pt-rPT/strings.xml index 089790182cfb..596474fde6ad 100644 --- a/packages/DocumentsUI/res/values-pt-rPT/strings.xml +++ b/packages/DocumentsUI/res/values-pt-rPT/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"Vista de lista"</string> <string name="menu_sort" msgid="7677740407158414452">"Ordenar por"</string> <string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string> - <string name="menu_settings" msgid="6008033148948428823">"Definições"</string> + <string name="menu_settings" msgid="8239065133341597825">"Defin. de armazenamento"</string> <string name="menu_open" msgid="432922957274920903">"Abrir"</string> <string name="menu_save" msgid="2394743337684426338">"Guardar"</string> <string name="menu_share" msgid="3075149983979628146">"Partilhar"</string> diff --git a/packages/DocumentsUI/res/values-pt/strings.xml b/packages/DocumentsUI/res/values-pt/strings.xml index 068a4e6f652a..f72f43c57848 100644 --- a/packages/DocumentsUI/res/values-pt/strings.xml +++ b/packages/DocumentsUI/res/values-pt/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Visualização em lista"</string> <string name="menu_sort" msgid="7677740407158414452">"Classificar por"</string> <string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string> - <string name="menu_settings" msgid="6008033148948428823">"Configurações"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Abrir"</string> <string name="menu_save" msgid="2394743337684426338">"Salvar"</string> <string name="menu_share" msgid="3075149983979628146">"Compartilhar"</string> diff --git a/packages/DocumentsUI/res/values-ro/strings.xml b/packages/DocumentsUI/res/values-ro/strings.xml index c8c0c09fc4bb..07f25f63d462 100644 --- a/packages/DocumentsUI/res/values-ro/strings.xml +++ b/packages/DocumentsUI/res/values-ro/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Afișare tip listă"</string> <string name="menu_sort" msgid="7677740407158414452">"Sortați după"</string> <string name="menu_search" msgid="3816712084502856974">"Căutați"</string> - <string name="menu_settings" msgid="6008033148948428823">"Setări"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Deschideți"</string> <string name="menu_save" msgid="2394743337684426338">"Salvați"</string> <string name="menu_share" msgid="3075149983979628146">"Distribuiți"</string> diff --git a/packages/DocumentsUI/res/values-ru/strings.xml b/packages/DocumentsUI/res/values-ru/strings.xml index 3f5e53c58ef0..97bd4dd820bb 100644 --- a/packages/DocumentsUI/res/values-ru/strings.xml +++ b/packages/DocumentsUI/res/values-ru/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Список"</string> <string name="menu_sort" msgid="7677740407158414452">"Сортировать"</string> <string name="menu_search" msgid="3816712084502856974">"Поиск"</string> - <string name="menu_settings" msgid="6008033148948428823">"Настройки"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Открыть"</string> <string name="menu_save" msgid="2394743337684426338">"Сохранить"</string> <string name="menu_share" msgid="3075149983979628146">"Поделиться"</string> diff --git a/packages/DocumentsUI/res/values-si-rLK/strings.xml b/packages/DocumentsUI/res/values-si-rLK/strings.xml index 1237f1443f14..19d8e897ef0a 100644 --- a/packages/DocumentsUI/res/values-si-rLK/strings.xml +++ b/packages/DocumentsUI/res/values-si-rLK/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"ලැයිස්තු පෙනුම"</string> <string name="menu_sort" msgid="7677740407158414452">"අනුපිළිවෙලට සකසා ඇත්තේ"</string> <string name="menu_search" msgid="3816712084502856974">"සෙවීම"</string> - <string name="menu_settings" msgid="6008033148948428823">"සැකසීම්"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"විවෘත කරන්න"</string> <string name="menu_save" msgid="2394743337684426338">"සුරකින්න"</string> <string name="menu_share" msgid="3075149983979628146">"බෙදාගන්න"</string> diff --git a/packages/DocumentsUI/res/values-sk/strings.xml b/packages/DocumentsUI/res/values-sk/strings.xml index db2ec542dc21..cf74acfeaf84 100644 --- a/packages/DocumentsUI/res/values-sk/strings.xml +++ b/packages/DocumentsUI/res/values-sk/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Zobrazenie zoznamu"</string> <string name="menu_sort" msgid="7677740407158414452">"Zoradiť podľa"</string> <string name="menu_search" msgid="3816712084502856974">"Hľadať"</string> - <string name="menu_settings" msgid="6008033148948428823">"Nastavenia"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Otvoriť"</string> <string name="menu_save" msgid="2394743337684426338">"Uložiť"</string> <string name="menu_share" msgid="3075149983979628146">"Zdieľať"</string> diff --git a/packages/DocumentsUI/res/values-sl/strings.xml b/packages/DocumentsUI/res/values-sl/strings.xml index f000f05f65fd..7da4628910ab 100644 --- a/packages/DocumentsUI/res/values-sl/strings.xml +++ b/packages/DocumentsUI/res/values-sl/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Pogled seznama"</string> <string name="menu_sort" msgid="7677740407158414452">"Razvrsti glede na"</string> <string name="menu_search" msgid="3816712084502856974">"Iskanje"</string> - <string name="menu_settings" msgid="6008033148948428823">"Nastavitve"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Odpri"</string> <string name="menu_save" msgid="2394743337684426338">"Shrani"</string> <string name="menu_share" msgid="3075149983979628146">"Skupna raba"</string> diff --git a/packages/DocumentsUI/res/values-sq-rAL/strings.xml b/packages/DocumentsUI/res/values-sq-rAL/strings.xml index fa531570b8ad..fec090cfd0dc 100644 --- a/packages/DocumentsUI/res/values-sq-rAL/strings.xml +++ b/packages/DocumentsUI/res/values-sq-rAL/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Pamje liste"</string> <string name="menu_sort" msgid="7677740407158414452">"Rendit sipas"</string> <string name="menu_search" msgid="3816712084502856974">"Kërko"</string> - <string name="menu_settings" msgid="6008033148948428823">"Cilësimet"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Hap"</string> <string name="menu_save" msgid="2394743337684426338">"Ruaj"</string> <string name="menu_share" msgid="3075149983979628146">"Shpërnda"</string> diff --git a/packages/DocumentsUI/res/values-sr/strings.xml b/packages/DocumentsUI/res/values-sr/strings.xml index 7b9f65924aac..b43a8d3e5127 100644 --- a/packages/DocumentsUI/res/values-sr/strings.xml +++ b/packages/DocumentsUI/res/values-sr/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Приказ листе"</string> <string name="menu_sort" msgid="7677740407158414452">"Сортирај према"</string> <string name="menu_search" msgid="3816712084502856974">"Претражи"</string> - <string name="menu_settings" msgid="6008033148948428823">"Подешавања"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Отвори"</string> <string name="menu_save" msgid="2394743337684426338">"Сачувај"</string> <string name="menu_share" msgid="3075149983979628146">"Дели"</string> diff --git a/packages/DocumentsUI/res/values-sv/strings.xml b/packages/DocumentsUI/res/values-sv/strings.xml index 3590fe713409..2d1d924f9a8a 100644 --- a/packages/DocumentsUI/res/values-sv/strings.xml +++ b/packages/DocumentsUI/res/values-sv/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Listvy"</string> <string name="menu_sort" msgid="7677740407158414452">"Sortera efter"</string> <string name="menu_search" msgid="3816712084502856974">"Sök"</string> - <string name="menu_settings" msgid="6008033148948428823">"Inställningar"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Öppna"</string> <string name="menu_save" msgid="2394743337684426338">"Spara"</string> <string name="menu_share" msgid="3075149983979628146">"Dela"</string> diff --git a/packages/DocumentsUI/res/values-sw/strings.xml b/packages/DocumentsUI/res/values-sw/strings.xml index f15db63270c8..e28365dcdbd5 100644 --- a/packages/DocumentsUI/res/values-sw/strings.xml +++ b/packages/DocumentsUI/res/values-sw/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Mwonekano orodha"</string> <string name="menu_sort" msgid="7677740407158414452">"Panga kwa"</string> <string name="menu_search" msgid="3816712084502856974">"Utafutaji"</string> - <string name="menu_settings" msgid="6008033148948428823">"Mipangilio"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Fungua"</string> <string name="menu_save" msgid="2394743337684426338">"Hifadhi"</string> <string name="menu_share" msgid="3075149983979628146">"Shiriki"</string> diff --git a/packages/DocumentsUI/res/values-ta-rIN/strings.xml b/packages/DocumentsUI/res/values-ta-rIN/strings.xml index 3b71514a0f70..fed470d1e695 100644 --- a/packages/DocumentsUI/res/values-ta-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-ta-rIN/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"பட்டியல்"</string> <string name="menu_sort" msgid="7677740407158414452">"இதன்படி வரிசைப்படுத்து"</string> <string name="menu_search" msgid="3816712084502856974">"தேடு"</string> - <string name="menu_settings" msgid="6008033148948428823">"அமைப்பு"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"திற"</string> <string name="menu_save" msgid="2394743337684426338">"சேமி"</string> <string name="menu_share" msgid="3075149983979628146">"பகிர்"</string> diff --git a/packages/DocumentsUI/res/values-te-rIN/strings.xml b/packages/DocumentsUI/res/values-te-rIN/strings.xml index 900fe410b6aa..0d906272ca02 100644 --- a/packages/DocumentsUI/res/values-te-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-te-rIN/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"జాబితా వీక్షణ"</string> <string name="menu_sort" msgid="7677740407158414452">"ఇలా క్రమబద్ధీకరించు"</string> <string name="menu_search" msgid="3816712084502856974">"శోధించు"</string> - <string name="menu_settings" msgid="6008033148948428823">"సెట్టింగ్లు"</string> + <string name="menu_settings" msgid="8239065133341597825">"నిల్వ సెట్టింగ్లు"</string> <string name="menu_open" msgid="432922957274920903">"తెరువు"</string> <string name="menu_save" msgid="2394743337684426338">"సేవ్ చేయి"</string> <string name="menu_share" msgid="3075149983979628146">"భాగస్వామ్యం చేయి"</string> diff --git a/packages/DocumentsUI/res/values-th/strings.xml b/packages/DocumentsUI/res/values-th/strings.xml index 4d93f43a5aad..25ab564d80aa 100644 --- a/packages/DocumentsUI/res/values-th/strings.xml +++ b/packages/DocumentsUI/res/values-th/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"มุมมองรายการ"</string> <string name="menu_sort" msgid="7677740407158414452">"จัดเรียงตาม"</string> <string name="menu_search" msgid="3816712084502856974">"ค้นหา"</string> - <string name="menu_settings" msgid="6008033148948428823">"การตั้งค่า"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"เปิด"</string> <string name="menu_save" msgid="2394743337684426338">"บันทึก"</string> <string name="menu_share" msgid="3075149983979628146">"แชร์"</string> diff --git a/packages/DocumentsUI/res/values-tl/strings.xml b/packages/DocumentsUI/res/values-tl/strings.xml index d28eb69b339e..1baa5db75474 100644 --- a/packages/DocumentsUI/res/values-tl/strings.xml +++ b/packages/DocumentsUI/res/values-tl/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"View na listahan"</string> <string name="menu_sort" msgid="7677740407158414452">"Uriin ayon sa"</string> <string name="menu_search" msgid="3816712084502856974">"Maghanap"</string> - <string name="menu_settings" msgid="6008033148948428823">"Mga Setting"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Buksan"</string> <string name="menu_save" msgid="2394743337684426338">"I-save"</string> <string name="menu_share" msgid="3075149983979628146">"Ibahagi"</string> diff --git a/packages/DocumentsUI/res/values-tr/strings.xml b/packages/DocumentsUI/res/values-tr/strings.xml index 52239194a4a8..500c37fe9edc 100644 --- a/packages/DocumentsUI/res/values-tr/strings.xml +++ b/packages/DocumentsUI/res/values-tr/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Liste görünümü"</string> <string name="menu_sort" msgid="7677740407158414452">"Sıralama ölçütü"</string> <string name="menu_search" msgid="3816712084502856974">"Ara"</string> - <string name="menu_settings" msgid="6008033148948428823">"Ayarlar"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Aç"</string> <string name="menu_save" msgid="2394743337684426338">"Kaydet"</string> <string name="menu_share" msgid="3075149983979628146">"Paylaş"</string> diff --git a/packages/DocumentsUI/res/values-uk/strings.xml b/packages/DocumentsUI/res/values-uk/strings.xml index 1987ee2bfe36..c57ca6a94562 100644 --- a/packages/DocumentsUI/res/values-uk/strings.xml +++ b/packages/DocumentsUI/res/values-uk/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Режим списку"</string> <string name="menu_sort" msgid="7677740407158414452">"Параметри сортування"</string> <string name="menu_search" msgid="3816712084502856974">"Пошук"</string> - <string name="menu_settings" msgid="6008033148948428823">"Налаштування"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Відкрити"</string> <string name="menu_save" msgid="2394743337684426338">"Зберегти"</string> <string name="menu_share" msgid="3075149983979628146">"Поділитися"</string> diff --git a/packages/DocumentsUI/res/values-ur-rPK/strings.xml b/packages/DocumentsUI/res/values-ur-rPK/strings.xml index 387149694c70..90bce27cb971 100644 --- a/packages/DocumentsUI/res/values-ur-rPK/strings.xml +++ b/packages/DocumentsUI/res/values-ur-rPK/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"فہرست منظر"</string> <string name="menu_sort" msgid="7677740407158414452">"ترتیب دیں بلحاظ"</string> <string name="menu_search" msgid="3816712084502856974">"تلاش کریں"</string> - <string name="menu_settings" msgid="6008033148948428823">"ترتیبات"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"کھولیں"</string> <string name="menu_save" msgid="2394743337684426338">"محفوظ کریں"</string> <string name="menu_share" msgid="3075149983979628146">"اشتراک کریں"</string> diff --git a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml index a915afd1b0b8..4a0aba2ebd84 100644 --- a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml +++ b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Ro‘yxat ko‘rinishida"</string> <string name="menu_sort" msgid="7677740407158414452">"Saralash"</string> <string name="menu_search" msgid="3816712084502856974">"Qidirish"</string> - <string name="menu_settings" msgid="6008033148948428823">"Sozlamalar"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Ochish"</string> <string name="menu_save" msgid="2394743337684426338">"Saqlash"</string> <string name="menu_share" msgid="3075149983979628146">"Ulashish"</string> diff --git a/packages/DocumentsUI/res/values-vi/strings.xml b/packages/DocumentsUI/res/values-vi/strings.xml index 536c7a51a68c..48290d1d0362 100644 --- a/packages/DocumentsUI/res/values-vi/strings.xml +++ b/packages/DocumentsUI/res/values-vi/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"Chế độ xem danh sách"</string> <string name="menu_sort" msgid="7677740407158414452">"Sắp xếp theo"</string> <string name="menu_search" msgid="3816712084502856974">"Tìm kiếm"</string> - <string name="menu_settings" msgid="6008033148948428823">"Cài đặt"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"Mở"</string> <string name="menu_save" msgid="2394743337684426338">"Lưu"</string> <string name="menu_share" msgid="3075149983979628146">"Chia sẻ"</string> diff --git a/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/packages/DocumentsUI/res/values-zh-rCN/strings.xml index df2cf04ba8c5..f3d4e6cc854f 100644 --- a/packages/DocumentsUI/res/values-zh-rCN/strings.xml +++ b/packages/DocumentsUI/res/values-zh-rCN/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"列表视图"</string> <string name="menu_sort" msgid="7677740407158414452">"排序依据"</string> <string name="menu_search" msgid="3816712084502856974">"搜索"</string> - <string name="menu_settings" msgid="6008033148948428823">"设置"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"打开"</string> <string name="menu_save" msgid="2394743337684426338">"保存"</string> <string name="menu_share" msgid="3075149983979628146">"分享"</string> @@ -100,8 +101,7 @@ <string name="close" msgid="3043722427445528732">"关闭"</string> <string name="copy_failure_alert_content" msgid="3715575000297709082">"以下文件无法复制：<xliff:g id="LIST">%1$s</xliff:g>"</string> <string name="move_failure_alert_content" msgid="7151140279020481180">"以下文件无法移动：<xliff:g id="LIST">%1$s</xliff:g>"</string> - <!-- no translation found for copy_converted_warning_content (5753861488218674361) --> - <skip /> + <string name="copy_converted_warning_content" msgid="5753861488218674361">"下列文件已转换成其他格式：<xliff:g id="LIST">%1$s</xliff:g>"</string> <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539"> <item quantity="other">已将 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件复制到剪贴板。</item> <item quantity="one">已将 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件复制到剪贴板。</item> @@ -109,8 +109,7 @@ <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"无法将所选文件粘贴到此位置。"</string> <string name="menu_rename" msgid="7678802479104285353">"重命名"</string> <string name="rename_error" msgid="4203041674883412606">"无法重命名文档"</string> - <!-- no translation found for notification_copy_files_converted_title (3153573223054275181) --> - <skip /> + <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分文件已转换成其他格式"</string> <string name="allow" msgid="7225948811296386551">"允许"</string> <string name="deny" msgid="2081879885755434506">"拒绝"</string> </resources> diff --git a/packages/DocumentsUI/res/values-zh-rHK/strings.xml b/packages/DocumentsUI/res/values-zh-rHK/strings.xml index fa66c7f5f4ce..3c55cd8ae059 100644 --- a/packages/DocumentsUI/res/values-zh-rHK/strings.xml +++ b/packages/DocumentsUI/res/values-zh-rHK/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"清單檢視"</string> <string name="menu_sort" msgid="7677740407158414452">"排序方式"</string> <string name="menu_search" msgid="3816712084502856974">"搜尋"</string> - <string name="menu_settings" msgid="6008033148948428823">"設定"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"開啟"</string> <string name="menu_save" msgid="2394743337684426338">"儲存"</string> <string name="menu_share" msgid="3075149983979628146">"分享"</string> diff --git a/packages/DocumentsUI/res/values-zh-rTW/strings.xml b/packages/DocumentsUI/res/values-zh-rTW/strings.xml index 0288bd304ffd..f09899cc9c25 100644 --- a/packages/DocumentsUI/res/values-zh-rTW/strings.xml +++ b/packages/DocumentsUI/res/values-zh-rTW/strings.xml @@ -26,7 +26,8 @@ <string name="menu_list" msgid="7279285939892417279">"清單檢視"</string> <string name="menu_sort" msgid="7677740407158414452">"排序依據"</string> <string name="menu_search" msgid="3816712084502856974">"搜尋"</string> - <string name="menu_settings" msgid="6008033148948428823">"設定"</string> + <!-- no translation found for menu_settings (8239065133341597825) --> + <skip /> <string name="menu_open" msgid="432922957274920903">"開啟"</string> <string name="menu_save" msgid="2394743337684426338">"儲存"</string> <string name="menu_share" msgid="3075149983979628146">"共用"</string> diff --git a/packages/DocumentsUI/res/values-zu/strings.xml b/packages/DocumentsUI/res/values-zu/strings.xml index 9bff3556c2bd..dffe2418aaea 100644 --- a/packages/DocumentsUI/res/values-zu/strings.xml +++ b/packages/DocumentsUI/res/values-zu/strings.xml @@ -26,7 +26,7 @@ <string name="menu_list" msgid="7279285939892417279">"Ukubuka uhlu"</string> <string name="menu_sort" msgid="7677740407158414452">"Hlunga nge-"</string> <string name="menu_search" msgid="3816712084502856974">"Sesha"</string> - <string name="menu_settings" msgid="6008033148948428823">"Izilungiselelo"</string> + <string name="menu_settings" msgid="8239065133341597825">"Izilungiselelo zesitoreji"</string> <string name="menu_open" msgid="432922957274920903">"Vula"</string> <string name="menu_save" msgid="2394743337684426338">"Londoloza"</string> <string name="menu_share" msgid="3075149983979628146">"Yabelana"</string> diff --git a/packages/DocumentsUI/res/values/layouts.xml b/packages/DocumentsUI/res/values/layouts.xml index 8ac1ac2bbbfc..c9308a19ebd8 100644 --- a/packages/DocumentsUI/res/values/layouts.xml +++ b/packages/DocumentsUI/res/values/layouts.xml @@ -15,7 +15,7 @@ --> <resources> - <item name="docs_activity" type="layout">@layout/drawer_layout</item> + <item name="documents_activity" type="layout">@layout/drawer_layout</item> <item name="files_activity" type="layout">@layout/drawer_layout</item> - <item name="manage_roots_activity" type="layout">@layout/single_pane_layout</item> + <item name="downloads_activity" type="layout">@layout/single_pane_layout</item> </resources> diff --git a/packages/DocumentsUI/res/values/strings.xml b/packages/DocumentsUI/res/values/strings.xml index afe93369ae2b..3c49f167534e 100644 --- a/packages/DocumentsUI/res/values/strings.xml +++ b/packages/DocumentsUI/res/values/strings.xml @@ -39,8 +39,8 @@ <string name="menu_sort">Sort by</string> <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] --> <string name="menu_search">Search</string> - <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] --> - <string name="menu_settings">Settings</string> + <!-- Menu item that enters activity to change settings for current root [CHAR LIMIT=24] --> + <string name="menu_settings">Storage settings</string> <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] --> <string name="menu_open">Open</string> diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java index 1474aa6b7690..e72343e9a9ba 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java @@ -18,10 +18,10 @@ package com.android.documentsui; import static com.android.documentsui.Shared.DEBUG; import static com.android.documentsui.State.MODE_GRID; -import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_DOWN; +import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_ENTER; +import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_LEAVE; import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE; import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_SIDE; -import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_UP; import static com.android.internal.util.Preconditions.checkArgument; import static com.android.internal.util.Preconditions.checkState; @@ -38,19 +38,14 @@ import android.os.AsyncTask; import android.os.Bundle; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Root; +import android.support.annotation.CallSuper; import android.support.annotation.LayoutRes; import android.support.annotation.Nullable; import android.util.Log; -import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemSelectedListener; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.TextView; +import android.widget.Spinner; +import android.widget.Toolbar; import com.android.documentsui.RecentsProvider.ResumeColumns; import com.android.documentsui.SearchManager.SearchManagerListener; @@ -71,7 +66,8 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.Executor; -public abstract class BaseActivity extends Activity implements SearchManagerListener { +public abstract class BaseActivity extends Activity + implements SearchManagerListener, NavigationView.Environment { static final String EXTRA_STATE = "state"; @@ -79,7 +75,7 @@ public abstract class BaseActivity extends Activity implements SearchManagerList RootsCache mRoots; SearchManager mSearchManager; DrawerController mDrawer; - boolean mProductivityDevice; + NavigationView mNavigator; private final String mTag; @LayoutRes @@ -91,7 +87,6 @@ public abstract class BaseActivity extends Activity implements SearchManagerList abstract void onTaskFinished(Uri... uris); abstract void refreshDirectory(int anim); - abstract void updateActionBar(); abstract void saveStackBlocking(); abstract State buildState(); @@ -100,19 +95,21 @@ public abstract class BaseActivity extends Activity implements SearchManagerList mTag = tag; } + @CallSuper @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); + setContentView(mLayoutId); + + mDrawer = DrawerController.create(this); mState = (icicle != null) ? icicle.<State>getParcelable(EXTRA_STATE) : buildState(); - Metrics.logActivityLaunch(this, mState, getIntent()); - setContentView(mLayoutId); - mRoots = DocumentsApplication.getRootsCache(this); + mRoots.setOnCacheUpdateListener( new RootsCache.OnCacheUpdateListener() { @Override @@ -120,9 +117,19 @@ public abstract class BaseActivity extends Activity implements SearchManagerList new HandleRootsChangedTask().execute(getCurrentRoot()); } }); + mDirectoryContainer = (DirectoryContainerView) findViewById(R.id.container_directory); mSearchManager = new SearchManager(this); + DocumentsToolbar toolbar = (DocumentsToolbar) findViewById(R.id.toolbar); + setActionBar(toolbar); + mNavigator = new NavigationView( + mDrawer, + toolbar, + (Spinner) findViewById(R.id.stack), + mState, + this); + // Base classes must update result in their onCreate. setResult(Activity.RESULT_CANCELED); } @@ -132,16 +139,18 @@ public abstract class BaseActivity extends Activity implements SearchManagerList boolean showMenu = super.onCreateOptionsMenu(menu); getMenuInflater().inflate(R.menu.activity, menu); - mSearchManager.install((DocumentsToolBar) findViewById(R.id.toolbar)); + mSearchManager.install((DocumentsToolbar) findViewById(R.id.toolbar)); return showMenu; } @Override + @CallSuper public boolean onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); - final RootInfo root = getCurrentRoot(); + mSearchManager.showMenu(canSearchRoot()); + final boolean inRecents = getCurrentDirectory() == null; final MenuItem sort = menu.findItem(R.id.menu_sort); @@ -150,26 +159,17 @@ public abstract class BaseActivity extends Activity implements SearchManagerList final MenuItem list = menu.findItem(R.id.menu_list); final MenuItem advanced = menu.findItem(R.id.menu_advanced); final MenuItem fileSize = menu.findItem(R.id.menu_file_size); - final MenuItem settings = menu.findItem(R.id.menu_settings); - final MenuItem search = menu.findItem(R.id.menu_search); - // I'm thinkin' this isn't necesary here. If it is...'cuz of a bug.... - // then uncomment the linke and let's get a proper bug reference here. - // mSearchManager.update(root); - - // Search uses backend ranking; no sorting + // Search uses backend ranking; no sorting, recents doesn't support sort. sort.setVisible(!inRecents && !mSearchManager.isSearching()); + sortSize.setVisible(mState.showSize); // Only sort by size when file sizes are visible + fileSize.setVisible(!mState.forceSize); // grid/list is effectively a toggle. grid.setVisible(mState.derivedMode != State.MODE_GRID); list.setVisible(mState.derivedMode != State.MODE_LIST); - sortSize.setVisible(mState.showSize); // Only sort by size when visible - fileSize.setVisible(!mState.forceSize); advanced.setVisible(!mState.forceAdvanced); - settings.setVisible((root.flags & Root.FLAG_HAS_SETTINGS) != 0); - search.setVisible(canSearchRoot()); - advanced.setTitle(LocalPreferences.getDisplayAdvancedDevices(this) ? R.string.menu_advanced_hide : R.string.menu_advanced_show); fileSize.setTitle(LocalPreferences.getDisplayFileSize(this) @@ -207,6 +207,11 @@ public abstract class BaseActivity extends Activity implements SearchManagerList void onStackRestored(boolean restored, boolean external) {} void onRootPicked(RootInfo root) { + // Skip refreshing if root didn't change + if(root.equals(getCurrentRoot())) { + return; + } + mState.derivedMode = LocalPreferences.getViewMode(this, root, MODE_GRID); // Clear entire backstack and start in new root @@ -217,9 +222,9 @@ public abstract class BaseActivity extends Activity implements SearchManagerList // Otherwise we delegate loading data from disk to a task // to ensure a responsive ui. if (mRoots.isRecentsRoot(root)) { - refreshCurrentRootAndDirectory(ANIM_SIDE); + refreshCurrentRootAndDirectory(ANIM_NONE); } else { - new PickRootTask(root, true).executeOnExecutor(getExecutorForCurrentDirectory()); + new PickRootTask(root).executeOnExecutor(getExecutorForCurrentDirectory()); } } @@ -273,8 +278,10 @@ public abstract class BaseActivity extends Activity implements SearchManagerList return true; case R.id.menu_paste_from_clipboard: - DirectoryFragment.get(getFragmentManager()) - .pasteFromClipboard(); + DirectoryFragment dir = getDirectoryFragment(); + if (dir != null) { + dir.pasteFromClipboard(); + } return true; case R.id.menu_advanced: @@ -297,6 +304,10 @@ public abstract class BaseActivity extends Activity implements SearchManagerList } } + final @Nullable DirectoryFragment getDirectoryFragment() { + return DirectoryFragment.get(getFragmentManager()); + } + void showCreateDirectoryDialog() { CreateDirectoryFragment.show(getFragmentManager()); } @@ -323,7 +334,12 @@ public abstract class BaseActivity extends Activity implements SearchManagerList void openContainerDocument(DocumentInfo doc) { checkArgument(doc.isContainer()); mState.pushDocument(doc); - refreshCurrentRootAndDirectory(ANIM_DOWN); + // Show an opening animation only if pressing "back" would get us back to the + // previous directory. Especially after opening a root document, pressing + // back, wouldn't go to the previous root, but close the activity. + final int anim = (mState.hasLocationChanged() && mState.stack.size() > 1) + ? ANIM_ENTER : ANIM_NONE; + refreshCurrentRootAndDirectory(anim); } /** @@ -331,10 +347,11 @@ public abstract class BaseActivity extends Activity implements SearchManagerList * The current directory name and selection will get updated. * @param anim */ - final void refreshCurrentRootAndDirectory(int anim) { + @Override + public final void refreshCurrentRootAndDirectory(int anim) { mSearchManager.cancelSearch(); - mDirectoryContainer.setDrawDisappearingFirst(anim == ANIM_DOWN); + mDirectoryContainer.setDrawDisappearingFirst(anim == ANIM_ENTER); refreshDirectory(anim); final RootsFragment roots = RootsFragment.get(getFragmentManager()); @@ -342,8 +359,7 @@ public abstract class BaseActivity extends Activity implements SearchManagerList roots.onCurrentRootChanged(); } - updateActionBar(); - + mNavigator.update(); invalidateOptionsMenu(); } @@ -425,7 +441,10 @@ public abstract class BaseActivity extends Activity implements SearchManagerList void setDisplayFileSize(boolean display) { LocalPreferences.setDisplayFileSize(this, display); mState.showSize = display; - DirectoryFragment.get(getFragmentManager()).onDisplayStateChanged(); + DirectoryFragment dir = getDirectoryFragment(); + if (dir != null) { + dir.onDisplayStateChanged(); + } invalidateOptionsMenu(); } @@ -434,7 +453,10 @@ public abstract class BaseActivity extends Activity implements SearchManagerList */ void setUserSortOrder(int sortOrder) { mState.userSortOrder = sortOrder; - DirectoryFragment.get(getFragmentManager()).onSortOrderChanged(); + DirectoryFragment dir = getDirectoryFragment(); + if (dir != null) { + dir.onSortOrderChanged(); + }; } /** @@ -449,7 +471,10 @@ public abstract class BaseActivity extends Activity implements SearchManagerList // in onOptionsItemSelected, and not do the full invalidation // But! That's a larger refactoring we'll save for another day. invalidateOptionsMenu(); - DirectoryFragment.get(getFragmentManager()).onViewModeChanged(); + DirectoryFragment dir = getDirectoryFragment(); + if (dir != null) { + dir.onViewModeChanged(); + }; } public void setPending(boolean pending) { @@ -470,6 +495,12 @@ public abstract class BaseActivity extends Activity implements SearchManagerList super.onRestoreInstanceState(state); } + @Override + public boolean isSearchExpanded() { + return mSearchManager.isExpanded(); + } + + @Override public RootInfo getCurrentRoot() { if (mState.stack.root != null) { return mState.stack.root; @@ -498,7 +529,8 @@ public abstract class BaseActivity extends Activity implements SearchManagerList return; } - if (DirectoryFragment.get(getFragmentManager()).onBackPressed()) { + DirectoryFragment dir = getDirectoryFragment(); + if (dir != null && dir.onBackPressed()) { return; } @@ -513,7 +545,7 @@ public abstract class BaseActivity extends Activity implements SearchManagerList mDrawer.setOpen(false); } else if (size > 1) { mState.stack.pop(); - refreshCurrentRootAndDirectory(ANIM_UP); + refreshCurrentRootAndDirectory(ANIM_LEAVE); } else { super.onBackPressed(); } @@ -531,7 +563,7 @@ public abstract class BaseActivity extends Activity implements SearchManagerList } } - private DocumentInfo getRootDocumentBlocking(RootInfo root) { + DocumentInfo getRootDocumentBlocking(RootInfo root) { try { final Uri uri = DocumentsContract.buildDocumentUri( root.authority, root.documentId); @@ -544,11 +576,9 @@ public abstract class BaseActivity extends Activity implements SearchManagerList final class PickRootTask extends AsyncTask<Void, Void, DocumentInfo> { private RootInfo mRoot; - private boolean mTouched; - public PickRootTask(RootInfo root, boolean touched) { + public PickRootTask(RootInfo root) { mRoot = root; - mTouched = touched; } @Override @@ -679,92 +709,6 @@ public abstract class BaseActivity extends Activity implements SearchManagerList } } - final class ItemSelectedListener implements OnItemSelectedListener { - - boolean mIgnoreNextNavigation; - - @Override - public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { - if (mIgnoreNextNavigation) { - mIgnoreNextNavigation = false; - return; - } - - while (mState.stack.size() > position + 1) { - mState.popDocument(); - } - refreshCurrentRootAndDirectory(ANIM_UP); - } - - @Override - public void onNothingSelected(AdapterView<?> parent) { - // Ignored - } - } - - /** - * Class providing toolbar with runtime access to useful activity data. - */ - final class StackAdapter extends BaseAdapter { - @Override - public int getCount() { - return mState.stack.size(); - } - - @Override - public DocumentInfo getItem(int position) { - return mState.stack.get(mState.stack.size() - position - 1); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - if (convertView == null) { - convertView = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.item_subdir_title, parent, false); - } - - final TextView title = (TextView) convertView.findViewById(android.R.id.title); - final DocumentInfo doc = getItem(position); - - if (position == 0) { - final RootInfo root = getCurrentRoot(); - title.setText(root.title); - } else { - title.setText(doc.displayName); - } - - return convertView; - } - - @Override - public View getDropDownView(int position, View convertView, ViewGroup parent) { - if (convertView == null) { - convertView = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.item_subdir, parent, false); - } - - final ImageView subdir = (ImageView) convertView.findViewById(R.id.subdir); - final TextView title = (TextView) convertView.findViewById(android.R.id.title); - final DocumentInfo doc = getItem(position); - - if (position == 0) { - final RootInfo root = getCurrentRoot(); - title.setText(root.title); - subdir.setVisibility(View.GONE); - } else { - title.setText(doc.displayName); - subdir.setVisibility(View.VISIBLE); - } - - return convertView; - } - } - /** * Interface providing access to current view of documents * even when all documents are not homed to the same parent. diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index c3395aeb7ba2..815ff3db9517 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -43,10 +43,6 @@ import android.support.design.widget.Snackbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import android.view.View; -import android.widget.BaseAdapter; -import android.widget.Spinner; -import android.widget.Toolbar; import com.android.documentsui.RecentsProvider.RecentColumns; import com.android.documentsui.RecentsProvider.ResumeColumns; @@ -63,16 +59,8 @@ public class DocumentsActivity extends BaseActivity { private static final int CODE_FORWARD = 42; private static final String TAG = "DocumentsActivity"; - private Toolbar mToolbar; - private Spinner mToolbarStack; - - private Toolbar mRootsToolbar; - - private ItemSelectedListener mStackListener; - private BaseAdapter mStackAdapter; - public DocumentsActivity() { - super(R.layout.docs_activity, TAG); + super(R.layout.documents_activity, TAG); } @Override @@ -81,18 +69,6 @@ public class DocumentsActivity extends BaseActivity { final Resources res = getResources(); - mDrawer = DrawerController.create(this); - mToolbar = (Toolbar) findViewById(R.id.toolbar); - - mStackAdapter = new StackAdapter(); - mStackListener = new ItemSelectedListener(); - mToolbarStack = (Spinner) findViewById(R.id.stack); - mToolbarStack.setOnItemSelectedListener(mStackListener); - - mRootsToolbar = (Toolbar) findViewById(R.id.roots_toolbar); - - setActionBar(mToolbar); - if (mState.action == ACTION_CREATE) { final String mimeType = getIntent().getType(); final String title = getIntent().getStringExtra(Intent.EXTRA_TITLE); @@ -180,7 +156,7 @@ public class DocumentsActivity extends BaseActivity { } if (showDrawer) { - setRootsDrawerOpen(true); + mNavigator.revealRootsDrawer(true); } } @@ -217,66 +193,28 @@ public class DocumentsActivity extends BaseActivity { @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); - mDrawer.syncState(); - updateActionBar(); - } - - public void setRootsDrawerOpen(boolean open) { - mDrawer.setOpen(open); + mDrawer.update(); + mNavigator.update(); } @Override - public void updateActionBar() { - if (mRootsToolbar != null) { - final String prompt = getIntent().getStringExtra(DocumentsContract.EXTRA_PROMPT); - if (prompt != null) { - mRootsToolbar.setTitle(prompt); + public String getDrawerTitle() { + String title = getIntent().getStringExtra(DocumentsContract.EXTRA_PROMPT); + if (title == null) { + if (mState.action == ACTION_OPEN || + mState.action == ACTION_GET_CONTENT || + mState.action == ACTION_OPEN_TREE) { + title = getResources().getString(R.string.title_open); + } else if (mState.action == ACTION_CREATE || + mState.action == ACTION_PICK_COPY_DESTINATION) { + title = getResources().getString(R.string.title_save); } else { - if (mState.action == ACTION_OPEN || - mState.action == ACTION_GET_CONTENT || - mState.action == ACTION_OPEN_TREE) { - mRootsToolbar.setTitle(R.string.title_open); - } else if (mState.action == ACTION_CREATE || - mState.action == ACTION_PICK_COPY_DESTINATION) { - mRootsToolbar.setTitle(R.string.title_save); - } + // If all else fails, just call it "Files". + title = getResources().getString(R.string.files_label); } } - if (mDrawer.isUnlocked()) { - mToolbar.setNavigationIcon(R.drawable.ic_hamburger); - mToolbar.setNavigationContentDescription(R.string.drawer_open); - mToolbar.setNavigationOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - setRootsDrawerOpen(true); - } - }); - } else { - mToolbar.setNavigationIcon(null); - mToolbar.setNavigationContentDescription(R.string.drawer_open); - mToolbar.setNavigationOnClickListener(null); - } - - if (mSearchManager.isExpanded()) { - mToolbar.setTitle(null); - mToolbarStack.setVisibility(View.GONE); - mToolbarStack.setAdapter(null); - } else { - if (mState.stack.size() <= 1) { - mToolbar.setTitle(getCurrentRoot().title); - mToolbarStack.setVisibility(View.GONE); - mToolbarStack.setAdapter(null); - } else { - mToolbar.setTitle(null); - mToolbarStack.setVisibility(View.VISIBLE); - mToolbarStack.setAdapter(mStackAdapter); - - mStackListener.mIgnoreNextNavigation = true; - mToolbarStack.setSelection(mStackAdapter.getCount() - 1); - } - } + return title; } @Override @@ -293,19 +231,24 @@ public class DocumentsActivity extends BaseActivity { final DocumentInfo cwd = getCurrentDirectory(); + boolean picking = mState.action == ACTION_CREATE + || mState.action == ACTION_OPEN_TREE + || mState.action == ACTION_PICK_COPY_DESTINATION; + + if (picking) { + // May already be hidden because the root + // doesn't support search. + mSearchManager.showMenu(false); + } + final MenuItem createDir = menu.findItem(R.id.menu_create_dir); final MenuItem grid = menu.findItem(R.id.menu_grid); final MenuItem list = menu.findItem(R.id.menu_list); final MenuItem fileSize = menu.findItem(R.id.menu_file_size); - final MenuItem settings = menu.findItem(R.id.menu_settings); boolean recents = cwd == null; - boolean picking = mState.action == ACTION_CREATE - || mState.action == ACTION_OPEN_TREE - || mState.action == ACTION_PICK_COPY_DESTINATION; createDir.setVisible(picking && !recents && cwd.isCreateSupported()); - mSearchManager.showMenu(!picking); // No display options in recent directories if (picking && recents) { @@ -314,7 +257,6 @@ public class DocumentsActivity extends BaseActivity { } fileSize.setVisible(fileSize.isVisible() && !picking); - settings.setVisible(false); if (mState.action == ACTION_CREATE) { final FragmentManager fm = getFragmentManager(); @@ -327,11 +269,6 @@ public class DocumentsActivity extends BaseActivity { } @Override - public boolean onOptionsItemSelected(MenuItem item) { - return mDrawer.onOptionsItemSelected(item) || super.onOptionsItemSelected(item); - } - - @Override void refreshDirectory(int anim) { final FragmentManager fm = getFragmentManager(); final RootInfo root = getCurrentRoot(); @@ -392,7 +329,11 @@ public class DocumentsActivity extends BaseActivity { @Override void onRootPicked(RootInfo root) { super.onRootPicked(root); - setRootsDrawerOpen(false); + mNavigator.revealRootsDrawer(false); + } + + public void setRootsDrawerOpen(boolean open) { + mNavigator.revealRootsDrawer(open); } @Override diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java index 547e343cdb0d..900544220cce 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java @@ -63,6 +63,8 @@ public class DocumentsApplication extends Application { @Override public void onCreate() { + super.onCreate(); + final ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); final int memoryClassBytes = am.getMemoryClass() * 1024 * 1024; diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsToolBar.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsToolbar.java index 36b764659c05..7742cbf226e8 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsToolBar.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsToolbar.java @@ -24,28 +24,28 @@ import android.widget.Toolbar; /** * ToolBar of Documents UI. */ -public class DocumentsToolBar extends Toolbar { +public class DocumentsToolbar extends Toolbar { interface OnActionViewCollapsedListener { void onActionViewCollapsed(); } private OnActionViewCollapsedListener mOnActionViewCollapsedListener; - public DocumentsToolBar(Context context, AttributeSet attrs, + public DocumentsToolbar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } - public DocumentsToolBar(Context context, AttributeSet attrs, + public DocumentsToolbar(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } - public DocumentsToolBar(Context context, AttributeSet attrs) { + public DocumentsToolbar(Context context, AttributeSet attrs) { super(context, attrs); } - public DocumentsToolBar(Context context) { + public DocumentsToolbar(Context context) { super(context); } diff --git a/packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java index 3302da97bcae..89be9107e077 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java @@ -35,9 +35,6 @@ import android.support.design.widget.Snackbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import android.view.View; -import android.widget.BaseAdapter; -import android.widget.Spinner; import android.widget.Toolbar; import com.android.documentsui.RecentsProvider.ResumeColumns; @@ -56,14 +53,8 @@ import java.util.List; public class DownloadsActivity extends BaseActivity { private static final String TAG = "DownloadsActivity"; - private Toolbar mToolbar; - private Spinner mToolbarStack; - - private ItemSelectedListener mStackListener; - private BaseAdapter mStackAdapter; - public DownloadsActivity() { - super(R.layout.manage_roots_activity, TAG); + super(R.layout.downloads_activity, TAG); } @Override @@ -72,19 +63,10 @@ public class DownloadsActivity extends BaseActivity { final Context context = this; - mDrawer = DrawerController.createDummy(); - - mToolbar = (Toolbar) findViewById(R.id.toolbar); - mToolbar.setTitleTextAppearance(context, + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar.setTitleTextAppearance(context, android.R.style.TextAppearance_DeviceDefault_Widget_ActionBar_Title); - mStackAdapter = new StackAdapter(); - mStackListener = new ItemSelectedListener(); - mToolbarStack = (Spinner) findViewById(R.id.stack); - mToolbarStack.setOnItemSelectedListener(mStackListener); - - setActionBar(mToolbar); - if (!mState.restored) { // In this case, we set the activity title in AsyncTask.onPostExecute(). To prevent // talkback from reading aloud the default title, we clear it here. @@ -112,33 +94,12 @@ public class DownloadsActivity extends BaseActivity { @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); - updateActionBar(); + mNavigator.update(); } @Override - public void updateActionBar() { - // No navigation in manage root mode. - mToolbar.setNavigationIcon(null); - mToolbar.setNavigationOnClickListener(null); - - if (mSearchManager.isExpanded()) { - mToolbar.setTitle(null); - mToolbarStack.setVisibility(View.GONE); - mToolbarStack.setAdapter(null); - } else { - if (mState.stack.size() <= 1) { - mToolbar.setTitle(getCurrentRoot().title); - mToolbarStack.setVisibility(View.GONE); - mToolbarStack.setAdapter(null); - } else { - mToolbar.setTitle(null); - mToolbarStack.setVisibility(View.VISIBLE); - mToolbarStack.setAdapter(mStackAdapter); - - mStackListener.mIgnoreNextNavigation = true; - mToolbarStack.setSelection(mStackAdapter.getCount() - 1); - } - } + public String getDrawerTitle() { + return null; // being and nothingness } @Override @@ -150,14 +111,12 @@ public class DownloadsActivity extends BaseActivity { final MenuItem newWindow = menu.findItem(R.id.menu_new_window); final MenuItem pasteFromCb = menu.findItem(R.id.menu_paste_from_clipboard); final MenuItem fileSize = menu.findItem(R.id.menu_file_size); - final MenuItem search = menu.findItem(R.id.menu_search); advanced.setVisible(false); createDir.setVisible(false); pasteFromCb.setEnabled(false); newWindow.setEnabled(false); fileSize.setVisible(false); - search.setVisible(false); Menus.disableHiddenItems(menu); return true; @@ -184,29 +143,25 @@ public class DownloadsActivity extends BaseActivity { @Override public void onDocumentPicked(DocumentInfo doc, SiblingProvider siblings) { - final FragmentManager fm = getFragmentManager(); - if (doc.isContainer()) { - openContainerDocument(doc); - } else { - // First try managing the document; we expect manager to filter - // based on authority, so we don't grant. - final Intent manage = new Intent(DocumentsContract.ACTION_MANAGE_DOCUMENT); - manage.setData(doc.derivedUri); + Preconditions.checkArgument(!doc.isDirectory()); + // First try managing the document; we expect manager to filter + // based on authority, so we don't grant. + final Intent manage = new Intent(DocumentsContract.ACTION_MANAGE_DOCUMENT); + manage.setData(doc.derivedUri); + + try { + startActivity(manage); + } catch (ActivityNotFoundException ex) { + // Fall back to viewing. + final Intent view = new Intent(Intent.ACTION_VIEW); + view.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + view.setData(doc.derivedUri); try { - startActivity(manage); - } catch (ActivityNotFoundException ex) { - // Fall back to viewing - final Intent view = new Intent(Intent.ACTION_VIEW); - view.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - view.setData(doc.derivedUri); - - try { - startActivity(view); - } catch (ActivityNotFoundException ex2) { - Snackbars.makeSnackbar(this, R.string.toast_no_application, Snackbar.LENGTH_SHORT) - .show(); - } + startActivity(view); + } catch (ActivityNotFoundException ex2) { + Snackbars.makeSnackbar(this, R.string.toast_no_application, Snackbar.LENGTH_SHORT) + .show(); } } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/DrawerController.java b/packages/DocumentsUI/src/com/android/documentsui/DrawerController.java index df3ac1b0e7ef..bcf69c44070a 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DrawerController.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DrawerController.java @@ -22,8 +22,8 @@ import android.app.Activity; import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout.DrawerListener; -import android.view.MenuItem; import android.view.View; +import android.widget.Toolbar; /** * A facade over the various pieces comprising "roots fragment in a Drawer". @@ -33,13 +33,10 @@ import android.view.View; abstract class DrawerController implements DrawerListener { abstract void setOpen(boolean open); - abstract void lockOpen(); - abstract void lockClosed(); abstract boolean isPresent(); abstract boolean isOpen(); - abstract boolean isUnlocked(); - abstract void syncState(); - abstract boolean onOptionsItemSelected(MenuItem item); + abstract void setTitle(String title); + abstract void update(); /** * Returns a controller suitable for {@code Layout}. @@ -53,6 +50,8 @@ abstract class DrawerController implements DrawerListener { } View drawer = activity.findViewById(R.id.drawer_roots); + Toolbar toolbar = (Toolbar) activity.findViewById(R.id.roots_toolbar); + ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( activity, layout, @@ -60,7 +59,7 @@ abstract class DrawerController implements DrawerListener { R.string.drawer_open, R.string.drawer_close); - return new RuntimeDrawerController(layout, drawer, toggle); + return new RuntimeDrawerController(layout, drawer, toggle, toolbar); } /** @@ -78,9 +77,12 @@ abstract class DrawerController implements DrawerListener { private final ActionBarDrawerToggle mToggle; private DrawerLayout mLayout; private View mDrawer; + private Toolbar mToolbar; public RuntimeDrawerController( - DrawerLayout layout, View drawer, ActionBarDrawerToggle toggle) { + DrawerLayout layout, View drawer, ActionBarDrawerToggle toggle, + Toolbar drawerToolbar) { + mToolbar = drawerToolbar; checkArgument(layout != null); mLayout = layout; @@ -110,28 +112,13 @@ abstract class DrawerController implements DrawerListener { } @Override - void syncState() { - mToggle.syncState(); + void setTitle(String title) { + mToolbar.setTitle(title); } @Override - boolean isUnlocked() { - return mLayout.getDrawerLockMode(mDrawer) == DrawerLayout.LOCK_MODE_UNLOCKED; - } - - @Override - void lockOpen() { - mLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_OPEN); - } - - @Override - void lockClosed() { - mLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); - } - - @Override - boolean onOptionsItemSelected(MenuItem item) { - return false; + void update() { + mToggle.syncState(); } @Override @@ -163,14 +150,6 @@ abstract class DrawerController implements DrawerListener { @Override void setOpen(boolean open) {} - @Override - void syncState() {} - - @Override - void lockOpen() {} - - @Override - void lockClosed() {} @Override boolean isOpen() { @@ -178,19 +157,15 @@ abstract class DrawerController implements DrawerListener { } @Override - boolean isUnlocked() { - return true; - } - - @Override boolean isPresent() { return false; } @Override - boolean onOptionsItemSelected(MenuItem item) { - return false; - } + void setTitle(String title) {} + + @Override + void update() {} @Override public void onDrawerSlide(View drawerView, float slideOffset) {} diff --git a/packages/DocumentsUI/src/com/android/documentsui/Events.java b/packages/DocumentsUI/src/com/android/documentsui/Events.java index 10a78b9f8b51..99b425e9fac2 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/Events.java +++ b/packages/DocumentsUI/src/com/android/documentsui/Events.java @@ -78,6 +78,27 @@ public final class Events { } /** + * Whether or not the given keyCode represents a navigation keystroke (e.g. up, down, home). + * + * @param keyCode + * @return + */ + public static boolean isNavigationKeyCode(int keyCode) { + switch (keyCode) { + case KeyEvent.KEYCODE_DPAD_UP: + case KeyEvent.KEYCODE_DPAD_DOWN: + case KeyEvent.KEYCODE_DPAD_LEFT: + case KeyEvent.KEYCODE_DPAD_RIGHT: + case KeyEvent.KEYCODE_MOVE_HOME: + case KeyEvent.KEYCODE_MOVE_END: + return true; + default: + return false; + } + } + + + /** * Returns true if the "SHIFT" bit is set. */ public static boolean hasShiftBit(int metaState) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java index b490c002dc6c..3aba356793df 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java @@ -30,6 +30,7 @@ import android.content.ContentResolver; import android.content.ContentValues; import android.content.Intent; import android.net.Uri; +import android.os.AsyncTask; import android.os.Bundle; import android.os.Parcelable; import android.provider.DocumentsContract; @@ -39,10 +40,6 @@ import android.util.Log; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; -import android.view.View; -import android.widget.BaseAdapter; -import android.widget.Spinner; -import android.widget.Toolbar; import com.android.documentsui.OperationDialogFragment.DialogType; import com.android.documentsui.RecentsProvider.ResumeColumns; @@ -53,8 +50,10 @@ import com.android.documentsui.model.DurableUtils; import com.android.documentsui.model.RootInfo; import com.android.documentsui.services.FileOperationService; +import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; /** @@ -64,10 +63,6 @@ public class FilesActivity extends BaseActivity { public static final String TAG = "FilesActivity"; - private Toolbar mToolbar; - private Spinner mToolbarStack; - private ItemSelectedListener mStackListener; - private BaseAdapter mStackAdapter; private DocumentClipper mClipper; public FilesActivity() { @@ -78,17 +73,7 @@ public class FilesActivity extends BaseActivity { public void onCreate(Bundle icicle) { super.onCreate(icicle); - mToolbar = (Toolbar) findViewById(R.id.toolbar); - - mStackAdapter = new StackAdapter(); - mStackListener = new ItemSelectedListener(); - mToolbarStack = (Spinner) findViewById(R.id.stack); - mToolbarStack.setOnItemSelectedListener(mStackListener); - - setActionBar(mToolbar); - mClipper = new DocumentClipper(this); - mDrawer = DrawerController.create(this); RootsFragment.show(getFragmentManager(), null); @@ -104,11 +89,17 @@ public class FilesActivity extends BaseActivity { // loading or restoring the stack. // // When restoring from a stack, if a URI is present, it should only ever - // be a launch URI. Launch URIs support sensible activity management, but - // don't specify a real content target. + // be a launch URI, or a fake Uri from notifications. + // Launch URIs support sensible activity management, but don't specify a real + // content target. if (DEBUG) Log.d(TAG, "Launching with non-empty stack."); - checkState(uri == null || LauncherActivity.isLaunchUri(uri)); + checkState(uri == null || uri.getAuthority() == null || + LauncherActivity.isLaunchUri(uri)); refreshCurrentRootAndDirectory(ANIM_NONE); + } else if (intent.getAction() == Intent.ACTION_VIEW) { + checkArgument(uri != null); + new OpenUriForViewTask().executeOnExecutor( + ProviderExecutor.forAuthority(uri.getAuthority()), uri); } else if (DocumentsContract.isRootUri(this, uri)) { if (DEBUG) Log.d(TAG, "Launching with root URI."); // If we've got a specific root to display, restore that root using a dedicated @@ -170,11 +161,11 @@ public class FilesActivity extends BaseActivity { // serach. Why? Because this avoid an early (undesired) load of // the recents root...which is the default root in other activities. // In Files app "Home" is the default, but it is loaded async. - // updateActionBar will be called once Home root is loaded. + // update will be called once Home root is loaded. // Except while searching we need this call to ensure the // search bits get layed out correctly. if (mSearchManager.isSearching()) { - updateActionBar(); + mNavigator.update(); } } @@ -194,44 +185,8 @@ public class FilesActivity extends BaseActivity { } @Override - public void updateActionBar() { - final RootInfo root = getCurrentRoot(); - - if (mDrawer.isPresent()) { - mToolbar.setNavigationIcon(R.drawable.ic_hamburger); - mToolbar.setNavigationContentDescription(R.string.drawer_open); - mToolbar.setNavigationOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - mDrawer.setOpen(true); - } - }); - } else { - mToolbar.setNavigationIcon( - root != null ? root.loadToolbarIcon(mToolbar.getContext()) : null); - mToolbar.setNavigationContentDescription(R.string.drawer_open); - mToolbar.setNavigationOnClickListener(null); - } - - if (mSearchManager.isExpanded()) { - mToolbar.setTitle(null); - mToolbarStack.setVisibility(View.GONE); - mToolbarStack.setAdapter(null); - } else { - if (mState.stack.size() <= 1) { - mToolbar.setTitle(root.title); - mToolbarStack.setVisibility(View.GONE); - mToolbarStack.setAdapter(null); - } else { - mToolbar.setTitle(null); - mToolbarStack.setVisibility(View.VISIBLE); - mToolbarStack.setAdapter(mStackAdapter); - - mStackListener.mIgnoreNextNavigation = true; - mToolbarStack.setSelection(mStackAdapter.getCount() - 1); - } - } + public String getDrawerTitle() { + return getResources().getString(R.string.files_label); } @Override @@ -246,15 +201,20 @@ public class FilesActivity extends BaseActivity { public boolean onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); + final RootInfo root = getCurrentRoot(); + final MenuItem createDir = menu.findItem(R.id.menu_create_dir); - final MenuItem newWindow = menu.findItem(R.id.menu_new_window); final MenuItem pasteFromCb = menu.findItem(R.id.menu_paste_from_clipboard); + final MenuItem settings = menu.findItem(R.id.menu_settings); - createDir.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); createDir.setVisible(true); createDir.setEnabled(canCreateDirectory()); - pasteFromCb.setEnabled(mClipper.hasItemsToPaste()); + settings.setVisible(root.hasSettings()); + + // TODO: For some reason settings menu item is not + // honoring the "showAsAction=never" setting in activity.xml. + settings.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); Menus.disableHiddenItems(menu, pasteFromCb); return true; @@ -271,9 +231,10 @@ public class FilesActivity extends BaseActivity { createNewWindow(); return true; case R.id.menu_paste_from_clipboard: - DirectoryFragment dir = DirectoryFragment.get(getFragmentManager()); - dir = DirectoryFragment.get(getFragmentManager()); - dir.pasteFromClipboard(); + DirectoryFragment dir = getDirectoryFragment(); + if (dir != null) { + dir.pasteFromClipboard(); + } return true; } @@ -376,20 +337,26 @@ public class FilesActivity extends BaseActivity { @Override public boolean onKeyShortcut(int keyCode, KeyEvent event) { DirectoryFragment dir; + // TODO: All key events should be statically bound using alphabeticShortcut. + // But not working. switch (keyCode) { case KeyEvent.KEYCODE_A: - dir = DirectoryFragment.get(getFragmentManager()); - dir.selectAllFiles(); + dir = getDirectoryFragment(); + if (dir != null) { + dir.selectAllFiles(); + } return true; case KeyEvent.KEYCODE_C: - // TODO: Should be statically bound using alphabeticShortcut. See b/21330356. - dir = DirectoryFragment.get(getFragmentManager()); - dir.copySelectedToClipboard(); + dir = getDirectoryFragment(); + if (dir != null) { + dir.copySelectedToClipboard(); + } return true; case KeyEvent.KEYCODE_V: - // TODO: Should be statically bound using alphabeticShortcut. See b/21330356. - dir = DirectoryFragment.get(getFragmentManager()); - dir.pasteFromClipboard(); + dir = getDirectoryFragment(); + if (dir != null) { + dir.pasteFromClipboard(); + } return true; default: return super.onKeyShortcut(keyCode, event); @@ -435,4 +402,44 @@ public class FilesActivity extends BaseActivity { setResult(Activity.RESULT_OK, intent); finish(); } + + /** + * Builds a stack for the specific Uris. Multi roots are not supported, as it's impossible + * to know which root to select. Also, the stack doesn't contain intermediate directories. + * It's primarly used for opening ZIP archives from Downloads app. + */ + final class OpenUriForViewTask extends AsyncTask<Uri, Void, Void> { + @Override + protected Void doInBackground(Uri... params) { + final Uri uri = params[0]; + + final RootsCache rootsCache = DocumentsApplication.getRootsCache(FilesActivity.this); + final String authority = uri.getAuthority(); + + final Collection<RootInfo> roots = + rootsCache.getRootsForAuthorityBlocking(authority); + if (roots.isEmpty()) { + Log.e(TAG, "Failed to find root for the requested Uri: " + uri); + return null; + } + + final RootInfo root = roots.iterator().next(); + mState.stack.root = root; + try { + mState.stack.add(DocumentInfo.fromUri(getContentResolver(), uri)); + } catch (FileNotFoundException e) { + Log.e(TAG, "Failed to resolve DocumentInfo from Uri: " + uri); + } + mState.stack.add(getRootDocumentBlocking(root)); + return null; + } + + @Override + protected void onPostExecute(Void result) { + if (isDestroyed()) { + return; + } + refreshCurrentRootAndDirectory(ANIM_NONE); + } + } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/ListItem.java b/packages/DocumentsUI/src/com/android/documentsui/ListItem.java index 5c40f1b20d74..6d6f21ea30bd 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/ListItem.java +++ b/packages/DocumentsUI/src/com/android/documentsui/ListItem.java @@ -20,7 +20,6 @@ import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; import android.util.TypedValue; -import android.view.View; import android.widget.LinearLayout; /** @@ -39,14 +38,11 @@ public class ListItem extends LinearLayout @Override protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) { - View indicator = findViewById(R.id.focus_indicator); - if (gainFocus) { - TypedValue color = new TypedValue(); - getContext().getTheme().resolveAttribute(android.R.attr.colorAccent, color, true); - indicator.setBackgroundColor(color.data); - } else { - indicator.setBackgroundColor(android.R.color.transparent); - } + TypedValue color = new TypedValue(); + int colorId = gainFocus ? android.R.attr.colorAccent : android.R.color.transparent; + getContext().getTheme().resolveAttribute(colorId, color, true); + + findViewById(R.id.focus_indicator).setBackgroundColor(color.data); super.onFocusChanged(gainFocus, direction, previouslyFocusedRect); } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/Metrics.java b/packages/DocumentsUI/src/com/android/documentsui/Metrics.java index bae334b3759f..172282a9b3f9 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/Metrics.java +++ b/packages/DocumentsUI/src/com/android/documentsui/Metrics.java @@ -354,7 +354,7 @@ public final class Metrics { * a single ROOT_OTHER bucket. */ private static @Root int sanitizeRoot(Uri uri) { - if (LauncherActivity.isLaunchUri(uri)) { + if (uri == null || uri.getAuthority() == null || LauncherActivity.isLaunchUri(uri)) { return ROOT_NONE; } diff --git a/packages/DocumentsUI/src/com/android/documentsui/NavigationView.java b/packages/DocumentsUI/src/com/android/documentsui/NavigationView.java new file mode 100644 index 000000000000..ff1940aea94d --- /dev/null +++ b/packages/DocumentsUI/src/com/android/documentsui/NavigationView.java @@ -0,0 +1,246 @@ +/* + * Copyright (C) 2016 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.documentsui; + +import static android.view.View.GONE; +import static android.view.View.VISIBLE; +import static com.android.documentsui.Shared.DEBUG; +import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_LEAVE; + +import android.annotation.Nullable; +import android.graphics.drawable.Drawable; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.AdapterView.OnItemSelectedListener; +import android.widget.BaseAdapter; +import android.widget.ImageView; +import android.widget.Spinner; +import android.widget.TextView; + +import com.android.documentsui.model.DocumentInfo; +import com.android.documentsui.model.RootInfo; + +/** + * A facade over the portions of the app and drawer toolbars. + */ +class NavigationView { + + private static final String TAG = "NavigationView"; + + private final DrawerController mDrawer; + private final DocumentsToolbar mToolbar; + private final Spinner mBreadcrumb; + private final State mState; + private final NavigationView.Environment mEnv; + private final BreadcrumbAdapter mBreadcrumbAdapter; + + private boolean mIgnoreNextNavigation; + + public NavigationView( + DrawerController drawer, + DocumentsToolbar toolbar, + Spinner breadcrumb, + State state, + NavigationView.Environment env) { + + mToolbar = toolbar; + mBreadcrumb = breadcrumb; + mDrawer = drawer; + mState = state; + mEnv = env; + + mBreadcrumbAdapter = new BreadcrumbAdapter(mState, mEnv); + mToolbar.setNavigationOnClickListener( + new View.OnClickListener() { + @Override + public void onClick(View v) { + onNavigationIconClicked(); + } + + }); + + mBreadcrumb.setOnItemSelectedListener( + new OnItemSelectedListener() { + @Override + public void onItemSelected( + AdapterView<?> parent, View view, int position, long id) { + onBreadcrumbItemSelected(position); + } + + @Override + public void onNothingSelected(AdapterView<?> parent) {} + }); + + } + + private void onNavigationIconClicked() { + if (mDrawer.isPresent()) { + mDrawer.setOpen(true); + } + } + + private void onBreadcrumbItemSelected(int position) { + if (mIgnoreNextNavigation) { + mIgnoreNextNavigation = false; + return; + } + + while (mState.stack.size() > position + 1) { + mState.popDocument(); + } + mEnv.refreshCurrentRootAndDirectory(ANIM_LEAVE); + } + + void update() { + + // TODO: Looks to me like this block is never getting hit. + if (mEnv.isSearchExpanded()) { + mToolbar.setTitle(null); + mBreadcrumb.setVisibility(View.GONE); + mBreadcrumb.setAdapter(null); + return; + } + + mDrawer.setTitle(mEnv.getDrawerTitle()); + + mToolbar.setNavigationIcon(getActionBarIcon()); + mToolbar.setNavigationContentDescription(R.string.drawer_open); + + if (mState.stack.size() <= 1) { + showBreadcrumb(false); + String title = mEnv.getCurrentRoot().title; + if (DEBUG) Log.d(TAG, "New toolbar title is: " + title); + mToolbar.setTitle(title); + } else { + showBreadcrumb(true); + mToolbar.setTitle(null); + mIgnoreNextNavigation = true; + mBreadcrumb.setSelection(mBreadcrumbAdapter.getCount() - 1); + } + + if (DEBUG) Log.d(TAG, "Final toolbar title is: " + mToolbar.getTitle()); + } + + private void showBreadcrumb(boolean visibility) { + if (visibility) { + mBreadcrumb.setVisibility(VISIBLE); + mBreadcrumb.setAdapter(mBreadcrumbAdapter); + } else { + mBreadcrumb.setVisibility(GONE); + mBreadcrumb.setAdapter(null); + } + } + + // Hamburger if drawer is present, else root icon, or sad nullness. + private @Nullable Drawable getActionBarIcon() { + if (mDrawer.isPresent()) { + return mToolbar.getContext().getDrawable(R.drawable.ic_hamburger); + } else { + RootInfo root = mEnv.getCurrentRoot(); + if (root != null) { + return root.loadToolbarIcon(mToolbar.getContext()); + } + } + return null; + } + + void revealRootsDrawer(boolean open) { + mDrawer.setOpen(open); + } + + /** + * Class providing toolbar with runtime access to useful activity data. + */ + static final class BreadcrumbAdapter extends BaseAdapter { + + private Environment mEnv; + private State mState; + + public BreadcrumbAdapter(State state, Environment env) { + mState = state; + mEnv = env; + } + + @Override + public int getCount() { + return mState.stack.size(); + } + + @Override + public DocumentInfo getItem(int position) { + return mState.stack.get(mState.stack.size() - position - 1); + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + if (convertView == null) { + convertView = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.item_subdir_title, parent, false); + } + + final TextView title = (TextView) convertView.findViewById(android.R.id.title); + final DocumentInfo doc = getItem(position); + + if (position == 0) { + final RootInfo root = mEnv.getCurrentRoot(); + title.setText(root.title); + } else { + title.setText(doc.displayName); + } + + return convertView; + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + if (convertView == null) { + convertView = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.item_subdir, parent, false); + } + + final ImageView subdir = (ImageView) convertView.findViewById(R.id.subdir); + final TextView title = (TextView) convertView.findViewById(android.R.id.title); + final DocumentInfo doc = getItem(position); + + if (position == 0) { + final RootInfo root = mEnv.getCurrentRoot(); + title.setText(root.title); + subdir.setVisibility(View.GONE); + } else { + title.setText(doc.displayName); + subdir.setVisibility(View.VISIBLE); + } + + return convertView; + } + } + + interface Environment { + RootInfo getCurrentRoot(); + String getDrawerTitle(); + void refreshCurrentRootAndDirectory(int animation); + boolean isSearchExpanded(); + } +} diff --git a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java index 5dc4f57bdb7b..d6015501b003 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java @@ -19,17 +19,12 @@ package com.android.documentsui; import static android.os.Environment.isStandardDirectory; import static com.android.documentsui.Shared.DEBUG; -import java.io.File; -import java.io.IOException; -import java.util.List; - import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.app.FragmentManager; import android.app.FragmentTransaction; -import android.content.ContentProvider; import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.Context; @@ -48,11 +43,15 @@ import android.provider.DocumentsContract; import android.text.TextUtils; import android.util.Log; +import java.io.File; +import java.io.IOException; +import java.util.List; + /** * Activity responsible for handling {@link Intent#ACTION_OPEN_EXTERNAL_DOCUMENT}. */ public class OpenExternalDirectoryActivity extends Activity { - private static final String TAG = "OpenExternalDirectoryActivity"; + private static final String TAG = "OpenExternalDirectory"; private static final String FM_TAG = "open_external_directory"; private static final String EXTERNAL_STORAGE_AUTH = "com.android.externalstorage.documents"; private static final String EXTRA_FILE = "com.android.documentsui.FILE"; @@ -209,7 +208,7 @@ public class OpenExternalDirectoryActivity extends Activity { return intent; } - private static class OpenExternalDirectoryDialogFragment extends DialogFragment { + public static class OpenExternalDirectoryDialogFragment extends DialogFragment { private File mFile; private String mVolumeLabel; diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java index 21e756623bdd..29a72b86ea7e 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java @@ -48,6 +48,7 @@ import libcore.io.IoUtils; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -159,6 +160,24 @@ public class RootsCache { } } + /** + * Load roots from a stopped authority. Normal {@link UpdateTask} passes + * ignore stopped applications. + */ + private void loadStoppedAuthority(String authority) { + final ContentResolver resolver = mContext.getContentResolver(); + synchronized (mLock) { + if (!mStoppedAuthorities.contains(authority)) { + return; + } + if (DEBUG) { + Log.d(TAG, "Loading stopped authority " + authority); + } + mRoots.putAll(authority, loadRootsForAuthority(resolver, authority)); + mStoppedAuthorities.remove(authority); + } + } + private class UpdateTask extends AsyncTask<Void, Void, Void> { private final String mFilterPackage; @@ -360,6 +379,19 @@ public class RootsCache { } } + /** + * Returns a list of roots for the specified authority. If not found, then + * an empty list is returned. + */ + public Collection<RootInfo> getRootsForAuthorityBlocking(String authority) { + waitForFirstLoad(); + loadStoppedAuthority(authority); + synchronized (mLock) { + final Collection<RootInfo> roots = mRoots.get(authority); + return roots != null ? roots : Collections.<RootInfo>emptyList(); + } + } + public void setOnCacheUpdateListener(OnCacheUpdateListener cacheUpdateListener) { mCacheUpdateListener = cacheUpdateListener; } diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java index c2aeb86a1f07..26bda31261ef 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java @@ -92,7 +92,6 @@ public class RootsFragment extends Fragment { mList = (ListView) view.findViewById(android.R.id.list); mList.setOnItemClickListener(mItemListener); mList.setChoiceMode(ListView.CHOICE_MODE_SINGLE); - return view; } @@ -161,6 +160,7 @@ public class RootsFragment extends Fragment { final RootInfo testRoot = ((RootItem) item).root; if (Objects.equals(testRoot, root)) { mList.setItemChecked(i, true); + mList.setSelection(i); return; } } @@ -180,9 +180,9 @@ public class RootsFragment extends Fragment { Item item = mAdapter.getItem(position); if (item instanceof RootItem) { BaseActivity activity = BaseActivity.get(RootsFragment.this); - RootInfo info = ((RootItem) item).root; - Metrics.logRootVisited(getActivity(), info); - activity.onRootPicked(info); + RootInfo newRoot = ((RootItem) item).root; + Metrics.logRootVisited(getActivity(), newRoot); + activity.onRootPicked(newRoot); } else if (item instanceof AppItem) { DocumentsActivity activity = DocumentsActivity.get(RootsFragment.this); ResolveInfo info = ((AppItem) item).info; @@ -302,8 +302,10 @@ public class RootsFragment extends Fragment { for (final RootInfo root : roots) { final RootItem item = new RootItem(root); if (root.isLibrary()) { + if (DEBUG) Log.d(TAG, "Adding " + root + " as library."); libraries.add(item); } else { + if (DEBUG) Log.d(TAG, "Adding " + root + " as non-library."); others.add(item); } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/SearchManager.java b/packages/DocumentsUI/src/com/android/documentsui/SearchManager.java index fb585a618c47..69f54c77fe8b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/SearchManager.java +++ b/packages/DocumentsUI/src/com/android/documentsui/SearchManager.java @@ -47,7 +47,7 @@ final class SearchManager implements private boolean mSearchExpanded; private boolean mIgnoreNextClose; - private DocumentsToolBar mActionBar; + private DocumentsToolbar mActionBar; private MenuItem mMenu; private SearchView mView; @@ -59,7 +59,7 @@ final class SearchManager implements mListener = listener; } - public void install(DocumentsToolBar actionBar) { + public void install(DocumentsToolbar actionBar) { assert (mActionBar == null); mActionBar = actionBar; mMenu = actionBar.getSearchMenu(); diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index 2aabc991431c..1e3da6b1ac8a 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -66,6 +66,7 @@ import android.util.TypedValue; import android.view.ActionMode; import android.view.DragEvent; import android.view.GestureDetector; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -117,8 +118,8 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi public static final int ANIM_NONE = 1; public static final int ANIM_SIDE = 2; - public static final int ANIM_DOWN = 3; - public static final int ANIM_UP = 4; + public static final int ANIM_LEAVE = 3; + public static final int ANIM_ENTER = 4; public static final int REQUEST_COPY_DESTINATION = 1; @@ -151,7 +152,6 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi private String mStateKey; private int mLastSortOrder = SORT_ORDER_UNKNOWN; - private boolean mLastShowSize; private DocumentsAdapter mAdapter; private LoaderCallbacks<DirectoryResult> mCallbacks; private FragmentTuner mTuner; @@ -428,7 +428,6 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi private void updateDisplayState() { State state = getDisplayState(); - mLastShowSize = state.showSize; updateLayout(state.derivedMode); mRecView.setAdapter(mAdapter); } @@ -529,6 +528,9 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi final Cursor cursor = mModel.getItem(modelId); checkNotNull(cursor, "Cursor cannot be null."); + // TODO: Should this be happening in onSelectionChanged? Technically this callback is + // triggered on "silent" selection updates (i.e. we might be reacting to unfinalized + // selection changes here) final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS); if ((docFlags & Document.FLAG_SUPPORTS_DELETE) == 0) { mNoDeleteCount += selected ? 1 : -1; @@ -827,7 +829,6 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi @Override public void initDocumentHolder(DocumentHolder holder) { holder.addEventListener(mItemEventListener); - holder.addOnKeyListener(mSelectionManager); } @Override @@ -1230,7 +1231,12 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi private class ItemEventListener implements DocumentHolder.EventListener { @Override public boolean onActivate(DocumentHolder doc) { - handleViewItem(doc.modelId); + // Toggle selection if we're in selection mode, othewise, view item. + if (mSelectionManager.hasSelection()) { + mSelectionManager.toggleSelection(doc.modelId); + } else { + handleViewItem(doc.modelId); + } return true; } @@ -1240,6 +1246,128 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi mSelectionManager.setSelectionRangeBegin(doc.getAdapterPosition()); return true; } + + @Override + public boolean onKey(DocumentHolder doc, int keyCode, KeyEvent event) { + // Only handle key-down events. This is simpler, consistent with most other UIs, and + // enables the handling of repeated key events from holding down a key. + if (event.getAction() != KeyEvent.ACTION_DOWN) { + return false; + } + + boolean handled = false; + if (Events.isNavigationKeyCode(keyCode)) { + // Find the target item and focus it. + int endPos = findTargetPosition(doc.itemView, keyCode); + + if (endPos != RecyclerView.NO_POSITION) { + focusItem(endPos); + + // Handle any necessary adjustments to selection. + boolean extendSelection = event.isShiftPressed(); + if (extendSelection) { + int startPos = doc.getAdapterPosition(); + mSelectionManager.selectRange(startPos, endPos); + } + handled = true; + } + } else { + // Handle enter key events + if (keyCode == KeyEvent.KEYCODE_ENTER) { + handled = onActivate(doc); + } + } + + return handled; + } + + /** + * Finds the destination position where the focus should land for a given navigation event. + * + * @param view The view that received the event. + * @param keyCode The key code for the event. + * @return The adapter position of the destination item. Could be RecyclerView.NO_POSITION. + */ + private int findTargetPosition(View view, int keyCode) { + if (keyCode == KeyEvent.KEYCODE_MOVE_HOME) { + return 0; + } + + if (keyCode == KeyEvent.KEYCODE_MOVE_END) { + return mAdapter.getItemCount() - 1; + } + + // Find a navigation target based on the arrow key that the user pressed. + int searchDir = -1; + switch (keyCode) { + case KeyEvent.KEYCODE_DPAD_UP: + searchDir = View.FOCUS_UP; + break; + case KeyEvent.KEYCODE_DPAD_DOWN: + searchDir = View.FOCUS_DOWN; + break; + case KeyEvent.KEYCODE_DPAD_LEFT: + searchDir = View.FOCUS_LEFT; + break; + case KeyEvent.KEYCODE_DPAD_RIGHT: + searchDir = View.FOCUS_RIGHT; + break; + } + + if (searchDir != -1) { + View targetView = view.focusSearch(searchDir); + // TargetView can be null, for example, if the user pressed <down> at the bottom + // of the list. + if (targetView != null) { + // Ignore navigation targets that aren't items in the RecyclerView. + if (targetView.getParent() == mRecView) { + return mRecView.getChildAdapterPosition(targetView); + } + } + } + + return RecyclerView.NO_POSITION; + } + + /** + * Requests focus for the item in the given adapter position, scrolling the RecyclerView if + * necessary. + * + * @param pos + */ + public void focusItem(final int pos) { + // If the item is already in view, focus it; otherwise, scroll to it and focus it. + RecyclerView.ViewHolder vh = mRecView.findViewHolderForAdapterPosition(pos); + if (vh != null) { + vh.itemView.requestFocus(); + } else { + mRecView.smoothScrollToPosition(pos); + // Set a one-time listener to request focus when the scroll has completed. + mRecView.addOnScrollListener( + new RecyclerView.OnScrollListener() { + @Override + public void onScrollStateChanged (RecyclerView view, int newState) { + if (newState == RecyclerView.SCROLL_STATE_IDLE) { + // When scrolling stops, find the item and focus it. + RecyclerView.ViewHolder vh = + view.findViewHolderForAdapterPosition(pos); + if (vh != null) { + vh.itemView.requestFocus(); + } else { + // This might happen in weird corner cases, e.g. if the user is + // scrolling while a delete operation is in progress. In that + // case, just don't attempt to focus the missing item. + Log.w( + TAG, "Unable to focus position " + pos + " after a scroll"); + } + view.removeOnScrollListener(this); + } + } + }); + } + } + + } private final class ModelUpdateListener implements Model.UpdateListener { @@ -1404,12 +1532,12 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi case ANIM_SIDE: args.putBoolean(EXTRA_IGNORE_STATE, true); break; - case ANIM_DOWN: + case ANIM_ENTER: args.putBoolean(EXTRA_IGNORE_STATE, true); - ft.setCustomAnimations(R.animator.dir_down, R.animator.dir_frozen); + ft.setCustomAnimations(R.animator.dir_enter, R.animator.dir_frozen); break; - case ANIM_UP: - ft.setCustomAnimations(R.animator.dir_frozen, R.animator.dir_up); + case ANIM_LEAVE: + ft.setCustomAnimations(R.animator.dir_frozen, R.animator.dir_leave); break; } diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentHolder.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentHolder.java index 8acf1af8713b..1bfc6e909c5a 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentHolder.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentHolder.java @@ -84,13 +84,7 @@ public abstract class DocumentHolder public boolean onKey(View v, int keyCode, KeyEvent event) { // Event listener should always be set. checkNotNull(mEventListener); - // Intercept enter key-up events, and treat them as clicks. Forward other events. - if (event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_ENTER) { - return mEventListener.onActivate(this); - } else if (mKeyListener != null) { - return mKeyListener.onKey(v, keyCode, event); - } - return false; + return mEventListener.onKey(this, keyCode, event); } public void addEventListener(DocumentHolder.EventListener listener) { @@ -159,15 +153,29 @@ public abstract class DocumentHolder */ interface EventListener { /** + * Handles activation events on the document holder. + * * @param doc The target DocumentHolder * @return Whether the event was handled. */ public boolean onActivate(DocumentHolder doc); /** + * Handles selection events on the document holder. + * * @param doc The target DocumentHolder * @return Whether the event was handled. */ public boolean onSelect(DocumentHolder doc); + + /** + * Handles key events on the document holder. + * + * @param doc The target DocumentHolder. + * @param keyCode Key code for the event. + * @param event KeyEvent for the event. + * @return Whether the event was handled. + */ + public boolean onKey(DocumentHolder doc, int keyCode, KeyEvent event); } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java index 880da9c07bef..69a67111ca38 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java @@ -29,7 +29,6 @@ import android.util.SparseArray; import android.view.ViewGroup; import com.android.documentsui.State; - import com.google.common.collect.Sets; import java.util.ArrayList; @@ -42,7 +41,7 @@ import java.util.Set; */ final class ModelBackedDocumentsAdapter extends DocumentsAdapter { - private static final String TAG = "ModelBackedDocumentsAdapter"; + private static final String TAG = "ModelBackedDocuments"; public static final int ITEM_TYPE_DOCUMENT = 1; public static final int ITEM_TYPE_DIRECTORY = 2; diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java index eea91a015efd..516b25e6f572 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java @@ -34,7 +34,6 @@ import android.util.Log; import android.util.SparseArray; import android.util.SparseBooleanArray; import android.util.SparseIntArray; -import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; @@ -57,7 +56,7 @@ import java.util.Set; * Additionally it can be configured to restrict selection to a single element, @see * #setSelectMode. */ -public final class MultiSelectManager implements View.OnKeyListener { +public final class MultiSelectManager { /** Selection mode for multiple select. **/ public static final int MODE_MULTIPLE = 0; @@ -239,7 +238,8 @@ public final class MultiSelectManager implements View.OnKeyListener { } /** - * Clears the selection, without notifying anyone. + * Clears the selection, without notifying selection listeners. UI elements still need to be + * notified about state changes so that they can update their appearance. */ private void clearSelectionQuietly() { mRanger = null; @@ -248,10 +248,10 @@ public final class MultiSelectManager implements View.OnKeyListener { return; } - Selection intermediateSelection = getSelection(new Selection()); + Selection oldSelection = getSelection(new Selection()); mSelection.clear(); - for (String id: intermediateSelection.getAll()) { + for (String id: oldSelection.getAll()) { notifyItemStateChanged(id, false); } } @@ -334,21 +334,7 @@ public final class MultiSelectManager implements View.OnKeyListener { if (mSelection.contains(modelId)) { changed = attemptDeselect(modelId); } else { - boolean canSelect = notifyBeforeItemStateChange(modelId, true); - if (!canSelect) { - return; - } - if (mSingleSelect && hasSelection()) { - clearSelectionQuietly(); - } - - // Here we're already in selection mode. In that case - // When a simple click/tap (without SHIFT) creates causes - // an item to be selected. - // By recreating Ranger at this point, we allow the user to create - // multiple separate contiguous ranges with SHIFT+Click & Click. - selectAndNotify(modelId); - changed = true; + changed = attemptSelect(modelId); } if (changed) { @@ -357,9 +343,46 @@ public final class MultiSelectManager implements View.OnKeyListener { } /** - * Sets the magic location at which a selection range begins. This - * value is consulted when determining how to extend, and modify - * selection ranges. + * Handle a range selection event. + * <li> If the MSM is currently in single-select mode, only the last item in the range will + * actually be selected. + * <li>If a range selection is not already active, one will be started, and the given range of + * items will be selected. The given startPos becomes the anchor for the range selection. + * <li>If a range selection is already active, the anchor is not changed. The range is extended + * from its current anchor to endPos. + * + * @param startPos + * @param endPos + */ + public void selectRange(int startPos, int endPos) { + // In single-select mode, just select the last item in the range. + if (mSingleSelect) { + attemptSelect(mAdapter.getModelId(endPos)); + return; + } + + // In regular (i.e. multi-select) mode + if (!isRangeSelectionActive()) { + // If a range selection isn't active, start one up + attemptSelect(mAdapter.getModelId(startPos)); + setSelectionRangeBegin(startPos); + } + // Extend the range selection + mRanger.snapSelection(endPos); + notifySelectionChanged(); + } + + /** + * @return Whether or not there is a current range selection active. + */ + private boolean isRangeSelectionActive() { + return mRanger != null; + } + + /** + * Sets the magic location at which a selection range begins (the selection anchor). This value + * is consulted when determining how to extend, and modify selection ranges. Calling this when a + * range selection is active will reset the range selection. * * @throws IllegalStateException if {@code position} is not already be selected * @param position @@ -434,6 +457,24 @@ public final class MultiSelectManager implements View.OnKeyListener { } } + /** + * @param id + * @return True if the update was applied. + */ + private boolean attemptSelect(String id) { + checkArgument(id != null); + boolean canSelect = notifyBeforeItemStateChange(id, true); + if (!canSelect) { + return false; + } + if (mSingleSelect && hasSelection()) { + clearSelectionQuietly(); + } + + selectAndNotify(id); + return true; + } + private boolean notifyBeforeItemStateChange(String id, boolean nextState) { int lastListener = mCallbacks.size() - 1; for (int i = lastListener; i > -1; i--) { @@ -786,12 +827,10 @@ public final class MultiSelectManager implements View.OnKeyListener { Point createAbsolutePoint(Point relativePoint); Rect getAbsoluteRectForChildViewAt(int index); int getAdapterPositionAt(int index); - int getAdapterPositionForChildView(View view); int getColumnCount(); int getRowCount(); int getChildCount(); int getVisibleChildCount(); - void focusItem(int position); /** * Layout items are excluded from the GridModel. */ @@ -812,17 +851,8 @@ public final class MultiSelectManager implements View.OnKeyListener { } @Override - public int getAdapterPositionForChildView(View view) { - if (view.getParent() == mView) { - return mView.getChildAdapterPosition(view); - } else { - return RecyclerView.NO_POSITION; - } - } - - @Override public int getAdapterPositionAt(int index) { - return getAdapterPositionForChildView(mView.getChildAt(index)); + return mView.getChildAdapterPosition(mView.getChildAt(index)); } @Override @@ -921,39 +951,6 @@ public final class MultiSelectManager implements View.OnKeyListener { } @Override - public void focusItem(final int pos) { - // If the item is already in view, focus it; otherwise, scroll to it and focus it. - RecyclerView.ViewHolder vh = mView.findViewHolderForAdapterPosition(pos); - if (vh != null) { - vh.itemView.requestFocus(); - } else { - mView.smoothScrollToPosition(pos); - // Set a one-time listener to request focus when the scroll has completed. - mView.addOnScrollListener( - new RecyclerView.OnScrollListener() { - @Override - public void onScrollStateChanged (RecyclerView view, int newState) { - if (newState == RecyclerView.SCROLL_STATE_IDLE) { - // When scrolling stops, find the item and focus it. - RecyclerView.ViewHolder vh = - view.findViewHolderForAdapterPosition(pos); - if (vh != null) { - vh.itemView.requestFocus(); - } else { - // This might happen in weird corner cases, e.g. if the user is - // scrolling while a delete operation is in progress. In that - // case, just don't attempt to focus the missing item. - Log.w( - TAG, "Unable to focus position " + pos + " after a scroll"); - } - view.removeOnScrollListener(this); - } - } - }); - } - } - - @Override public boolean isLayoutItem(int pos) { // The band selection model only operates on documents and directories. Exclude other // types of adapter items (e.g. whitespace items like dividers). @@ -1907,99 +1904,4 @@ public final class MultiSelectManager implements View.OnKeyListener { return true; } } - - // TODO: Might have to move this to a more global level. e.g. What should happen if the - // user taps a file and then presses shift-down? Currently the RecyclerView never even sees - // the key event. Perhaps install a global key handler to catch those events while in - // selection mode? - @Override - public boolean onKey(View view, int keyCode, KeyEvent event) { - // Listen for key-down events. This allows the handler to respond appropriately when - // the user holds down the arrow keys for navigation. - if (event.getAction() != KeyEvent.ACTION_DOWN) { - return false; - } - - // Here we unpack information from the event and pass it to an more - // easily tested method....basically eliminating the need to synthesize - // events and views and so on in our tests. - int endPos = findTargetPosition(view, keyCode); - if (endPos == RecyclerView.NO_POSITION) { - // If there is no valid navigation target, don't handle the keypress. - return false; - } - - int startPos = mEnvironment.getAdapterPositionForChildView(view); - - return changeFocus(startPos, endPos, event.isShiftPressed()); - } - - /** - * @param startPosition The current focus position. - * @param targetPosition The adapter position to focus. - * @param extendSelection - */ - @VisibleForTesting - boolean changeFocus(int startPosition, int targetPosition, boolean extendSelection) { - // Focus the new file. - mEnvironment.focusItem(targetPosition); - - if (extendSelection) { - if (mSingleSelect) { - // We're in single select and have an existing selection. - // Our best guess as to what the user would expect is to advance the selection. - clearSelection(); - toggleSelection(targetPosition); - } else { - if (!hasSelection()) { - // No selection - start a selection when the user presses shift-arrow. - toggleSelection(startPosition); - setSelectionRangeBegin(startPosition); - } - mRanger.snapSelection(targetPosition); - notifySelectionChanged(); - } - } - - return true; - } - - /** - * Returns the adapter position that the key combo is targeted at. - */ - private int findTargetPosition(View view, int keyCode) { - int position = RecyclerView.NO_POSITION; - if (keyCode == KeyEvent.KEYCODE_MOVE_HOME) { - position = 0; - } else if (keyCode == KeyEvent.KEYCODE_MOVE_END) { - position = mAdapter.getItemCount() - 1; - } else { - // Find a navigation target based on the arrow key that the user pressed. Ignore - // navigation targets that aren't items in the recycler view. - int searchDir = -1; - switch (keyCode) { - case KeyEvent.KEYCODE_DPAD_UP: - searchDir = View.FOCUS_UP; - break; - case KeyEvent.KEYCODE_DPAD_DOWN: - searchDir = View.FOCUS_DOWN; - break; - case KeyEvent.KEYCODE_DPAD_LEFT: - searchDir = View.FOCUS_LEFT; - break; - case KeyEvent.KEYCODE_DPAD_RIGHT: - searchDir = View.FOCUS_RIGHT; - break; - } - if (searchDir != -1) { - View targetView = view.focusSearch(searchDir); - // TargetView can be null, for example, if the user pressed <down> at the bottom of - // the list. - if (targetView != null) { - position = mEnvironment.getAdapterPositionForChildView(targetView); - } - } - } - return position; - } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java index 71708c1f2c5d..0bb682e7c967 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/RenameDocumentFragment.java @@ -44,13 +44,13 @@ import android.widget.TextView.OnEditorActionListener; import com.android.documentsui.BaseActivity; import com.android.documentsui.DocumentsApplication; -import com.android.documentsui.model.DocumentInfo; import com.android.documentsui.R; import com.android.documentsui.Snackbars; +import com.android.documentsui.model.DocumentInfo; /** * Dialog to rename file or directory. */ -class RenameDocumentFragment extends DialogFragment { +public class RenameDocumentFragment extends DialogFragment { private static final String TAG_RENAME_DOCUMENT = "rename_document"; private DocumentInfo mDocument; diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java index 12c0b8fcd228..3f14a5506adf 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java +++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java @@ -176,6 +176,7 @@ public class RootInfo implements Durable, Parcelable { } else if (isExternalStorage()) { derivedIcon = R.drawable.ic_root_smartphone; derivedType = TYPE_LOCAL; + // TODO: Apply SD card icon to SD devices. } else if (isDownloads()) { derivedIcon = R.drawable.ic_root_download; derivedType = TYPE_DOWNLOADS; @@ -244,6 +245,10 @@ public class RootInfo implements Durable, Parcelable { || derivedType == TYPE_RECENTS || derivedType == TYPE_DOWNLOADS; } + public boolean hasSettings() { + return (flags & Root.FLAG_HAS_SETTINGS) != 0; + } + public Drawable loadIcon(Context context) { if (derivedIcon != 0) { return context.getDrawable(derivedIcon); diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java b/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java index 7c08ba787806..dad86977c7a2 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java +++ b/packages/DocumentsUI/src/com/android/documentsui/services/CopyJob.java @@ -186,7 +186,7 @@ class CopyJob extends Job { @Override Notification getWarningNotification() { - final Intent navigateIntent = buildNavigateIntent(); + final Intent navigateIntent = buildNavigateIntent(INTENT_TAG_WARNING); navigateIntent.putExtra(EXTRA_DIALOG_TYPE, DIALOG_TYPE_CONVERTED); navigateIntent.putExtra(EXTRA_OPERATION, operationType); diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/Job.java b/packages/DocumentsUI/src/com/android/documentsui/services/Job.java index f2c8763157dd..77517ca9085b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/services/Job.java +++ b/packages/DocumentsUI/src/com/android/documentsui/services/Job.java @@ -35,6 +35,7 @@ import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.net.Uri; import android.os.Parcelable; import android.os.RemoteException; import android.provider.DocumentsContract; @@ -60,6 +61,12 @@ import java.util.Map; */ abstract public class Job implements Runnable { private static final String TAG = "Job"; + + static final String INTENT_TAG_WARNING = "warning"; + static final String INTENT_TAG_FAILURE = "failure"; + static final String INTENT_TAG_PROGRESS = "progress"; + static final String INTENT_TAG_CANCEL = "cancel"; + final Context service; final Context appContext; final Listener listener; @@ -130,6 +137,10 @@ abstract public class Job implements Runnable { abstract Notification getWarningNotification(); + Uri getDataUriForIntent(String tag) { + return Uri.parse(String.format("data,%s-%s", tag, id)); + } + ContentProviderClient getClient(DocumentInfo doc) throws RemoteException { ContentProviderClient client = mClients.get(doc.authority); if (client == null) { @@ -193,10 +204,9 @@ abstract public class Job implements Runnable { } Notification getFailureNotification(@PluralsRes int titleId, @DrawableRes int icon) { - final Intent navigateIntent = buildNavigateIntent(); + final Intent navigateIntent = buildNavigateIntent(INTENT_TAG_FAILURE); navigateIntent.putExtra(EXTRA_DIALOG_TYPE, OperationDialogFragment.DIALOG_TYPE_FAILURE); navigateIntent.putExtra(EXTRA_OPERATION, operationType); - navigateIntent.putParcelableArrayListExtra(EXTRA_SRC_LIST, failedFiles); final Notification.Builder errorBuilder = new Notification.Builder(service) @@ -219,7 +229,8 @@ abstract public class Job implements Runnable { Notification.Builder progressBuilder = new Notification.Builder(service) .setContentTitle(title) .setContentIntent( - PendingIntent.getActivity(appContext, 0, buildNavigateIntent(), 0)) + PendingIntent.getActivity(appContext, 0, + buildNavigateIntent(INTENT_TAG_PROGRESS), 0)) .setCategory(Notification.CATEGORY_PROGRESS) .setSmallIcon(icon) .setOngoing(true); @@ -241,15 +252,18 @@ abstract public class Job implements Runnable { /** * Creates an intent for navigating back to the destination directory. */ - Intent buildNavigateIntent() { + Intent buildNavigateIntent(String tag) { Intent intent = new Intent(service, FilesActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setAction(DocumentsContract.ACTION_BROWSE); + intent.setData(getDataUriForIntent(tag)); intent.putExtra(Shared.EXTRA_STACK, (Parcelable) stack); return intent; } Intent createCancelIntent() { final Intent cancelIntent = new Intent(service, FileOperationService.class); + cancelIntent.setData(getDataUriForIntent(INTENT_TAG_CANCEL)); cancelIntent.putExtra(EXTRA_CANCEL, true); cancelIntent.putExtra(EXTRA_JOB_ID, id); return cancelIntent; diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java index 0a91427c6ad9..243c3577500c 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java @@ -30,7 +30,7 @@ import android.support.test.uiautomator.By; import android.support.test.uiautomator.Configurator; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.Until; -import android.test.InstrumentationTestCase; +import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.LargeTest; import android.util.Log; import android.view.MotionEvent; @@ -38,7 +38,7 @@ import android.view.MotionEvent; import com.android.documentsui.model.RootInfo; @LargeTest -public class DownloadsActivityUiTest extends InstrumentationTestCase { +public class DownloadsActivityUiTest extends ActivityInstrumentationTestCase2<DownloadsActivity> { private static final int TIMEOUT = 5000; private static final String TAG = "DownloadsActivityUiTest"; @@ -53,6 +53,10 @@ public class DownloadsActivityUiTest extends InstrumentationTestCase { private ContentProviderClient mClient; private RootInfo mRoot; + public DownloadsActivityUiTest() { + super(DownloadsActivity.class); + } + public void setUp() throws Exception { // Initialize UiDevice instance. Instrumentation instrumentation = getInstrumentation(); @@ -79,7 +83,8 @@ public class DownloadsActivityUiTest extends InstrumentationTestCase { intent.setDataAndType(mRoot.getUri(), DocumentsContract.Root.MIME_TYPE_ITEM); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); - mContext.startActivity(intent); + setActivityIntent(intent); + getActivity(); // Start the activity. // Wait for the app to appear. mDevice.wait(Until.hasObject(By.pkg(TARGET_PKG).depth(0)), TIMEOUT); @@ -92,11 +97,11 @@ public class DownloadsActivityUiTest extends InstrumentationTestCase { @Override protected void tearDown() throws Exception { - // Need to kill off the task we started. - super.tearDown(); Log.d(TAG, "Resetting storage from setUp"); resetStorage(); mClient.release(); + + super.tearDown(); } private void resetStorage() throws RemoteException { diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java index 379300b62b8e..868dbbb39e1b 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java @@ -30,7 +30,7 @@ import android.support.test.uiautomator.By; import android.support.test.uiautomator.Configurator; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.Until; -import android.test.InstrumentationTestCase; +import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.LargeTest; import android.util.Log; import android.view.MotionEvent; @@ -38,7 +38,7 @@ import android.view.MotionEvent; import com.android.documentsui.model.RootInfo; @LargeTest -public class FilesActivityUiTest extends InstrumentationTestCase { +public class FilesActivityUiTest extends ActivityInstrumentationTestCase2<FilesActivity> { private static final int TIMEOUT = 5000; private static final String TAG = "FilesActivityUiTest"; @@ -54,6 +54,10 @@ public class FilesActivityUiTest extends InstrumentationTestCase { private RootInfo mRoot_0; private RootInfo mRoot_1; + public FilesActivityUiTest() { + super(FilesActivity.class); + } + public void setUp() throws Exception { // Initialize UiDevice instance. Instrumentation instrumentation = getInstrumentation(); @@ -71,12 +75,14 @@ public class FilesActivityUiTest extends InstrumentationTestCase { mResolver = mContext.getContentResolver(); mClient = mResolver.acquireUnstableContentProviderClient(DEFAULT_AUTHORITY); + assertNotNull("Failed to acquire ContentProviderClient.", mClient); mDocsHelper = new DocumentsProviderHelper(DEFAULT_AUTHORITY, mClient); // Launch app. Intent intent = mContext.getPackageManager().getLaunchIntentForPackage(TARGET_PKG); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); - mContext.startActivity(intent); + setActivityIntent(intent); + getActivity(); // Start the activity. // Wait for the app to appear. mDevice.wait(Until.hasObject(By.pkg(TARGET_PKG).depth(0)), TIMEOUT); @@ -89,10 +95,11 @@ public class FilesActivityUiTest extends InstrumentationTestCase { @Override protected void tearDown() throws Exception { - super.tearDown(); Log.d(TAG, "Resetting storage from setUp"); resetStorage(); mClient.release(); + + super.tearDown(); } private void resetStorage() throws RemoteException { @@ -156,6 +163,8 @@ public class FilesActivityUiTest extends InstrumentationTestCase { mBot.openRoot(ROOT_0_ID); mDocsHelper.createDocument(mRoot_0, "yummers/sandwich", "Ham & Cheese.sandwich"); + + mDevice.waitForIdle(); mBot.assertHasDocuments("file0.log", "file1.png", "file2.csv", "Ham & Cheese.sandwich"); } diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java index ce5472580731..042ec85ad212 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java @@ -20,7 +20,6 @@ import static com.android.documentsui.StubProvider.ROOT_0_ID; import static com.android.documentsui.StubProvider.ROOT_1_ID; import android.support.test.uiautomator.UiObject; -import android.support.test.uiautomator.UiObjectNotFoundException; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.LargeTest; @@ -31,9 +30,6 @@ public class SearchViewUiTest extends InstrumentationTestCase { private UiTestEnvironment mEnv; - private UiObject mDocsList; - private UiObject mMessageTextView; - @Override public void setUp() throws Exception { super.setUp(); @@ -151,4 +147,15 @@ public class SearchViewUiTest extends InstrumentationTestCase { mEnv.bot().openRoot(ROOT_0_ID); mEnv.assertDefaultContentOfTestDir0(); } + + public void testSearchIconVisible_RootWithSearchSupport() throws Exception { + mEnv.bot().openRoot(ROOT_0_ID); + mEnv.bot().assertSearchTextFiledAndIcon(false, true); + } + + public void testSearchIconHidden_RootNoSearchSupport() throws Exception { + mEnv.bot().openRoot(ROOT_1_ID); + mEnv.bot().assertSearchTextFiledAndIcon(false, false); + } + } diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java b/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java index 980627b17e7c..25276505ee43 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java @@ -16,10 +16,6 @@ package com.android.documentsui; -import static com.android.documentsui.Shared.TAG; - -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.content.SharedPreferences; import android.content.pm.ProviderInfo; @@ -130,6 +126,11 @@ public class StubProvider extends DocumentsProvider { Log.i(TAG, "Created new root directory @ " + file.getPath()); } final RootInfo rootInfo = new RootInfo(file, getSize(rootId)); + + if(rootId.equals(ROOT_1_ID)) { + rootInfo.setSearchEnabled(false); + } + mStorage.put(rootInfo.document.documentId, rootInfo.document); mRoots.put(rootId, rootInfo); } @@ -152,8 +153,7 @@ public class StubProvider extends DocumentsProvider { final RootInfo info = entry.getValue(); final RowBuilder row = result.newRow(); row.add(Root.COLUMN_ROOT_ID, id); - row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_IS_CHILD - | Root.FLAG_SUPPORTS_SEARCH); + row.add(Root.COLUMN_FLAGS, info.flags); row.add(Root.COLUMN_TITLE, id); row.add(Root.COLUMN_DOCUMENT_ID, info.document.documentId); row.add(Root.COLUMN_AVAILABLE_BYTES, info.getRemainingCapacity()); @@ -467,6 +467,14 @@ public class StubProvider extends DocumentsProvider { @Override public Bundle call(String method, String arg, Bundle extras) { + // We're not supposed to override any of the default DocumentsProvider + // methods that are supported by "call", so javadoc asks that we + // always call super.call first and return if response is not null. + Bundle result = super.call(method, arg, extras); + if (result != null) { + return result; + } + switch (method) { case "clear": clearCacheAndBuildRoots(); @@ -480,11 +488,10 @@ public class StubProvider extends DocumentsProvider { simulateReadErrorsForFile(arg); return null; case "createDocumentWithFlags": - Bundle bundle = dispatchCreateDocumentWithFlags(extras); - return bundle; - default: - return super.call(method, arg, extras); + return dispatchCreateDocumentWithFlags(extras); } + + return null; } private Bundle createVirtualFileFromBundle(Bundle extras) { @@ -705,22 +712,33 @@ public class StubProvider extends DocumentsProvider { } final static class RootInfo { + private static final int DEFAULT_ROOTS_FLAGS = Root.FLAG_SUPPORTS_SEARCH + | Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_IS_CHILD; + public final String name; public final StubDocument document; public long capacity; public long size; + public int flags; RootInfo(File file, long capacity) { this.name = file.getName(); this.capacity = 1024 * 1024; - this.document = StubDocument.createRootDocument(file, this); + this.flags = DEFAULT_ROOTS_FLAGS; this.capacity = capacity; this.size = 0; + this.document = StubDocument.createRootDocument(file, this); } public long getRemainingCapacity() { return capacity - size; } + + public void setSearchEnabled(boolean enabled) { + flags = enabled ? (flags | Root.FLAG_SUPPORTS_SEARCH) + : (flags & ~Root.FLAG_SUPPORTS_SEARCH); + } + } final static class StubDocument { diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/UiBot.java b/packages/DocumentsUI/tests/src/com/android/documentsui/UiBot.java index f12ae106bb00..d609fa846591 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/UiBot.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/UiBot.java @@ -150,7 +150,6 @@ class UiBot { void assertSearchTextFiledAndIcon(boolean searchTextFieldExists, boolean searchIconExists) { assertEquals(searchTextFieldExists, findSearchViewTextField().exists()); assertEquals(searchIconExists, findSearchViewIcon().exists()); - } void assertHasDocuments(String... labels) throws UiObjectNotFoundException { diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DocumentHolderTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DocumentHolderTest.java index 16efc6e98174..87cd42f08079 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DocumentHolderTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DocumentHolderTest.java @@ -22,6 +22,7 @@ import android.graphics.Rect; import android.os.SystemClock; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.MotionEvent.PointerCoords; @@ -130,5 +131,10 @@ public class DocumentHolderTest extends AndroidTestCase { return true; } + @Override + public boolean onKey(DocumentHolder doc, int keyCode, KeyEvent event) { + return false; + } + } } diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java index d3ef9aa64ffb..b1cb29e775b5 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java @@ -173,12 +173,6 @@ public class MultiSelectManagerTest extends AndroidTestCase { assertRangeSelection(0, 7); } - public void testKeyboardSelection() { - // This simulates shift-navigation. - keyToPosition(5, 10, true); - assertRangeSelection(5, 10); - } - public void testSingleSelectMode() { mManager = new MultiSelectManager(mEnv, mAdapter, MultiSelectManager.MODE_SINGLE); mManager.addCallback(mCallback); @@ -195,14 +189,6 @@ public class MultiSelectManagerTest extends AndroidTestCase { assertSelection(items.get(20)); } - public void testSingleSelectMode_ShiftDoesNotExtendSelection() { - mManager = new MultiSelectManager(mEnv, mAdapter, MultiSelectManager.MODE_SINGLE); - mManager.addCallback(mCallback); - longPress(20); - keyToPosition(20, 22, true); - assertSelection(items.get(22)); - } - public void testProvisionalSelection() { Selection s = mManager.getSelection(); assertSelection(); @@ -263,10 +249,6 @@ public class MultiSelectManagerTest extends AndroidTestCase { mManager.onSingleTapUp(TestInputEvent.shiftClick(position)); } - private void keyToPosition(int startPos, int endPos, boolean shift) { - mManager.changeFocus(startPos, endPos, shift); - } - private void assertSelected(String... expected) { for (int i = 0; i < expected.length; i++) { Selection selection = mManager.getSelection(); diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java index 7920c50fb9a8..353d4bdfb0b1 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java @@ -23,7 +23,6 @@ import android.graphics.Rect; import android.support.v7.widget.RecyclerView.OnScrollListener; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; -import android.view.View; import com.android.documentsui.dirlist.MultiSelectManager.GridModel; @@ -326,16 +325,6 @@ public class MultiSelectManager_GridModelTest extends AndroidTestCase { } @Override - public int getAdapterPositionForChildView(View view) { - throw new UnsupportedOperationException(); - } - - @Override - public void focusItem(int i) { - throw new UnsupportedOperationException(); - } - - @Override public boolean isLayoutItem(int adapterPosition) { return false; } diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestSelectionEnvironment.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestSelectionEnvironment.java index 0e795615a137..8e624a036331 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestSelectionEnvironment.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestSelectionEnvironment.java @@ -19,7 +19,6 @@ package com.android.documentsui.dirlist; import android.graphics.Point; import android.graphics.Rect; import android.support.v7.widget.RecyclerView.OnScrollListener; -import android.view.View; import com.android.documentsui.dirlist.MultiSelectManager.SelectionEnvironment; @@ -83,11 +82,6 @@ public class TestSelectionEnvironment implements SelectionEnvironment { } @Override - public int getAdapterPositionForChildView(View view) { - return 0; - } - - @Override public int getColumnCount() { return 0; } @@ -108,10 +102,6 @@ public class TestSelectionEnvironment implements SelectionEnvironment { } @Override - public void focusItem(int position) { - } - - @Override public boolean isLayoutItem(int adapterPosition) { return false; } diff --git a/packages/ExtServices/Android.mk b/packages/ExtServices/Android.mk new file mode 100644 index 000000000000..e8a40078ef0f --- /dev/null +++ b/packages/ExtServices/Android.mk @@ -0,0 +1,40 @@ +# Copyright (C) 2016 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. + +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_PACKAGE_NAME := ExtServices + +LOCAL_CERTIFICATE := platform + +LOCAL_AAPT_FLAGS := --shared-lib + +LOCAL_EXPORT_PACKAGE_RESOURCES := true + +LOCAL_PROGUARD_FLAG_FILES := proguard.proguard + +LOCAL_PRIVILEGED_MODULE := true + +include $(BUILD_PACKAGE) + + + + + diff --git a/packages/PrintSpooler/res/values-ca/arrays.xml b/packages/ExtServices/AndroidManifest.xml index c1b149c59960..100b35c13d34 100644 --- a/packages/PrintSpooler/res/values-ca/arrays.xml +++ b/packages/ExtServices/AndroidManifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project +<!-- Copyright (C) 2016 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,21 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources> - - <string-array name="pdf_printer_media_sizes" translatable="false"> - <item>NA_LETTER</item> - <item>NA_GOVT_LETTER</item> - <item>NA_LEGAL</item> - <item>NA_JUNIOR_LEGAL</item> - <item>NA_LEDGER</item> - <item>NA_TABLOID</item> - <item>NA_INDEX_3X5</item> - <item>NA_INDEX_4X6</item> - <item>NA_INDEX_5X8</item> - <item>NA_MONARCH</item> - <item>NA_QUARTO</item> - <item>NA_FOOLSCAP</item> - </string-array> - -</resources> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="android.ext.services" + android:versionCode="1" + android:versionName="1" + coreApp="true"> + + <application android:label="@string/app_name" + android:allowBackup="false" + android:forceDeviceEncrypted="true" + android:encryptionAware="true"> + + <library android:name="android.ext.services"/> + + </application> + +</manifest> diff --git a/packages/ExtServices/MODULE_LICENSE_APACHE2 b/packages/ExtServices/MODULE_LICENSE_APACHE2 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/packages/ExtServices/MODULE_LICENSE_APACHE2 diff --git a/packages/ExtServices/NOTICE b/packages/ExtServices/NOTICE new file mode 100644 index 000000000000..c5b1efa7aac7 --- /dev/null +++ b/packages/ExtServices/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2005-2008, 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. + + 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. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/packages/ExtServices/proguard.proguard b/packages/ExtServices/proguard.proguard new file mode 100644 index 000000000000..e5dfbe1c453d --- /dev/null +++ b/packages/ExtServices/proguard.proguard @@ -0,0 +1,7 @@ +-keepparameternames +-keepattributes Exceptions,InnerClasses,Signature,Deprecated, + SourceFile,LineNumberTable,*Annotation*,EnclosingMethod + +-keep public class * { + public protected *; +} diff --git a/packages/PrintSpooler/res/color/item_text_color.xml b/packages/ExtServices/res/values/strings.xml index f580fbd75577..531e5171dec8 100644 --- a/packages/PrintSpooler/res/color/item_text_color.xml +++ b/packages/ExtServices/res/values/strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project +<!-- Copyright (C) 2016 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. @@ -14,7 +14,6 @@ limitations under the License. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="true" android:color="#333333" /> - <item android:color="#888888"/> -</selector>
\ No newline at end of file +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name">Android Services Library</string> +</resources> diff --git a/packages/ExtServices/src/android/ext/services/Version.java b/packages/ExtServices/src/android/ext/services/Version.java new file mode 100644 index 000000000000..026cccd37334 --- /dev/null +++ b/packages/ExtServices/src/android/ext/services/Version.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2016 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 android.ext.services; + +/** + * Class that provides the version of the library. + */ +public final class Version { + + private Version() { + /* do nothing - hide constructor */ + } + + /** + * Gets the version of the library. + * + * @return The version. + */ + public static int getVersionCode() { + return 1; + } +}
\ No newline at end of file diff --git a/packages/ExtShared/Android.mk b/packages/ExtShared/Android.mk new file mode 100644 index 000000000000..d8052df8a8e8 --- /dev/null +++ b/packages/ExtShared/Android.mk @@ -0,0 +1,33 @@ +# Copyright (C) 2016 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. + +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_PACKAGE_NAME := ExtShared + +LOCAL_CERTIFICATE := platform + +LOCAL_AAPT_FLAGS := --shared-lib + +LOCAL_EXPORT_PACKAGE_RESOURCES := true + +LOCAL_PROGUARD_FLAG_FILES := proguard.proguard + +include $(BUILD_PACKAGE)
\ No newline at end of file diff --git a/packages/PrintSpooler/res/values-en-rCA/arrays.xml b/packages/ExtShared/AndroidManifest.xml index d40278c3973d..e2e81d08c747 100644 --- a/packages/PrintSpooler/res/values-en-rCA/arrays.xml +++ b/packages/ExtShared/AndroidManifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project +<!-- Copyright (C) 2016 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,21 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources> - - <string-array name="pdf_printer_media_sizes" translatable="false"> - <item>NA_LETTER</item> - <item>NA_GOVT_LETTER</item> - <item>NA_LEGAL</item> - <item>NA_JUNIOR_LEGAL</item> - <item>NA_LEDGER</item> - <item>NA_TABLOID</item> - <item>NA_INDEX_3X5</item> - <item>NA_INDEX_4X6</item> - <item>NA_INDEX_5X8</item> - <item>NA_MONARCH</item> - <item>NA_QUARTO</item> - <item>NA_FOOLSCAP</item> - </string-array> - -</resources> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="android.ext.shared" + android:versionCode="1" + android:versionName="1" + coreApp="true"> + + <application android:label="@string/app_name" + android:allowBackup="false" + android:forceDeviceEncrypted="true" + android:encryptionAware="true"> + + <library android:name="android.ext.shared"/> + + </application> + +</manifest> diff --git a/packages/ExtShared/MODULE_LICENSE_APACHE2 b/packages/ExtShared/MODULE_LICENSE_APACHE2 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/packages/ExtShared/MODULE_LICENSE_APACHE2 diff --git a/packages/ExtShared/NOTICE b/packages/ExtShared/NOTICE new file mode 100644 index 000000000000..c5b1efa7aac7 --- /dev/null +++ b/packages/ExtShared/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2005-2008, 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. + + 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. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/packages/ExtShared/proguard.proguard b/packages/ExtShared/proguard.proguard new file mode 100644 index 000000000000..e5dfbe1c453d --- /dev/null +++ b/packages/ExtShared/proguard.proguard @@ -0,0 +1,7 @@ +-keepparameternames +-keepattributes Exceptions,InnerClasses,Signature,Deprecated, + SourceFile,LineNumberTable,*Annotation*,EnclosingMethod + +-keep public class * { + public protected *; +} diff --git a/packages/PrintSpooler/res/values-en-rUS/arrays.xml b/packages/ExtShared/res/values/strings.xml index d40278c3973d..0914e4318bce 100644 --- a/packages/PrintSpooler/res/values-en-rUS/arrays.xml +++ b/packages/ExtShared/res/values/strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project +<!-- Copyright (C) 2016 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,21 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources> - - <string-array name="pdf_printer_media_sizes" translatable="false"> - <item>NA_LETTER</item> - <item>NA_GOVT_LETTER</item> - <item>NA_LEGAL</item> - <item>NA_JUNIOR_LEGAL</item> - <item>NA_LEDGER</item> - <item>NA_TABLOID</item> - <item>NA_INDEX_3X5</item> - <item>NA_INDEX_4X6</item> - <item>NA_INDEX_5X8</item> - <item>NA_MONARCH</item> - <item>NA_QUARTO</item> - <item>NA_FOOLSCAP</item> - </string-array> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name">Android Shared Library</string> </resources> diff --git a/packages/ExtShared/src/android/ext/shared/Version.java b/packages/ExtShared/src/android/ext/shared/Version.java new file mode 100644 index 000000000000..3ff2d415bc20 --- /dev/null +++ b/packages/ExtShared/src/android/ext/shared/Version.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2016 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 android.ext.shared; + +/** + * Class that provides the version of the library. + */ +public final class Version { + + private Version() { + /* do nothing - hide constructor */ + } + + /** + * Gets the version of the library. + * + * @return The version. + */ + public static int getVersionCode() { + return 1; + } +}
\ No newline at end of file diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 56e5a9b6c58d..f89934dc50e4 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -134,9 +134,6 @@ public class ExternalStorageProvider extends DocumentsProvider { final String rootId; final String title; if (volume.getType() == VolumeInfo.TYPE_EMULATED) { - // save off the primary volume for subsequent "Home" dir initialization. - primaryVolume = volume; - // We currently only support a single emulated volume mounted at // a time, and it's always considered the primary rootId = ROOT_ID_PRIMARY_EMULATED; @@ -167,9 +164,14 @@ public class ExternalStorageProvider extends DocumentsProvider { mRoots.put(rootId, root); root.rootId = rootId; - root.flags = Root.FLAG_LOCAL_ONLY | Root.FLAG_ADVANCED + root.flags = Root.FLAG_LOCAL_ONLY | Root.FLAG_SUPPORTS_SEARCH | Root.FLAG_SUPPORTS_IS_CHILD; + if (volume.isPrimary()) { + // save off the primary volume for subsequent "Home" dir initialization. + primaryVolume = volume; + root.flags |= Root.FLAG_ADVANCED; + } // Dunno when this would NOT be the case, but never hurts to be correct. if (volume.isMountedWritable()) { root.flags |= Root.FLAG_SUPPORTS_CREATE; diff --git a/packages/Keyguard/res/values-ro/strings.xml b/packages/Keyguard/res/values-ro/strings.xml index 2b279ad76107..439de3de733e 100644 --- a/packages/Keyguard/res/values-ro/strings.xml +++ b/packages/Keyguard/res/values-ro/strings.xml @@ -59,7 +59,7 @@ <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enter"</string> <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Model uitat"</string> <string name="kg_wrong_pattern" msgid="1850806070801358830">"Model greşit"</string> - <string name="kg_wrong_password" msgid="2333281762128113157">"Parolă greşită"</string> + <string name="kg_wrong_password" msgid="2333281762128113157">"Parolă greșită"</string> <string name="kg_wrong_pin" msgid="1131306510833563801">"Cod PIN greşit"</string> <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Încercați din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string> <string name="kg_pattern_instructions" msgid="398978611683075868">"Desenaţi modelul"</string> @@ -92,8 +92,8 @@ <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a telefonului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string> <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a tabletei. Profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string> <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a telefonului. Profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string> - <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> - <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Codul PIN pentru cardul SIM este incorect. Contactați operatorul pentru a vă debloca dispozitivul."</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249"> <item quantity="few">Codul PIN pentru cardul SIM este incorect. V-au mai rămas <xliff:g id="NUMBER_1">%d</xliff:g> încercări.</item> diff --git a/packages/MtpDocumentsProvider/AndroidManifest.xml b/packages/MtpDocumentsProvider/AndroidManifest.xml index 7ea54c9774bf..2dd49ab0782f 100644 --- a/packages/MtpDocumentsProvider/AndroidManifest.xml +++ b/packages/MtpDocumentsProvider/AndroidManifest.xml @@ -30,16 +30,12 @@ </activity> <receiver android:name=".UsbIntentReceiver" android:exported="true"> - <!-- TODO: Remove an intent-filter for USB_DEVICE_ATTACHED after the provider becomes to - open devices on demand. --> <intent-filter> <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> + <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" /> </intent-filter> <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" android:resource="@xml/device_filter" /> - <intent-filter> - <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" /> - </intent-filter> </receiver> </application> </manifest> diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java b/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java index 1d726470765b..1829746bb143 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java @@ -74,7 +74,7 @@ class DocumentLoader { int parentHandle = parent.mObjectHandle; // Need to pass the special value MtpManager.OBJECT_HANDLE_ROOT_CHILDREN to // getObjectHandles if we would like to obtain children under the root. - if (parentHandle == Identifier.DUMMY_HANDLE_FOR_ROOT) { + if (parent.mDocumentType == MtpDatabaseConstants.DOCUMENT_TYPE_STORAGE) { parentHandle = MtpManager.OBJECT_HANDLE_ROOT_CHILDREN; } // TODO: Handle nit race around here. diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/Identifier.java b/packages/MtpDocumentsProvider/src/com/android/mtp/Identifier.java index 20b3bf5db3b7..124d207696aa 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/Identifier.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/Identifier.java @@ -17,36 +17,65 @@ package com.android.mtp; import java.util.Objects; +import static com.android.mtp.MtpDatabaseConstants.DocumentType; /** * Static utilities for ID. */ class Identifier { - final static int DUMMY_HANDLE_FOR_ROOT = 0; - final int mDeviceId; final int mStorageId; final int mObjectHandle; final String mDocumentId; + final @DocumentType int mDocumentType; - Identifier(int deviceId, int storageId, int objectHandle, String documentId) { + Identifier(int deviceId, int storageId, int objectHandle, String documentId, + @DocumentType int documentType) { mDeviceId = deviceId; mStorageId = storageId; mObjectHandle = objectHandle; mDocumentId = documentId; + mDocumentType = documentType; } @Override public boolean equals(Object obj) { if (!(obj instanceof Identifier)) return false; - final Identifier other = (Identifier)obj; + final Identifier other = (Identifier) obj; return mDeviceId == other.mDeviceId && mStorageId == other.mStorageId && - mObjectHandle == other.mObjectHandle; + mObjectHandle == other.mObjectHandle && mDocumentId.equals(other.mDocumentId); } @Override public int hashCode() { return Objects.hash(mDeviceId, mStorageId, mObjectHandle, mDocumentId); } + + @Override + public String toString() { + final StringBuilder builder = new StringBuilder(); + builder.append("Identifier { "); + + builder.append("mDeviceId: "); + builder.append(mDeviceId); + builder.append(", "); + + builder.append("mStorageId: "); + builder.append(mStorageId); + builder.append(", "); + + builder.append("mObjectHandle: "); + builder.append(mObjectHandle); + builder.append(", "); + + builder.append("mDocumentId: "); + builder.append(mDocumentId); + builder.append(", "); + + builder.append("mDocumentType: "); + builder.append(mDocumentType); + builder.append(" }"); + return builder.toString(); + } } diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/Mapper.java b/packages/MtpDocumentsProvider/src/com/android/mtp/Mapper.java index ac470671a582..3faa8f4394f7 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/Mapper.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/Mapper.java @@ -20,11 +20,9 @@ import static com.android.mtp.MtpDatabaseConstants.*; import android.annotation.Nullable; import android.content.ContentValues; -import android.content.res.Resources; import android.database.Cursor; import android.database.DatabaseUtils; import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteException; import android.mtp.MtpObjectInfo; import android.provider.DocumentsContract.Document; import android.provider.DocumentsContract.Root; @@ -87,12 +85,10 @@ class Mapper { /** * Puts root information to database. * @param parentDocumentId Document ID of device document. - * @param resources Resources required to localize root name. * @param roots List of root information. * @return If roots are added or removed from the database. */ - synchronized boolean putStorageDocuments( - String parentDocumentId, Resources resources, MtpRoot[] roots) { + synchronized boolean putStorageDocuments(String parentDocumentId, MtpRoot[] roots) { final SQLiteDatabase database = mDatabase.getSQLiteDatabase(); database.beginTransaction(); try { @@ -117,7 +113,7 @@ class Mapper { valuesList[i] = new ContentValues(); extraValuesList[i] = new ContentValues(); MtpDatabase.getStorageDocumentValues( - valuesList[i], extraValuesList[i], resources, parentDocumentId, roots[i]); + valuesList[i], extraValuesList[i], parentDocumentId, roots[i]); } final boolean changed = putDocuments( valuesList, diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java index 959fac69c817..b44f9af3c3bc 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java @@ -108,7 +108,7 @@ class MtpDatabase { * @param columnNames Column names defined in {@link android.provider.DocumentsContract.Root}. * @return Database cursor. */ - Cursor queryRoots(String[] columnNames) { + Cursor queryRoots(Resources resources, String[] columnNames) { final String selection = COLUMN_ROW_STATE + " IN (?, ?) AND " + COLUMN_DOCUMENT_TYPE + " = ?"; final Cursor deviceCursor = mDatabase.query( @@ -143,49 +143,54 @@ class MtpDatabase { null); try { values.clear(); - if (storageCursor.getCount() == 1) { - storageCursor.moveToNext(); - DatabaseUtils.cursorRowToContentValues(storageCursor, values); - } else { - final Cursor cursor = builder.query( - mDatabase, - columnNames, - selection + " AND " + COLUMN_DEVICE_ID + " = ?", - strings(ROW_STATE_VALID, - ROW_STATE_INVALIDATED, - DOCUMENT_TYPE_DEVICE, - deviceId), - null, - null, - null); - try { - cursor.moveToNext(); - DatabaseUtils.cursorRowToContentValues(cursor, values); - } finally { - cursor.close(); - } + try (final Cursor deviceRoot = builder.query( + mDatabase, + columnNames, + selection + " AND " + COLUMN_DEVICE_ID + " = ?", + strings(ROW_STATE_VALID, + ROW_STATE_INVALIDATED, + DOCUMENT_TYPE_DEVICE, + deviceId), + null, + null, + null)) { + deviceRoot.moveToNext(); + DatabaseUtils.cursorRowToContentValues(deviceRoot, values); + } - if (storageCursor.getCount() != 0) { - long capacityBytes = 0; - long availableBytes = 0; - int capacityIndex = cursor.getColumnIndex(Root.COLUMN_CAPACITY_BYTES); - int availableIndex = cursor.getColumnIndex(Root.COLUMN_AVAILABLE_BYTES); - while (storageCursor.moveToNext()) { - // If requested columnNames does not include COLUMN_XXX_BYTES, we - // don't calculate corresponding values. - if (capacityIndex != -1) { - capacityBytes += cursor.getLong(capacityIndex); - } - if (availableIndex != -1) { - availableBytes += cursor.getLong(availableIndex); - } + if (storageCursor.getCount() != 0) { + long capacityBytes = 0; + long availableBytes = 0; + final int capacityIndex = + storageCursor.getColumnIndex(Root.COLUMN_CAPACITY_BYTES); + final int availableIndex = + storageCursor.getColumnIndex(Root.COLUMN_AVAILABLE_BYTES); + while (storageCursor.moveToNext()) { + // If requested columnNames does not include COLUMN_XXX_BYTES, we + // don't calculate corresponding values. + if (capacityIndex != -1) { + capacityBytes += storageCursor.getLong(capacityIndex); + } + if (availableIndex != -1) { + availableBytes += storageCursor.getLong(availableIndex); } - values.put(Root.COLUMN_CAPACITY_BYTES, capacityBytes); - values.put(Root.COLUMN_AVAILABLE_BYTES, availableBytes); - } else { - values.putNull(Root.COLUMN_CAPACITY_BYTES); - values.putNull(Root.COLUMN_AVAILABLE_BYTES); } + values.put(Root.COLUMN_CAPACITY_BYTES, capacityBytes); + values.put(Root.COLUMN_AVAILABLE_BYTES, availableBytes); + } else { + values.putNull(Root.COLUMN_CAPACITY_BYTES); + values.putNull(Root.COLUMN_AVAILABLE_BYTES); + } + if (storageCursor.getCount() == 1 && values.containsKey(Root.COLUMN_TITLE)) { + storageCursor.moveToFirst(); + // Add storage name to device name if we have only 1 storage. + values.put( + Root.COLUMN_TITLE, + resources.getString( + R.string.root_name, + values.getAsString(Root.COLUMN_TITLE), + storageCursor.getString( + storageCursor.getColumnIndex(Root.COLUMN_TITLE)))); } } finally { storageCursor.close(); @@ -239,12 +244,45 @@ class MtpDatabase { } /** + * Returns identifier of single storage if given document points device and it has only one + * storage. Otherwise null. + * + * @param documentId Document ID that may point a device. + * @return Identifier for single storage or null. + * @throws FileNotFoundException The given document ID is not registered in database. + */ + @Nullable Identifier getSingleStorageIdentifier(String documentId) + throws FileNotFoundException { + // Check if the parent document is device that has single storage. + try (final Cursor cursor = mDatabase.query( + TABLE_DOCUMENTS, + strings(Document.COLUMN_DOCUMENT_ID), + COLUMN_ROW_STATE + " IN (?, ?) AND " + + COLUMN_PARENT_DOCUMENT_ID + " = ? AND " + + COLUMN_DOCUMENT_TYPE + " = ?", + strings(ROW_STATE_VALID, + ROW_STATE_INVALIDATED, + documentId, + DOCUMENT_TYPE_STORAGE), + null, + null, + null)) { + if (cursor.getCount() == 1) { + cursor.moveToNext(); + return createIdentifier(cursor.getString(0)); + } else { + return null; + } + } + } + + /** * Queries a single document. * @param documentId * @param projection * @return Database cursor. */ - public Cursor queryDocument(String documentId, String[] projection) { + Cursor queryDocument(String documentId, String[] projection) { return mDatabase.query( TABLE_DOCUMENTS, projection, @@ -287,12 +325,12 @@ class MtpDatabase { } /** - * Obtains parent document ID. + * Obtains parent identifier. * @param documentId - * @return parent document ID. + * @return parent identifier. * @throws FileNotFoundException */ - String getParentId(String documentId) throws FileNotFoundException { + Identifier getParentIdentifier(String documentId) throws FileNotFoundException { final Cursor cursor = mDatabase.query( TABLE_DOCUMENTS, strings(COLUMN_PARENT_DOCUMENT_ID), @@ -304,7 +342,7 @@ class MtpDatabase { "1"); try { if (cursor.moveToNext()) { - return cursor.getString(0); + return createIdentifier(cursor.getString(0)); } else { throw new FileNotFoundException("Cannot find a row having ID=" + documentId); } @@ -352,7 +390,10 @@ class MtpDatabase { // Currently documentId is old format. final Cursor cursor = mDatabase.query( TABLE_DOCUMENTS, - strings(COLUMN_DEVICE_ID, COLUMN_STORAGE_ID, COLUMN_OBJECT_HANDLE), + strings(COLUMN_DEVICE_ID, + COLUMN_STORAGE_ID, + COLUMN_OBJECT_HANDLE, + COLUMN_DOCUMENT_TYPE), SELECTION_DOCUMENT_ID, strings(documentId), null, @@ -367,8 +408,9 @@ class MtpDatabase { return new Identifier( cursor.getInt(0), cursor.getInt(1), - cursor.isNull(2) ? Identifier.DUMMY_HANDLE_FOR_ROOT : cursor.getInt(2), - documentId); + cursor.getInt(2), + documentId, + cursor.getInt(3)); } } finally { cursor.close(); @@ -495,13 +537,11 @@ class MtpDatabase { /** * Gets {@link ContentValues} for the given root. * @param values {@link ContentValues} that receives values. - * @param resources Resources used to get localized root name. * @param root Root to be converted {@link ContentValues}. */ static void getStorageDocumentValues( ContentValues values, ContentValues extraValues, - Resources resources, String parentDocumentId, MtpRoot root) { values.clear(); @@ -512,13 +552,12 @@ class MtpDatabase { values.put(COLUMN_ROW_STATE, ROW_STATE_VALID); values.put(COLUMN_DOCUMENT_TYPE, DOCUMENT_TYPE_STORAGE); values.put(Document.COLUMN_MIME_TYPE, Document.MIME_TYPE_DIR); - values.put(Document.COLUMN_DISPLAY_NAME, root.getRootName(resources)); + values.put(Document.COLUMN_DISPLAY_NAME, root.mDescription); values.putNull(Document.COLUMN_SUMMARY); values.putNull(Document.COLUMN_LAST_MODIFIED); values.put(Document.COLUMN_ICON, R.drawable.ic_root_mtp); values.put(Document.COLUMN_FLAGS, 0); - values.put(Document.COLUMN_SIZE, - (int) Math.min(root.mMaxCapacity - root.mFreeSpace, Integer.MAX_VALUE)); + values.put(Document.COLUMN_SIZE, root.mMaxCapacity - root.mFreeSpace); extraValues.put( Root.COLUMN_FLAGS, diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java index f252e0f7d337..3cfb82f24746 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java @@ -16,10 +16,13 @@ package com.android.mtp; +import android.annotation.IntDef; import android.database.sqlite.SQLiteQueryBuilder; import android.provider.DocumentsContract.Document; import android.provider.DocumentsContract.Root; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.HashMap; import java.util.Map; @@ -92,6 +95,10 @@ class MtpDatabaseConstants { */ static final int MAP_BY_NAME = 1; + @IntDef(value = { DOCUMENT_TYPE_DEVICE, DOCUMENT_TYPE_STORAGE, DOCUMENT_TYPE_OBJECT }) + @Retention(RetentionPolicy.SOURCE) + public @interface DocumentType {} + /** * Document that represents a MTP device. */ diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java index 6b5f16a609b3..70a1aae86b95 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java @@ -58,6 +58,8 @@ public class MtpDocumentsProvider extends DocumentsProvider { Document.COLUMN_FLAGS, Document.COLUMN_SIZE, }; + static final boolean DEBUG = false; + private final Object mDeviceListLock = new Object(); private static MtpDocumentsProvider sSingleton; @@ -70,6 +72,7 @@ public class MtpDocumentsProvider extends DocumentsProvider { private Resources mResources; private MtpDatabase mDatabase; private AppFuse mAppFuse; + private ServiceIntentSender mIntentSender; /** * Provides singleton instance to MtpDocumentsService. @@ -86,8 +89,9 @@ public class MtpDocumentsProvider extends DocumentsProvider { mResolver = getContext().getContentResolver(); mDeviceToolkits = new HashMap<Integer, DeviceToolkit>(); mDatabase = new MtpDatabase(getContext(), MtpDatabaseConstants.FLAG_DATABASE_IN_FILE); - mRootScanner = new RootScanner(mResolver, mResources, mMtpManager, mDatabase); + mRootScanner = new RootScanner(mResolver, mMtpManager, mDatabase); mAppFuse = new AppFuse(TAG, new AppFuseCallback()); + mIntentSender = new ServiceIntentSender(getContext()); // TODO: Mount AppFuse on demands. try { mAppFuse.mount(getContext().getSystemService(StorageManager.class)); @@ -105,14 +109,16 @@ public class MtpDocumentsProvider extends DocumentsProvider { MtpManager mtpManager, ContentResolver resolver, MtpDatabase database, - StorageManager storageManager) { + StorageManager storageManager, + ServiceIntentSender intentSender) { mResources = resources; mMtpManager = mtpManager; mResolver = resolver; mDeviceToolkits = new HashMap<Integer, DeviceToolkit>(); mDatabase = database; - mRootScanner = new RootScanner(mResolver, mResources, mMtpManager, mDatabase); + mRootScanner = new RootScanner(mResolver, mMtpManager, mDatabase); mAppFuse = new AppFuse(TAG, new AppFuseCallback()); + mIntentSender = intentSender; // TODO: Mount AppFuse on demands. try { mAppFuse.mount(storageManager); @@ -129,7 +135,7 @@ public class MtpDocumentsProvider extends DocumentsProvider { if (projection == null) { projection = MtpDocumentsProvider.DEFAULT_ROOT_PROJECTION; } - final Cursor cursor = mDatabase.queryRoots(projection); + final Cursor cursor = mDatabase.queryRoots(mResources, projection); cursor.setNotificationUri( mResolver, DocumentsContract.buildRootsUri(MtpDocumentsProvider.AUTHORITY)); return cursor; @@ -147,14 +153,29 @@ public class MtpDocumentsProvider extends DocumentsProvider { @Override public Cursor queryChildDocuments(String parentDocumentId, String[] projection, String sortOrder) throws FileNotFoundException { + if (DEBUG) { + Log.d(TAG, "queryChildDocuments: " + parentDocumentId); + } if (projection == null) { projection = MtpDocumentsProvider.DEFAULT_DOCUMENT_PROJECTION; } - final Identifier parentIdentifier = mDatabase.createIdentifier(parentDocumentId); + Identifier parentIdentifier = mDatabase.createIdentifier(parentDocumentId); try { + openDevice(parentIdentifier.mDeviceId); + if (parentIdentifier.mDocumentType == MtpDatabaseConstants.DOCUMENT_TYPE_DEVICE) { + final Identifier singleStorageIdentifier = + mDatabase.getSingleStorageIdentifier(parentDocumentId); + if (singleStorageIdentifier == null) { + // Returns storage list from database. + return mDatabase.queryChildDocuments(projection, parentDocumentId); + } + parentIdentifier = singleStorageIdentifier; + } + // Returns object list from document loader. return getDocumentLoader(parentIdentifier).queryChildDocuments( projection, parentIdentifier); } catch (IOException exception) { + Log.e(MtpDocumentsProvider.TAG, "queryChildDocuments", exception); throw new FileNotFoundException(exception.getMessage()); } } @@ -165,11 +186,12 @@ public class MtpDocumentsProvider extends DocumentsProvider { throws FileNotFoundException { final Identifier identifier = mDatabase.createIdentifier(documentId); try { + openDevice(identifier.mDeviceId); switch (mode) { case "r": final long fileSize = getFileSize(documentId); - // MTP getPartialObject operation does not support files that are larger than 4GB. - // Fallback to non-seekable file descriptor. + // MTP getPartialObject operation does not support files that are larger than + // 4GB. Fallback to non-seekable file descriptor. // TODO: Use getPartialObject64 for MTP devices that support Android vendor // extension. if (fileSize <= 0xffffffffl) { @@ -190,6 +212,7 @@ public class MtpDocumentsProvider extends DocumentsProvider { throw new IllegalArgumentException("Unknown mode for openDocument: " + mode); } } catch (IOException error) { + Log.e(MtpDocumentsProvider.TAG, "openDocument", error); throw new FileNotFoundException(error.getMessage()); } } @@ -201,11 +224,13 @@ public class MtpDocumentsProvider extends DocumentsProvider { CancellationSignal signal) throws FileNotFoundException { final Identifier identifier = mDatabase.createIdentifier(documentId); try { + openDevice(identifier.mDeviceId); return new AssetFileDescriptor( getPipeManager(identifier).readThumbnail(mMtpManager, identifier), 0, // Start offset. AssetFileDescriptor.UNKNOWN_LENGTH); } catch (IOException error) { + Log.e(MtpDocumentsProvider.TAG, "openDocumentThumbnail", error); throw new FileNotFoundException(error.getMessage()); } } @@ -214,13 +239,21 @@ public class MtpDocumentsProvider extends DocumentsProvider { public void deleteDocument(String documentId) throws FileNotFoundException { try { final Identifier identifier = mDatabase.createIdentifier(documentId); - final Identifier parentIdentifier = - mDatabase.createIdentifier(mDatabase.getParentId(documentId)); + openDevice(identifier.mDeviceId); + final Identifier parentIdentifier = mDatabase.getParentIdentifier(documentId); mMtpManager.deleteDocument(identifier.mDeviceId, identifier.mObjectHandle); mDatabase.deleteDocument(documentId); getDocumentLoader(parentIdentifier).clearTask(parentIdentifier); notifyChildDocumentsChange(parentIdentifier.mDocumentId); + if (parentIdentifier.mDocumentType == MtpDatabaseConstants.DOCUMENT_TYPE_STORAGE) { + // If the parent is storage, the object might be appeared as child of device because + // we skip storage when the device has only one storage. + final Identifier deviceIdentifier = mDatabase.getParentIdentifier( + parentIdentifier.mDocumentId); + notifyChildDocumentsChange(deviceIdentifier.mDocumentId); + } } catch (IOException error) { + Log.e(MtpDocumentsProvider.TAG, "deleteDocument", error); throw new FileNotFoundException(error.getMessage()); } } @@ -239,6 +272,7 @@ public class MtpDocumentsProvider extends DocumentsProvider { throws FileNotFoundException { try { final Identifier parentId = mDatabase.createIdentifier(parentDocumentId); + openDevice(parentId.mDeviceId); final ParcelFileDescriptor pipe[] = ParcelFileDescriptor.createReliablePipe(); pipe[0].close(); // 0 bytes for a new document. final int formatCode = Document.MIME_TYPE_DIR.equals(mimeType) ? @@ -259,18 +293,29 @@ public class MtpDocumentsProvider extends DocumentsProvider { notifyChildDocumentsChange(parentDocumentId); return documentId; } catch (IOException error) { - Log.e(TAG, error.getMessage()); + Log.e(TAG, "createDocument", error); throw new FileNotFoundException(error.getMessage()); } } void openDevice(int deviceId) throws IOException { synchronized (mDeviceListLock) { + if (mDeviceToolkits.containsKey(deviceId)) { + return; + } + if (DEBUG) { + Log.d(TAG, "Open device " + deviceId); + } mMtpManager.openDevice(deviceId); mDeviceToolkits.put( deviceId, new DeviceToolkit(mMtpManager, mResolver, mDatabase)); + mIntentSender.sendUpdateNotificationIntent(); + try { + mRootScanner.resume().await(); + } catch (InterruptedException error) { + Log.e(TAG, "openDevice", error); + } } - mRootScanner.resume(); } void closeDevice(int deviceId) throws IOException, InterruptedException { @@ -278,6 +323,7 @@ public class MtpDocumentsProvider extends DocumentsProvider { closeDeviceInternal(deviceId); } mRootScanner.resume(); + mIntentSender.sendUpdateNotificationIntent(); } int[] getOpenedDeviceIds() { @@ -298,6 +344,13 @@ public class MtpDocumentsProvider extends DocumentsProvider { } /** + * Resumes root scanner to handle the update of device list. + */ + void resumeRootScanner() { + mRootScanner.resume(); + } + + /** * Finalize the content provider for unit tests. */ @Override @@ -336,6 +389,12 @@ public class MtpDocumentsProvider extends DocumentsProvider { private void closeDeviceInternal(int deviceId) throws IOException, InterruptedException { // TODO: Flush the device before closing (if not closed externally). + if (!mDeviceToolkits.containsKey(deviceId)) { + return; + } + if (DEBUG) { + Log.d(TAG, "Close device " + deviceId); + } getDeviceToolkit(deviceId).mDocumentLoader.clearTasks(); mDeviceToolkits.remove(deviceId); mMtpManager.closeDevice(deviceId); diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsService.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsService.java index 5bede8617d60..9c4952bc5759 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsService.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsService.java @@ -19,13 +19,12 @@ package com.android.mtp; import android.app.Notification; import android.app.Service; import android.app.NotificationManager; +import android.content.ComponentName; +import android.content.Context; import android.content.Intent; -import android.hardware.usb.UsbDevice; import android.os.IBinder; import android.util.Log; -import com.android.internal.util.Preconditions; - import java.io.IOException; /** @@ -36,6 +35,7 @@ import java.io.IOException; public class MtpDocumentsService extends Service { static final String ACTION_OPEN_DEVICE = "com.android.mtp.OPEN_DEVICE"; static final String ACTION_CLOSE_DEVICE = "com.android.mtp.CLOSE_DEVICE"; + static final String ACTION_UPDATE_NOTIFICATION = "com.android.mtp.UPDATE_NOTIFICATION"; static final String EXTRA_DEVICE = "device"; NotificationManager mNotificationManager; @@ -55,32 +55,10 @@ public class MtpDocumentsService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { // If intent is null, the service was restarted. - if (intent != null) { - final MtpDocumentsProvider provider = MtpDocumentsProvider.getInstance(); - final UsbDevice device = intent.<UsbDevice>getParcelableExtra(EXTRA_DEVICE); - try { - Preconditions.checkNotNull(device); - switch (intent.getAction()) { - case ACTION_OPEN_DEVICE: - provider.openDevice(device.getDeviceId()); - break; - - case ACTION_CLOSE_DEVICE: - mNotificationManager.cancel(device.getDeviceId()); - provider.closeDevice(device.getDeviceId()); - break; - - default: - throw new IllegalArgumentException("Received unknown intent action."); - } - } catch (IOException | InterruptedException | IllegalArgumentException error) { - logErrorMessage(error); - } - } else { - // TODO: Fetch devices again. + if (intent == null || ACTION_UPDATE_NOTIFICATION.equals(intent.getAction())) { + return updateForegroundState() ? START_STICKY : START_NOT_STICKY; } - - return updateForegroundState() ? START_STICKY : START_NOT_STICKY; + return START_NOT_STICKY; } /** @@ -92,6 +70,7 @@ public class MtpDocumentsService extends Service { final int[] deviceIds = provider.getOpenedDeviceIds(); int notificationId = 0; Notification notification = null; + // TODO: Hide notification if the device has already been removed. for (final int deviceId : deviceIds) { try { final String title = getResources().getString( diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java index efe5ff172d78..5519efd5a323 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java @@ -273,9 +273,7 @@ class MtpManager { final MtpRoot[] results = new MtpRoot[storageIds.length]; for (int i = 0; i < storageIds.length; i++) { results[i] = new MtpRoot( - device.getDeviceId(), - device.getDeviceInfo().getModel(), - device.getStorageInfo(storageIds[i])); + device.getDeviceId(), device.getStorageInfo(storageIds[i])); } return results; } diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpRoot.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpRoot.java index ec338c33bc7b..8530aaff7f95 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpRoot.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpRoot.java @@ -16,7 +16,6 @@ package com.android.mtp; -import android.content.res.Resources; import android.mtp.MtpStorageInfo; import com.android.internal.annotations.VisibleForTesting; @@ -24,7 +23,6 @@ import com.android.internal.annotations.VisibleForTesting; class MtpRoot { final int mDeviceId; final int mStorageId; - final String mDeviceModelName; final String mDescription; final long mFreeSpace; final long mMaxCapacity; @@ -33,24 +31,21 @@ class MtpRoot { @VisibleForTesting MtpRoot(int deviceId, int storageId, - String deviceName, String description, long freeSpace, long maxCapacity, String volumeIdentifier) { mDeviceId = deviceId; mStorageId = storageId; - mDeviceModelName = deviceName; mDescription = description; mFreeSpace = freeSpace; mMaxCapacity = maxCapacity; mVolumeIdentifier = volumeIdentifier; } - MtpRoot(int deviceId, String deviceModelName, MtpStorageInfo storageInfo) { + MtpRoot(int deviceId, MtpStorageInfo storageInfo) { mDeviceId = deviceId; mStorageId = storageInfo.getStorageId(); - mDeviceModelName = deviceModelName; mDescription = storageInfo.getDescription(); mFreeSpace = storageInfo.getFreeSpace(); mMaxCapacity = storageInfo.getMaxCapacity(); @@ -64,7 +59,6 @@ class MtpRoot { final MtpRoot other = (MtpRoot) object; return mDeviceId == other.mDeviceId && mStorageId == other.mStorageId && - mDeviceModelName.equals(other.mDeviceModelName) && mDescription.equals(other.mDescription) && mFreeSpace == other.mFreeSpace && mMaxCapacity == other.mMaxCapacity && @@ -73,19 +67,12 @@ class MtpRoot { @Override public int hashCode() { - return mDeviceId ^ mStorageId ^ mDeviceModelName.hashCode() ^ mDescription.hashCode() ^ + return mDeviceId ^ mStorageId ^ mDescription.hashCode() ^ ((int) mFreeSpace) ^ ((int) mMaxCapacity) ^ mVolumeIdentifier.hashCode(); } - + @Override public String toString() { - return "MtpRoot{Name: " + mDeviceModelName + " " + mDescription + "}"; - } - - String getRootName(Resources resources) { - return String.format( - resources.getString(R.string.root_name), - mDeviceModelName, - mDescription); + return "MtpRoot{Name: " + mDescription + "}"; } } diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java b/packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java index 15b8ef3cae9a..a4c3cf4fa5b4 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java @@ -1,12 +1,28 @@ +/* + * Copyright (C) 2016 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.mtp; import android.content.ContentResolver; -import android.content.res.Resources; import android.net.Uri; import android.os.Process; import android.provider.DocumentsContract; import android.util.Log; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.FutureTask; @@ -35,7 +51,6 @@ final class RootScanner { private final static long AWAIT_TERMINATION_TIMEOUT = 2000; final ContentResolver mResolver; - final Resources mResources; final MtpManager mManager; final MtpDatabase mDatabase; @@ -44,11 +59,9 @@ final class RootScanner { RootScanner( ContentResolver resolver, - Resources resources, MtpManager manager, MtpDatabase database) { mResolver = resolver; - mResources = resources; mManager = manager; mDatabase = database; } @@ -64,9 +77,8 @@ final class RootScanner { /** * Starts to check new changes right away. - * If the background thread has already gone, it restarts another background thread. */ - synchronized void resume() { + synchronized CountDownLatch resume() { if (mExecutor == null) { // Only single thread updates the database. mExecutor = Executors.newSingleThreadExecutor(); @@ -75,8 +87,10 @@ final class RootScanner { // Cancel previous task. mCurrentTask.cancel(true); } - mCurrentTask = new FutureTask<Void>(new UpdateRootsRunnable(), null); + final UpdateRootsRunnable runnable = new UpdateRootsRunnable(); + mCurrentTask = new FutureTask<Void>(runnable, null); mExecutor.submit(mCurrentTask); + return runnable.mFirstScanCompleted; } /** @@ -98,6 +112,8 @@ final class RootScanner { * Runnable to scan roots and update the database information. */ private final class UpdateRootsRunnable implements Runnable { + final CountDownLatch mFirstScanCompleted = new CountDownLatch(1); + @Override public void run() { Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); @@ -124,8 +140,7 @@ final class RootScanner { continue; } mDatabase.getMapper().startAddingDocuments(documentId); - if (mDatabase.getMapper().putStorageDocuments( - documentId, mResources, device.roots)) { + if (mDatabase.getMapper().putStorageDocuments(documentId, device.roots)) { changed = true; } if (mDatabase.getMapper().stopAddingDocuments(documentId)) { @@ -136,6 +151,7 @@ final class RootScanner { if (changed) { notifyChange(); } + mFirstScanCompleted.countDown(); pollingCount++; try { // Use SHORT_POLLING_PERIOD for the first SHORT_POLLING_TIMES because it is diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/ServiceIntentSender.java b/packages/MtpDocumentsProvider/src/com/android/mtp/ServiceIntentSender.java new file mode 100644 index 000000000000..a1bb2c13d386 --- /dev/null +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/ServiceIntentSender.java @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2016 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.mtp; + +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; + +/** + * Sends intent to MtpDocumentsService. + */ +class ServiceIntentSender { + private Context mContext; + + ServiceIntentSender(Context context) { + mContext = context; + } + + void sendUpdateNotificationIntent() { + final Intent intent = new Intent(MtpDocumentsService.ACTION_UPDATE_NOTIFICATION); + intent.setComponent(new ComponentName(mContext, MtpDocumentsService.class)); + mContext.startService(intent); + } +} diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/UsbIntentReceiver.java b/packages/MtpDocumentsProvider/src/com/android/mtp/UsbIntentReceiver.java index 0ac130eb7ec0..0489ea863396 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/UsbIntentReceiver.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/UsbIntentReceiver.java @@ -21,7 +21,9 @@ import android.content.Context; import android.content.Intent; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbManager; -import android.net.Uri; +import android.util.Log; + +import java.io.IOException; public class UsbIntentReceiver extends BroadcastReceiver { @Override @@ -29,17 +31,15 @@ public class UsbIntentReceiver extends BroadcastReceiver { final UsbDevice device = intent.getExtras().getParcelable(UsbManager.EXTRA_DEVICE); switch (intent.getAction()) { case UsbManager.ACTION_USB_DEVICE_ATTACHED: - startService(context, MtpDocumentsService.ACTION_OPEN_DEVICE, device); + MtpDocumentsProvider.getInstance().resumeRootScanner(); break; case UsbManager.ACTION_USB_DEVICE_DETACHED: - startService(context, MtpDocumentsService.ACTION_CLOSE_DEVICE, device); + try { + MtpDocumentsProvider.getInstance().closeDevice(device.getDeviceId()); + } catch (IOException | InterruptedException e) { + Log.e(MtpDocumentsProvider.TAG, "Failed to close device", e); + } break; } } - - private void startService(Context context, String action, UsbDevice device) { - final Intent intent = new Intent(action, Uri.EMPTY, context, MtpDocumentsService.class); - intent.putExtra(MtpDocumentsService.EXTRA_DEVICE, device); - context.startService(intent); - } } diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java index f37a55c9568d..af1fed49f272 100644 --- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java +++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java @@ -35,14 +35,15 @@ public class DocumentLoaderTest extends AndroidTestCase { private BlockableTestMtpManager mManager; private TestContentResolver mResolver; private DocumentLoader mLoader; - final private Identifier mParentIdentifier = new Identifier(0, 0, 0, "1"); + final private Identifier mParentIdentifier = new Identifier( + 0, 0, 0, "1", MtpDatabaseConstants.DOCUMENT_TYPE_STORAGE); @Override public void setUp() { mDatabase = new MtpDatabase(getContext(), MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", new TestResources(), new MtpRoot[] { - new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "") + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 0, "Storage", 1000, 1000, "") }); mDatabase.getMapper().stopAddingDocuments("deviceDocId"); mManager = new BlockableTestMtpManager(getContext()); diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java index 80759994e6a1..a49dc6784af4 100644 --- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java +++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java @@ -81,8 +81,8 @@ public class MtpDatabaseTest extends AndroidTestCase { mDatabase.getMapper().stopAddingDocuments(null); mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 1, "Device", "Storage", 1000, 2000, "") + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 1, "Storage", 1000, 2000, "") }); mDatabase.getMapper().stopAddingDocuments("1"); @@ -96,7 +96,7 @@ public class MtpDatabaseTest extends AndroidTestCase { assertEquals(1, getInt(cursor, COLUMN_STORAGE_ID)); assertTrue(isNull(cursor, COLUMN_OBJECT_HANDLE)); assertEquals(DocumentsContract.Document.MIME_TYPE_DIR, getString(cursor, COLUMN_MIME_TYPE)); - assertEquals("Device Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); assertTrue(isNull(cursor, COLUMN_SUMMARY)); assertTrue(isNull(cursor, COLUMN_LAST_MODIFIED)); assertEquals(R.drawable.ic_root_mtp, getInt(cursor, COLUMN_ICON)); @@ -109,7 +109,7 @@ public class MtpDatabaseTest extends AndroidTestCase { } { - final Cursor cursor = mDatabase.queryRoots(new String [] { + final Cursor cursor = mDatabase.queryRoots(resources, new String [] { Root.COLUMN_ROOT_ID, Root.COLUMN_FLAGS, Root.COLUMN_ICON, @@ -122,14 +122,14 @@ public class MtpDatabaseTest extends AndroidTestCase { assertEquals(1, cursor.getCount()); cursor.moveToNext(); - assertEquals(2, getInt(cursor, Root.COLUMN_ROOT_ID)); + assertEquals(1, getInt(cursor, Root.COLUMN_ROOT_ID)); assertEquals( Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, getInt(cursor, Root.COLUMN_FLAGS)); assertEquals(R.drawable.ic_root_mtp, getInt(cursor, Root.COLUMN_ICON)); assertEquals("Device Storage", getString(cursor, Root.COLUMN_TITLE)); assertTrue(isNull(cursor, Root.COLUMN_SUMMARY)); - assertEquals(2, getInt(cursor, Root.COLUMN_DOCUMENT_ID)); + assertEquals(1, getInt(cursor, Root.COLUMN_DOCUMENT_ID)); assertEquals(1000, getInt(cursor, Root.COLUMN_AVAILABLE_BYTES)); assertEquals(2000, getInt(cursor, Root.COLUMN_CAPACITY_BYTES)); @@ -139,10 +139,10 @@ public class MtpDatabaseTest extends AndroidTestCase { public void testPutStorageDocuments() throws Exception { mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", resources, new MtpRoot[] { - new MtpRoot(0, 1, "Device", "Storage", 1000, 2000, ""), - new MtpRoot(0, 2, "Device", "Storage", 2000, 4000, ""), - new MtpRoot(0, 3, "Device", "/@#%&<>Storage", 3000, 6000,"") + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 1, "Storage", 1000, 2000, ""), + new MtpRoot(0, 2, "Storage", 2000, 4000, ""), + new MtpRoot(0, 3, "/@#%&<>Storage", 3000, 6000,"") }); { @@ -155,7 +155,7 @@ public class MtpDatabaseTest extends AndroidTestCase { assertEquals(1, getInt(cursor, COLUMN_STORAGE_ID)); assertTrue(isNull(cursor, COLUMN_OBJECT_HANDLE)); assertEquals(DocumentsContract.Document.MIME_TYPE_DIR, getString(cursor, COLUMN_MIME_TYPE)); - assertEquals("Device Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); assertTrue(isNull(cursor, COLUMN_SUMMARY)); assertTrue(isNull(cursor, COLUMN_LAST_MODIFIED)); assertEquals(R.drawable.ic_root_mtp, getInt(cursor, COLUMN_ICON)); @@ -166,11 +166,11 @@ public class MtpDatabaseTest extends AndroidTestCase { cursor.moveToNext(); assertEquals(2, getInt(cursor, COLUMN_DOCUMENT_ID)); - assertEquals("Device Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.moveToNext(); assertEquals(3, getInt(cursor, COLUMN_DOCUMENT_ID)); - assertEquals("Device /@#%&<>Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("/@#%&<>Storage", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } @@ -264,9 +264,9 @@ public class MtpDatabaseTest extends AndroidTestCase { }; mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage A", 1000, 0, ""), - new MtpRoot(0, 101, "Device", "Storage B", 1001, 0, "") + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 100, "Storage A", 1000, 0, ""), + new MtpRoot(0, 101, "Storage B", 1001, 0, "") }); { @@ -275,11 +275,11 @@ public class MtpDatabaseTest extends AndroidTestCase { cursor.moveToNext(); assertEquals(1, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(100, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage A", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage A", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.moveToNext(); assertEquals(2, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(101, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage B", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage B", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } @@ -291,18 +291,18 @@ public class MtpDatabaseTest extends AndroidTestCase { cursor.moveToNext(); assertEquals(1, getInt(cursor, COLUMN_DOCUMENT_ID)); assertTrue(isNull(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage A", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage A", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.moveToNext(); assertEquals(2, getInt(cursor, COLUMN_DOCUMENT_ID)); assertTrue(isNull(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage B", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage B", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", resources, new MtpRoot[] { - new MtpRoot(0, 200, "Device", "Storage A", 2000, 0, ""), - new MtpRoot(0, 202, "Device", "Storage C", 2002, 0, "") + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 200, "Storage A", 2000, 0, ""), + new MtpRoot(0, 202, "Storage C", 2002, 0, "") }); { @@ -311,15 +311,15 @@ public class MtpDatabaseTest extends AndroidTestCase { cursor.moveToNext(); assertEquals(1, getInt(cursor, COLUMN_DOCUMENT_ID)); assertTrue(isNull(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage A", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage A", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.moveToNext(); assertEquals(2, getInt(cursor, COLUMN_DOCUMENT_ID)); assertTrue(isNull(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage B", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage B", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.moveToNext(); assertEquals(4, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(202, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage C", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage C", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } @@ -331,11 +331,11 @@ public class MtpDatabaseTest extends AndroidTestCase { cursor.moveToNext(); assertEquals(1, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(200, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage A", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage A", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.moveToNext(); assertEquals(4, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(202, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage C", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage C", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } } @@ -432,11 +432,11 @@ public class MtpDatabaseTest extends AndroidTestCase { mDatabase.getMapper().startAddingDocuments("1"); mDatabase.getMapper().startAddingDocuments("2"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device A", "Storage", 0, 0, "") + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 100, "Storage", 0, 0, "") }); - mDatabase.getMapper().putStorageDocuments("2", resources, new MtpRoot[] { - new MtpRoot(1, 100, "Device B", "Storage", 0, 0, "") + mDatabase.getMapper().putStorageDocuments("2", new MtpRoot[] { + new MtpRoot(1, 100, "Storage", 0, 0, "") }); { @@ -445,22 +445,22 @@ public class MtpDatabaseTest extends AndroidTestCase { cursor.moveToNext(); assertEquals(3, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(100, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device A Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.moveToNext(); assertEquals(4, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(100, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device B Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } { - final Cursor cursor = mDatabase.queryRoots(rootColumns); + final Cursor cursor = mDatabase.queryRoots(resources, rootColumns); assertEquals(2, cursor.getCount()); cursor.moveToNext(); - assertEquals(3, getInt(cursor, Root.COLUMN_ROOT_ID)); + assertEquals(1, getInt(cursor, Root.COLUMN_ROOT_ID)); assertEquals(0, getInt(cursor, Root.COLUMN_AVAILABLE_BYTES)); cursor.moveToNext(); - assertEquals(4, getInt(cursor, Root.COLUMN_ROOT_ID)); + assertEquals(2, getInt(cursor, Root.COLUMN_ROOT_ID)); assertEquals(0, getInt(cursor, Root.COLUMN_AVAILABLE_BYTES)); cursor.close(); } @@ -469,11 +469,11 @@ public class MtpDatabaseTest extends AndroidTestCase { mDatabase.getMapper().startAddingDocuments("1"); mDatabase.getMapper().startAddingDocuments("2"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 200, "Device", "Storage", 2000, 0, "") + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 200, "Storage", 2000, 0, "") }); - mDatabase.getMapper().putStorageDocuments("2", resources, new MtpRoot[] { - new MtpRoot(1, 300, "Device", "Storage", 3000, 0, "") + mDatabase.getMapper().putStorageDocuments("2", new MtpRoot[] { + new MtpRoot(1, 300, "Storage", 3000, 0, "") }); mDatabase.getMapper().stopAddingDocuments("1"); mDatabase.getMapper().stopAddingDocuments("2"); @@ -482,24 +482,24 @@ public class MtpDatabaseTest extends AndroidTestCase { final Cursor cursor = mDatabase.queryRootDocuments(columns); assertEquals(2, cursor.getCount()); cursor.moveToNext(); - assertEquals(5, getInt(cursor, COLUMN_DOCUMENT_ID)); + assertEquals(3, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(200, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.moveToNext(); - assertEquals(6, getInt(cursor, COLUMN_DOCUMENT_ID)); + assertEquals(4, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(300, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } { - final Cursor cursor = mDatabase.queryRoots(rootColumns); + final Cursor cursor = mDatabase.queryRoots(resources, rootColumns); assertEquals(2, cursor.getCount()); cursor.moveToNext(); - assertEquals(5, getInt(cursor, Root.COLUMN_ROOT_ID)); + assertEquals(1, getInt(cursor, Root.COLUMN_ROOT_ID)); assertEquals(2000, getInt(cursor, Root.COLUMN_AVAILABLE_BYTES)); cursor.moveToNext(); - assertEquals(6, getInt(cursor, Root.COLUMN_ROOT_ID)); + assertEquals(2, getInt(cursor, Root.COLUMN_ROOT_ID)); assertEquals(3000, getInt(cursor, Root.COLUMN_AVAILABLE_BYTES)); cursor.close(); } @@ -562,24 +562,24 @@ public class MtpDatabaseTest extends AndroidTestCase { mDatabase.getMapper().startAddingDocuments(null); mDatabase.getMapper().putDeviceDocument( - new MtpDeviceRecord(0, "Device", false, new MtpRoot[0], null, null)); + new MtpDeviceRecord(0, "Device", false, new MtpRoot[0], null, null)); mDatabase.getMapper().stopAddingDocuments(null); mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage", 0, 0, ""), + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 100, "Storage", 0, 0, ""), }); mDatabase.getMapper().clearMapping(); mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 200, "Device", "Storage", 2000, 0, ""), + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 200, "Storage", 2000, 0, ""), }); mDatabase.getMapper().clearMapping(); mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 300, "Device", "Storage", 3000, 0, ""), + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 300, "Storage", 3000, 0, ""), }); mDatabase.getMapper().stopAddingDocuments("1"); @@ -589,14 +589,14 @@ public class MtpDatabaseTest extends AndroidTestCase { cursor.moveToNext(); assertEquals(2, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(300, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } { - final Cursor cursor = mDatabase.queryRoots(rootColumns); + final Cursor cursor = mDatabase.queryRoots(resources, rootColumns); assertEquals(1, cursor.getCount()); cursor.moveToNext(); - assertEquals(2, getInt(cursor, Root.COLUMN_ROOT_ID)); + assertEquals(1, getInt(cursor, Root.COLUMN_ROOT_ID)); assertEquals(3000, getInt(cursor, Root.COLUMN_AVAILABLE_BYTES)); cursor.close(); } @@ -610,15 +610,15 @@ public class MtpDatabaseTest extends AndroidTestCase { }; mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage", 0, 0, ""), + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 100, "Storage", 0, 0, ""), }); mDatabase.getMapper().clearMapping(); mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", resources, new MtpRoot[] { - new MtpRoot(0, 200, "Device", "Storage", 2000, 0, ""), - new MtpRoot(0, 201, "Device", "Storage", 2001, 0, ""), + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 200, "Storage", 2000, 0, ""), + new MtpRoot(0, 201, "Storage", 2001, 0, ""), }); mDatabase.getMapper().stopAddingDocuments("deviceDocId"); @@ -628,11 +628,11 @@ public class MtpDatabaseTest extends AndroidTestCase { cursor.moveToNext(); assertEquals(2, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(200, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.moveToNext(); assertEquals(3, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(201, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } } @@ -646,14 +646,14 @@ public class MtpDatabaseTest extends AndroidTestCase { // The client code should be able to replace existing rows with new information. // Add one. mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""), + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 100, "Storage A", 0, 0, ""), }); mDatabase.getMapper().stopAddingDocuments("1"); // Replace it. mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage B", 1000, 1000, ""), + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 100, "Storage B", 1000, 1000, ""), }); mDatabase.getMapper().stopAddingDocuments("1"); { @@ -667,7 +667,7 @@ public class MtpDatabaseTest extends AndroidTestCase { cursor.moveToNext(); assertEquals(2, getInt(cursor, COLUMN_DOCUMENT_ID)); assertEquals(100, getInt(cursor, COLUMN_STORAGE_ID)); - assertEquals("Device Storage B", getString(cursor, COLUMN_DISPLAY_NAME)); + assertEquals("Storage B", getString(cursor, COLUMN_DISPLAY_NAME)); cursor.close(); } { @@ -676,10 +676,10 @@ public class MtpDatabaseTest extends AndroidTestCase { Root.COLUMN_TITLE, Root.COLUMN_AVAILABLE_BYTES }; - final Cursor cursor = mDatabase.queryRoots(columns); + final Cursor cursor = mDatabase.queryRoots(resources, columns); assertEquals(1, cursor.getCount()); cursor.moveToNext(); - assertEquals(2, getInt(cursor, Root.COLUMN_ROOT_ID)); + assertEquals(1, getInt(cursor, Root.COLUMN_ROOT_ID)); assertEquals("Device Storage B", getString(cursor, Root.COLUMN_TITLE)); assertEquals(1000, getInt(cursor, Root.COLUMN_AVAILABLE_BYTES)); cursor.close(); @@ -695,21 +695,21 @@ public class MtpDatabaseTest extends AndroidTestCase { mDatabase.getMapper().stopAddingDocuments(null); mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""), + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 100, "Storage A", 0, 0, ""), }); mDatabase.getMapper().clearMapping(); - final Cursor oldCursor = mDatabase.queryRoots(strings(Root.COLUMN_ROOT_ID)); + final Cursor oldCursor = mDatabase.queryRoots(resources, strings(Root.COLUMN_ROOT_ID)); assertEquals(1, oldCursor.getCount()); // Add one. mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 101, "Device", "Storage B", 1000, 1000, ""), + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 101, "Storage B", 1000, 1000, ""), }); // Add one more before resolving unmapped documents. - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 102, "Device", "Storage B", 1000, 1000, ""), + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 102, "Storage B", 1000, 1000, ""), }); mDatabase.getMapper().stopAddingDocuments("1"); @@ -729,15 +729,15 @@ public class MtpDatabaseTest extends AndroidTestCase { public void testQueryDocuments() { mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""), + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 100, "Storage A", 0, 0, ""), }); mDatabase.getMapper().stopAddingDocuments("deviceDocId"); final Cursor cursor = mDatabase.queryDocument("1", strings(Document.COLUMN_DISPLAY_NAME)); assertEquals(1, cursor.getCount()); cursor.moveToNext(); - assertEquals("Device Storage A", getString(cursor, Document.COLUMN_DISPLAY_NAME)); + assertEquals("Storage A", getString(cursor, Document.COLUMN_DISPLAY_NAME)); cursor.close(); } @@ -750,7 +750,7 @@ public class MtpDatabaseTest extends AndroidTestCase { // It the device does not have storages, it shows a device root. { - final Cursor cursor = mDatabase.queryRoots(strings(Root.COLUMN_TITLE)); + final Cursor cursor = mDatabase.queryRoots(resources, strings(Root.COLUMN_TITLE)); assertEquals(1, cursor.getCount()); cursor.moveToNext(); assertEquals("Device", cursor.getString(0)); @@ -758,14 +758,14 @@ public class MtpDatabaseTest extends AndroidTestCase { } mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage A", 0, 0, "") + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 100, "Storage A", 0, 0, "") }); mDatabase.getMapper().stopAddingDocuments("1"); // It the device has single storage, it shows a storage root. { - final Cursor cursor = mDatabase.queryRoots(strings(Root.COLUMN_TITLE)); + final Cursor cursor = mDatabase.queryRoots(resources, strings(Root.COLUMN_TITLE)); assertEquals(1, cursor.getCount()); cursor.moveToNext(); assertEquals("Device Storage A", cursor.getString(0)); @@ -773,15 +773,15 @@ public class MtpDatabaseTest extends AndroidTestCase { } mDatabase.getMapper().startAddingDocuments("1"); - mDatabase.getMapper().putStorageDocuments("1", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""), - new MtpRoot(0, 101, "Device", "Storage B", 0, 0, "") + mDatabase.getMapper().putStorageDocuments("1", new MtpRoot[] { + new MtpRoot(0, 100, "Storage A", 0, 0, ""), + new MtpRoot(0, 101, "Storage B", 0, 0, "") }); mDatabase.getMapper().stopAddingDocuments("1"); // It the device has multiple storages, it shows a device root. { - final Cursor cursor = mDatabase.queryRoots(strings(Root.COLUMN_TITLE)); + final Cursor cursor = mDatabase.queryRoots(resources, strings(Root.COLUMN_TITLE)); assertEquals(1, cursor.getCount()); cursor.moveToNext(); assertEquals("Device", cursor.getString(0)); @@ -791,8 +791,8 @@ public class MtpDatabaseTest extends AndroidTestCase { public void testGetParentId() throws FileNotFoundException { mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""), + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 100, "Storage A", 0, 0, ""), }); mDatabase.getMapper().stopAddingDocuments("deviceDocId"); @@ -805,13 +805,13 @@ public class MtpDatabaseTest extends AndroidTestCase { }); mDatabase.getMapper().stopAddingDocuments("1"); - assertEquals("1", mDatabase.getParentId("2")); + assertEquals("1", mDatabase.getParentIdentifier("2").mDocumentId); } public void testDeleteDocument() { mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""), + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 100, "Storage A", 0, 0, ""), }); mDatabase.getMapper().stopAddingDocuments("deviceDocId"); @@ -854,8 +854,8 @@ public class MtpDatabaseTest extends AndroidTestCase { public void testPutNewDocument() { mDatabase.getMapper().startAddingDocuments("deviceDocId"); - mDatabase.getMapper().putStorageDocuments("deviceDocId", resources, new MtpRoot[] { - new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""), + mDatabase.getMapper().putStorageDocuments("deviceDocId", new MtpRoot[] { + new MtpRoot(0, 100, "Storage A", 0, 0, ""), }); mDatabase.getMapper().stopAddingDocuments("deviceDocId"); @@ -911,7 +911,7 @@ public class MtpDatabaseTest extends AndroidTestCase { DocumentsContract.Root.COLUMN_TITLE, DocumentsContract.Root.COLUMN_AVAILABLE_BYTES }; - try (final Cursor cursor = mDatabase.queryRoots(columns)) { + try (final Cursor cursor = mDatabase.queryRoots(resources, columns)) { assertEquals(1, cursor.getCount()); assertTrue(cursor.moveToNext()); assertEquals(1, cursor.getLong(0)); diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java index 7066f7d48401..5b0f55703a2b 100644 --- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java +++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java @@ -23,13 +23,11 @@ import android.net.Uri; import android.os.ParcelFileDescriptor; import android.os.storage.StorageManager; import android.provider.DocumentsContract.Root; -import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; import android.provider.DocumentsContract; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.MediumTest; -import android.util.Log; import java.io.FileNotFoundException; import java.io.IOException; @@ -64,13 +62,12 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); mMtpManager.addValidDevice(new MtpDeviceRecord( 0, - "Device", + "Device A", false /* unopened */, new MtpRoot[] { new MtpRoot( 0 /* deviceId */, 1 /* storageId */, - "Device A" /* device model name */, "Storage A" /* volume description */, 1024 /* free space */, 2048 /* total space */, @@ -79,11 +76,14 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { null, null)); - mProvider.openDevice(0); + mProvider.resumeRootScanner(); mResolver.waitForNotification(ROOTS_URI, 1); - mProvider.closeDevice(0); + mProvider.openDevice(0); mResolver.waitForNotification(ROOTS_URI, 2); + + mProvider.closeDevice(0); + mResolver.waitForNotification(ROOTS_URI, 3); } public void testOpenAndCloseErrorDevice() throws Exception { @@ -94,24 +94,17 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { } catch (Throwable error) { assertTrue(error instanceof IOException); } - - try { - mProvider.closeDevice(1); - fail(); - } catch (Throwable error) { - assertTrue(error instanceof IOException); - } + assertEquals(0, mProvider.getOpenedDeviceIds().length); // Check if the following notification is the first one or not. mMtpManager.addValidDevice(new MtpDeviceRecord( 0, - "Device", + "Device A", false /* unopened */, new MtpRoot[] { new MtpRoot( 0 /* deviceId */, 1 /* storageId */, - "Device A" /* device model name */, "Storage A" /* volume description */, 1024 /* free space */, 2048 /* total space */, @@ -119,21 +112,66 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { }, null, null)); + mProvider.resumeRootScanner(); + mResolver.waitForNotification(ROOTS_URI, 1); mProvider.openDevice(0); + mResolver.waitForNotification(ROOTS_URI, 2); + } + + public void testOpenDeviceOnDemand() throws Exception { + setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); + mMtpManager.addValidDevice(new MtpDeviceRecord( + 0, + "Device A", + false /* unopened */, + new MtpRoot[] { + new MtpRoot( + 0 /* deviceId */, + 1 /* storageId */, + "Storage A" /* volume description */, + 1024 /* free space */, + 2048 /* total space */, + "" /* no volume identifier */) + }, + null, + null)); + mMtpManager.setObjectHandles(0, 1, -1, new int[0]); + mProvider.resumeRootScanner(); mResolver.waitForNotification(ROOTS_URI, 1); + final String[] columns = new String[] { + DocumentsContract.Root.COLUMN_TITLE, + DocumentsContract.Root.COLUMN_DOCUMENT_ID + }; + try (final Cursor cursor = mProvider.queryRoots(columns)) { + assertEquals(1, cursor.getCount()); + assertTrue(cursor.moveToNext()); + assertEquals("Device A", cursor.getString(0)); + assertEquals(1, cursor.getLong(1)); + } + { + final int [] openedDevice = mProvider.getOpenedDeviceIds(); + assertEquals(0, openedDevice.length); + } + // Device is opened automatically when querying its children. + try (final Cursor cursor = mProvider.queryChildDocuments("1", null, null)) {} + + { + final int [] openedDevice = mProvider.getOpenedDeviceIds(); + assertEquals(1, openedDevice.length); + assertEquals(0, openedDevice[0]); + } } public void testQueryRoots() throws Exception { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); mMtpManager.addValidDevice(new MtpDeviceRecord( 0, - "Device", + "Device A", false /* unopened */, new MtpRoot[] { new MtpRoot( 0 /* deviceId */, 1 /* storageId */, - "Device A" /* device model name */, "Storage A" /* volume description */, 1024 /* free space */, 2048 /* total space */, @@ -143,13 +181,12 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { null)); mMtpManager.addValidDevice(new MtpDeviceRecord( 1, - "Device", + "Device B", false /* unopened */, new MtpRoot[] { new MtpRoot( 1 /* deviceId */, 1 /* storageId */, - "Device B" /* device model name */, "Storage B" /* volume description */, 2048 /* free space */, 4096 /* total space */, @@ -164,11 +201,11 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { final Cursor cursor = mProvider.queryRoots(null); assertEquals(2, cursor.getCount()); cursor.moveToNext(); - assertEquals("3", cursor.getString(0)); + assertEquals("1", cursor.getString(0)); assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1)); assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2)); assertEquals("Device A Storage A", cursor.getString(3)); - assertEquals("3", cursor.getString(4)); + assertEquals("1", cursor.getString(4)); assertEquals(1024, cursor.getInt(5)); } @@ -179,11 +216,11 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { assertEquals(2, cursor.getCount()); cursor.moveToNext(); cursor.moveToNext(); - assertEquals("4", cursor.getString(0)); + assertEquals("2", cursor.getString(0)); assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1)); assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2)); assertEquals("Device B Storage B", cursor.getString(3)); - assertEquals("4", cursor.getString(4)); + assertEquals("2", cursor.getString(4)); assertEquals(2048, cursor.getInt(5)); } } @@ -194,13 +231,12 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { 0, "Device A", false /* unopened */, new MtpRoot[0], null, null)); mMtpManager.addValidDevice(new MtpDeviceRecord( 1, - "Device", + "Device B", false /* unopened */, new MtpRoot[] { new MtpRoot( 1 /* deviceId */, 1 /* storageId */, - "Device B" /* device model name */, "Storage B" /* volume description */, 2048 /* free space */, 4096 /* total space */, @@ -210,9 +246,13 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { null)); { mProvider.openDevice(0); - mProvider.openDevice(1); + mProvider.resumeRootScanner(); mResolver.waitForNotification(ROOTS_URI, 1); + mProvider.openDevice(1); + mProvider.resumeRootScanner(); + mResolver.waitForNotification(ROOTS_URI, 2); + final Cursor cursor = mProvider.queryRoots(null); assertEquals(2, cursor.getCount()); @@ -225,18 +265,18 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { assertEquals(0, cursor.getInt(5)); cursor.moveToNext(); - assertEquals("3", cursor.getString(0)); + assertEquals("2", cursor.getString(0)); assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1)); assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2)); assertEquals("Device B Storage B", cursor.getString(3)); - assertEquals("3", cursor.getString(4)); + assertEquals("2", cursor.getString(4)); assertEquals(2048, cursor.getInt(5)); } } public void testQueryDocument() throws IOException, InterruptedException, TimeoutException { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); - setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "") }); + setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Storage", 1000, 1000, "") }); setupDocuments( 0, 0, @@ -273,7 +313,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { public void testQueryDocument_directory() throws IOException, InterruptedException, TimeoutException { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); - setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "") }); + setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Storage", 1000, 1000, "") }); setupDocuments( 0, 0, @@ -312,7 +352,6 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { new MtpRoot( 0 /* deviceId */, 1 /* storageId */, - "Device A" /* device model name */, "Storage A" /* volume description */, 1024 /* free space */, 4096 /* total space */, @@ -324,7 +363,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { cursor.moveToNext(); assertEquals("2", cursor.getString(0)); assertEquals(DocumentsContract.Document.MIME_TYPE_DIR, cursor.getString(1)); - assertEquals("Device A Storage A", cursor.getString(2)); + assertEquals("Storage A", cursor.getString(2)); assertTrue(cursor.isNull(3)); assertEquals(0, cursor.getInt(4)); assertEquals(3072, cursor.getInt(5)); @@ -332,7 +371,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { public void testQueryChildDocuments() throws Exception { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); - setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "") }); + setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Storage", 1000, 1000, "") }); setupDocuments( 0, 0, @@ -375,7 +414,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { public void testQueryChildDocuments_documentError() throws Exception { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); - setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "") }); + setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Storage", 1000, 1000, "") }); mMtpManager.setObjectHandles(0, 0, -1, new int[] { 1 }); try { mProvider.queryChildDocuments("1", null, null); @@ -388,7 +427,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { public void testDeleteDocument() throws IOException, InterruptedException, TimeoutException { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); setupRoots(0, new MtpRoot[] { - new MtpRoot(0, 0, "Device", "Storage", 0, 0, "") + new MtpRoot(0, 0, "Storage", 0, 0, "") }); setupDocuments(0, 0, MtpManager.OBJECT_HANDLE_ROOT_CHILDREN, "1", new MtpObjectInfo[] { new MtpObjectInfo.Builder() @@ -408,7 +447,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { throws IOException, InterruptedException, TimeoutException { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); setupRoots(0, new MtpRoot[] { - new MtpRoot(0, 0, "Device", "Storage", 0, 0, "") + new MtpRoot(0, 0, "Storage", 0, 0, "") }); setupDocuments(0, 0, MtpManager.OBJECT_HANDLE_ROOT_CHILDREN, "1", new MtpObjectInfo[] { new MtpObjectInfo.Builder() @@ -431,7 +470,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { public void testOpenDocument() throws Exception { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); setupRoots(0, new MtpRoot[] { - new MtpRoot(0, 0, "Device", "Storage", 0, 0, "") + new MtpRoot(0, 0, "Storage", 0, 0, "") }); final byte[] bytes = "Hello world".getBytes(); setupDocuments(0, 0, MtpManager.OBJECT_HANDLE_ROOT_CHILDREN, "1", new MtpObjectInfo[] { @@ -469,7 +508,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { }; setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); setupRoots(0, new MtpRoot[] { - new MtpRoot(0, 0, "Device", "Storage", 0, 0, "") + new MtpRoot(0, 0, "Storage", 0, 0, "") }); final byte[] bytes = "Hello world".getBytes(); setupDocuments(0, 0, MtpManager.OBJECT_HANDLE_ROOT_CHILDREN, "1", new MtpObjectInfo[] { @@ -492,7 +531,12 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { mProvider = new MtpDocumentsProvider(); final StorageManager storageManager = getContext().getSystemService(StorageManager.class); assertTrue(mProvider.onCreateForTesting( - mResources, mMtpManager, mResolver, mDatabase, storageManager)); + mResources, + mMtpManager, + mResolver, + mDatabase, + storageManager, + new TestServiceIntentSender())); } private String[] getStrings(Cursor cursor) { diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java index ccdea033ab6c..4dfc785a54ec 100644 --- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java +++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java @@ -44,13 +44,15 @@ public class PipeManagerTest extends AndroidTestCase { public void testReadDocument_basic() throws Exception { mtpManager.setImportFileBytes(0, 1, HELLO_BYTES); final ParcelFileDescriptor descriptor = mPipeManager.readDocument( - mtpManager, new Identifier(0, 0, 1, null)); + mtpManager, + new Identifier(0, 0, 1, null, MtpDatabaseConstants.DOCUMENT_TYPE_OBJECT)); assertDescriptor(descriptor, HELLO_BYTES); } public void testReadDocument_error() throws Exception { - final ParcelFileDescriptor descriptor = - mPipeManager.readDocument(mtpManager, new Identifier(0, 0, 1, null)); + final ParcelFileDescriptor descriptor = mPipeManager.readDocument( + mtpManager, + new Identifier(0, 0, 1, null, MtpDatabaseConstants.DOCUMENT_TYPE_OBJECT)); assertDescriptorError(descriptor); } @@ -62,7 +64,9 @@ public class PipeManagerTest extends AndroidTestCase { // Upload testing bytes. final ParcelFileDescriptor descriptor = mPipeManager.writeDocument( - getContext(), mtpManager, new Identifier(0, 0, 1, null)); + getContext(), + mtpManager, + new Identifier(0, 0, 1, null, MtpDatabaseConstants.DOCUMENT_TYPE_OBJECT)); final ParcelFileDescriptor.AutoCloseOutputStream outputStream = new ParcelFileDescriptor.AutoCloseOutputStream(descriptor); outputStream.write(HELLO_BYTES, 0, HELLO_BYTES.length); @@ -94,13 +98,15 @@ public class PipeManagerTest extends AndroidTestCase { public void testReadThumbnail_basic() throws Exception { mtpManager.setThumbnail(0, 1, HELLO_BYTES); final ParcelFileDescriptor descriptor = mPipeManager.readThumbnail( - mtpManager, new Identifier(0, 0, 1, null)); + mtpManager, + new Identifier(0, 0, 1, null, MtpDatabaseConstants.DOCUMENT_TYPE_OBJECT)); assertDescriptor(descriptor, HELLO_BYTES); } public void testReadThumbnail_error() throws Exception { - final ParcelFileDescriptor descriptor = - mPipeManager.readThumbnail(mtpManager, new Identifier(0, 0, 1, null)); + final ParcelFileDescriptor descriptor = mPipeManager.readThumbnail( + mtpManager, + new Identifier(0, 0, 1, null, MtpDatabaseConstants.DOCUMENT_TYPE_OBJECT)); assertDescriptorError(descriptor); } diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestResources.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestResources.java index eb80e3b60e6a..b23038b6c3f6 100644 --- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestResources.java +++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestResources.java @@ -27,4 +27,9 @@ class TestResources extends MockResources { } throw new NotFoundException(); } + + @Override + public String getString(int id, Object... formatArgs) throws NotFoundException { + return String.format(getString(id), formatArgs); + } } diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestServiceIntentSender.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestServiceIntentSender.java new file mode 100644 index 000000000000..d4a4a487d8ee --- /dev/null +++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestServiceIntentSender.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2016 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.mtp; + +class TestServiceIntentSender extends ServiceIntentSender { + TestServiceIntentSender() { + super(null); + } + + @Override + void sendUpdateNotificationIntent() {} +} diff --git a/packages/PrintSpooler/res/drawable/ic_info.xml b/packages/PrintSpooler/res/drawable/ic_info.xml index 2ecd1c79d23e..d64435b83e74 100644 --- a/packages/PrintSpooler/res/drawable/ic_info.xml +++ b/packages/PrintSpooler/res/drawable/ic_info.xml @@ -16,9 +16,9 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> <path - android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" - android:fillColor="#757575"/> + android:fillColor="@android:color/white" + android:pathData="M11,17l2,0l0,-6l-2,0l0,6.0zm1,-15.0C6.48,2 2,6.48 2,12.0s4.48,10 10,10 10,-4.48 10,-10.0S17.52,2 12,2.0zm0,18.0c-4.41,0 -8,-3.59 -8,-8.0s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8.0zM11,9l2,0L13,7l-2,0l0,2.0z"/> </vector>
\ No newline at end of file diff --git a/packages/PrintSpooler/res/layout/printer_dropdown_item.xml b/packages/PrintSpooler/res/layout/printer_dropdown_item.xml index e0efbc42a627..defbf8db0026 100644 --- a/packages/PrintSpooler/res/layout/printer_dropdown_item.xml +++ b/packages/PrintSpooler/res/layout/printer_dropdown_item.xml @@ -28,7 +28,6 @@ android:layout_width="32dip" android:layout_height="32dip" android:layout_gravity="center_vertical" - android:layout_marginEnd="8dip" android:duplicateParentState="true" android:contentDescription="@null" android:visibility="invisible"> @@ -38,6 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" + android:layout_marginStart="8dip" android:duplicateParentState="true"> <TextView diff --git a/packages/PrintSpooler/res/layout/printer_list_item.xml b/packages/PrintSpooler/res/layout/printer_list_item.xml index 50f44c21656c..1209aa6f0fa2 100644 --- a/packages/PrintSpooler/res/layout/printer_list_item.xml +++ b/packages/PrintSpooler/res/layout/printer_list_item.xml @@ -25,20 +25,22 @@ <ImageView android:id="@+id/icon" - android:layout_width="32dip" - android:layout_height="32dip" + android:layout_width="40dip" + android:layout_height="40dip" android:layout_gravity="center_vertical" - android:layout_marginEnd="8dip" + android:layout_marginTop="8dip" + android:layout_marginBottom="8dip" android:duplicateParentState="true" android:contentDescription="@null" android:visibility="invisible"> </ImageView> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" + <RelativeLayout + android:layout_width="0dip" android:layout_weight="1" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="16dip" android:duplicateParentState="true"> <TextView @@ -49,7 +51,10 @@ android:singleLine="true" android:ellipsize="end" android:textIsSelectable="false" - android:gravity="top|start" + android:layout_alignParentTop="true" + android:layout_alignParentStart="true" + android:fadingEdge="horizontal" + android:textAlignment="viewStart" android:textColor="?android:attr/textColorPrimary" android:duplicateParentState="true"> </TextView> @@ -58,24 +63,30 @@ android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_below="@id/title" + android:layout_alignParentStart="true" android:textAppearance="?android:attr/textAppearanceSmall" android:singleLine="true" android:ellipsize="end" android:textIsSelectable="false" android:visibility="gone" android:textColor="?android:attr/textColorSecondary" + android:textAlignment="viewStart" android:duplicateParentState="true"> </TextView> - </LinearLayout> + </RelativeLayout> <ImageView android:id="@+id/more_info" - android:layout_width="24dip" - android:layout_height="24dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:paddingLeft="16dip" android:contentDescription="@string/printer_info_desc" android:src="@drawable/ic_info" + android:tint="?android:attr/colorControlNormal" + android:tintMode="src_in" android:visibility="gone"> </ImageView> diff --git a/packages/PrintSpooler/res/values-es-rUS/arrays.xml b/packages/PrintSpooler/res/values-es-rUS/arrays.xml deleted file mode 100644 index c1b149c59960..000000000000 --- a/packages/PrintSpooler/res/values-es-rUS/arrays.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<resources> - - <string-array name="pdf_printer_media_sizes" translatable="false"> - <item>NA_LETTER</item> - <item>NA_GOVT_LETTER</item> - <item>NA_LEGAL</item> - <item>NA_JUNIOR_LEGAL</item> - <item>NA_LEDGER</item> - <item>NA_TABLOID</item> - <item>NA_INDEX_3X5</item> - <item>NA_INDEX_4X6</item> - <item>NA_INDEX_5X8</item> - <item>NA_MONARCH</item> - <item>NA_QUARTO</item> - <item>NA_FOOLSCAP</item> - </string-array> - -</resources> diff --git a/packages/PrintSpooler/res/values-ja/arrays.xml b/packages/PrintSpooler/res/values-ja/arrays.xml deleted file mode 100644 index 3187cbefaa1e..000000000000 --- a/packages/PrintSpooler/res/values-ja/arrays.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> -<resources> - - <string-array name="pdf_printer_media_sizes" translatable="false"> - <item>JIS_B10</item> - <item>JIS_B9</item> - <item>JIS_B8</item> - <item>JIS_B7</item> - <item>JIS_B6</item> - <item>JIS_B5</item> - <item>JIS_B4</item> - <item>JIS_B3</item> - <item>JIS_B2</item> - <item>JIS_B1</item> - <item>JIS_B0</item> - <item>JIS_EXEC</item> - <item>JPN_CHOU4</item> - <item>JPN_CHOU3</item> - <item>JPN_CHOU2</item> - <item>JPN_HAGAKI</item> - <item>JPN_OUFUKU</item> - <item>JPN_KAHU</item> - <item>JPN_KAKU2</item> - <item>JPN_YOU4</item> - </string-array> - -</resources> diff --git a/packages/PrintSpooler/res/values/arrays.xml b/packages/PrintSpooler/res/values/arrays.xml index afe3c7122dd7..8658be46c6eb 100644 --- a/packages/PrintSpooler/res/values/arrays.xml +++ b/packages/PrintSpooler/res/values/arrays.xml @@ -121,38 +121,4 @@ <!-- Everything else is ISO --> </string-array> - <string-array name="pdf_printer_media_sizes" translatable="false"> - <item>ISO_A0</item> - <item>ISO_A1</item> - <item>ISO_A2</item> - <item>ISO_A3</item> - <item>ISO_A4</item> - <item>ISO_A5</item> - <item>ISO_A6</item> - <item>ISO_A7</item> - <item>ISO_A8</item> - <item>ISO_A9</item> - <item>ISO_A10</item> - <item>ISO_B1</item> - <item>ISO_B2</item> - <item>ISO_B3</item> - <item>ISO_B4</item> - <item>ISO_B5</item> - <item>ISO_B6</item> - <item>ISO_B7</item> - <item>ISO_B8</item> - <item>ISO_B9</item> - <item>ISO_B10</item> - <item>ISO_C1</item> - <item>ISO_C2</item> - <item>ISO_C3</item> - <item>ISO_C4</item> - <item>ISO_C5</item> - <item>ISO_C6</item> - <item>ISO_C7</item> - <item>ISO_C8</item> - <item>ISO_C9</item> - <item>ISO_C10</item> - </string-array> - </resources> diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index 892be2d06fce..d0cf6351d018 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -61,7 +61,9 @@ import android.text.TextUtils; import android.text.TextUtils.SimpleStringSplitter; import android.text.TextWatcher; import android.util.ArrayMap; +import android.util.ArraySet; import android.util.Log; +import android.util.TypedValue; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; @@ -263,7 +265,14 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat new Runnable() { @Override public void run() { - onConnectedToPrintSpooler(adapter); + if (isFinishing()) { + // onPause might have not been able to cancel the job, see PrintActivity#onPause + // To be sure, cancel the job again. Double canceling does no harm. + mSpoolerProvider.getSpooler().setPrintJobState(mPrintJob.getId(), + PrintJobInfo.STATE_CANCELED, null); + } else { + onConnectedToPrintSpooler(adapter); + } } }); } @@ -351,7 +360,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat if (mState == STATE_INITIALIZING) { if (isFinishing()) { - spooler.setPrintJobState(mPrintJob.getId(), PrintJobInfo.STATE_CANCELED, null); + if (spooler != null) { + spooler.setPrintJobState(mPrintJob.getId(), PrintJobInfo.STATE_CANCELED, null); + } } super.onPause(); return; @@ -2252,10 +2263,17 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat ImageView iconView = (ImageView) convertView.findViewById(R.id.icon); if (icon != null) { - iconView.setImageDrawable(icon); iconView.setVisibility(View.VISIBLE); + if (!isEnabled(position)) { + icon.mutate(); + + TypedValue value = new TypedValue(); + getTheme().resolveAttribute(android.R.attr.disabledAlpha, value, true); + icon.setAlpha((int)(value.getFloat() * 255)); + } + iconView.setImageDrawable(icon); } else { - iconView.setVisibility(View.INVISIBLE); + iconView.setVisibility(View.GONE); } return convertView; @@ -2353,6 +2371,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat } private PrinterInfo createFakePdfPrinter() { + ArraySet<MediaSize> allMediaSizes = MediaSize.getAllPredefinedSizes(); MediaSize defaultMediaSize = MediaSizeUtils.getDefault(PrintActivity.this); PrinterId printerId = new PrinterId(getComponentName(), "PDF printer"); @@ -2360,11 +2379,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat PrinterCapabilitiesInfo.Builder builder = new PrinterCapabilitiesInfo.Builder(printerId); - String[] mediaSizeIds = getResources().getStringArray(R.array.pdf_printer_media_sizes); - final int mediaSizeIdCount = mediaSizeIds.length; - for (int i = 0; i < mediaSizeIdCount; i++) { - String id = mediaSizeIds[i]; - MediaSize mediaSize = MediaSize.getStandardMediaSizeById(id); + final int mediaSizeCount = allMediaSizes.size(); + for (int i = 0; i < mediaSizeCount; i++) { + MediaSize mediaSize = allMediaSizes.valueAt(i); builder.addMediaSize(mediaSize, mediaSize.equals(defaultMediaSize)); } @@ -2442,6 +2459,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat } updateOptionsUi(); + updateSummary(); } private boolean capabilitiesChanged(PrinterCapabilitiesInfo oldCapabilities, diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java index 1aec2531e2ca..4f7624adc9ad 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java @@ -37,6 +37,7 @@ import android.content.pm.ServiceInfo; import android.database.ContentObserver; import android.database.DataSetObserver; import android.graphics.drawable.Drawable; +import android.graphics.drawable.Icon; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -47,6 +48,7 @@ import android.printservice.PrintServiceInfo; import android.provider.Settings; import android.text.TextUtils; import android.util.Log; +import android.util.TypedValue; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.Menu; @@ -544,7 +546,10 @@ public final class SelectPrinterActivity extends Activity { final int printerCount = mPrinters.size(); for (int i = 0; i < printerCount; i++) { PrinterInfo printer = mPrinters.get(i); - if (printer.getName().toLowerCase().contains(constraintLowerCase)) { + String description = printer.getDescription(); + if (printer.getName().toLowerCase().contains(constraintLowerCase) + || description != null && description.toLowerCase() + .contains(constraintLowerCase)) { filteredPrinters.add(printer); } } @@ -663,18 +668,28 @@ public final class SelectPrinterActivity extends Activity { @Override public void onClick(View v) { try { - startIntentSender(printer.getInfoIntent().getIntentSender(), null, 0, 0, 0); + startIntentSender(printer.getInfoIntent().getIntentSender(), null, 0, 0, + 0); } catch (SendIntentException e) { Log.e(LOG_TAG, "Could not execute pending info intent: %s", e); } } }); + } else { + moreInfoView.setVisibility(View.GONE); } ImageView iconView = (ImageView) convertView.findViewById(R.id.icon); if (icon != null) { - iconView.setImageDrawable(icon); iconView.setVisibility(View.VISIBLE); + if (!isActionable(position)) { + icon.mutate(); + + TypedValue value = new TypedValue(); + getTheme().resolveAttribute(android.R.attr.disabledAlpha, value, true); + icon.setAlpha((int)(value.getFloat() * 255)); + } + iconView.setImageDrawable(icon); } else { iconView.setVisibility(View.GONE); } diff --git a/packages/SettingsLib/res/values-bs-rBA/strings.xml b/packages/SettingsLib/res/values-bs-rBA/strings.xml index a3b540d60be0..8aae5bb9c649 100644 --- a/packages/SettingsLib/res/values-bs-rBA/strings.xml +++ b/packages/SettingsLib/res/values-bs-rBA/strings.xml @@ -146,50 +146,37 @@ <skip /> <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string> <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Uklonjene aplikacije"</string> - <!-- no translation found for data_usage_uninstalled_apps_users (7986294489899813194) --> - <skip /> + <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Uklonjene aplikacije i korisnici"</string> <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string> <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosna pristupna tačka"</string> <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string> <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string> <string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje internetske veze i prenosna pristupna tačka"</string> - <!-- no translation found for managed_user_title (8101244883654409696) --> - <skip /> - <!-- no translation found for user_guest (8475274842845401871) --> - <skip /> + <string name="managed_user_title" msgid="8101244883654409696">"Profil za Work"</string> + <string name="user_guest" msgid="8475274842845401871">"Gost"</string> <string name="unknown" msgid="1592123443519355854">"Nepoznato"</string> <string name="running_process_item_user_label" msgid="3129887865552025943">"Korisnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string> - <!-- no translation found for launch_defaults_some (313159469856372621) --> - <skip /> - <!-- no translation found for launch_defaults_none (4241129108140034876) --> - <skip /> + <string name="launch_defaults_some" msgid="313159469856372621">"Neke zadane vrijednosti su postavljene"</string> + <string name="launch_defaults_none" msgid="4241129108140034876">"Nema postavljenih zadanih vrijednosti"</string> <string name="tts_settings" msgid="8186971894801348327">"Postavke za pretvaranje teksta u govor"</string> <string name="tts_settings_title" msgid="1237820681016639683">"Izlaz za pretvaranje teksta u govor"</string> <string name="tts_default_rate_title" msgid="6030550998379310088">"Brzina govora"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"Brzina kojom se izgovara tekst"</string> <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string> - <!-- no translation found for tts_lang_use_system (2679252467416513208) --> - <skip /> - <!-- no translation found for tts_lang_not_selected (7395787019276734765) --> - <skip /> + <string name="tts_lang_use_system" msgid="2679252467416513208">"Koristi sistemski jezik"</string> + <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik nije izabran"</string> <string name="tts_default_lang_summary" msgid="5219362163902707785">"Postavlja glas za dati jezik za izgovoreni tekst"</string> <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušajte primjer"</string> <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduciraj kratku demonstraciju sintetiziranja govora"</string> <string name="tts_install_data_title" msgid="4264378440508149986">"Instaliraj glasovne podatke"</string> <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalirajte glasovne podatke potrebne za sintetiziranje govora"</string> <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ovaj program za sintetiziranje govora može biti u mogućnosti da prikuplja sav tekst koji se izgovara, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Potiče od aplikacije <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Da li želite koristiti ovaj program za sintetiziranje govora?"</string> - <!-- no translation found for tts_engine_network_required (1190837151485314743) --> - <skip /> - <!-- no translation found for tts_default_sample_string (4040835213373086322) --> - <skip /> - <!-- no translation found for tts_status_title (7268566550242584413) --> - <skip /> - <!-- no translation found for tts_status_ok (1309762510278029765) --> - <skip /> - <!-- no translation found for tts_status_requires_network (6042500821503226892) --> - <skip /> - <!-- no translation found for tts_status_not_supported (4491154212762472495) --> - <skip /> + <string name="tts_engine_network_required" msgid="1190837151485314743">"Ovaj jezik zahtijeva mrežnu vezu radi za izlaz tekst-u-govor."</string> + <string name="tts_default_sample_string" msgid="4040835213373086322">"Ovo je primjer sinteze govora"</string> + <string name="tts_status_title" msgid="7268566550242584413">"Zadani status jezika"</string> + <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> je u potpunosti podržan"</string> + <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> zahtjeva mrežnu vezu"</string> + <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> nije podržan"</string> <!-- no translation found for tts_status_checking (5339150797940483592) --> <skip /> <string name="tts_engine_settings_title" msgid="3499112142425680334">"Postavke za <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string> @@ -205,104 +192,62 @@ <!-- no translation found for tts_rate_entries:6 (7831712693748700507) --> <!-- no translation found for tts_rate_entries:7 (5194774745031751806) --> <!-- no translation found for tts_rate_entries:8 (9085102246155045744) --> - <!-- no translation found for choose_profile (8229363046053568878) --> - <skip /> - <!-- no translation found for category_personal (1299663247844969448) --> - <skip /> - <!-- no translation found for category_work (8699184680584175622) --> - <skip /> + <string name="choose_profile" msgid="8229363046053568878">"Odaberite profil"</string> + <string name="category_personal" msgid="1299663247844969448">"Lično"</string> + <string name="category_work" msgid="8699184680584175622">"Posao"</string> <string name="development_settings_title" msgid="215179176067683667">"Opcije za programere"</string> <!-- no translation found for development_settings_enable (542530994778109538) --> <skip /> <string name="development_settings_summary" msgid="1815795401632854041">"Postavi opcije za razvoj aplikacija"</string> - <!-- no translation found for development_settings_not_available (4308569041701535607) --> - <skip /> - <!-- no translation found for vpn_settings_not_available (956841430176985598) --> - <skip /> - <!-- no translation found for tethering_settings_not_available (6765770438438291012) --> - <skip /> - <!-- no translation found for apn_settings_not_available (7873729032165324000) --> - <skip /> + <string name="development_settings_not_available" msgid="4308569041701535607">"Opcije za programere nisu dostupne za ovog korisnika"</string> + <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN postavke nisu dostupne za ovog korisnika"</string> + <string name="tethering_settings_not_available" msgid="6765770438438291012">"Postavke za privezivanje nisu dostupne za ovog korisnika"</string> + <string name="apn_settings_not_available" msgid="7873729032165324000">"Postavke za naziv pristupne tačke nisu dostupne za ovog korisnika"</string> <string name="enable_adb" msgid="7982306934419797485">"USB otklanjanje grešaka"</string> <string name="enable_adb_summary" msgid="4881186971746056635">"Način rada za uklanjanje grešaka kada je povezan USB"</string> - <!-- no translation found for clear_adb_keys (4038889221503122743) --> - <skip /> - <!-- no translation found for bugreport_in_power (7923901846375587241) --> - <skip /> - <!-- no translation found for bugreport_in_power_summary (1778455732762984579) --> - <skip /> + <string name="clear_adb_keys" msgid="4038889221503122743">"Ukini odobrenja otklanjanja grešaka USB-om"</string> + <string name="bugreport_in_power" msgid="7923901846375587241">"Prečica za izvještaj o greškama"</string> + <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Prikaži tipku za prijavu grešaka u izborniku za potrošnju energije"</string> <string name="keep_screen_on" msgid="1146389631208760344">"Ostani aktivan"</string> <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran neće prelaziti u stanje mirovanja tokom punjenja"</string> - <!-- no translation found for bt_hci_snoop_log (3340699311158865670) --> - <skip /> - <!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) --> - <skip /> - <!-- no translation found for oem_unlock_enable (6040763321967327691) --> - <skip /> - <!-- no translation found for oem_unlock_enable_summary (4720281828891618376) --> - <skip /> - <!-- no translation found for confirm_enable_oem_unlock_title (4802157344812385674) --> - <skip /> - <!-- no translation found for confirm_enable_oem_unlock_text (5517144575601647022) --> - <skip /> - <!-- no translation found for mock_location_app (7966220972812881854) --> - <skip /> - <!-- no translation found for mock_location_app_not_set (809543285495344223) --> - <skip /> - <!-- no translation found for mock_location_app_set (8966420655295102685) --> - <skip /> - <!-- no translation found for debug_networking_category (7044075693643009662) --> - <skip /> - <!-- no translation found for wifi_display_certification (8611569543791307533) --> - <skip /> - <!-- no translation found for wifi_verbose_logging (4203729756047242344) --> - <skip /> - <!-- no translation found for wifi_aggressive_handover (9194078645887480917) --> - <skip /> - <!-- no translation found for wifi_allow_scan_with_traffic (3601853081178265786) --> - <skip /> - <!-- no translation found for legacy_dhcp_client (694426978909127287) --> - <skip /> - <!-- no translation found for mobile_data_always_on (7745605759775320362) --> - <skip /> - <!-- no translation found for wifi_display_certification_summary (1155182309166746973) --> - <skip /> - <!-- no translation found for wifi_verbose_logging_summary (6615071616111731958) --> - <skip /> - <!-- no translation found for wifi_aggressive_handover_summary (6328455667642570371) --> - <skip /> - <!-- no translation found for wifi_allow_scan_with_traffic_summary (2575101424972686310) --> - <skip /> - <!-- no translation found for select_logd_size_title (7433137108348553508) --> - <skip /> - <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) --> - <skip /> - <!-- no translation found for select_usb_configuration_title (2649938511506971843) --> - <skip /> - <!-- no translation found for select_usb_configuration_dialog_title (6385564442851599963) --> - <skip /> + <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogući Bluetooth HCI snoop zapis"</string> + <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Smjesti sve Bluetooth HCI pakete u datoteku"</string> + <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM otključavanje"</string> + <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Dozvoli otključavanje bootloadera"</string> + <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Želite li dozvoliti OEM otključavanje?"</string> + <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORENJE: Funkcije zaštite ovog uređaja neće funkcionisati dok je ova postavka uključena."</string> + <string name="mock_location_app" msgid="7966220972812881854">"Odaberite aplikaciju za lažne lokacije"</string> + <string name="mock_location_app_not_set" msgid="809543285495344223">"Aplikacija za lažnu lokaciju nije postavljena"</string> + <string name="mock_location_app_set" msgid="8966420655295102685">"Aplikacija za lažne lokacije: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="debug_networking_category" msgid="7044075693643009662">"Umrežavanje"</string> + <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikacija bežičnog prikaza"</string> + <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogućiti Wi-Fi Verbose zapisivanje"</string> + <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresivni Wi-Fi u mobilnoj primopredaji"</string> + <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Uvijek dopustiti Wi-Fi lutajuće skeniranje"</string> + <string name="legacy_dhcp_client" msgid="694426978909127287">"Koristi zastareli DHCP klijent"</string> + <string name="mobile_data_always_on" msgid="7745605759775320362">"Mobilni podaci uvijek aktivni"</string> + <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaži opcije za certifikaciju Bežičnog prikaza"</string> + <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Povećajte nivo Wi-Fi zapisivanja, pokazati po SSID RSSI Wi-Fi Picker"</string> + <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Kada je omogućeno, Wi-Fi će biti agresivniji u predavanju podatkovne veze mobilnoj, kada je Wi-Fi signal slab"</string> + <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Dozvoli/Zabrani Wi-Fi lutajuće skeniranje na osnovu količine podatkovnog prometa prisutnog na sučelju"</string> + <string name="select_logd_size_title" msgid="7433137108348553508">"Veličine bafera za zapisnik"</string> + <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Izaberite veličine za Logger prema međumemoriji evidencije"</string> + <string name="select_usb_configuration_title" msgid="2649938511506971843">"Odaberite USB konfiguraciju"</string> + <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"Odaberite konfiguraciju USB-a"</string> <string name="allow_mock_location" msgid="2787962564578664888">"Dozvoli lažne lokacije"</string> <string name="allow_mock_location_summary" msgid="317615105156345626">"Dozvoli lažne lokacije"</string> - <!-- no translation found for debug_view_attributes (6485448367803310384) --> - <skip /> - <!-- no translation found for legacy_dhcp_client_summary (163383566317652040) --> - <skip /> - <!-- no translation found for mobile_data_always_on_summary (8149773901431697910) --> - <skip /> + <string name="debug_view_attributes" msgid="6485448367803310384">"Omogući pregled atributa prikaza"</string> + <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Koristi DHCP klijent iz Lollipopa umjesto novog Android DHCP klijenta."</string> + <string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Uvijek drži mobilne podatke aktivnim, čak i kada je Wi-Fi je aktivan (za brzo prebacivanje između mreža)."</string> <string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti USB otklanjanje grešaka?"</string> <string name="adb_warning_message" msgid="7316799925425402244">"USB otklanjanje grešaka je namijenjeno samo u svrhe razvoja aplikacija. Koristite ga za kopiranje podataka između računara i uređaja, instaliranje aplikacija na uređaj bez obavještenja te čitanje podataka iz dnevnika rada."</string> - <!-- no translation found for adb_keys_warning_message (5659849457135841625) --> - <skip /> + <string name="adb_keys_warning_message" msgid="5659849457135841625">"Opozvati pristup otklanjanju grešaka USB-om za sve računare koje ste prethodno ovlastili?"</string> <string name="dev_settings_warning_title" msgid="7244607768088540165">"Dopustiti postavke za razvoj?"</string> <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ove postavke su namijenjene samo za svrhe razvoja. Mogu izazvati pogrešno ponašanje uređaja i aplikacija na njemu."</string> - <!-- no translation found for verify_apps_over_usb_title (4177086489869041953) --> - <skip /> - <!-- no translation found for verify_apps_over_usb_summary (9164096969924529200) --> - <skip /> - <!-- no translation found for enable_terminal_title (95572094356054120) --> - <skip /> - <!-- no translation found for enable_terminal_summary (67667852659359206) --> - <skip /> + <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verifikuj aplikacije putem USB-a"</string> + <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Provjerava da li se u aplikacijama instaliranim putem ADB-a/ADT-a javlja zlonamerno ponašanje."</string> + <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string> + <string name="enable_terminal_summary" msgid="67667852659359206">"Omogući terminalnu aplik. koja nudi pristup lok. kom. okruženju"</string> <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP provjeravanje"</string> <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Pos. ponaš. kod HDCP pr."</string> <string name="debug_debugging_category" msgid="6781250159513471316">"Otklanjanje grešaka"</string> @@ -315,10 +260,8 @@ <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikacija u kojoj se otklanjaju greške čeka da se priloži program za otklanjanje grešaka prije izvršavanja"</string> <string name="debug_input_category" msgid="1811069939601180246">"Ulaz"</string> <string name="debug_drawing_category" msgid="6755716469267367852">"Crtanje"</string> - <!-- no translation found for debug_hw_drawing_category (6220174216912308658) --> - <skip /> - <!-- no translation found for media_category (4388305075496848353) --> - <skip /> + <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Prikaz s hardverskom akceleracijom"</string> + <string name="media_category" msgid="4388305075496848353">"Mediji"</string> <string name="debug_monitoring_category" msgid="7640508148375798343">"Praćenje"</string> <string name="strict_mode" msgid="1938795874357830695">"Omogućen strogi režim"</string> <string name="strict_mode_summary" msgid="142834318897332338">"Prikaži ekran uz treptanje kada aplikacije vrše duge operacije u glavnoj niti"</string> @@ -332,42 +275,31 @@ <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Prikazi uz treptanje unutar prozora kada se crta koristeći GPU"</string> <string name="show_hw_layers_updates" msgid="5645728765605699821">"Prikaži dodatne informacije za ažuriranja za hardver"</string> <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Trepći hardverske slojeve zeleno kada se ažuriraju"</string> - <!-- no translation found for debug_hw_overdraw (2968692419951565417) --> - <skip /> + <string name="debug_hw_overdraw" msgid="2968692419951565417">"Otkl. GPU overdraw greške"</string> <string name="disable_overlays" msgid="2074488440505934665">"Onemog. HW preklapanja"</string> <string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek koristi GPU za kompoziciju ekrana"</string> - <!-- no translation found for simulate_color_space (6745847141353345872) --> - <skip /> - <!-- no translation found for enable_opengl_traces_title (6790444011053219871) --> - <skip /> - <!-- no translation found for usb_audio_disable_routing (8114498436003102671) --> - <skip /> - <!-- no translation found for usb_audio_disable_routing_summary (980282760277312264) --> - <skip /> + <string name="simulate_color_space" msgid="6745847141353345872">"Simuliraj prostor boje"</string> + <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogući OpenGL zapise"</string> + <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Isključi USB audio usmjeravanje"</string> + <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Onemogući autom. usmjerav. na USB audio periferije"</string> <string name="debug_layout" msgid="5981361776594526155">"Prikaži granice rasporeda"</string> <string name="debug_layout_summary" msgid="2001775315258637682">"Prikaži granice isječka, margine itd."</string> - <!-- no translation found for force_rtl_layout_all_locales (2259906643093138978) --> - <skip /> - <!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) --> - <skip /> + <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Prisilno postavi raspored s desna u lijevo"</string> + <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Prisilno postavi raspored ekrana s desna u lijevo za sve regije"</string> <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži korištenje CPU-a"</string> <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Trenutno korištenje CPU-a prikazuje se u nadsloju preko ekrana"</string> <string name="force_hw_ui" msgid="6426383462520888732">"Prisili GPU iscrtavanje"</string> <string name="force_hw_ui_summary" msgid="5535991166074861515">"Prisilno koristite GPU za 2d crtanje"</string> - <!-- no translation found for force_msaa (7920323238677284387) --> - <skip /> - <!-- no translation found for force_msaa_summary (9123553203895817537) --> - <skip /> - <!-- no translation found for show_non_rect_clip (505954950474595172) --> - <skip /> + <string name="force_msaa" msgid="7920323238677284387">"Prinudno primjeni 4x MSAA"</string> + <string name="force_msaa_summary" msgid="9123553203895817537">"Omogući 4x MSAA u OpenGL ES 2.0 aplikacijama"</string> + <string name="show_non_rect_clip" msgid="505954950474595172">"Ispravi pogreške na nepravougaonim operacijama isecanja"</string> <string name="track_frame_time" msgid="6146354853663863443">"Iscrtavanje GPU profila"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animacije prozora"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Skaliranje animacije prelaza"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala trajanja animatora"</string> <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuliraj sekundarne ekrane"</string> <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacije"</string> - <!-- no translation found for immediately_destroy_activities (1579659389568133959) --> - <skip /> + <string name="immediately_destroy_activities" msgid="1579659389568133959">"Ne čuvaj aktivnosti"</string> <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Obustavi svaku aktivnosti čim je korisnik napusti"</string> <string name="app_process_limit_title" msgid="4280600650253107163">"Ograničenje procesa u pozadini"</string> <string name="show_all_anrs" msgid="28462979638729082">"Prikaži sve ANR-ove"</string> @@ -385,37 +317,34 @@ <!-- no translation found for enable_freeform_support_summary (2252563497485436534) --> <skip /> <string name="local_backup_password_title" msgid="3860471654439418822">"Lozinka za rezervnu kopiju za radnu površinu"</string> - <!-- no translation found for local_backup_password_summary_none (6951095485537767956) --> - <skip /> + <string name="local_backup_password_summary_none" msgid="6951095485537767956">"Potpune sigurnosne kopije za računare trenutno nisu zaštićene"</string> <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dodirnite da promijenite ili uklonite lozinku za potpune rezervne kopije za radnu površinu"</string> <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nova lozinka za rezervnu kopiju postavljena"</string> - <!-- no translation found for local_backup_password_toast_confirmation_mismatch (7805892532752708288) --> - <skip /> + <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Nova lozinka i potvrda se ne podudaraju"</string> <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Nije uspjelo postavljanje lozinke za rezervnu kopiju"</string> - <!-- no translation found for color_mode_names:0 (2425514299220523812) --> - <!-- no translation found for color_mode_names:1 (8446070607501413455) --> - <!-- no translation found for color_mode_names:2 (6553408765810699025) --> - <!-- no translation found for color_mode_descriptions:0 (4979629397075120893) --> - <!-- no translation found for color_mode_descriptions:1 (8280754435979370728) --> - <!-- no translation found for color_mode_descriptions:2 (5363960654009010371) --> - <!-- no translation found for inactive_apps_title (1317817863508274533) --> - <skip /> - <!-- no translation found for inactive_app_inactive_summary (6768756967594202411) --> - <skip /> - <!-- no translation found for inactive_app_active_summary (4512911571954375968) --> - <skip /> + <string-array name="color_mode_names"> + <item msgid="2425514299220523812">"Živopisan (zadano)"</item> + <item msgid="8446070607501413455">"Prirodan"</item> + <item msgid="6553408765810699025">"Standardni"</item> + </string-array> + <string-array name="color_mode_descriptions"> + <item msgid="4979629397075120893">"Unaprijeđene boje"</item> + <item msgid="8280754435979370728">"Prirodne boje onako kako ih oko vidi"</item> + <item msgid="5363960654009010371">"Boje optimizirane za digitalni sadržaj"</item> + </string-array> + <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktivne aplikacije"</string> + <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktivna je. Dodirnite da biste promenili."</string> + <string name="inactive_app_active_summary" msgid="4512911571954375968">"Aktivna je. Dodirnite da biste promenili."</string> <string name="runningservices_settings_title" msgid="8097287939865165213">"Pokrenute usluge"</string> <string name="runningservices_settings_summary" msgid="854608995821032748">"Prikažite trenutno pokrenute usluge i upravljajte njima"</string> <!-- no translation found for night_mode_title (2594133148531256513) --> <skip /> - <!-- no translation found for night_mode_summary (9196605054622017193) --> - <skip /> + <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string> <!-- no translation found for night_mode_no (9171772244775838901) --> <skip /> <!-- no translation found for night_mode_yes (2218157265997633432) --> <skip /> - <!-- no translation found for night_mode_auto (7508348175804304327) --> - <skip /> + <string name="night_mode_auto" msgid="7508348175804304327">"Automatski"</string> <!-- no translation found for select_webview_provider_title (4628592979751918907) --> <skip /> <!-- no translation found for select_webview_provider_dialog_title (4370551378720004872) --> @@ -434,46 +363,27 @@ <skip /> <!-- no translation found for button_convert_fbe (5152671181309826405) --> <skip /> - <!-- no translation found for picture_color_mode (4560755008730283695) --> - <skip /> - <!-- no translation found for picture_color_mode_desc (1141891467675548590) --> - <skip /> - <!-- no translation found for daltonizer_mode_disabled (7482661936053801862) --> - <skip /> - <!-- no translation found for daltonizer_mode_monochromacy (8485709880666106721) --> - <skip /> - <!-- no translation found for daltonizer_mode_deuteranomaly (5475532989673586329) --> - <skip /> - <!-- no translation found for daltonizer_mode_protanomaly (8424148009038666065) --> - <skip /> - <!-- no translation found for daltonizer_mode_tritanomaly (481725854987912389) --> - <skip /> - <!-- no translation found for accessibility_display_daltonizer_preference_title (5800761362678707872) --> - <skip /> - <!-- no translation found for accessibility_display_daltonizer_preference_subtitle (3484969015295282911) --> - <skip /> - <!-- no translation found for daltonizer_type_overridden (3116947244410245916) --> - <skip /> - <!-- no translation found for power_discharging_duration (1605929174734600590) --> - <skip /> - <!-- no translation found for power_charging (1779532561355864267) --> - <skip /> - <!-- no translation found for power_charging_duration (2853265177761520490) --> - <skip /> - <!-- no translation found for power_charging_duration_ac (3969186192576594254) --> - <skip /> - <!-- no translation found for power_charging_duration_usb (182405645340976546) --> - <skip /> - <!-- no translation found for power_charging_duration_wireless (1829295708243159464) --> - <skip /> + <string name="picture_color_mode" msgid="4560755008730283695">"Režim boja Slika"</string> + <string name="picture_color_mode_desc" msgid="1141891467675548590">"Koristi sRGB"</string> + <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"Onemogućeno"</string> + <string name="daltonizer_mode_monochromacy" msgid="8485709880666106721">"Crno-bijelo"</string> + <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"Deuteranomalija (crveno-zeleno)"</string> + <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomalija (crveno-zeleno)"</string> + <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomalija (plavo-žuta)"</string> + <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Ispravka boje"</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna te može utjecati na performanse."</string> + <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Zamjenjuje <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – preostalo vreme je otprilike <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pune baterije"</string> + <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do kraja punjenja na el. napajanju"</string> + <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pune baterije preko USB-a"</string> + <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pune baterije bežičnim punjenjem"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Nepoznato"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Puni se"</string> - <!-- no translation found for battery_info_status_charging_ac (2909861890674399949) --> - <skip /> - <!-- no translation found for battery_info_status_charging_usb (2207489369680923929) --> - <skip /> - <!-- no translation found for battery_info_status_charging_wireless (3574032603735446573) --> - <skip /> + <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Puni se na punjaču"</string> + <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Punjenje preko USB-a"</string> + <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Bežično punjenje"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string> <string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string> diff --git a/packages/SettingsLib/res/values-ro/arrays.xml b/packages/SettingsLib/res/values-ro/arrays.xml index 141f877a64f9..30d6cf3a7819 100644 --- a/packages/SettingsLib/res/values-ro/arrays.xml +++ b/packages/SettingsLib/res/values-ro/arrays.xml @@ -86,7 +86,7 @@ <item msgid="2219332261255416635">"Animație la scara 1x"</item> <item msgid="3544428804137048509">"Animație la scara 1,5x"</item> <item msgid="3110710404225974514">"Animație la scara 2x"</item> - <item msgid="4402738611528318731">"Animaţie la scara 5x"</item> + <item msgid="4402738611528318731">"Animație la scara 5x"</item> <item msgid="6189539267968330656">"Animație la scara 10x"</item> </string-array> <string-array name="transition_animation_scale_entries"> @@ -99,13 +99,13 @@ <item msgid="6660750935954853365">"Animație la scara 10x"</item> </string-array> <string-array name="animator_duration_scale_entries"> - <item msgid="6039901060648228241">"Animaţie dezactivată"</item> - <item msgid="1138649021950863198">"Animaţie la scara 0,5x"</item> - <item msgid="4394388961370833040">"Animaţie la scara 1x"</item> - <item msgid="8125427921655194973">"Animaţie la scara 1,5x"</item> - <item msgid="3334024790739189573">"Animaţie la scara 2x"</item> - <item msgid="3170120558236848008">"Animaţie la scara 5x"</item> - <item msgid="1069584980746680398">"Animaţie la scara 10x"</item> + <item msgid="6039901060648228241">"Animație dezactivată"</item> + <item msgid="1138649021950863198">"Animație la scara 0,5x"</item> + <item msgid="4394388961370833040">"Animație la scara 1x"</item> + <item msgid="8125427921655194973">"Animație la scara 1,5x"</item> + <item msgid="3334024790739189573">"Animație la scara 2x"</item> + <item msgid="3170120558236848008">"Animație la scara 5x"</item> + <item msgid="1069584980746680398">"Animație la scara 10x"</item> </string-array> <string-array name="overlay_display_devices_entries"> <item msgid="1606809880904982133">"Niciuna"</item> diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml index 04cba9977bc1..97bdd5103430 100644 --- a/packages/SettingsLib/res/values-ro/strings.xml +++ b/packages/SettingsLib/res/values-ro/strings.xml @@ -191,7 +191,7 @@ <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurați verific. HDCP"</string> <string name="debug_debugging_category" msgid="6781250159513471316">"Depanare"</string> <string name="debug_app" msgid="8349591734751384446">"Selectați aplicația de depanare"</string> - <string name="debug_app_not_set" msgid="718752499586403499">"Nu aţi setat o aplicație de depanare"</string> + <string name="debug_app_not_set" msgid="718752499586403499">"Nu ați setat o aplicație de depanare"</string> <string name="debug_app_set" msgid="2063077997870280017">"Aplicaţie de depanare: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="select_application" msgid="5156029161289091703">"Selectaţi o aplicație"</string> <string name="no_application" msgid="2813387563129153880">"Niciuna"</string> @@ -251,7 +251,7 @@ <string name="enable_freeform_support_summary" msgid="2252563497485436534">"Activează compatibilitatea pentru ferestrele experimentale cu formă liberă."</string> <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă copie rez. desktop"</string> <string name="local_backup_password_summary_none" msgid="6951095485537767956">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate"</string> - <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeţi pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string> + <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeți pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string> <string name="local_backup_password_toast_success" msgid="582016086228434290">"A fost setată o parolă de rezervă nouă"</string> <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Parola nouă și confirmarea acesteia nu se potrivesc."</string> <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Setarea parolei de rezervă a eșuat"</string> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index d3c8416a4abb..38d890777994 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -515,9 +515,9 @@ <string name="pointer_location_summary">Screen overlay showing current touch data</string> <!-- UI debug setting: show touches? [CHAR LIMIT=25] --> - <string name="show_touches">Show touches</string> + <string name="show_touches">Show taps</string> <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] --> - <string name="show_touches_summary">Show visual feedback for touches</string> + <string name="show_touches_summary">Show visual feedback for taps</string> <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] --> <string name="show_screen_updates">Show surface updates</string> @@ -634,7 +634,7 @@ <!-- Summary text of the "local backup password" setting when the user has not supplied a password --> <string name="local_backup_password_summary_none">Desktop full backups aren\u2019t currently protected</string> <!-- Summary text of the "local backup password" setting when the user has already supplied a password --> - <string name="local_backup_password_summary_change">Touch to change or remove the password for desktop full backups</string> + <string name="local_backup_password_summary_change">Tap to change or remove the password for desktop full backups</string> <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] --> <string name="local_backup_password_toast_success">New backup password set</string> @@ -660,9 +660,9 @@ <!-- Settings item title for inactive apps [CHAR LIMIT=35] --> <string name="inactive_apps_title">Inactive apps</string> <!-- Settings item summary for inactive app [CHAR LIMIT=100] --> - <string name="inactive_app_inactive_summary">Inactive. Touch to toggle.</string> + <string name="inactive_app_inactive_summary">Inactive. Tap to toggle.</string> <!-- Settings item summary for active app [CHAR LIMIT=100] --> - <string name="inactive_app_active_summary">Active. Touch to toggle.</string> + <string name="inactive_app_active_summary">Active. Tap to toggle.</string> <!-- Services settings screen, setting option name for the user to go to the screen to view running services --> <string name="runningservices_settings_title">Running services</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java index 85cc3e44bba8..78c530c2b0d7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java @@ -427,6 +427,19 @@ public class RestrictedLockUtils { return null; } + public static EnforcedAdmin getDeviceOwner(Context context) { + final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService( + Context.DEVICE_POLICY_SERVICE); + if (dpm == null) { + return null; + } + ComponentName adminComponent = dpm.getDeviceOwnerComponentOnAnyUser(); + if (adminComponent != null) { + return new EnforcedAdmin(adminComponent, dpm.getDeviceOwnerUserId()); + } + return null; + } + /** * Set the menu item as disabled by admin by adding a restricted padlock at the end of the * text and set the click listener which will send an intent to show the admin support details diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java index 56c4edb7f377..5ffa581c2de3 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java @@ -141,6 +141,16 @@ public class SettingsDrawerActivity extends Activity { mCategoryListeners.remove(listener); } + public void setIsDrawerPresent(boolean isPresent) { + if (isPresent) { + mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); + updateDrawer(); + } else { + mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); + mDrawerLayout = null; + } + } + public void openDrawer() { if (mDrawerLayout != null) { mDrawerLayout.openDrawer(Gravity.START); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 2e96f18bedb2..b270dd86bb8e 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -730,6 +730,11 @@ public class SettingsBackupAgent extends BackupAgentHelper { try { int stateVersion = dataInput.readInt(); + if (stateVersion > STATE_VERSION) { + // Constrain the maximum state version this backup agent + // can handle in case a newer or corrupt backup set existed + stateVersion = STATE_VERSION; + } for (int i = 0; i < STATE_SIZES[stateVersion]; i++) { stateChecksums[i] = dataInput.readLong(); } diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 2713fb51991c..c74e4112dada 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -349,6 +349,12 @@ android:resizeable="true" android:supportsPictureInPicture="true" android:excludeFromRecents="true" /> + <activity + android:name="com.android.systemui.tv.pip.PipOnboardingActivity" + android:exported="true" + android:theme="@style/PipTheme" + android:launchMode="singleTop" + android:excludeFromRecents="true" /> <!-- platform logo easter egg activity --> <activity diff --git a/packages/SystemUI/res/layout/qs_add_tile_layout.xml b/packages/SystemUI/res/layout/qs_add_tile_layout.xml deleted file mode 100644 index 962b00e88b99..000000000000 --- a/packages/SystemUI/res/layout/qs_add_tile_layout.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2015 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. ---> - -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:paddingTop="20dp" - android:paddingStart="7dp" - android:paddingEnd="7dp"> - <LinearLayout - android:layout_height="wrap_content" - android:layout_width="80dp" - android:orientation="vertical"> - <ImageView - android:id="@+id/tile_icon" - android:layout_gravity="center" - android:layout_width="@dimen/qs_tile_icon_size" - android:layout_height="@dimen/qs_tile_icon_size" /> - <TextView - android:id="@+id/tile_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center|bottom" - android:paddingTop="10dp" - android:gravity="center" - android:textSize="@dimen/qs_tile_text_size" /> - </LinearLayout> -</FrameLayout> diff --git a/packages/SystemUI/res/layout/qs_customize_layout.xml b/packages/SystemUI/res/layout/qs_customize_divider.xml index 0b8e02fb3564..71ad85bf3a96 100644 --- a/packages/SystemUI/res/layout/qs_customize_layout.xml +++ b/packages/SystemUI/res/layout/qs_customize_divider.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2016 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. @@ -14,18 +14,16 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.systemui.qs.customize.NonPagedTileLayout + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/tiles_container" + android:id="@android:id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> - - <view - class="com.android.systemui.qs.PagedTileLayout$TilePage" - android:id="@+id/tile_page" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - -</com.android.systemui.qs.customize.NonPagedTileLayout> - + android:paddingTop="20dp" + android:paddingStart="16dp" + android:paddingEnd="8dp" + android:paddingBottom="13dp" + android:textAppearance="@android:style/TextAppearance.Material.Body2" + android:textColor="?android:attr/colorAccent" + android:text="@string/drag_to_add_tiles" /> diff --git a/packages/SystemUI/res/layout/qs_customize_panel.xml b/packages/SystemUI/res/layout/qs_customize_panel.xml index e56431b012e7..73a92d905a3d 100644 --- a/packages/SystemUI/res/layout/qs_customize_panel.xml +++ b/packages/SystemUI/res/layout/qs_customize_panel.xml @@ -22,85 +22,53 @@ android:background="@drawable/qs_customizer_background" android:gravity="center_horizontal"> - <FrameLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/notification_header_bg"> + android:paddingTop="28dp" + android:paddingEnd="8dp"> - <LinearLayout - android:id="@+id/drag_buttons" - android:layout_width="match_parent" - android:layout_height="fill_parent" - android:orientation="horizontal"> - <FrameLayout - android:layout_width="0dp" - android:layout_height="fill_parent" - android:layout_weight="1"> - <com.android.systemui.qs.customize.DropButton - android:id="@+id/info_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:gravity="center" - android:drawableStart="@drawable/ic_info" - android:drawablePadding="10dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@android:color/white" - android:text="@string/qs_customize_info" /> - </FrameLayout> - <FrameLayout - android:layout_width="0dp" - android:layout_height="fill_parent" - android:layout_weight="1"> - <com.android.systemui.qs.customize.DropButton - android:id="@+id/remove_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:gravity="center" - android:drawableStart="@drawable/ic_close_white" - android:drawablePadding="10dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@android:color/white" - android:text="@string/qs_customize_remove" /> - </FrameLayout> - </LinearLayout> + <ImageView + android:id="@+id/close" + android:layout_width="56dp" + android:layout_height="56dp" + android:padding="16dp" + android:src="@drawable/ic_close_white" /> - <Toolbar - android:id="@*android:id/action_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:navigationContentDescription="@*android:string/action_bar_up_description" - android:background="@drawable/notification_header_bg" - style="?android:attr/toolbarStyle" /> - </FrameLayout> + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" /> - <com.android.systemui.tuner.AutoScrollView - android:layout_width="@dimen/notification_panel_width" - android:layout_height="0dp" - android:layout_weight="1" - android:paddingTop="12dp" - android:paddingBottom="8dp" - android:elevation="2dp"> + <Button + android:id="@+id/save" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingStart="12dp" + android:paddingEnd="12dp" + android:background="?android:attr/selectableItemBackground" + android:textAppearance="@android:style/TextAppearance.Material.Widget.Button.Inverse" + android:textColor="?android:attr/colorAccent" + android:text="@string/save" /> - <com.android.systemui.qs.customize.CustomQSPanel - android:id="@+id/quick_settings_panel" - android:background="#0000" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <Button + android:id="@+id/reset" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingStart="12dp" + android:paddingEnd="12dp" + android:background="?android:attr/selectableItemBackground" + android:textAppearance="@android:style/TextAppearance.Material.Widget.Button.Inverse" + android:textColor="?android:attr/colorAccent" + android:text="@*android:string/reset" /> - </com.android.systemui.tuner.AutoScrollView> + </LinearLayout> - <com.android.systemui.qs.customize.FloatingActionButton - android:id="@+id/fab" - android:clickable="true" - android:layout_width="@dimen/fab_size" - android:layout_height="@dimen/fab_size" - android:layout_gravity="bottom|end" - android:layout_marginEnd="@dimen/fab_margin" - android:layout_marginBottom="@dimen/fab_margin" - android:elevation="@dimen/fab_elevation" - android:background="@drawable/fab_background" /> + <android.support.v7.widget.RecyclerView + android:id="@android:id/list" + android:layout_width="@dimen/notification_panel_width" + android:layout_height="0dp" + android:layout_weight="1" /> <View android:layout_width="match_parent" diff --git a/packages/SystemUI/res/layout/qs_customize_tile_frame.xml b/packages/SystemUI/res/layout/qs_customize_tile_frame.xml new file mode 100644 index 000000000000..aaa84fd86d08 --- /dev/null +++ b/packages/SystemUI/res/layout/qs_customize_tile_frame.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2016 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. +--> + +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:paddingBottom="16dp" /> diff --git a/packages/SystemUI/res/layout/qs_detail_header.xml b/packages/SystemUI/res/layout/qs_detail_header.xml index 5a96dc3bd01e..153e35f1f675 100644 --- a/packages/SystemUI/res/layout/qs_detail_header.xml +++ b/packages/SystemUI/res/layout/qs_detail_header.xml @@ -18,10 +18,20 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:padding="@dimen/qs_panel_padding" + android:paddingEnd="@dimen/qs_panel_padding" android:visibility="invisible" - android:background="@drawable/btn_borderless_rect" > + android:background="@drawable/btn_borderless_rect" + android:gravity="center"> + + <ImageView + android:id="@*android:id/up" + android:layout_width="56dp" + android:layout_height="56dp" + android:layout_marginEnd="16dp" + android:padding="16dp" + android:clickable="true" + android:background="?android:attr/selectableItemBackground" + android:src="?android:attr/homeAsUpIndicator" /> <TextView android:id="@android:id/title" @@ -37,4 +47,4 @@ android:clickable="false" android:textAppearance="@style/TextAppearance.QS.DetailHeader" /> -</com.android.keyguard.AlphaOptimizedLinearLayout>
\ No newline at end of file +</com.android.keyguard.AlphaOptimizedLinearLayout> diff --git a/packages/SystemUI/res/layout/qs_detail_item.xml b/packages/SystemUI/res/layout/qs_detail_item.xml index ccdddf7a0a59..5bb4f5d04019 100644 --- a/packages/SystemUI/res/layout/qs_detail_item.xml +++ b/packages/SystemUI/res/layout/qs_detail_item.xml @@ -28,7 +28,7 @@ android:id="@android:id/icon" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginEnd="12dp" /> + android:layout_marginEnd="20dp" /> <LinearLayout android:layout_width="0dp" diff --git a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml index 0bef513af659..5fde4f696979 100644 --- a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml +++ b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml @@ -15,6 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res-auto" + android:layout_height="48dp" android:paddingLeft="16dp" android:paddingRight="16dp" style="@style/BrightnessDialogContainer"> diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index 6784695e5a99..07ac6a58e351 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -106,7 +106,7 @@ <LinearLayout android:id="@+id/date_time_group" android:layout_width="wrap_content" - android:layout_height="28dp" + android:layout_height="25dp" android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:orientation="horizontal"> @@ -115,7 +115,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="16dp" - android:layout_marginTop="2dp" + android:layout_marginTop="4dp" android:id="@+id/clock" /> <com.android.systemui.statusbar.policy.DateView @@ -123,7 +123,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="6dp" - android:layout_marginTop="8dp" + android:layout_marginTop="4dp" android:drawableStart="@drawable/header_dot" android:drawablePadding="6dp" android:singleLine="true" @@ -136,7 +136,7 @@ android:id="@+id/alarm_status" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginTop="8dp" + android:layout_marginTop="4dp" android:drawablePadding="6dp" android:drawableStart="@drawable/ic_access_alarms_small" android:textColor="#64ffffff" @@ -152,9 +152,9 @@ android:background="#0000" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="30dp" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" + android:layout_marginTop="25dp" + android:layout_marginStart="12dp" + android:layout_marginEnd="12dp" android:layout_alignParentEnd="true" android:clipChildren="false" android:clipToPadding="false" /> @@ -164,7 +164,7 @@ layout="@layout/qs_detail_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" + android:layout_marginTop="28dp" /> <com.android.systemui.statusbar.AlphaOptimizedImageView diff --git a/packages/SystemUI/res/layout/status_bar_no_notifications.xml b/packages/SystemUI/res/layout/status_bar_no_notifications.xml index dd501d4861eb..6f87184498d5 100644 --- a/packages/SystemUI/res/layout/status_bar_no_notifications.xml +++ b/packages/SystemUI/res/layout/status_bar_no_notifications.xml @@ -25,9 +25,9 @@ android:id="@+id/no_notifications" android:layout_width="match_parent" android:layout_height="64dp" - android:paddingTop="12dp" + android:paddingTop="28dp" android:gravity="top|center_horizontal" - android:textColor="#ffffff" - android:textSize="20sp" + android:textColor="#e6ffffff" + android:textSize="16sp" android:text="@string/empty_shade_text"/> </com.android.systemui.statusbar.EmptyShadeView> diff --git a/packages/SystemUI/res/layout/status_bar_notification_dismiss_all.xml b/packages/SystemUI/res/layout/status_bar_notification_dismiss_all.xml index dc7577af29ee..efb273f8692d 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_dismiss_all.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_dismiss_all.xml @@ -19,15 +19,16 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="gone" - android:clipChildren="false" - android:clipToPadding="false"> + android:paddingEnd="8dp" + android:visibility="gone"> <com.android.systemui.statusbar.DismissViewButton + style="@android:style/Widget.Material.Button.Borderless" android:id="@+id/dismiss_text" - android:layout_width="48dp" - android:layout_height="48dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="end" android:focusable="true" - android:background="@drawable/ripple_drawable" - android:contentDescription="@string/accessibility_clear_all"/> + android:contentDescription="@string/accessibility_clear_all" + android:text="@string/clear_all_notifications_text" + android:textAllCaps="true"/> </com.android.systemui.statusbar.DismissView> diff --git a/packages/SystemUI/res/layout/tv_pip_menu.xml b/packages/SystemUI/res/layout/tv_pip_menu.xml index a638d175c341..3562c644e61e 100644 --- a/packages/SystemUI/res/layout/tv_pip_menu.xml +++ b/packages/SystemUI/res/layout/tv_pip_menu.xml @@ -17,45 +17,37 @@ */ --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <FrameLayout - android:layout_alignParentEnd="true" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:paddingStart="10dp" - android:paddingEnd="10dp" - android:background="#88FFFFFF"> - <LinearLayout - android:orientation="vertical" - android:layout_gravity="center_vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content" > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="end" + android:paddingStart="10dp" + android:paddingEnd="10dp" + android:background="#88FFFFFF" + android:gravity="center_vertical" > - <Button android:id="@+id/full" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/pip_fullscreen" - android:textSize="10sp" - android:focusable="true" /> + <Button android:id="@+id/full" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/pip_fullscreen" + android:textSize="10sp" + android:focusable="true" /> - <Button android:id="@+id/exit" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/pip_exit" - android:textSize="10sp" - android:focusable="true" /> + <Button android:id="@+id/exit" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/pip_exit" + android:textSize="10sp" + android:focusable="true" /> - <Button android:id="@+id/cancel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/pip_cancel" - android:textSize="10sp" - android:focusable="true" /> - </LinearLayout> - </FrameLayout> -</RelativeLayout> + <Button android:id="@+id/cancel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/pip_cancel" + android:textSize="10sp" + android:focusable="true" /> +</LinearLayout> diff --git a/packages/SystemUI/res/layout/tv_pip_onboarding.xml b/packages/SystemUI/res/layout/tv_pip_onboarding.xml new file mode 100644 index 000000000000..ef395558af64 --- /dev/null +++ b/packages/SystemUI/res/layout/tv_pip_onboarding.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 2016, 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. +*/ +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="#C00288D1" + android:gravity="center" + android:orientation="vertical" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="30sp" + android:textColor="@android:color/white" + android:text="@string/pip_onboarding_title" /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_sysbar_home" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="30dp" + android:textSize="13sp" + android:textColor="@android:color/white" + android:text="@string/pip_onboarding_description" /> + <Button + android:id="@+id/close" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="15sp" + android:textAllCaps="true" + android:text="@string/pip_onboarding_button" /> +</LinearLayout> diff --git a/packages/SystemUI/res/layout/tv_pip_overlay.xml b/packages/SystemUI/res/layout/tv_pip_overlay.xml index e8691b511706..6d9c48d44dc6 100644 --- a/packages/SystemUI/res/layout/tv_pip_overlay.xml +++ b/packages/SystemUI/res/layout/tv_pip_overlay.xml @@ -17,17 +17,13 @@ */ --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/guide_overlay" android:layout_width="match_parent" - android:layout_height="match_parent"> - <TextView - android:id="@+id/guide_overlay" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="3dp" - android:textSize="13sp" - android:textColor="#111111" - android:background="#99EEEEEE" - android:text="@string/pip_hold_home" /> -</FrameLayout> + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:padding="3dp" + android:textSize="13sp" + android:textColor="#111111" + android:background="#99EEEEEE" + android:text="@string/pip_hold_home" /> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index c4dad9f0c769..7edf3a0876ed 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -504,16 +504,16 @@ <string name="center" msgid="4327473927066010960">"Centre"</string> <string name="end" msgid="125797972524818282">"Final"</string> <string name="space" msgid="804232271282109749">"Separador"</string> - <string name="menu_ime" msgid="4943221416525250684">"Menú / Commutador del teclat"</string> + <string name="menu_ime" msgid="4943221416525250684">"Commutador del teclat/menú"</string> <string name="select_button" msgid="1597989540662710653">"Tria un botó per afegir-lo"</string> <string name="add_button" msgid="4134946063432258161">"Afegeix un botó"</string> <string name="save" msgid="2311877285724540644">"Desa"</string> <string name="reset" msgid="2448168080964209908">"Reinicia"</string> - <string name="no_home_title" msgid="1563808595146071549">"Cap botó de pàgina d\'inici"</string> - <string name="no_home_message" msgid="5408485011659260911">"Per poder navegar per aquest dispositiu, cal un botó de pàgina d\'inici. Afegeix-ne un abans de desar."</string> + <string name="no_home_title" msgid="1563808595146071549">"No s\'ha trobat cap botó d\'inici"</string> + <string name="no_home_message" msgid="5408485011659260911">"Per poder navegar per aquest dispositiu, cal un botó d\'inici. Afegeix-ne un abans de desar."</string> <string name="adjust_button_width" msgid="6138616087197632947">"Ajusta l\'amplada del botó"</string> <string name="clipboard" msgid="1313879395099896312">"Porta-retalls"</string> - <string name="clipboard_description" msgid="3819919243940546364">"Pots arrossegar elements al porta-retalls directament. Per treure\'n elements, també els pots arrossegar directament cap a fora."</string> + <string name="clipboard_description" msgid="3819919243940546364">"Pots arrossegar elements al porta-retalls directament. Si conté elements, també els pots treure directament arrossegant-los."</string> <string name="accessibility_key" msgid="5701989859305675896">"Botó de navegació personalitzat"</string> <string name="keycode" msgid="7335281375728356499">"Codi de tecla"</string> <string name="keycode_description" msgid="1403795192716828949">"Amb els botons de codi de tecla es poden afegir tecles del teclat a la barra de navegació. En prémer aquests botons es duen a terme les mateixes accions que quan es prem la tecla corresponent. Primer cal seleccionar la tecla del botó i, a continuació, triar la imatge que es mostrarà."</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index a60b498b8b92..62fe2c7fcaff 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -515,8 +515,8 @@ <string name="clipboard" msgid="1313879395099896312">"Presse-papiers"</string> <string name="clipboard_description" msgid="3819919243940546364">"Vous pouvez faire glisser des éléments directement dans le Presse-papiers et inversement."</string> <string name="accessibility_key" msgid="5701989859305675896">"Bouton de navigation personnalisé"</string> - <string name="keycode" msgid="7335281375728356499">"Code touche"</string> - <string name="keycode_description" msgid="1403795192716828949">"Les boutons de codes touche permettent d\'ajouter des touches du clavier à la barre de navigation. Lorsque vous appuyez sur l\'un de ces boutons, il reproduit la fonction de la touche du clavier correspondante. Vous devez d\'abord sélectionner la touche pour le bouton, puis l\'image à afficher sur celui-ci."</string> + <string name="keycode" msgid="7335281375728356499">"Code de touche"</string> + <string name="keycode_description" msgid="1403795192716828949">"Les boutons de codes de touche permettent d\'ajouter des touches du clavier à la barre de navigation. Lorsque vous appuyez sur l\'un de ces boutons, il reproduit la fonction de la touche du clavier correspondante. Vous devez d\'abord sélectionner la touche pour le bouton, puis l\'image à afficher sur celui-ci."</string> <string name="select_keycode" msgid="7413765103381924584">"Sélectionner la touche du clavier"</string> <string name="preview" msgid="9077832302472282938">"Aperçu"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 929150b3d039..d1e117f44431 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -505,7 +505,7 @@ <string name="end" msgid="125797972524818282">"Vége"</string> <string name="space" msgid="804232271282109749">"Távtartó"</string> <string name="menu_ime" msgid="4943221416525250684">"Menü/Billentyűzetváltó"</string> - <string name="select_button" msgid="1597989540662710653">"Gomb kiválasztása hozzáadáshoz"</string> + <string name="select_button" msgid="1597989540662710653">"Hozzáadni kívánt gomb kiválasztása"</string> <string name="add_button" msgid="4134946063432258161">"Gomb hozzáadása"</string> <string name="save" msgid="2311877285724540644">"Mentés"</string> <string name="reset" msgid="2448168080964209908">"Alaphelyzet"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index d8bf20506d86..537dbf02ea9f 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -519,7 +519,7 @@ <string name="clipboard_description" msgid="3819919243940546364">"クリップボード機能ではクリップボードにアイテムを直接ドラッグできます。クリップボードにアイテムがある場合、直接そのアイテムをドラッグして取り出すこともできます。"</string> <string name="accessibility_key" msgid="5701989859305675896">"カスタム ナビゲーション ボタン"</string> <string name="keycode" msgid="7335281375728356499">"キーコード"</string> - <string name="keycode_description" msgid="1403795192716828949">"キーコード ボタンを利用すると、ナビゲーション バーにキーボードのキー機能を追加できるようになります。ボタンを押すと選択済みのキーボードのキーがエミュレートされます。まずボタン用にキーを選択する必要があり、選択するとボタン上に画像が表示されます。"</string> + <string name="keycode_description" msgid="1403795192716828949">"キーコード ボタンを利用すると、ナビゲーション バーにキーボードのキー機能を追加できるようになります。ボタンを押すと選択済みのキーボードのキーがエミュレートされます。まずボタン用にキーを選択し、次にボタン上の画像を選択する必要があります。"</string> <string name="select_keycode" msgid="7413765103381924584">"キーボードのボタンの選択"</string> <string name="preview" msgid="9077832302472282938">"プレビュー"</string> </resources> diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml index 197a76c71f00..66f79e76d2b1 100644 --- a/packages/SystemUI/res/values-ky-rKG/strings.xml +++ b/packages/SystemUI/res/values-ky-rKG/strings.xml @@ -146,7 +146,7 @@ <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string> <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string> <string name="accessibility_no_sim" msgid="8274017118472455155">"SIM карта жок."</string> - <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Уюлдук дайындар өчүк"</string> + <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Мобилдик дайындарды өткөрүү өчүрүлгөн"</string> <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth аркылуу интернет бөлүшүү."</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"Учак тартиби."</string> <string name="accessibility_no_sims" msgid="3957997018324995781">"SIM-карта жок"</string> @@ -501,7 +501,7 @@ <string name="switch_bar_on" msgid="1142437840752794229">"Күйүк"</string> <string name="nav_bar" msgid="1993221402773877607">"Чабыттоо тилкеси"</string> <string name="start" msgid="6873794757232879664">"Баштоо"</string> - <string name="center" msgid="4327473927066010960">"Борбор"</string> + <string name="center" msgid="4327473927066010960">"Экрандын ортосунда"</string> <string name="end" msgid="125797972524818282">"Бүтүрүү"</string> <string name="space" msgid="804232271282109749">"Боштук калтыргыч"</string> <string name="menu_ime" msgid="4943221416525250684">"Меню / Баскычтоп которуштургуч"</string> @@ -513,10 +513,10 @@ <string name="no_home_message" msgid="5408485011659260911">"Бул түзмөктө чабыттоо үчүн башкы бет баскычы керек. Сактаардан мурун, башкы бет баскычын кошуңуз."</string> <string name="adjust_button_width" msgid="6138616087197632947">"Баскычтын жазылыгын тууралоо"</string> <string name="clipboard" msgid="1313879395099896312">"Алмашуу буфери"</string> - <string name="clipboard_description" msgid="3819919243940546364">"Алмашуу буфери нерселерди түздөн-түз буферге сүйрөө мүмкүнчүлүгүн берет. Нерселерди буферден түздөн-түз сүйрөп чыкса да болот."</string> + <string name="clipboard_description" msgid="3819919243940546364">"Бул баскычтын жардамы менен файлдарды алмашуу буферине көчүрүп, анын ичинен сүйрөп чыгууга болот."</string> <string name="accessibility_key" msgid="5701989859305675896">"Ыңгайлаштырылган чабыттоо баскычы"</string> <string name="keycode" msgid="7335281375728356499">"Баскыч коду"</string> - <string name="keycode_description" msgid="1403795192716828949">"Баскыч коддору баскычтоптун баскычтарын Чабыттоо тилкесине кошуу мүмкүнчүлүгүн берет. Алар басылганда, баскычтоптогу тандалган баскычтын функциясын аткарат. Адегенде баскыч, андан соң баскычта көрсөтүлө турган сүрөт тандалат."</string> + <string name="keycode_description" msgid="1403795192716828949">"Бул баскычтын жардамы менен баскычтоптогу баскычтарды чабыттоо тилкесине кошууга болот. Ал үчүн баскычты жана тийиштүү баскычтын көрүнүшүн тандаңыз."</string> <string name="select_keycode" msgid="7413765103381924584">"Баскычтоптогу баскычты тандоо"</string> <string name="preview" msgid="9077832302472282938">"Алдын ала көрүү"</string> </resources> diff --git a/packages/SystemUI/res/values-land/config.xml b/packages/SystemUI/res/values-land/config.xml index e0affa177897..43e7bacd3d41 100644 --- a/packages/SystemUI/res/values-land/config.xml +++ b/packages/SystemUI/res/values-land/config.xml @@ -38,6 +38,4 @@ while the stack is not focused. --> <item name="recents_layout_unfocused_range_min" format="float" type="integer">-2</item> <item name="recents_layout_unfocused_range_max" format="float" type="integer">1.5</item> - - <integer name="quick_settings_num_columns">4</integer> </resources> diff --git a/packages/SystemUI/res/values-land/dimens.xml b/packages/SystemUI/res/values-land/dimens.xml index c75a89fa4b31..26a81c8d835c 100644 --- a/packages/SystemUI/res/values-land/dimens.xml +++ b/packages/SystemUI/res/values-land/dimens.xml @@ -19,8 +19,7 @@ <!-- thickness (width) of the navigation bar on phones that require it --> <dimen name="navigation_bar_size">@*android:dimen/navigation_bar_width</dimen> - <!-- Standard notification width + gravity --> - <dimen name="notification_panel_width">@dimen/standard_notification_panel_width</dimen> + <!-- Standard notification gravity --> <integer name="notification_panel_layout_gravity">@integer/standard_notification_panel_layout_gravity</integer> <dimen name="docked_divider_handle_width">2dp</dimen> diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml index a0faf75711af..ffd2b8fe68bd 100644 --- a/packages/SystemUI/res/values-ne-rNP/strings.xml +++ b/packages/SystemUI/res/values-ne-rNP/strings.xml @@ -499,7 +499,7 @@ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"डेटा सेभर अन छ"</string> <string name="accessibility_data_saver_off" msgid="8841582529453005337">"डेटा सेभर बन्द छ"</string> <string name="switch_bar_on" msgid="1142437840752794229">"सक्रिय गर्नुहोस्"</string> - <string name="nav_bar" msgid="1993221402773877607">"नेभिगेसन पट्टी"</string> + <string name="nav_bar" msgid="1993221402773877607">"नेभिगेशन पट्टी"</string> <string name="start" msgid="6873794757232879664">"सुरु गर्नुहोस्"</string> <string name="center" msgid="4327473927066010960">"केन्द्र"</string> <string name="end" msgid="125797972524818282">"अन्त्य गर्नुहोस्"</string> @@ -514,9 +514,9 @@ <string name="adjust_button_width" msgid="6138616087197632947">"बटनको चौडाइ समायोजन गर्नुहोस्"</string> <string name="clipboard" msgid="1313879395099896312">"क्लिपबोर्ड"</string> <string name="clipboard_description" msgid="3819919243940546364">"क्लिपबोर्डले वस्तुहरूलाई क्लिपबोर्डमा प्रत्यक्ष तान्न अनुमति दिन्छ। प्रस्तुत गर्दा वस्तुहरूलाई क्लिपबोर्डबाट प्रत्यक्ष रूपमा बाहिर तान्न पनि सकिन्छ।"</string> - <string name="accessibility_key" msgid="5701989859305675896">"अनुकूलन नेभिगेशन बटन"</string> + <string name="accessibility_key" msgid="5701989859305675896">"अनुकूलनको नेभिगेशन बटन"</string> <string name="keycode" msgid="7335281375728356499">"Keycode"</string> - <string name="keycode_description" msgid="1403795192716828949">"Keycode बटनहरूले किबोर्ड कुञ्जीहरूलाई नेभिगेसन पट्टीमा थपिने अनुमति दिन्छ। थिच्दा तिनीहरूले चयन गरिएको किबोर्ड कुञ्जी अनुकरण गर्छन्। सुरुमा बटनका लागि कुञ्जी चयन गर्नुपर्छ, त्यसपछि बटनमा छवि देखिनुपर्छ।"</string> + <string name="keycode_description" msgid="1403795192716828949">"Keycode बटनहरूले किबोर्ड कुञ्जीहरूलाई नेभिगेशन पट्टीमा थपिने अनुमति दिन्छ। थिच्दा तिनीहरूले चयन गरिएको किबोर्ड कुञ्जी अनुकरण गर्छन्। सुरुमा बटनका लागि कुञ्जी चयन गर्नुपर्छ, त्यसपछि बटनमा छवि देखिनुपर्छ।"</string> <string name="select_keycode" msgid="7413765103381924584">"किबोर्ड बटन चयन गर्नुहोस्"</string> <string name="preview" msgid="9077832302472282938">"पूर्वावलोकन"</string> </resources> diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 71f92fd18587..c0652d8a8e8b 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -93,4 +93,6 @@ <dimen name="navigation_key_width">128dp</dimen> <dimen name="navigation_key_padding">25dp</dimen> + + <dimen name="qs_expand_margin">0dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml index 5eaf15ddc92e..914c544cee21 100644 --- a/packages/SystemUI/res/values-ta-rIN/strings.xml +++ b/packages/SystemUI/res/values-ta-rIN/strings.xml @@ -495,9 +495,9 @@ <string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"ஹெட்ஃபோன்கள் இணைக்கப்பட்டன"</string> <string name="accessibility_status_bar_headset" msgid="8666419213072449202">"ஹெட்செட் இணைக்கப்பட்டது"</string> <string name="tuner_status_bar_explanation" msgid="9032196769944137864">"நிலைப் பட்டியில் ஐகான்களைக் காட்டுவதை இயக்கும் அல்லது முடக்கும்."</string> - <string name="data_saver" msgid="5037565123367048522">"தரவுச் சேமிப்பான்"</string> - <string name="accessibility_data_saver_on" msgid="8454111686783887148">"தரவுச் சேமிப்பான் இயக்கப்பட்டது"</string> - <string name="accessibility_data_saver_off" msgid="8841582529453005337">"தரவுச் சேமிப்பான் முடக்கப்பட்டது"</string> + <string name="data_saver" msgid="5037565123367048522">"தரவுச்சேமிப்பான்"</string> + <string name="accessibility_data_saver_on" msgid="8454111686783887148">"தரவு சேமிப்பான் இயக்கப்பட்டது"</string> + <string name="accessibility_data_saver_off" msgid="8841582529453005337">"தரவு சேமிப்பான் முடக்கப்பட்டது"</string> <string name="switch_bar_on" msgid="1142437840752794229">"இயக்கு"</string> <string name="nav_bar" msgid="1993221402773877607">"வழிசெலுத்தல் பட்டி"</string> <string name="start" msgid="6873794757232879664">"தொடங்கு"</string> diff --git a/packages/SystemUI/res/values-w550dp-land/config.xml b/packages/SystemUI/res/values-w550dp-land/config.xml new file mode 100644 index 000000000000..71e54a1ca61c --- /dev/null +++ b/packages/SystemUI/res/values-w550dp-land/config.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2016, 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. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources> + <integer name="quick_settings_num_columns">4</integer> +</resources> diff --git a/packages/SystemUI/res/values-w550dp-land/dimens.xml b/packages/SystemUI/res/values-w550dp-land/dimens.xml new file mode 100644 index 000000000000..4160c83683cc --- /dev/null +++ b/packages/SystemUI/res/values-w550dp-land/dimens.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (c) 2016, 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. +*/ +--> +<resources> + <!-- Standard notification width + gravity --> + <dimen name="notification_panel_width">544dp</dimen> + + <dimen name="qs_expand_margin">32dp</dimen> +</resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 25843f922c4a..318997c6ad31 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -302,8 +302,7 @@ <string name="recents_search_bar_label" msgid="8074997400187836677">"搜索"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"无法启动<xliff:g id="APP">%s</xliff:g>。"</string> <string name="recents_history_button_label" msgid="5153358867807604821">"历史记录"</string> - <!-- no translation found for recents_history_clear_all_button_label (5905258334958006953) --> - <skip /> + <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"清除"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自定义分割"</string> @@ -469,8 +468,7 @@ <string name="color_matrix_none" msgid="2121957926040543148">"常规颜色"</string> <string name="color_matrix_night" msgid="5943817622105307072">"夜间颜色"</string> <string name="color_matrix_custom" msgid="3655576492322298713">"自定义颜色"</string> - <!-- no translation found for color_matrix_auto (4896624757412029265) --> - <skip /> + <string name="color_matrix_auto" msgid="4896624757412029265">"自动"</string> <string name="color_matrix_unknown" msgid="2709202104256265107">"未知颜色"</string> <string name="color_transform" msgid="6985460408079086090">"颜色修改"</string> <string name="color_matrix_show_qs" msgid="1763244354399276679">"显示“快捷设置”图块"</string> @@ -500,45 +498,25 @@ <string name="data_saver" msgid="5037565123367048522">"流量节省程序"</string> <string name="accessibility_data_saver_on" msgid="8454111686783887148">"流量节省程序已开启"</string> <string name="accessibility_data_saver_off" msgid="8841582529453005337">"流量节省程序已关闭"</string> - <!-- no translation found for switch_bar_on (1142437840752794229) --> - <skip /> - <!-- no translation found for nav_bar (1993221402773877607) --> - <skip /> - <!-- no translation found for start (6873794757232879664) --> - <skip /> - <!-- no translation found for center (4327473927066010960) --> - <skip /> - <!-- no translation found for end (125797972524818282) --> - <skip /> - <!-- no translation found for space (804232271282109749) --> - <skip /> - <!-- no translation found for menu_ime (4943221416525250684) --> - <skip /> - <!-- no translation found for select_button (1597989540662710653) --> - <skip /> - <!-- no translation found for add_button (4134946063432258161) --> - <skip /> - <!-- no translation found for save (2311877285724540644) --> - <skip /> + <string name="switch_bar_on" msgid="1142437840752794229">"开启"</string> + <string name="nav_bar" msgid="1993221402773877607">"导航栏"</string> + <string name="start" msgid="6873794757232879664">"顶部"</string> + <string name="center" msgid="4327473927066010960">"中心位置"</string> + <string name="end" msgid="125797972524818282">"底部"</string> + <string name="space" msgid="804232271282109749">"空格键"</string> + <string name="menu_ime" msgid="4943221416525250684">"菜单/键盘切换器"</string> + <string name="select_button" msgid="1597989540662710653">"选择要添加的按钮"</string> + <string name="add_button" msgid="4134946063432258161">"添加按钮"</string> + <string name="save" msgid="2311877285724540644">"保存"</string> <string name="reset" msgid="2448168080964209908">"重置"</string> - <!-- no translation found for no_home_title (1563808595146071549) --> - <skip /> - <!-- no translation found for no_home_message (5408485011659260911) --> - <skip /> - <!-- no translation found for adjust_button_width (6138616087197632947) --> - <skip /> - <!-- no translation found for clipboard (1313879395099896312) --> - <skip /> - <!-- no translation found for clipboard_description (3819919243940546364) --> - <skip /> - <!-- no translation found for accessibility_key (5701989859305675896) --> - <skip /> - <!-- no translation found for keycode (7335281375728356499) --> - <skip /> - <!-- no translation found for keycode_description (1403795192716828949) --> - <skip /> - <!-- no translation found for select_keycode (7413765103381924584) --> - <skip /> - <!-- no translation found for preview (9077832302472282938) --> - <skip /> + <string name="no_home_title" msgid="1563808595146071549">"未找到主屏幕按钮"</string> + <string name="no_home_message" msgid="5408485011659260911">"要在此设备上导航，您必须使用主屏幕按钮。请先添加主屏幕按钮，然后再保存。"</string> + <string name="adjust_button_width" msgid="6138616087197632947">"调整按钮宽度"</string> + <string name="clipboard" msgid="1313879395099896312">"剪贴板"</string> + <string name="clipboard_description" msgid="3819919243940546364">"您可以利用“剪贴板”按钮将相应内容直接拖动到剪贴板中。剪贴板中有内容时，您也可以将剪贴板中的内容直接拖出来。"</string> + <string name="accessibility_key" msgid="5701989859305675896">"自定义导航按钮"</string> + <string name="keycode" msgid="7335281375728356499">"键码"</string> + <string name="keycode_description" msgid="1403795192716828949">"您可以利用“键码”按钮将键盘按键添加到导航栏中。只要按下这些按钮，按钮即可模仿所选键盘按键执行相应的操作。要使用这项功能，您必须先为按钮选择相应的按键，然后再选择要在按钮上显示的图片。"</string> + <string name="select_keycode" msgid="7413765103381924584">"选择键盘按钮"</string> + <string name="preview" msgid="9077832302472282938">"预览"</string> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 8ab2302159ac..76c269689c2b 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -512,11 +512,11 @@ <string name="no_home_title" msgid="1563808595146071549">"Ayikho inkinobho yasekhaya etholakele"</string> <string name="no_home_message" msgid="5408485011659260911">"Inkinobho yasekhaya iyadingeka ukuthi inikwe amandla ukuze uzule kule divayisi. Sicela ungeze inkinobho yasekhaya ngaphambi kokulondoloza."</string> <string name="adjust_button_width" msgid="6138616087197632947">"Lungisa ububanzi benkinobho"</string> - <string name="clipboard" msgid="1313879395099896312">"Ibhodi lokumanathisela"</string> + <string name="clipboard" msgid="1313879395099896312">"Ibhodi lokunamathisela"</string> <string name="clipboard_description" msgid="3819919243940546364">"Ibhodi lokunamathisela livumela izinto ukuthi zihudulelwe ngqo ebhodini lokunamathisela. Izinto zingahudulelwa ngqo ngaphandle kwebhodi lokunamathisela uma zikhona."</string> <string name="accessibility_key" msgid="5701989859305675896">"Inkinobho yokuzula yangokwezifiso"</string> <string name="keycode" msgid="7335281375728356499">"Ikhodi yokhiye"</string> - <string name="keycode_description" msgid="1403795192716828949">"Izinkinobho zebhodi yokhiye zivumela okhiye bekhibhodi ukuthi bangezwe kwibha yokuzula. Uma zicindezelwa zusula ukhiye wekhibhodi okhethiwe. Kokuqala ukhiye kufanele akhethelwe inkinobho, ulandelwe isithombe esizoboniswa kwinkinobho."</string> + <string name="keycode_description" msgid="1403795192716828949">"Izinkinobho zebhodi yokhiye zivumela okhiye bekhibhodi ukuthi bangezwe kwibha yokuzula. Uma zicindezelwa zisula ukhiye wekhibhodi okhethiwe. Kokuqala ukhiye kufanele ukhethelwe inkinobho, ulandelwe isithombe esizoboniswa kwinkinobho."</string> <string name="select_keycode" msgid="7413765103381924584">"Khetha inkinobho yekhibhodi"</string> <string name="preview" msgid="9077832302472282938">"Hlola kuqala"</string> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index ebe0d973e752..e8df01b19415 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -159,18 +159,6 @@ in from the bottom of the screen. --> <integer name="recents_enter_from_home_transition_duration">100</integer> - <!-- The duration for animating the task from the bottom of the screen when transitioning - from home. --> - <integer name="recents_task_enter_from_home_duration">225</integer> - - <!-- The stagger for each task when animating the task from the bottom of the screen when - transitioning from home. --> - <integer name="recents_task_enter_from_home_stagger_delay">12</integer> - - <!-- The duration of the animation of the tasks to the bottom of the screen when leaving - Recents to go back to the Launcher. --> - <integer name="recents_task_exit_to_home_duration">225</integer> - <!-- The min animation duration for animating the nav bar scrim in. --> <integer name="recents_nav_bar_scrim_enter_duration">400</integer> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 32d09e81b870..e5e5710cd68a 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -124,7 +124,7 @@ <dimen name="close_handle_underlap">32dp</dimen> <!-- Height of the status bar header bar --> - <dimen name="status_bar_header_height">90dp</dimen> + <dimen name="status_bar_header_height">80dp</dimen> <!-- Height of the status bar header bar when expanded --> <dimen name="status_bar_header_height_expanded">116dp</dimen> @@ -186,6 +186,7 @@ <dimen name="qs_detail_empty_text_size">14sp</dimen> <dimen name="qs_data_usage_text_size">14sp</dimen> <dimen name="qs_data_usage_usage_text_size">36sp</dimen> + <dimen name="qs_expand_margin">0dp</dimen> <dimen name="segmented_button_spacing">0dp</dimen> <dimen name="borderless_button_radius">2dp</dimen> @@ -606,4 +607,7 @@ <dimen name="docked_divider_handle_width">16dp</dimen> <dimen name="docked_divider_handle_height">2dp</dimen> + + <dimen name="battery_height">14.5dp</dimen> + <dimen name="battery_width">9.5dp</dimen> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index c6c448d0c449..76752e633f4a 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1044,9 +1044,6 @@ <!-- VolumeUI restoration notification: text --> <string name="volumeui_notification_text">Touch to restore the original.</string> - <!-- Describes the way 2 names are concatenated. An example would be ", " to produce "Peter Muller, Paul Curry". Please also include a space here if it's appropriate in the language and if it's a RTL language include it on the left. The translation should start and end with " to keep the white space if desired [CHAR LIMIT=5] --> - <string name="group_summary_concadenation">", "</string> - <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground --> <string name="managed_profile_foreground_toast">You\'re using your work profile</string> @@ -1400,4 +1397,7 @@ <!-- SysUI Tuner: Label for preview area in navigation bar tuner [CHAR LIMIT=NONE] --> <string name="preview">Preview</string> + <!-- Label for area where tiles can be dragged out of [CHAR LIMIT=60] --> + <string name="drag_to_add_tiles">Drag to add tiles</string> + </resources> diff --git a/packages/SystemUI/res/values/strings_tv.xml b/packages/SystemUI/res/values/strings_tv.xml index c64327de65da..7c4768d29cfe 100644 --- a/packages/SystemUI/res/values/strings_tv.xml +++ b/packages/SystemUI/res/values/strings_tv.xml @@ -17,6 +17,8 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Picture-in-Picture menu --> + <eat-comment /> <!-- Button to close PIP on PIP UI --> <string name="pip_exit" translatable="false">Close PIP</string> <!-- Button to move PIP screen to the fullscreen on PIP UI --> @@ -29,4 +31,13 @@ <string name="pip_cancel" translatable="false">Cancel</string> <!-- Overlay text on PIP --> <string name="pip_hold_home" translatable="false">Hold HOME to control PIP</string> + + <!-- Picture-in-Picture onboarding screen --> + <eat-comment /> + <!-- Title for onboarding screen. --> + <string name="pip_onboarding_title" translatable="false">Picture-in-picture</string> + <!-- Description for onboarding screen. --> + <string name="pip_onboarding_description" translatable="false">Press and hold the HOME\nbutton to close or control it</string> + <!-- Button to close onboarding screen. --> + <string name="pip_onboarding_button" translatable="false">Got it</string> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 9931ab97f938..b078a68ff35a 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -241,6 +241,10 @@ parent="@*android:style/TextAppearance.Material.Notification.Info"> </style> + <style name="TextAppearance.Material.Notification.HybridNotificationDivider" + parent="@*android:style/TextAppearance.Material.Notification"> + </style> + <style name="SearchPanelCircle"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java index a0dbad440c9b..e770b5d89a0b 100755 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java @@ -51,6 +51,8 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode, private static final float BOLT_LEVEL_THRESHOLD = 0.3f; // opaque bolt below this fraction private final int[] mColors; + private final int mIntrinsicWidth; + private final int mIntrinsicHeight; private boolean mShowPercent; private float mButtonHeightFraction; @@ -161,6 +163,19 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode, mLightModeBackgroundColor = context.getColor(R.color.light_mode_icon_color_dual_tone_background); mLightModeFillColor = context.getColor(R.color.light_mode_icon_color_dual_tone_fill); + + mIntrinsicWidth = context.getResources().getDimensionPixelSize(R.dimen.battery_width); + mIntrinsicHeight = context.getResources().getDimensionPixelSize(R.dimen.battery_height); + } + + @Override + public int getIntrinsicHeight() { + return mIntrinsicHeight; + } + + @Override + public int getIntrinsicWidth() { + return mIntrinsicWidth; } public void startListening() { diff --git a/packages/SystemUI/src/com/android/systemui/Prefs.java b/packages/SystemUI/src/com/android/systemui/Prefs.java index 7933cc692f02..e2b377737dbe 100644 --- a/packages/SystemUI/src/com/android/systemui/Prefs.java +++ b/packages/SystemUI/src/com/android/systemui/Prefs.java @@ -43,6 +43,7 @@ public final class Prefs { Key.DND_FAVORITE_BUCKET_INDEX, Key.DND_NONE_SELECTED, Key.DND_FAVORITE_ZEN, + Key.TV_PICTURE_IN_PICTURE_ONBOARDING_SHOWN, }) public @interface Key { String OVERVIEW_SEARCH_APP_WIDGET_ID = "searchAppWidgetId"; @@ -58,6 +59,7 @@ public final class Prefs { String DND_FAVORITE_BUCKET_INDEX = "DndCountdownMinuteIndex"; String DND_NONE_SELECTED = "DndNoneSelected"; String DND_FAVORITE_ZEN = "DndFavoriteZen"; + String TV_PICTURE_IN_PICTURE_ONBOARDING_SHOWN = "TvPictureInPictureOnboardingShown"; } public static boolean getBoolean(Context context, @Key String key, boolean defaultValue) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java b/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java index ed909040c5f1..1df372bc6f5e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java @@ -24,6 +24,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.ImageView.ScaleType; import com.android.systemui.R; import java.util.Objects; @@ -96,7 +97,7 @@ public class QSIconView extends ViewGroup { protected View createIcon() { final ImageView icon = new ImageView(mContext); icon.setId(android.R.id.icon); - icon.setScaleType(ImageView.ScaleType.CENTER_INSIDE); + icon.setScaleType(ScaleType.FIT_CENTER); return icon; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index 35000d3c3f11..d79f4d4d0e26 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -76,7 +76,7 @@ public abstract class QSTile<TState extends State> implements Listenable { private String mTileSpec; - abstract protected TState newTileState(); + public abstract TState newTileState(); abstract protected void handleClick(); abstract protected void handleUpdateState(TState state, Object arg); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java index 753efb0e05a8..f208470a2927 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java @@ -18,12 +18,13 @@ package com.android.systemui.qs; import android.content.Context; import android.content.res.ColorStateList; +import android.content.res.Configuration; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; - +import android.widget.Space; import com.android.systemui.R; import java.util.ArrayList; @@ -102,6 +103,8 @@ public class QuickQSPanel extends QSPanel { private static class HeaderTileLayout extends LinearLayout implements QSTileLayout { + private final ImageView mDownArrow; + public HeaderTileLayout(Context context) { super(context); setClipChildren(false); @@ -111,23 +114,40 @@ public class QuickQSPanel extends QSPanel { int padding = mContext.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding); - ImageView downArrow = new ImageView(context); - downArrow.setImageResource(R.drawable.ic_expand_more); - downArrow.setImageTintList(ColorStateList.valueOf(context.getResources().getColor( + mDownArrow = new ImageView(context); + mDownArrow.setImageResource(R.drawable.ic_expand_more); + mDownArrow.setImageTintList(ColorStateList.valueOf(context.getResources().getColor( android.R.color.white, null))); - downArrow.setLayoutParams(generateLayoutParams()); - downArrow.setPadding(padding, padding, padding, padding); - addView(downArrow); + mDownArrow.setLayoutParams(generateLayoutParams()); + mDownArrow.setPadding(padding, padding, padding, padding); + updateDownArrowMargin(); + addView(mDownArrow); setOrientation(LinearLayout.HORIZONTAL); } @Override + protected void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + updateDownArrowMargin(); + } + + private void updateDownArrowMargin() { + LayoutParams params = (LayoutParams) mDownArrow.getLayoutParams(); + params.setMarginStart(mContext.getResources().getDimensionPixelSize( + R.dimen.qs_expand_margin)); + mDownArrow.setLayoutParams(params); + } + + @Override public void addTile(TileRecord tile) { - tile.tileView.setLayoutParams(generateLayoutParams()); - addView(tile.tileView, getChildCount() - 1 /* Leave icon at end */); + addView(tile.tileView, getChildCount() - 1 /* Leave icon at end */, + generateLayoutParams()); + // Add a spacer. + addView(new Space(mContext), getChildCount() - 1 /* Leave icon at end */, + generateSpaceParams()); } - private LayoutParams generateLayoutParams() { + private LayoutParams generateSpaceParams() { int size = mContext.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_size); LayoutParams lp = new LayoutParams(0, size); lp.weight = 1; @@ -135,9 +155,30 @@ public class QuickQSPanel extends QSPanel { return lp; } + private LayoutParams generateLayoutParams() { + int size = mContext.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_size); + LayoutParams lp = new LayoutParams(size, size); + lp.gravity = Gravity.CENTER; + return lp; + } + @Override public void removeTile(TileRecord tile) { - removeView(tile.tileView); + int childIndex = getChildIndex(tile.tileView); + // Remove the tile. + removeViewAt(childIndex); + // Remove its spacer as well. + removeViewAt(childIndex); + } + + private int getChildIndex(QSTileBaseView tileView) { + final int N = getChildCount(); + for (int i = 0; i < N; i++) { + if (getChildAt(i) == tileView) { + return i; + } + } + return -1; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java deleted file mode 100644 index 36bed0d25c19..000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2015 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.qs.customize; - -import android.content.ComponentName; -import android.content.pm.PackageManager; -import android.content.pm.ServiceInfo; -import android.graphics.drawable.Drawable; - -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; -import com.android.systemui.R; -import com.android.systemui.qs.QSTile; - -public class BlankCustomTile extends QSTile<QSTile.State> { - public static final String PREFIX = "custom("; - - private final ComponentName mComponent; - - private BlankCustomTile(Host host, String action) { - super(host); - mComponent = ComponentName.unflattenFromString(action); - } - - public static QSTile<?> create(Host host, String spec) { - if (spec == null || !spec.startsWith(PREFIX) || !spec.endsWith(")")) { - throw new IllegalArgumentException("Bad custom tile spec: " + spec); - } - final String action = spec.substring(PREFIX.length(), spec.length() - 1); - if (action.isEmpty()) { - throw new IllegalArgumentException("Empty custom tile spec action"); - } - return new BlankCustomTile(host, action); - } - - @Override - public void setListening(boolean listening) { - } - - @Override - protected State newTileState() { - return new State(); - } - - @Override - protected void handleUserSwitch(int newUserId) { - super.handleUserSwitch(newUserId); - } - - @Override - protected void handleClick() { - MetricsLogger.action(mContext, getMetricsCategory(), mComponent.getPackageName()); - } - - @Override - protected void handleLongClick() { - } - - @Override - protected void handleUpdateState(State state, Object arg) { - try { - PackageManager pm = mContext.getPackageManager(); - ServiceInfo info = pm.getServiceInfo(mComponent, 0); - Drawable drawable = info.loadIcon(pm); - drawable.setTint(mContext.getColor(R.color.qs_tile_tint_active)); - state.icon = new DrawableIcon(drawable); - state.label = info.loadLabel(pm).toString(); - state.contentDescription = state.label; - } catch (Exception e) { - } - } - - @Override - public int getMetricsCategory() { - return MetricsEvent.QS_INTENT; - } -} diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java deleted file mode 100644 index 286748b17255..000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (C) 2015 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.qs.customize; - -import android.app.ActivityManager; -import android.content.ClipData; -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.UserHandle; -import android.provider.Settings.Secure; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; - -import com.android.systemui.R; -import com.android.systemui.qs.QSPanel; -import com.android.systemui.qs.QSTile; -import com.android.systemui.qs.external.CustomTile; -import com.android.systemui.qs.external.TileLifecycleManager; -import com.android.systemui.statusbar.phone.QSTileHost; -import com.android.systemui.tuner.TunerService; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -/** - * A version of QSPanel that allows tiles to be dragged around rather than - * clicked on. Dragging starting and receiving is handled in the NonPagedTileLayout, - * and the saving/ordering is handled by the CustomQSTileHost. - */ -public class CustomQSPanel extends QSPanel { - - private static final String TAG = "CustomQSPanel"; - private static final boolean DEBUG = false; - - private List<String> mSavedTiles = Collections.emptyList(); - private ArrayList<String> mStash; - private List<String> mTiles = new ArrayList<>(); - - private ArrayList<QSTile<?>> mCurrentTiles = new ArrayList<>(); - - public CustomQSPanel(Context context, AttributeSet attrs) { - super(context, attrs); - mTileLayout = (QSTileLayout) LayoutInflater.from(mContext) - .inflate(R.layout.qs_customize_layout, mQsContainer, false); - mQsContainer.addView((View) mTileLayout, 1 /* Between brightness and footer */); - ((NonPagedTileLayout) mTileLayout).setCustomQsPanel(this); - removeView(mFooter.getView()); - - if (DEBUG) Log.d(TAG, "new CustomQSPanel", new Throwable()); - TunerService.get(mContext).addTunable(this, QSTileHost.TILES_SETTING); - } - - @Override - protected void showDetail(boolean show, Record r) { - // No detail here. - } - - @Override - protected void onDetachedFromWindow() { - // Don't allow the super to unregister the tunable. - } - - @Override - public void onTuningChanged(String key, String newValue) { - if (key.equals(QS_SHOW_BRIGHTNESS)) { - // No Brightness for you. - super.onTuningChanged(key, "0"); - } - if (QSTileHost.TILES_SETTING.equals(key)) { - mSavedTiles = Collections.unmodifiableList( - QSTileHost.loadTileSpecs(mContext, newValue)); - if (DEBUG) Log.d(TAG, "New saved tiles " + TextUtils.join(",", mSavedTiles)); - } - } - - @Override - protected void createCustomizePanel() { - // Already in CustomizePanel. - } - - public void tileSelected(QSTile<?> tile, ClipData currentClip) { - String sourceSpec = getSpec(currentClip); - String destSpec = tile.getTileSpec(); - if (!sourceSpec.equals(destSpec)) { - moveTo(sourceSpec, destSpec); - } - } - - public ClipData getClip(QSTile<?> tile) { - String tileSpec = tile.getTileSpec(); - // TODO: Something better than plain text. - // TODO: Once using something better than plain text, stop listening to non-QS drag events. - return ClipData.newPlainText(tileSpec, tileSpec); - } - - public String getSpec(ClipData data) { - return data.getItemAt(0).getText().toString(); - } - - public void setSavedTiles() { - if (DEBUG) Log.d(TAG, "setSavedTiles " + TextUtils.join(",", mSavedTiles)); - setTiles(mSavedTiles); - } - - public void saveCurrentTiles() { - mHost.changeTiles(mSavedTiles, mTiles); - } - - public void stashCurrentTiles() { - mStash = new ArrayList<>(mTiles); - } - - public void unstashTiles() { - setTiles(mStash); - } - - @Override - public void setTiles(Collection<QSTile<?>> tiles) { - setTilesInternal(); - } - - private void setTilesInternal() { - if (DEBUG) Log.d(TAG, "Set tiles internal"); - for (int i = 0; i < mCurrentTiles.size(); i++) { - mCurrentTiles.get(i).destroy(); - } - mCurrentTiles.clear(); - for (int i = 0; i < mTiles.size(); i++) { - if (mTiles.get(i).startsWith(CustomTile.PREFIX)) { - QSTile<?> tile = BlankCustomTile.create(mHost, mTiles.get(i)); - tile.setTileSpec(mTiles.get(i)); - mCurrentTiles.add(tile); - } else { - QSTile<?> tile = mHost.createTile(mTiles.get(i)); - if (tile != null) { - tile.setTileSpec(mTiles.get(i)); - mCurrentTiles.add(tile); - } else { - if (DEBUG) Log.d(TAG, "Skipping " + mTiles.get(i)); - } - } - } - super.setTiles(mCurrentTiles); - } - - public void addTile(String spec) { - if (DEBUG) Log.d(TAG, "addTile " + spec); - mTiles.add(spec); - setTilesInternal(); - } - - public void moveTo(String from, String to) { - if (DEBUG) Log.d(TAG, "moveTo " + from + " " + to); - int fromIndex = mTiles.indexOf(from); - if (fromIndex < 0) { - Log.e(TAG, "Unknown from tile " + from); - return; - } - int index = mTiles.indexOf(to); - if (index < 0) { - Log.e(TAG, "Unknown to tile " + to); - return; - } - mTiles.remove(fromIndex); - mTiles.add(index, from); - setTilesInternal(); - } - - public void remove(String spec) { - if (!mTiles.remove(spec)) { - Log.e(TAG, "Unknown remove spec " + spec); - } - setTilesInternal(); - } - - public void setTiles(List<String> tiles) { - if (DEBUG) Log.d(TAG, "Set tiles " + TextUtils.join(",", tiles)); - mTiles = new ArrayList<>(tiles); - setTilesInternal(); - } - - public Collection<QSTile<?>> getTiles() { - return mCurrentTiles; - } -} diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/DropButton.java b/packages/SystemUI/src/com/android/systemui/qs/customize/DropButton.java deleted file mode 100644 index 313540809e0d..000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/DropButton.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2015 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.qs.customize; - -import android.content.ClipData; -import android.content.Context; -import android.util.AttributeSet; -import android.view.DragEvent; -import android.view.View; -import android.view.View.OnDragListener; -import android.widget.TextView; - -public class DropButton extends TextView implements OnDragListener { - - private OnDropListener mListener; - - public DropButton(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - // TODO: Don't do this, instead make this view the right size... - ((View) getParent()).setOnDragListener(this); - } - - public void setOnDropListener(OnDropListener listener) { - mListener = listener; - } - - private void setHovering(boolean hovering) { - setAlpha(hovering ? .3f : 1); - } - - @Override - public boolean onDrag(View v, DragEvent event) { - switch (event.getAction()) { - case DragEvent.ACTION_DRAG_ENTERED: - setHovering(true); - break; - case DragEvent.ACTION_DROP: - if (mListener != null) { - mListener.onDrop(this, event.getClipData()); - } - case DragEvent.ACTION_DRAG_EXITED: - case DragEvent.ACTION_DRAG_ENDED: - setHovering(false); - break; - } - return true; - } - - public interface OnDropListener { - void onDrop(View v, ClipData data); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/FloatingActionButton.java b/packages/SystemUI/src/com/android/systemui/qs/customize/FloatingActionButton.java deleted file mode 100644 index 8791a1007adc..000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/FloatingActionButton.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2015 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.qs.customize; - -import android.animation.AnimatorInflater; -import android.content.Context; -import android.graphics.Outline; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewOutlineProvider; -import android.widget.ImageView; - -import com.android.systemui.R; - -public class FloatingActionButton extends ImageView { - - public FloatingActionButton(Context context, AttributeSet attrs) { - super(context, attrs); - setScaleType(ScaleType.CENTER); - setStateListAnimator(AnimatorInflater.loadStateListAnimator(context, R.anim.fab_elevation)); - setOutlineProvider(new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - outline.setOval(0, 0, getWidth(), getHeight()); - } - }); - setClipToOutline(true); - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - invalidateOutline(); - } -}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java deleted file mode 100644 index 98c7be414748..000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright (C) 2015 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.qs.customize; - -import android.content.ClipData; -import android.content.Context; -import android.graphics.Rect; -import android.util.AttributeSet; -import android.view.DragEvent; -import android.view.LayoutInflater; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnTouchListener; -import android.widget.LinearLayout; - -import com.android.systemui.R; -import com.android.systemui.qs.PagedTileLayout; -import com.android.systemui.qs.PagedTileLayout.TilePage; -import com.android.systemui.qs.QSPanel.QSTileLayout; -import com.android.systemui.qs.QSPanel.TileRecord; -import com.android.systemui.qs.QSTile; - -import java.util.ArrayList; - -/** - * Similar to PagedTileLayout, except that instead of pages it lays them out - * vertically and expects to be inside a ScrollView. - * @see CustomQSPanel - */ -public class NonPagedTileLayout extends LinearLayout implements QSTileLayout, OnTouchListener { - - private final ArrayList<TilePage> mPages = new ArrayList<>(); - private final ArrayList<TileRecord> mTiles = new ArrayList<TileRecord>(); - private CustomQSPanel mPanel; - private final Rect mHitRect = new Rect(); - - private ClipData mCurrentClip; - private View mCurrentView; - - public NonPagedTileLayout(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - TilePage page = (PagedTileLayout.TilePage) findViewById(R.id.tile_page); - page.setMaxRows(3 /* First page only gets 3 */); - mPages.add(page); - } - - public void setCustomQsPanel(CustomQSPanel qsPanel) { - mPanel = qsPanel; - } - - @Override - public void addTile(TileRecord record) { - mTiles.add(record); - distributeTiles(); - if (record.tileView.getTag() == record.tile) { - return; - } - record.tileView.setTag(record.tile); - record.tileView.setVisibility(View.VISIBLE); - record.tileView.init(null, null); - record.tileView.setOnTouchListener(this); - if (mCurrentClip != null && mCurrentClip.getItemAt(0) - .getText().toString().equals(record.tile.getTileSpec())) { - record.tileView.setAlpha(.3f); - mCurrentView = record.tileView; - } - } - - @Override - public void removeTile(TileRecord tile) { - if (mTiles.remove(tile)) { - distributeTiles(); - } - } - - private void distributeTiles() { - final int NP = mPages.size(); - for (int i = 0; i < NP; i++) { - mPages.get(i).removeAllViews(); - } - int index = 0; - final int NT = mTiles.size(); - for (int i = 0; i < NT; i++) { - TileRecord tile = mTiles.get(i); - mPages.get(index).addTile(tile); - // Keep everything in one layout for now. - if (false && mPages.get(index).isFull()) { - if (++index == mPages.size()) { - LayoutInflater inflater = LayoutInflater.from(mContext); - inflater.inflate(R.layout.horizontal_divider, this); - mPages.add((TilePage) inflater.inflate(R.layout.qs_paged_page, this, false)); - addView(mPages.get(mPages.size() - 1)); - } - } - } - } - - @Override - public int getOffsetTop(TileRecord tile) { - // No touch feedback, so this isn't required. - return 0; - } - - @Override - public boolean updateResources() { - return false; - } - - @Override - public boolean onDragEvent(DragEvent event) { - switch (event.getAction()) { - case DragEvent.ACTION_DRAG_LOCATION: - float x = event.getX(); - float y = event.getY(); - final int NP = mPages.size(); - for (int i = 0; i < NP; i++) { - TilePage page = mPages.get(i); - if (contains(page, x, y)) { - x -= page.getLeft(); - y -= page.getTop(); - final int NC = page.getChildCount(); - for (int j = 0; j < NC; j++) { - View child = page.getChildAt(j); - if (contains(child, x, y)) { - mPanel.tileSelected((QSTile<?>) child.getTag(), mCurrentClip); - } - } - break; - } - } - break; - case DragEvent.ACTION_DRAG_ENDED: - onDragEnded(); - break; - } - return true; - } - - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - // Stash the current tiles, in case the drop is on info, that we can restore - // the previous state. - mPanel.stashCurrentTiles(); - mCurrentView = v; - mCurrentClip = mPanel.getClip((QSTile<?>) v.getTag()); - View.DragShadowBuilder shadow = new View.DragShadowBuilder(v); - ((View) getParent().getParent()).startDrag(mCurrentClip, shadow, null, 0); - v.setAlpha(.3f); - return true; - } - return false; - } - - public void onDragEnded() { - mCurrentView.setAlpha(1f); - mCurrentView = null; - mCurrentClip = null; - } - - private boolean contains(View v, float x, float y) { - v.getHitRect(mHitRect); - return mHitRect.contains((int) x, (int) y); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java index a6c7fe4ad92c..edcccaca2a14 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java @@ -16,38 +16,25 @@ package com.android.systemui.qs.customize; import android.animation.Animator; -import android.content.ClipData; +import android.animation.Animator.AnimatorListener; import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnCancelListener; -import android.content.DialogInterface.OnDismissListener; +import android.support.v7.widget.DefaultItemAnimator; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.helper.ItemTouchHelper; import android.util.AttributeSet; -import android.util.Log; -import android.util.TypedValue; import android.view.ContextThemeWrapper; -import android.view.DragEvent; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.view.WindowManager; import android.widget.LinearLayout; -import android.widget.ListView; -import android.widget.Toolbar; -import android.widget.Toolbar.OnMenuItemClickListener; - import com.android.systemui.R; import com.android.systemui.qs.QSDetailClipper; -import com.android.systemui.qs.QSTile.Host.Callback; -import com.android.systemui.qs.customize.DropButton.OnDropListener; -import com.android.systemui.qs.customize.TileAdapter.TileSelectedListener; +import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.phone.PhoneStatusBar; import com.android.systemui.statusbar.phone.QSTileHost; -import com.android.systemui.statusbar.phone.SystemUIDialog; import java.util.ArrayList; +import java.util.List; /** * Allows full-screen customization of QS, through show() and hide(). @@ -55,26 +42,19 @@ import java.util.ArrayList; * This adds itself to the status bar window, so it can appear on top of quick settings and * *someday* do fancy animations to get into/out of it. */ -public class QSCustomizer extends LinearLayout implements OnMenuItemClickListener, Callback, - OnDropListener, OnClickListener, Animator.AnimatorListener, TileSelectedListener, - OnCancelListener, OnDismissListener { +public class QSCustomizer extends LinearLayout implements AnimatorListener, OnClickListener { - private static final int MENU_SAVE = Menu.FIRST; - private static final int MENU_RESET = Menu.FIRST + 1; private final QSDetailClipper mClipper; private PhoneStatusBar mPhoneStatusBar; - private Toolbar mToolbar; - private ViewGroup mDragButtons; - private CustomQSPanel mQsPanel; - private boolean isShown; - private DropButton mInfoButton; - private DropButton mRemoveButton; - private FloatingActionButton mFab; - private SystemUIDialog mDialog; private QSTileHost mHost; + private RecyclerView mRecyclerView; + private TileAdapter mTileAdapter; + private View mClose; + private View mSave; + private View mReset; public QSCustomizer(Context context, AttributeSet attrs) { super(new ContextThemeWrapper(context, android.R.style.Theme_Material), attrs); @@ -83,59 +63,42 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene public void setHost(QSTileHost host) { mHost = host; - mHost.addCallback(this); mPhoneStatusBar = host.getPhoneStatusBar(); - mQsPanel.setTiles(mHost.getTiles()); - mQsPanel.setHost(mHost); - mQsPanel.setSavedTiles(); } @Override protected void onFinishInflate() { super.onFinishInflate(); - mToolbar = (Toolbar) findViewById(com.android.internal.R.id.action_bar); - TypedValue value = new TypedValue(); - mContext.getTheme().resolveAttribute(android.R.attr.homeAsUpIndicator, value, true); - mToolbar.setNavigationIcon( - getResources().getDrawable(R.drawable.ic_close_white, mContext.getTheme())); - mToolbar.setNavigationOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - hide(0, 0); - } - }); - mToolbar.setOnMenuItemClickListener(this); - mToolbar.getMenu().add(Menu.NONE, MENU_SAVE, 0, mContext.getString(R.string.save)) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); - mToolbar.getMenu().add(Menu.NONE, MENU_RESET, 0, - mContext.getString(com.android.internal.R.string.reset)); - - mQsPanel = (CustomQSPanel) findViewById(R.id.quick_settings_panel); - - mDragButtons = (ViewGroup) findViewById(R.id.drag_buttons); - setDragging(false); - - mInfoButton = (DropButton) findViewById(R.id.info_button); - mInfoButton.setOnDropListener(this); - mRemoveButton = (DropButton) findViewById(R.id.remove_button); - mRemoveButton.setOnDropListener(this); - - mFab = (FloatingActionButton) findViewById(R.id.fab); - mFab.setImageResource(R.drawable.ic_add); - mFab.setOnClickListener(this); + mClose = findViewById(R.id.close); + mSave = findViewById(R.id.save); + mReset = findViewById(R.id.reset); + mClose.setOnClickListener(this); + mSave.setOnClickListener(this); + mReset.setOnClickListener(this); + + mRecyclerView = (RecyclerView) findViewById(android.R.id.list); + mTileAdapter = new TileAdapter(getContext()); + mRecyclerView.setAdapter(mTileAdapter); + new ItemTouchHelper(mTileAdapter.getCallback()).attachToRecyclerView(mRecyclerView); + GridLayoutManager layout = new GridLayoutManager(getContext(), 3); + layout.setSpanSizeLookup(mTileAdapter.getSizeLookup()); + mRecyclerView.setLayoutManager(layout); + mRecyclerView.addItemDecoration(mTileAdapter.getItemDecoration()); + DefaultItemAnimator animator = new DefaultItemAnimator(); + animator.setMoveDuration(TileAdapter.MOVE_DURATION); + mRecyclerView.setItemAnimator(animator); } public void show(int x, int y) { isShown = true; - mQsPanel.setSavedTiles(); mPhoneStatusBar.getStatusBarWindow().addView(this); - mQsPanel.setListening(true); + setTileSpecs(); mClipper.animateCircularClip(x, y, true, this); + new TileQueryHelper(mContext, mHost).setListener(mTileAdapter); } public void hide(int x, int y) { isShown = false; - mQsPanel.setListening(false); mClipper.animateCircularClip(x, y, false, this); } @@ -149,109 +112,35 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene for (String tile : defTiles.split(",")) { tiles.add(tile); } - mQsPanel.setTiles(tiles); - } - - private void setDragging(boolean dragging) { - mToolbar.setVisibility(!dragging ? View.VISIBLE : View.INVISIBLE); - } - - private void save() { - Log.d("CustomQSPanel", "Save!"); - mQsPanel.saveCurrentTiles(); - // TODO: At save button. - hide(0, 0); - } - - @Override - public boolean onMenuItemClick(MenuItem item) { - switch (item.getItemId()) { - case MENU_SAVE: - Log.d("CustomQSPanel", "Save..."); - save(); - break; - case MENU_RESET: - reset(); - break; - } - return true; + mTileAdapter.setTileSpecs(tiles); } - @Override - public void onTileSelected(String spec) { - if (mDialog != null) { - mQsPanel.addTile(spec); - mDialog.dismiss(); - } - } - - @Override - public void onTilesChanged() { - mQsPanel.setTiles(mHost.getTiles()); - } - - public boolean onDragEvent(DragEvent event) { - switch (event.getAction()) { - case DragEvent.ACTION_DRAG_STARTED: - setDragging(true); - break; - case DragEvent.ACTION_DRAG_ENDED: - setDragging(false); - break; + private void setTileSpecs() { + List<String> specs = new ArrayList<>(); + for (QSTile tile : mHost.getTiles()) { + specs.add(tile.getTileSpec()); } - return true; + mTileAdapter.setTileSpecs(specs); } - public void onDrop(View v, ClipData data) { - if (v == mRemoveButton) { - mQsPanel.remove(mQsPanel.getSpec(data)); - } else if (v == mInfoButton) { - mQsPanel.unstashTiles(); - SystemUIDialog dialog = new SystemUIDialog(mContext); - dialog.setTitle(mQsPanel.getSpec(data)); - dialog.setPositiveButton(R.string.ok, null); - dialog.show(); - } + private void save() { + mTileAdapter.saveSpecs(mHost); + hide((int) mSave.getX() + mSave.getWidth() / 2, (int) mSave.getY() + mSave.getHeight() / 2); } @Override public void onClick(View v) { - if (mFab == v) { - mDialog = new SystemUIDialog(mContext, - android.R.style.Theme_Material_Dialog); - View view = LayoutInflater.from(mContext).inflate(R.layout.qs_add_tiles_list, null); - ListView listView = (ListView) view.findViewById(android.R.id.list); - TileAdapter adapter = new TileAdapter(mContext, mQsPanel.getTiles(), mHost); - adapter.setListener(this); - listView.setDivider(null); - listView.setDividerHeight(0); - listView.setAdapter(adapter); - listView.setEmptyView(view.findViewById(R.id.empty_text)); - mDialog.setView(view); - mDialog.setOnDismissListener(this); - mDialog.setOnCancelListener(this); - mDialog.show(); - // Too lazy to figure out what this will be now, but it should probably be something - // besides just a dialog. - // For now, just make it big. - WindowManager.LayoutParams params = mDialog.getWindow().getAttributes(); - params.width = WindowManager.LayoutParams.MATCH_PARENT; - params.height = WindowManager.LayoutParams.WRAP_CONTENT; - mDialog.getWindow().setAttributes(params); + if (v == mClose) { + hide((int) mClose.getX() + mClose.getWidth() / 2, + (int) mClose.getY() + mClose.getHeight() / 2); + } else if (v == mSave) { + save(); + } else if (v == mReset) { + reset(); } } @Override - public void onDismiss(DialogInterface dialog) { - mDialog = null; - } - - @Override - public void onCancel(DialogInterface dialog) { - mDialog = null; - } - - @Override public void onAnimationEnd(Animator animation) { if (!isShown) { mPhoneStatusBar.getStatusBarWindow().removeView(this); @@ -274,4 +163,4 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene public void onAnimationRepeat(Animator animation) { // Don't care. } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java index b72789ef9f3c..fb3818cf9db1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -1,262 +1,293 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2016 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 + * 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. + * 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.qs.customize; -import android.content.ComponentName; import android.content.Context; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.content.pm.PackageManager.NameNotFoundException; -import android.content.pm.ResolveInfo; -import android.graphics.drawable.Drawable; -import android.os.AsyncTask; -import android.os.Handler; -import android.os.Looper; -import android.service.quicksettings.TileService; -import android.util.Log; +import android.graphics.Canvas; +import android.graphics.drawable.ColorDrawable; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.GridLayoutManager.SpanSizeLookup; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.RecyclerView.ItemDecoration; +import android.support.v7.widget.RecyclerView.State; +import android.support.v7.widget.RecyclerView.ViewHolder; +import android.support.v7.widget.helper.ItemTouchHelper; +import android.support.v7.widget.helper.ItemTouchHelper.Callback; import android.view.LayoutInflater; import android.view.View; -import android.view.View.OnClickListener; import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.GridLayout; -import android.widget.ImageView; -import android.widget.TextView; - +import android.widget.FrameLayout; import com.android.systemui.R; -import com.android.systemui.qs.QSTile; -import com.android.systemui.qs.QSTile.Icon; -import com.android.systemui.qs.external.CustomTile; +import com.android.systemui.qs.QSIconView; +import com.android.systemui.qs.QSTileView; +import com.android.systemui.qs.customize.TileAdapter.Holder; +import com.android.systemui.qs.customize.TileQueryHelper.TileInfo; +import com.android.systemui.qs.customize.TileQueryHelper.TileStateListener; import com.android.systemui.statusbar.phone.QSTileHost; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.List; -public class TileAdapter extends BaseAdapter { +public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileStateListener { + + private static final long DRAG_LENGTH = 100; + private static final float DRAG_SCALE = 1.2f; + public static final long MOVE_DURATION = 150; - private static final String TAG = "TileAdapter"; + private static final int TYPE_TILE = 0; + private static final int TYPE_EDIT = 1; - private final ArrayList<TileGroup> mGroups = new ArrayList<>(); private final Context mContext; - private TileSelectedListener mListener; - private ArrayList<String> mCurrentTiles; + private final List<TileInfo> mTiles = new ArrayList<>(); + private int mDividerIndex; + private List<String> mCurrentSpecs; + private List<TileInfo> mOtherTiles; + private List<TileInfo> mAllTiles; + + private Holder mCurrentDrag; - public TileAdapter(Context context, Collection<QSTile<?>> currentTiles, QSTileHost host) { + public TileAdapter(Context context) { mContext = context; - addSystemTiles(currentTiles, host); - // TODO: Live? + setHasStableIds(true); } - private void addSystemTiles(Collection<QSTile<?>> currentTiles, QSTileHost host) { - try { - ArrayList<String> tileSpecs = new ArrayList<>(); - for (QSTile<?> tile : currentTiles) { - tileSpecs.add(tile.getTileSpec()); - } - mCurrentTiles = tileSpecs; - final TileGroup group = new TileGroup("com.android.settings", mContext); - boolean hasColorMod = host.getDisplayController().isEnabled(); - String possible = mContext.getString(R.string.quick_settings_tiles_default) - + ",hotspot,inversion,saver" + (hasColorMod ? ",colors" : ""); - String[] possibleTiles = possible.split(","); - for (int i = 0; i < possibleTiles.length; i++) { - final String spec = possibleTiles[i]; - if (spec.startsWith("q")) { - // Quick tiles can't be customized. - continue; - } - if (tileSpecs.contains(spec)) { - Log.d(TAG, "Skipping " + spec); - continue; - } - Log.d(TAG, "Trying " + spec); - final QSTile<?> tile = host.createTile(spec); - if (tile == null) { - continue; - } - // Bad, bad, very bad. - tile.setListening(true); - tile.clearState(); - tile.refreshState(); - tile.setListening(false); - new Handler(host.getLooper()).post(new Runnable() { - @Override - public void run() { - group.addTile(spec, tile.getState().icon, tile.getState().label, mContext); - } - }); - } - // Error: Badness (10000). - // Serialize this work after the host's looper's queue is empty. - new Handler(host.getLooper()).post(new Runnable() { - @Override - public void run() { - new Handler(Looper.getMainLooper()).post(new Runnable() { - @Override - public void run() { - if (group.mTiles.size() > 0) { - mGroups.add(group); - notifyDataSetChanged(); - } - new QueryTilesTask().execute(); - } - }); - } - }); - } catch (NameNotFoundException e) { - Log.e(TAG, "Couldn't load system tiles", e); + @Override + public long getItemId(int position) { + return mTiles.get(position) != null ? mAllTiles.indexOf(mTiles.get(position)) : -1; + } + + public Callback getCallback() { + return mCallbacks; + } + + public ItemDecoration getItemDecoration() { + return mDecoration; + } + + public void saveSpecs(QSTileHost host) { + List<String> newSpecs = new ArrayList<>(); + for (int i = 0; mTiles.get(i) != null; i++) { + newSpecs.add(mTiles.get(i).spec); + } + host.changeTiles(mCurrentSpecs, newSpecs); + setTileSpecs(newSpecs); + } + + public void setTileSpecs(List<String> currentSpecs) { + mCurrentSpecs = currentSpecs; + recalcSpecs(); + } + + @Override + public void onTilesChanged(List<TileInfo> tiles) { + mAllTiles = tiles; + recalcSpecs(); + } + + private void recalcSpecs() { + if (mCurrentSpecs == null || mAllTiles == null) { + return; } + mOtherTiles = new ArrayList<TileInfo>(mAllTiles); + mTiles.clear(); + for (int i = 0; i < mCurrentSpecs.size(); i++) { + mTiles.add(getAndRemoveOther(mCurrentSpecs.get(i))); + } + mTiles.add(null); + mTiles.addAll(mOtherTiles); + mDividerIndex = mTiles.indexOf(null); + notifyDataSetChanged(); } - public void setListener(TileSelectedListener listener) { - mListener = listener; + private TileInfo getAndRemoveOther(String s) { + for (int i = 0; i < mOtherTiles.size(); i++) { + if (mOtherTiles.get(i).spec.equals(s)) { + return mOtherTiles.remove(i); + } + } + return null; } @Override - public int getCount() { - return mGroups.size(); + public int getItemViewType(int position) { + if (mTiles.get(position) == null) { + return TYPE_EDIT; + } + return TYPE_TILE; } @Override - public Object getItem(int position) { - return mGroups.get(position); + public Holder onCreateViewHolder(ViewGroup parent, int viewType) { + final Context context = parent.getContext(); + LayoutInflater inflater = LayoutInflater.from(context); + if (viewType == 1) { + return new Holder(inflater.inflate(R.layout.qs_customize_divider, parent, false)); + } + FrameLayout frame = (FrameLayout) inflater.inflate(R.layout.qs_customize_tile_frame, parent, + false); + frame.addView(new QSTileView(context, new QSIconView(context))); + return new Holder(frame); } @Override - public long getItemId(int position) { - return position; + public int getItemCount() { + return mTiles.size(); } @Override - public View getView(int position, View convertView, ViewGroup parent) { - return mGroups.get(position).getView(mContext, convertView, parent, mListener); + public void onBindViewHolder(Holder holder, int position) { + if (holder.getItemViewType() == TYPE_EDIT) return; + + TileInfo info = mTiles.get(position); + holder.mTileView.onStateChanged(info.state); + } + + public SpanSizeLookup getSizeLookup() { + return mSizeLookup; } - private static class TileGroup { - private final ArrayList<TileInfo> mTiles = new ArrayList<>(); - private CharSequence mLabel; - private Drawable mIcon; - - public TileGroup(String pkg, Context context) throws NameNotFoundException { - PackageManager pm = context.getPackageManager(); - ApplicationInfo info = pm.getApplicationInfo(pkg, 0); - mLabel = info.loadLabel(pm); - mIcon = info.loadIcon(pm); - Log.d(TAG, "Added " + mLabel); + public class Holder extends ViewHolder { + private QSTileView mTileView; + + public Holder(View itemView) { + super(itemView); + if (itemView instanceof FrameLayout) { + mTileView = (QSTileView) ((FrameLayout) itemView).getChildAt(0); + } } - private void addTile(String spec, Drawable icon, CharSequence label) { - TileInfo info = new TileInfo(); - info.label = label; - info.drawable = icon; - info.spec = spec; - mTiles.add(info); + public void startDrag() { + itemView.animate() + .setDuration(DRAG_LENGTH) + .scaleX(DRAG_SCALE) + .scaleY(DRAG_SCALE); + mTileView.findViewById(R.id.tile_label).animate() + .setDuration(DRAG_LENGTH) + .alpha(0); } - private void addTile(String spec, Icon icon, CharSequence label, Context context) { - addTile(spec, icon != null ? icon.getDrawable(context) : null, label); + public void stopDrag() { + itemView.animate() + .setDuration(DRAG_LENGTH) + .scaleX(1) + .scaleY(1); + mTileView.findViewById(R.id.tile_label).animate() + .setDuration(DRAG_LENGTH) + .alpha(1); } + } - private View getView(Context context, View convertView, ViewGroup parent, - final TileSelectedListener listener) { - if (convertView == null) { - convertView = LayoutInflater.from(context).inflate(R.layout.tile_listing, parent, - false); - } - ((TextView) convertView.findViewById(android.R.id.title)).setText(mLabel); - ((ImageView) convertView.findViewById(android.R.id.icon)).setImageDrawable(mIcon); - GridLayout grid = (GridLayout) convertView.findViewById(R.id.tile_grid); - final int N = mTiles.size(); - if (grid.getChildCount() != N) { - grid.removeAllViews(); - } - for (int i = 0; i < N; i++) { - if (grid.getChildCount() <= i) { - grid.addView(createTile(context)); + private final SpanSizeLookup mSizeLookup = new SpanSizeLookup() { + @Override + public int getSpanSize(int position) { + return getItemViewType(position) == TYPE_EDIT ? 3 : 1; + } + }; + + private final ItemDecoration mDecoration = new ItemDecoration() { + // TODO: Move this to resource. + private final ColorDrawable mDrawable = new ColorDrawable(0xff384248); + + @Override + public void onDraw(Canvas c, RecyclerView parent, State state) { + super.onDraw(c, parent, state); + + final int childCount = parent.getChildCount(); + final int width = parent.getWidth(); + final int bottom = parent.getBottom(); + for (int i = 0; i < childCount; i++) { + final View child = parent.getChildAt(i); + final ViewHolder holder = parent.getChildViewHolder(child); + if (holder.getAdapterPosition() < mDividerIndex) { + continue; } - View view = grid.getChildAt(i); - final TileInfo tileInfo = mTiles.get(i); - ((ImageView) view.findViewById(R.id.tile_icon)).setImageDrawable(tileInfo.drawable); - ((TextView) view.findViewById(R.id.tile_label)).setText(tileInfo.label); - view.setClickable(true); - view.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - listener.onTileSelected(tileInfo.spec); - } - }); + + final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child + .getLayoutParams(); + final int top = child.getTop() + params.topMargin + + Math.round(ViewCompat.getTranslationY(child)); + // Draw full width, in case there aren't tiles all the way across. + mDrawable.setBounds(0, top, width, bottom); + mDrawable.draw(c); + break; } - return convertView; } + }; + + private final ItemTouchHelper.Callback mCallbacks = new ItemTouchHelper.Callback() { - private View createTile(Context context) { - return LayoutInflater.from(context).inflate(R.layout.qs_add_tile_layout, null); + @Override + public boolean isLongPressDragEnabled() { + return true; } - } - private static class TileInfo { - private String spec; - private Drawable drawable; - private CharSequence label; - } + @Override + public boolean isItemViewSwipeEnabled() { + return false; + } - private class QueryTilesTask extends AsyncTask<Void, Void, Collection<TileGroup>> { @Override - protected Collection<TileGroup> doInBackground(Void... params) { - HashMap<String, TileGroup> pkgMap = new HashMap<>(); - PackageManager pm = mContext.getPackageManager(); - // TODO: Handle userness. - List<ResolveInfo> services = pm.queryIntentServices( - new Intent(TileService.ACTION_QS_TILE), 0); - for (ResolveInfo info : services) { - String packageName = info.serviceInfo.packageName; - ComponentName componentName = new ComponentName(packageName, info.serviceInfo.name); - String spec = CustomTile.toSpec(componentName); - if (mCurrentTiles.contains(spec)) { - continue; - } - try { - TileGroup group = pkgMap.get(packageName); - if (group == null) { - group = new TileGroup(packageName, mContext); - pkgMap.put(packageName, group); - } - Drawable icon = info.serviceInfo.loadIcon(pm); - CharSequence label = info.serviceInfo.loadLabel(pm); - group.addTile(spec, icon, label != null ? label.toString() : "null"); - } catch (NameNotFoundException e) { - Log.w(TAG, "Couldn't find resolved package... " + packageName, e); - } + public void onSelectedChanged(ViewHolder viewHolder, int actionState) { + super.onSelectedChanged(viewHolder, actionState); + if (mCurrentDrag != null) { + mCurrentDrag.stopDrag(); + } + if (viewHolder != null) { + mCurrentDrag = (Holder) viewHolder; + mCurrentDrag.startDrag(); } - return pkgMap.values(); } @Override - protected void onPostExecute(Collection<TileGroup> result) { - mGroups.addAll(result); - notifyDataSetChanged(); + public int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHolder) { + if (viewHolder.getItemViewType() == TYPE_EDIT) { + return makeMovementFlags(0, 0); + } + int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.RIGHT + | ItemTouchHelper.LEFT; + return makeMovementFlags(dragFlags, 0); } - } - public interface TileSelectedListener { - void onTileSelected(String spec); - } + @Override + public boolean onMove(RecyclerView recyclerView, ViewHolder viewHolder, ViewHolder target) { + int from = viewHolder.getAdapterPosition(); + int to = target.getAdapterPosition(); + if (to > mDividerIndex) { + if (from < mDividerIndex) { + to = mDividerIndex; + } else { + return false; + } + } + if (target.getItemViewType() == TYPE_EDIT && from < mDividerIndex) { + to++; + } + move(from, to, mTiles); + mDividerIndex = mTiles.indexOf(null); + notifyItemMoved(from, to); + return true; + } + + private <T> void move(int from, int to, List<T> list) { + list.add(from > to ? to : to + 1, list.get(from)); + list.remove(from > to ? from + 1 : from); + } + + @Override + public void onSwiped(ViewHolder viewHolder, int direction) { + } + }; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java new file mode 100644 index 000000000000..6840e08f2cfe --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2016 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.qs.customize; + +import android.app.ActivityManager; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.graphics.drawable.Drawable; +import android.os.AsyncTask; +import android.os.Handler; +import android.os.Looper; +import android.service.quicksettings.TileService; +import com.android.systemui.R; +import com.android.systemui.qs.QSTile; +import com.android.systemui.qs.QSTile.DrawableIcon; +import com.android.systemui.qs.external.CustomTile; +import com.android.systemui.statusbar.phone.QSTileHost; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class TileQueryHelper { + + private static final String TAG = "TileQueryHelper"; + + private final ArrayList<TileInfo> mTiles = new ArrayList<>(); + private final Context mContext; + private TileStateListener mListener; + + public TileQueryHelper(Context context, QSTileHost host) { + mContext = context; + addSystemTiles(host); + // TODO: Live? + } + + private void addSystemTiles(QSTileHost host) { + boolean hasColorMod = host.getDisplayController().isEnabled(); + String possible = mContext.getString(R.string.quick_settings_tiles_default) + + ",hotspot,inversion,saver" + (hasColorMod ? ",colors" : ""); + String[] possibleTiles = possible.split(","); + final Handler qsHandler = new Handler(host.getLooper()); + final Handler mainHandler = new Handler(Looper.getMainLooper()); + for (int i = 0; i < possibleTiles.length; i++) { + final String spec = possibleTiles[i]; + final QSTile<?> tile = host.createTile(spec); + if (tile == null) { + continue; + } + tile.setListening(true); + tile.clearState(); + tile.refreshState(); + tile.setListening(false); + qsHandler.post(new Runnable() { + @Override + public void run() { + final QSTile.State state = tile.newTileState(); + tile.getState().copyTo(state); + mainHandler.post(new Runnable() { + @Override + public void run() { + addTile(spec, state, mTiles); + mListener.onTilesChanged(mTiles); + } + }); + } + }); + } + qsHandler.post(new Runnable() { + @Override + public void run() { + new QueryTilesTask().execute(); + } + }); + } + + public void setListener(TileStateListener listener) { + mListener = listener; + } + + private static void addTile(String spec, QSTile.State state, List<TileInfo> tiles) { + TileInfo info = new TileInfo(); + info.state = state; + info.spec = spec; + tiles.add(info); + } + + private static void addTile(String spec, Drawable drawable, CharSequence label, Context context, + List<TileInfo> tiles) { + QSTile.State state = new QSTile.State(); + state.label = label; + state.contentDescription = label; + state.icon = new DrawableIcon(drawable); + addTile(spec, state, tiles); + } + + public static class TileInfo { + public String spec; + public QSTile.State state; + } + + private class QueryTilesTask extends AsyncTask<Void, Void, Collection<TileInfo>> { + @Override + protected Collection<TileInfo> doInBackground(Void... params) { + List<TileInfo> tiles = new ArrayList<>(); + PackageManager pm = mContext.getPackageManager(); + List<ResolveInfo> services = pm.queryIntentServicesAsUser( + new Intent(TileService.ACTION_QS_TILE), 0, ActivityManager.getCurrentUser()); + for (ResolveInfo info : services) { + String packageName = info.serviceInfo.packageName; + ComponentName componentName = new ComponentName(packageName, info.serviceInfo.name); + String spec = CustomTile.toSpec(componentName); + Drawable icon = info.serviceInfo.loadIcon(pm); + if (icon != null) { + icon.mutate(); + icon.setTint(mContext.getColor(android.R.color.white)); + } + CharSequence label = info.serviceInfo.loadLabel(pm); + addTile(spec, icon, label != null ? label.toString() : "null", mContext, tiles); + } + return tiles; + } + + @Override + protected void onPostExecute(Collection<TileInfo> result) { + mTiles.addAll(result); + mListener.onTilesChanged(mTiles); + } + } + + public interface TileStateListener { + void onTilesChanged(List<TileInfo> tiles); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index df3b5de9078b..3cd9e67e1269 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -151,7 +151,7 @@ public class CustomTile extends QSTile<QSTile.State> { } @Override - protected State newTileState() { + public State newTileState() { return new State(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java index d78d6ffe2cfe..5222e61ab5d3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java @@ -51,7 +51,7 @@ public class AirplaneModeTile extends QSTile<QSTile.BooleanState> { } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java index 64b3a6c6d359..cd3e3b2a3bf0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java @@ -54,7 +54,7 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll } @Override - protected State newTileState() { + public State newTileState() { return new QSTile.State(); } 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 874fc3ec0b88..1dce053f0ff3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -56,7 +56,7 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState> { } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java index 18eb7a1ded02..15e082abff67 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java @@ -60,7 +60,7 @@ public class CastTile extends QSTile<QSTile.BooleanState> { } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index aacdbc9c77d3..c3a2ebe18303 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -54,7 +54,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> { } @Override - protected SignalState newTileState() { + public SignalState newTileState() { return new SignalState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java index 6e843e911212..e98734cb3f43 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java @@ -54,7 +54,7 @@ public class ColorInversionTile extends QSTile<QSTile.BooleanState> { } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java index 1aeb0fe6c9dd..c6a98b4fb1d9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java @@ -30,7 +30,7 @@ public class DataSaverTile extends QSTile<QSTile.BooleanState> implements } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } 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 f99a3e4b73e9..58872ecdb2c4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -94,7 +94,7 @@ public class DndTile extends QSTile<QSTile.BooleanState> { } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java index 1d9f15bbf7a9..f06634e9cb78 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java @@ -47,7 +47,7 @@ public class FlashlightTile extends QSTile<QSTile.BooleanState> implements } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index 2f37943196fa..943b502a565f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java @@ -44,7 +44,7 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java index e1dc9f2b9cc2..bdf95d8782bf 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java @@ -75,7 +75,7 @@ public class IntentTile extends QSTile<QSTile.State> { } @Override - protected State newTileState() { + public State newTileState() { return new State(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index 8328897c47b9..9f41f9a17a83 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -45,7 +45,7 @@ public class LocationTile extends QSTile<QSTile.BooleanState> { } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java index f920d4806284..c94cf5a9bec2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java @@ -46,7 +46,7 @@ public class RotationLockTile extends QSTile<QSTile.BooleanState> { } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java index 1565b6f0251e..ba7ea4d66453 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserTile.java @@ -37,7 +37,7 @@ public class UserTile extends QSTile<QSTile.State> implements UserInfoController } @Override - protected State newTileState() { + public State newTileState() { return new QSTile.State(); } 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 42296f2aad36..ac4dfd54a0d4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -60,7 +60,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { } @Override - protected SignalState newTileState() { + public SignalState newTileState() { return new SignalState(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java index 508490ffa881..a94973c43f7a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java @@ -53,7 +53,7 @@ public class WorkModeTile extends QSTile<QSTile.BooleanState> { } @Override - protected BooleanState newTileState() { + public BooleanState newTileState() { return new BooleanState(); } diff --git a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java index e288878a15ff..ee3eb02c8a38 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java @@ -39,7 +39,7 @@ import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.recents.model.RecentsTaskLoader; import com.android.systemui.recents.model.Task; import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.recents.views.TaskViewAnimation; +import com.android.systemui.recents.views.AnimationProps; import java.util.ArrayList; import java.util.Calendar; @@ -224,7 +224,7 @@ public class RecentsHistoryAdapter extends RecyclerView.Adapter<RecentsHistoryAd if (row.getViewType() == TASK_ROW_VIEW_TYPE) { TaskRow taskRow = (TaskRow) row; Task task = taskRow.task; - mStack.removeTask(task, TaskViewAnimation.IMMEDIATE); + mStack.removeTask(task, AnimationProps.IMMEDIATE); EventBus.getDefault().send(new DeleteTaskDataEvent(task)); i = removeTaskRow(i); } @@ -304,7 +304,7 @@ public class RecentsHistoryAdapter extends RecyclerView.Adapter<RecentsHistoryAd public void onTaskRemoved(Task task, int position) { // Since this is removed from the history, we need to update the stack as well to ensure // that the model is correct. Since the stack is hidden, we can update it immediately. - mStack.removeTask(task, TaskViewAnimation.IMMEDIATE); + mStack.removeTask(task, AnimationProps.IMMEDIATE); removeTaskRow(position); if (mRows.isEmpty()) { dismissHistory(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java index aa8efa711550..1f91dceb3e99 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java @@ -43,7 +43,7 @@ import com.android.systemui.recents.misc.NamedCounter; import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.recents.misc.Utilities; import com.android.systemui.recents.views.DropTarget; -import com.android.systemui.recents.views.TaskViewAnimation; +import com.android.systemui.recents.views.AnimationProps; import java.util.ArrayList; import java.util.Collections; @@ -228,12 +228,12 @@ public class TaskStack { * Notifies when a task has been removed from the stack. */ void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask, - Task newFrontMostTask, TaskViewAnimation animation); + Task newFrontMostTask, AnimationProps animation); /** * Notifies when a task has been removed from the history. */ - void onHistoryTaskRemoved(TaskStack stack, Task removedTask, TaskViewAnimation animation); + void onHistoryTaskRemoved(TaskStack stack, Task removedTask, AnimationProps animation); } /** @@ -531,7 +531,7 @@ public class TaskStack { * Removes a task from the stack, with an additional {@param animation} hint to the callbacks on * how they should update themselves. */ - public void removeTask(Task t, TaskViewAnimation animation) { + public void removeTask(Task t, AnimationProps animation) { if (mStackTaskList.contains(t)) { boolean wasFrontMostTask = (getStackFrontMostTask(false /* includeFreeform */) == t); removeTaskImpl(mStackTaskList, t); @@ -575,7 +575,7 @@ public class TaskStack { if (!newTasksMap.containsKey(task.key)) { if (notifyStackChanges) { mCb.onStackTaskRemoved(this, task, i == (taskCount - 1), null, - TaskViewAnimation.IMMEDIATE); + AnimationProps.IMMEDIATE); } } task.setGroup(null); diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java index 2d4174296e7b..58ec8521ec7b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java @@ -28,7 +28,7 @@ import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent; import com.android.systemui.recents.model.Task; import com.android.systemui.recents.model.TaskStack; import com.android.systemui.recents.model.TaskStack.TaskStackCallbacks; -import com.android.systemui.recents.views.TaskViewAnimation; +import com.android.systemui.recents.views.AnimationProps; import java.util.ArrayList; import java.util.List; @@ -137,7 +137,7 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T @Override public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask, - Task newFrontMostTask, TaskViewAnimation animation) { + Task newFrontMostTask, AnimationProps animation) { getAdapter().notifyItemRemoved(stack.getStackTasks().indexOf(removedTask)); if (mFocusedTask == removedTask) { resetFocusedTask(removedTask); @@ -152,7 +152,7 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T } @Override - public void onHistoryTaskRemoved(TaskStack stack, Task removedTask, TaskViewAnimation animation) { + public void onHistoryTaskRemoved(TaskStack stack, Task removedTask, AnimationProps animation) { //No history task on tv } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/AnimationProps.java b/packages/SystemUI/src/com/android/systemui/recents/views/AnimationProps.java new file mode 100644 index 000000000000..93878c52d6de --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/recents/views/AnimationProps.java @@ -0,0 +1,227 @@ +/* + * Copyright (C) 2016 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.recents.views; + +import android.animation.Animator; +import android.animation.AnimatorSet; +import android.annotation.IntDef; +import android.util.SparseArray; +import android.util.SparseLongArray; +import android.view.View; +import android.view.animation.Interpolator; + +import com.android.systemui.Interpolators; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.List; + +/** + * The generic set of animation properties to animate a {@link View}. The animation can have + * different interpolators, start delays and durations for each of the different properties. + */ +public class AnimationProps { + + public static final AnimationProps IMMEDIATE = new AnimationProps(0, Interpolators.LINEAR); + + @Retention(RetentionPolicy.SOURCE) + @IntDef({ALL, TRANSLATION_X, TRANSLATION_Y, TRANSLATION_Z, ALPHA, SCALE, BOUNDS}) + public @interface PropType {} + + public static final int ALL = 0; + public static final int TRANSLATION_X = 1; + public static final int TRANSLATION_Y = 2; + public static final int TRANSLATION_Z = 3; + public static final int ALPHA = 4; + public static final int SCALE = 5; + public static final int BOUNDS = 6; + + private SparseLongArray mPropStartDelay; + private SparseLongArray mPropDuration; + private SparseArray<Interpolator> mPropInterpolators; + private Animator.AnimatorListener mListener; + + /** + * The builder constructor. + */ + public AnimationProps() {} + + /** + * Creates an animation with a default {@param duration} and {@param interpolator} for all + * properties in this animation. + */ + public AnimationProps(int duration, Interpolator interpolator) { + this(0, duration, interpolator, null); + } + + /** + * Creates an animation with a default {@param duration} and {@param interpolator} for all + * properties in this animation. + */ + public AnimationProps(int duration, Interpolator interpolator, + Animator.AnimatorListener listener) { + this(0, duration, interpolator, listener); + } + + /** + * Creates an animation with a default {@param startDelay}, {@param duration} and + * {@param interpolator} for all properties in this animation. + */ + public AnimationProps(int startDelay, int duration, Interpolator interpolator) { + this(startDelay, duration, interpolator, null); + } + + /** + * Creates an animation with a default {@param startDelay}, {@param duration} and + * {@param interpolator} for all properties in this animation. + */ + public AnimationProps(int startDelay, int duration, Interpolator interpolator, + Animator.AnimatorListener listener) { + setStartDelay(ALL, startDelay); + setDuration(ALL, duration); + setInterpolator(ALL, interpolator); + setListener(listener); + } + + /** + * Creates a new {@link AnimatorSet} that will animate the given animators. Callers need to + * manually apply the individual animation properties for each of the animators respectively. + */ + public AnimatorSet createAnimator(List<Animator> animators) { + AnimatorSet anim = new AnimatorSet(); + if (mListener != null) { + anim.addListener(mListener); + } + anim.playTogether(animators); + return anim; + } + + /** + * Applies the specific start delay, duration and interpolator to the given {@param animator} + * for the specified {@param propertyType}. + */ + public <T extends Animator> T apply(@PropType int propertyType, T animator) { + animator.setStartDelay(getStartDelay(propertyType)); + animator.setDuration(getDuration(propertyType)); + animator.setInterpolator(getInterpolator(propertyType)); + return animator; + } + + /** + * Sets a start delay for a specific property. + */ + public AnimationProps setStartDelay(@PropType int propertyType, int startDelay) { + if (mPropStartDelay == null) { + mPropStartDelay = new SparseLongArray(); + } + mPropStartDelay.append(propertyType, startDelay); + return this; + } + + /** + * Returns the start delay for a specific property. + */ + public long getStartDelay(@PropType int propertyType) { + if (mPropStartDelay != null) { + long startDelay = mPropStartDelay.get(propertyType, -1); + if (startDelay != -1) { + return startDelay; + } + return mPropStartDelay.get(ALL, 0); + } + return 0; + } + + /** + * Sets a duration for a specific property. + */ + public AnimationProps setDuration(@PropType int propertyType, int duration) { + if (mPropDuration == null) { + mPropDuration = new SparseLongArray(); + } + mPropDuration.append(propertyType, duration); + return this; + } + + /** + * Returns the duration for a specific property. + */ + public long getDuration(@PropType int propertyType) { + if (mPropDuration != null) { + long duration = mPropDuration.get(propertyType, -1); + if (duration != -1) { + return duration; + } + return mPropDuration.get(ALL, 0); + } + return 0; + } + + /** + * Sets an interpolator for a specific property. + */ + public AnimationProps setInterpolator(@PropType int propertyType, Interpolator interpolator) { + if (mPropInterpolators == null) { + mPropInterpolators = new SparseArray<>(); + } + mPropInterpolators.append(propertyType, interpolator); + return this; + } + + /** + * Returns the interpolator for a specific property, falling back to the general interpolator + * if there is no specific property interpolator. + */ + public Interpolator getInterpolator(@PropType int propertyType) { + if (mPropInterpolators != null) { + Interpolator interp = mPropInterpolators.get(propertyType); + if (interp != null) { + return interp; + } + return mPropInterpolators.get(ALL, Interpolators.LINEAR); + } + return Interpolators.LINEAR; + } + + /** + * Sets an animator listener for this animation. + */ + public AnimationProps setListener(Animator.AnimatorListener listener) { + mListener = listener; + return this; + } + + /** + * Returns the animator listener for this animation. + */ + public Animator.AnimatorListener getListener() { + return mListener; + } + + /** + * Returns whether this animation has any duration. + */ + public boolean isImmediate() { + int count = mPropDuration.size(); + for (int i = 0; i < count; i++) { + if (mPropDuration.valueAt(i) > 0) { + return false; + } + } + return true; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index e2ff52cefd23..5e113b997bce 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -497,8 +497,9 @@ public class RecentsView extends FrameLayout { } @Override - protected void dispatchDraw(Canvas canvas) { - super.dispatchDraw(canvas); + public void onDrawForeground(Canvas canvas) { + super.onDrawForeground(canvas); + ArrayList<TaskStack.DockState> visDockStates = mTouchHandler.getVisibleDockStates(); for (int i = visDockStates.size() - 1; i >= 0; i--) { Drawable d = visDockStates.get(i).viewState.dockAreaOverlay; @@ -530,8 +531,7 @@ public class RecentsView extends FrameLayout { public final void onBusEvent(DismissRecentsToHomeAnimationStarted event) { // Hide the history button - int taskViewExitToHomeDuration = getResources().getInteger( - R.integer.recents_task_exit_to_home_duration); + int taskViewExitToHomeDuration = TaskStackAnimationHelper.EXIT_TO_HOME_TRANSLATION_DURATION; hideHistoryButton(taskViewExitToHomeDuration, false /* translate */); animateBackgroundScrim(0f, taskViewExitToHomeDuration); } @@ -588,7 +588,7 @@ public class RecentsView extends FrameLayout { tmpTransform.scale = 1f; tmpTransform.rect.set(taskViewRect); mTaskStackView.updateTaskViewToTransform(event.taskView, tmpTransform, - new TaskViewAnimation(125, Interpolators.ALPHA_OUT, + new AnimationProps(125, Interpolators.ALPHA_OUT, new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { @@ -598,7 +598,7 @@ public class RecentsView extends FrameLayout { event.task.key.id, dockState.createMode); // Animate the stack accordingly - TaskViewAnimation stackAnim = new TaskViewAnimation( + AnimationProps stackAnim = new AnimationProps( TaskStackView.DEFAULT_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN); mTaskStackView.getStack().removeTask(event.task, stackAnim); @@ -646,9 +646,8 @@ public class RecentsView extends FrameLayout { public final void onBusEvent(EnterRecentsWindowAnimationCompletedEvent event) { RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState(); if (!launchState.launchedFromAppWithThumbnail && mStack.getTaskCount() > 0) { - int taskViewEnterFromHomeDuration = getResources().getInteger( - R.integer.recents_task_enter_from_home_duration); - animateBackgroundScrim(DEFAULT_SCRIM_ALPHA, taskViewEnterFromHomeDuration); + animateBackgroundScrim(DEFAULT_SCRIM_ALPHA, + TaskStackAnimationHelper.ENTER_FROM_HOME_TRANSLATION_DURATION); } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java index 682c29820ce3..0eae183e58d6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java @@ -20,8 +20,10 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.content.Context; import android.content.res.Resources; +import android.graphics.Path; import android.graphics.RectF; import android.view.View; +import android.view.animation.PathInterpolator; import com.android.systemui.Interpolators; import com.android.systemui.R; @@ -63,6 +65,22 @@ public class TaskStackAnimationHelper { ReferenceCountedTrigger postAnimationTrigger); } + private static final int FRAME_OFFSET_MS = 16; + + public static final int ENTER_FROM_HOME_ALPHA_DURATION = 100; + public static final int ENTER_FROM_HOME_TRANSLATION_DURATION = 333; + private static final PathInterpolator ENTER_FROM_HOME_TRANSLATION_INTERPOLATOR = + new PathInterpolator(0, 0, 0, 1f); + private static final PathInterpolator ENTER_FROM_HOME_ALPHA_INTERPOLATOR = + new PathInterpolator(0, 0, 0.2f, 1f); + + public static final int EXIT_TO_HOME_ALPHA_DURATION = 100; + public static final int EXIT_TO_HOME_TRANSLATION_DURATION = 150; + private static final PathInterpolator EXIT_TO_HOME_TRANSLATION_INTERPOLATOR = + new PathInterpolator(0.8f, 0, 0.6f, 1f); + private static final PathInterpolator EXIT_TO_HOME_ALPHA_INTERPOLATOR = + new PathInterpolator(0.4f, 0, 1f, 1f); + private TaskStackView mStackView; private TaskViewTransform mTmpTransform = new TaskViewTransform(); @@ -157,15 +175,12 @@ public class TaskStackAnimationHelper { R.integer.recents_task_enter_from_app_duration); int taskViewEnterFromAffiliatedAppDuration = res.getInteger( R.integer.recents_task_enter_from_affiliated_app_duration); - int taskViewEnterFromHomeDuration = res.getInteger( - R.integer.recents_task_enter_from_home_duration); - int taskViewEnterFromHomeStaggerDelay = res.getInteger( - R.integer.recents_task_enter_from_home_stagger_delay); // Create enter animations for each of the views from front to back List<TaskView> taskViews = mStackView.getTaskViews(); int taskViewCount = taskViews.size(); for (int i = taskViewCount - 1; i >= 0; i--) { + int taskIndexFromFront = taskViewCount - i - 1; final TaskView tv = taskViews.get(i); Task task = tv.getTask(); boolean currentTaskOccludesLaunchTarget = false; @@ -186,7 +201,7 @@ public class TaskStackAnimationHelper { } else { // Animate the task up if it was occluding the launch target if (currentTaskOccludesLaunchTarget) { - TaskViewAnimation taskAnimation = new TaskViewAnimation( + AnimationProps taskAnimation = new AnimationProps( taskViewEnterFromAffiliatedAppDuration, Interpolators.ALPHA_IN, new AnimatorListenerAdapter() { @Override @@ -202,14 +217,16 @@ public class TaskStackAnimationHelper { } else if (launchState.launchedFromHome) { // Animate the tasks up - int frontIndex = (taskViewCount - i - 1); - int delay = frontIndex * taskViewEnterFromHomeStaggerDelay; - int duration = taskViewEnterFromHomeDuration + - frontIndex * taskViewEnterFromHomeStaggerDelay; - - TaskViewAnimation taskAnimation = new TaskViewAnimation(delay, - duration, Interpolators.DECELERATE_QUINT, - postAnimationTrigger.decrementOnAnimationEnd()); + AnimationProps taskAnimation = new AnimationProps() + .setStartDelay(AnimationProps.ALPHA, taskIndexFromFront * FRAME_OFFSET_MS) + .setDuration(AnimationProps.ALPHA, ENTER_FROM_HOME_ALPHA_DURATION) + .setDuration(AnimationProps.BOUNDS, ENTER_FROM_HOME_TRANSLATION_DURATION - + (taskIndexFromFront * FRAME_OFFSET_MS)) + .setInterpolator(AnimationProps.BOUNDS, + ENTER_FROM_HOME_TRANSLATION_INTERPOLATOR) + .setInterpolator(AnimationProps.ALPHA, + ENTER_FROM_HOME_ALPHA_INTERPOLATOR) + .setListener(postAnimationTrigger.decrementOnAnimationEnd()); postAnimationTrigger.increment(); mStackView.updateTaskViewToTransform(tv, mTmpTransform, taskAnimation); } @@ -221,7 +238,6 @@ public class TaskStackAnimationHelper { */ public void startExitToHomeAnimation(boolean animated, ReferenceCountedTrigger postAnimationTrigger) { - Resources res = mStackView.getResources(); TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm(); TaskStackViewScroller stackScroller = mStackView.getScroller(); TaskStack stack = mStackView.getStack(); @@ -232,19 +248,32 @@ public class TaskStackAnimationHelper { } int offscreenY = stackLayout.mStackRect.bottom; - int taskViewExitToHomeDuration = res.getInteger( - R.integer.recents_task_exit_to_home_duration); // Create the animations for each of the tasks List<TaskView> taskViews = mStackView.getTaskViews(); int taskViewCount = taskViews.size(); for (int i = 0; i < taskViewCount; i++) { + int taskIndexFromFront = taskViewCount - i - 1; TaskView tv = taskViews.get(i); Task task = tv.getTask(); - TaskViewAnimation taskAnimation = new TaskViewAnimation( - animated ? taskViewExitToHomeDuration : 0, Interpolators.FAST_OUT_LINEAR_IN, - postAnimationTrigger.decrementOnAnimationEnd()); - postAnimationTrigger.increment(); + + // Animate the tasks down + AnimationProps taskAnimation; + if (animated) { + taskAnimation = new AnimationProps() + .setStartDelay(AnimationProps.ALPHA, i * FRAME_OFFSET_MS) + .setDuration(AnimationProps.ALPHA, EXIT_TO_HOME_ALPHA_DURATION) + .setDuration(AnimationProps.BOUNDS, EXIT_TO_HOME_TRANSLATION_DURATION + + (taskIndexFromFront * FRAME_OFFSET_MS)) + .setInterpolator(AnimationProps.BOUNDS, + EXIT_TO_HOME_TRANSLATION_INTERPOLATOR) + .setInterpolator(AnimationProps.ALPHA, + EXIT_TO_HOME_ALPHA_INTERPOLATOR) + .setListener(postAnimationTrigger.decrementOnAnimationEnd()); + postAnimationTrigger.increment(); + } else { + taskAnimation = AnimationProps.IMMEDIATE; + } stackLayout.getStackTransform(task, stackScroller.getStackScroll(), mTmpTransform, null); @@ -283,7 +312,7 @@ public class TaskStackAnimationHelper { screenPinningRequested, postAnimationTrigger); } else if (currentTaskOccludesLaunchTarget) { // Animate this task out of view - TaskViewAnimation taskAnimation = new TaskViewAnimation( + AnimationProps taskAnimation = new AnimationProps( taskViewExitToAppDuration, Interpolators.ALPHA_OUT, postAnimationTrigger.decrementOnAnimationEnd()); postAnimationTrigger.increment(); @@ -315,7 +344,7 @@ public class TaskStackAnimationHelper { deleteTaskView.setClipViewInStack(false); // Compose the new animation and transform and star the animation - TaskViewAnimation taskAnimation = new TaskViewAnimation(taskViewRemoveAnimDuration, + AnimationProps taskAnimation = new AnimationProps(taskViewRemoveAnimDuration, Interpolators.ALPHA_OUT, new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { @@ -352,7 +381,7 @@ public class TaskStackAnimationHelper { for (int i = taskViewCount - 1; i >= 0; i--) { TaskView tv = taskViews.get(i); Task task = tv.getTask(); - TaskViewAnimation taskAnimation = new TaskViewAnimation(startDelayIncr * i, + AnimationProps taskAnimation = new AnimationProps(startDelayIncr * i, historyTransitionDuration, Interpolators.FAST_OUT_SLOW_IN, postAnimationTrigger.decrementOnAnimationEnd()); postAnimationTrigger.increment(); @@ -381,7 +410,7 @@ public class TaskStackAnimationHelper { int taskViewCount = taskViews.size(); for (int i = taskViewCount - 1; i >= 0; i--) { TaskView tv = taskViews.get(i); - TaskViewAnimation taskAnimation = new TaskViewAnimation(startDelayIncr * i, + AnimationProps taskAnimation = new AnimationProps(startDelayIncr * i, historyTransitionDuration, Interpolators.FAST_OUT_SLOW_IN); stackLayout.getStackTransform(tv.getTask(), stackScroller.getStackScroll(), mTmpTransform, null); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 232b41648748..1c97b5a22ec7 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -16,6 +16,10 @@ package com.android.systemui.recents.views; +import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID; +import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID; +import static android.app.ActivityManager.StackId.INVALID_STACK_ID; + import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.content.ComponentName; @@ -34,9 +38,9 @@ import android.util.MutableBoolean; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; +import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; -import android.view.animation.Interpolator; import android.widget.FrameLayout; import com.android.systemui.Interpolators; @@ -85,10 +89,6 @@ import com.android.systemui.recents.model.TaskStack; import java.util.ArrayList; import java.util.List; -import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID; -import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID; -import static android.app.ActivityManager.StackId.INVALID_STACK_ID; - /* The visual representation of a task stack view */ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCallbacks, @@ -124,7 +124,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal ArrayList<TaskView> mTaskViews = new ArrayList<>(); ArrayList<TaskViewTransform> mCurrentTaskTransforms = new ArrayList<>(); ArraySet<Task.TaskKey> mIgnoreTasks = new ArraySet<>(); - TaskViewAnimation mDeferredTaskViewLayoutAnimation = null; + AnimationProps mDeferredTaskViewLayoutAnimation = null; DozeTrigger mUIDozeTrigger; Task mFocusedTask; @@ -135,6 +135,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal boolean mTaskViewsClipDirty = true; boolean mAwaitingFirstLayout = true; + boolean mInMeasureLayout = false; boolean mEnterAnimationComplete = false; boolean mTouchExplorationEnabled; boolean mScreenPinningEnabled; @@ -537,17 +538,17 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal if (tv == null) { tv = mViewPool.pickUpViewFromPool(task, task); if (task.isFreeformTask()) { - tv.updateViewPropertiesToTaskTransform(transform, TaskViewAnimation.IMMEDIATE, + tv.updateViewPropertiesToTaskTransform(transform, AnimationProps.IMMEDIATE, mRequestUpdateClippingListener); } else { if (Float.compare(transform.p, 0f) <= 0) { tv.updateViewPropertiesToTaskTransform( mLayoutAlgorithm.getBackOfStackTransform(), - TaskViewAnimation.IMMEDIATE, mRequestUpdateClippingListener); + AnimationProps.IMMEDIATE, mRequestUpdateClippingListener); } else { tv.updateViewPropertiesToTaskTransform( mLayoutAlgorithm.getFrontOfStackTransform(), - TaskViewAnimation.IMMEDIATE, mRequestUpdateClippingListener); + AnimationProps.IMMEDIATE, mRequestUpdateClippingListener); } } } else { @@ -580,9 +581,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal * animations that are current running on those task views, and will ensure that the children * {@link TaskView}s will match the set of visible tasks in the stack. * - * @see #relayoutTaskViews(TaskViewAnimation, ArraySet<Task.TaskKey>) + * @see #relayoutTaskViews(AnimationProps, ArraySet<Task.TaskKey>) */ - void relayoutTaskViews(TaskViewAnimation animation) { + void relayoutTaskViews(AnimationProps animation) { relayoutTaskViews(animation, mIgnoreTasks); } @@ -594,7 +595,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal * * @param ignoreTasksSet the set of tasks to ignore in the relayout */ - void relayoutTaskViews(TaskViewAnimation animation, ArraySet<Task.TaskKey> ignoreTasksSet) { + void relayoutTaskViews(AnimationProps animation, ArraySet<Task.TaskKey> ignoreTasksSet) { // If we had a deferred animation, cancel that mDeferredTaskViewLayoutAnimation = null; @@ -623,17 +624,17 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal /** * Posts an update to synchronize the {@link TaskView}s with the stack on the next frame. */ - void relayoutTaskViewsOnNextFrame(TaskViewAnimation animation) { + void relayoutTaskViewsOnNextFrame(AnimationProps animation) { mDeferredTaskViewLayoutAnimation = animation; invalidate(); } /** * Called to update a specific {@link TaskView} to a given {@link TaskViewTransform} with a - * given set of {@link TaskViewAnimation} properties. + * given set of {@link AnimationProps} properties. */ public void updateTaskViewToTransform(TaskView taskView, TaskViewTransform transform, - TaskViewAnimation animation) { + AnimationProps animation) { taskView.updateViewPropertiesToTaskTransform(transform, animation, mRequestUpdateClippingListener); } @@ -1137,6 +1138,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal */ @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + mInMeasureLayout = true; int width = MeasureSpec.getSize(widthMeasureSpec); int height = MeasureSpec.getSize(heightMeasureSpec); @@ -1159,22 +1161,29 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal mTmpTaskViews.addAll(mViewPool.getViews()); int taskViewCount = mTmpTaskViews.size(); for (int i = 0; i < taskViewCount; i++) { - TaskView tv = mTmpTaskViews.get(i); - if (tv.getBackground() != null) { - tv.getBackground().getPadding(mTmpRect); - } else { - mTmpRect.setEmpty(); - } - tv.measure( - MeasureSpec.makeMeasureSpec( - mLayoutAlgorithm.mTaskRect.width() + mTmpRect.left + mTmpRect.right, - MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec( - mLayoutAlgorithm.mTaskRect.height() + mTmpRect.top + mTmpRect.bottom, - MeasureSpec.EXACTLY)); + measureTaskView(mTmpTaskViews.get(i)); } setMeasuredDimension(width, height); + mInMeasureLayout = false; + } + + /** + * Measures a TaskView. + */ + private void measureTaskView(TaskView tv) { + if (tv.getBackground() != null) { + tv.getBackground().getPadding(mTmpRect); + } else { + mTmpRect.setEmpty(); + } + tv.measure( + MeasureSpec.makeMeasureSpec( + mLayoutAlgorithm.mTaskRect.width() + mTmpRect.left + mTmpRect.right, + MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec( + mLayoutAlgorithm.mTaskRect.height() + mTmpRect.top + mTmpRect.bottom, + MeasureSpec.EXACTLY)); } /** @@ -1190,15 +1199,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal mTmpTaskViews.addAll(mViewPool.getViews()); int taskViewCount = mTmpTaskViews.size(); for (int i = 0; i < taskViewCount; i++) { - TaskView tv = mTmpTaskViews.get(i); - if (tv.getBackground() != null) { - tv.getBackground().getPadding(mTmpRect); - } else { - mTmpRect.setEmpty(); - } - Rect taskRect = mLayoutAlgorithm.mTaskRect; - tv.layout(taskRect.left - mTmpRect.left, taskRect.top - mTmpRect.top, - taskRect.right + mTmpRect.right, taskRect.bottom + mTmpRect.bottom); + layoutTaskView(mTmpTaskViews.get(i)); } if (changed) { @@ -1207,29 +1208,41 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal } } // Relayout all of the task views including the ignored ones - relayoutTaskViews(TaskViewAnimation.IMMEDIATE, EMPTY_TASK_SET); + relayoutTaskViews(AnimationProps.IMMEDIATE, EMPTY_TASK_SET); clipTaskViews(); if (mAwaitingFirstLayout || !mEnterAnimationComplete) { mAwaitingFirstLayout = false; onFirstLayout(); - return; } } + /** + * Lays out a TaskView. + */ + private void layoutTaskView(TaskView tv) { + if (tv.getBackground() != null) { + tv.getBackground().getPadding(mTmpRect); + } else { + mTmpRect.setEmpty(); + } + Rect taskRect = mLayoutAlgorithm.mTaskRect; + tv.layout(taskRect.left - mTmpRect.left, taskRect.top - mTmpRect.top, + taskRect.right + mTmpRect.right, taskRect.bottom + mTmpRect.bottom); + } + /** Handler for the first layout. */ void onFirstLayout() { // Setup the view for the enter animation mAnimationHelper.prepareForEnterAnimation(); // Animate in the freeform workspace - animateFreeformWorkspaceBackgroundAlpha( - mLayoutAlgorithm.getStackState().freeformBackgroundAlpha, 150, - Interpolators.FAST_OUT_SLOW_IN); + int ffBgAlpha = mLayoutAlgorithm.getStackState().freeformBackgroundAlpha; + animateFreeformWorkspaceBackgroundAlpha(ffBgAlpha, new AnimationProps(150, + Interpolators.FAST_OUT_SLOW_IN)); // Set the task focused state without requesting view focus, and leave the focus animations // until after the enter-animation - Task launchTask = mStack.getLaunchTarget(); RecentsConfiguration config = Recents.getConfiguration(); RecentsActivityLaunchState launchState = config.getLaunchState(); int focusedTaskIndex = launchState.getInitialFocusTaskIndex(mStack.getTaskCount()); @@ -1274,7 +1287,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal } @Override - protected void dispatchDraw(Canvas canvas) { + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + // Draw the freeform workspace background SystemServicesProxy ssp = Recents.getSystemServices(); if (ssp.hasFreeformWorkspaceSupport()) { @@ -1282,8 +1297,6 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal mFreeformWorkspaceBackground.draw(canvas); } } - - super.dispatchDraw(canvas); } @Override @@ -1318,7 +1331,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal updateLayoutAlgorithm(true /* boundScroll */); // Animate all the tasks into place - relayoutTaskViews(new TaskViewAnimation(DEFAULT_SYNC_STACK_DURATION, + relayoutTaskViews(new AnimationProps(DEFAULT_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN)); } @@ -1327,7 +1340,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal */ @Override public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask, - Task newFrontMostTask, TaskViewAnimation animation) { + Task newFrontMostTask, AnimationProps animation) { if (mFocusedTask == removedTask) { resetFocusedTask(removedTask); } @@ -1364,7 +1377,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal @Override public void onHistoryTaskRemoved(TaskStack stack, Task removedTask, - TaskViewAnimation animation) { + AnimationProps animation) { // To be implemented } @@ -1404,7 +1417,21 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal // Add/attach the view to the hierarchy if (isNewView) { - addView(tv, insertIndex); + if (mInMeasureLayout) { + // If we are measuring the layout, then just add the view normally as it will be + // laid out during the layout pass + addView(tv, insertIndex); + } else { + // Otherwise, this is from a bindVisibleTaskViews() call outside the measure/layout + // pass, and we should layout the new child ourselves + ViewGroup.LayoutParams params = tv.getLayoutParams(); + if (params == null) { + params = generateDefaultLayoutParams(); + } + addViewInLayout(tv, insertIndex, params, true /* preventRequestLayout */); + measureTaskView(tv); + layoutTaskView(tv); + } } else { attachViewToParent(tv, insertIndex, tv.getLayoutParams()); } @@ -1463,14 +1490,14 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal public void onFocusStateChanged(float prevFocusState, float curFocusState) { if (mDeferredTaskViewLayoutAnimation == null) { mUIDozeTrigger.poke(); - relayoutTaskViewsOnNextFrame(TaskViewAnimation.IMMEDIATE); + relayoutTaskViewsOnNextFrame(AnimationProps.IMMEDIATE); } } /**** TaskStackViewScroller.TaskStackViewScrollerCallbacks ****/ @Override - public void onScrollChanged(float prevScroll, float curScroll, TaskViewAnimation animation) { + public void onScrollChanged(float prevScroll, float curScroll, AnimationProps animation) { mUIDozeTrigger.poke(); if (animation != null) { relayoutTaskViewsOnNextFrame(animation); @@ -1506,7 +1533,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal tv.dismissTask(); } else { // Otherwise, remove the task from the stack immediately - mStack.removeTask(t, TaskViewAnimation.IMMEDIATE); + mStack.removeTask(t, AnimationProps.IMMEDIATE); } } } @@ -1531,10 +1558,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal mAnimationHelper.startExitToHomeAnimation(event.animated, event.getAnimationTrigger()); // Dismiss the freeform workspace background - int taskViewExitToHomeDuration = getResources().getInteger( - R.integer.recents_task_exit_to_home_duration); - animateFreeformWorkspaceBackgroundAlpha(0, taskViewExitToHomeDuration, - Interpolators.FAST_OUT_SLOW_IN); + int taskViewExitToHomeDuration = TaskStackAnimationHelper.EXIT_TO_HOME_TRANSLATION_DURATION; + animateFreeformWorkspaceBackgroundAlpha(0, new AnimationProps(taskViewExitToHomeDuration, + Interpolators.FAST_OUT_SLOW_IN)); } public final void onBusEvent(DismissFocusedTaskViewEvent event) { @@ -1587,6 +1613,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal } public final void onBusEvent(DragStartEvent event) { + // Ensure that the drag task is not animated + addIgnoreTask(event.task); + if (event.task.isFreeformTask()) { // Animate to the front of the stack mStackScroller.animateScroll(mLayoutAlgorithm.mInitialScrollP, null); @@ -1599,7 +1628,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal mTmpTransform.scale = finalScale; mTmpTransform.translationZ = mLayoutAlgorithm.mMaxTranslationZ + 1; updateTaskViewToTransform(event.taskView, mTmpTransform, - new TaskViewAnimation(DRAG_SCALE_DURATION, Interpolators.FAST_OUT_SLOW_IN)); + new AnimationProps(DRAG_SCALE_DURATION, Interpolators.FAST_OUT_SLOW_IN)); } public final void onBusEvent(DragStartInitializeDropTargetsEvent event) { @@ -1611,7 +1640,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal } public final void onBusEvent(DragDropTargetChangedEvent event) { - TaskViewAnimation animation = new TaskViewAnimation(250, Interpolators.FAST_OUT_SLOW_IN); + AnimationProps animation = new AnimationProps(250, Interpolators.FAST_OUT_SLOW_IN); if (event.dropTarget instanceof TaskStack.DockState) { // Calculate the new task stack bounds that matches the window size that Recents will // have after the drop @@ -1683,10 +1712,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal mLayoutAlgorithm.getStackTransform(event.task, getScroller().getStackScroll(), mTmpTransform, null); event.getAnimationTrigger().increment(); - relayoutTaskViews(new TaskViewAnimation(DEFAULT_SYNC_STACK_DURATION, + relayoutTaskViews(new AnimationProps(DEFAULT_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN)); updateTaskViewToTransform(event.taskView, mTmpTransform, - new TaskViewAnimation(DEFAULT_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN, + new AnimationProps(DEFAULT_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN, event.getAnimationTrigger().decrementOnAnimationEnd())); removeIgnoreTask(event.task); } @@ -1797,15 +1826,15 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal R.string.accessibility_recents_item_dismissed, task.title)); // Remove the task from the stack - mStack.removeTask(task, new TaskViewAnimation(DEFAULT_SYNC_STACK_DURATION, + mStack.removeTask(task, new AnimationProps(DEFAULT_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN)); } /** * Starts an alpha animation on the freeform workspace background. */ - private void animateFreeformWorkspaceBackgroundAlpha(int targetAlpha, int duration, - Interpolator interpolator) { + private void animateFreeformWorkspaceBackgroundAlpha(int targetAlpha, + AnimationProps animation) { if (mFreeformWorkspaceBackground.getAlpha() == targetAlpha) { return; } @@ -1813,8 +1842,12 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal Utilities.cancelAnimationWithoutCallbacks(mFreeformWorkspaceBackgroundAnimator); mFreeformWorkspaceBackgroundAnimator = ObjectAnimator.ofInt(mFreeformWorkspaceBackground, Utilities.DRAWABLE_ALPHA, mFreeformWorkspaceBackground.getAlpha(), targetAlpha); - mFreeformWorkspaceBackgroundAnimator.setDuration(duration); - mFreeformWorkspaceBackgroundAnimator.setInterpolator(interpolator); + mFreeformWorkspaceBackgroundAnimator.setStartDelay( + animation.getDuration(AnimationProps.ALPHA)); + mFreeformWorkspaceBackgroundAnimator.setDuration( + animation.getDuration(AnimationProps.ALPHA)); + mFreeformWorkspaceBackgroundAnimator.setInterpolator( + animation.getInterpolator(AnimationProps.ALPHA)); mFreeformWorkspaceBackgroundAnimator.start(); } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java index ced5d4b500f4..c641d75c7bc8 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java @@ -38,7 +38,7 @@ public class TaskStackViewScroller { private static final boolean DEBUG = false; public interface TaskStackViewScrollerCallbacks { - void onScrollChanged(float prevScroll, float curScroll, TaskViewAnimation animation); + void onScrollChanged(float prevScroll, float curScroll, AnimationProps animation); } /** @@ -93,14 +93,14 @@ public class TaskStackViewScroller { * Sets the current stack scroll immediately. */ public void setStackScroll(float s) { - setStackScroll(s, TaskViewAnimation.IMMEDIATE); + setStackScroll(s, AnimationProps.IMMEDIATE); } /** * Sets the current stack scroll, but indicates to the callback the preferred animation to * update to this new scroll. */ - public void setStackScroll(float s, TaskViewAnimation animation) { + public void setStackScroll(float s, AnimationProps animation) { float prevStackScroll = mStackScrollP; mStackScrollP = s; if (mCb != null) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java index da99956d2a9c..b8b506800488 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java @@ -546,7 +546,7 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback { mTmpTransform.translationZ = fromTransform.translationZ + (toTransform.translationZ - fromTransform.translationZ) * dismissFraction; - mSv.updateTaskViewToTransform(tv, mTmpTransform, TaskViewAnimation.IMMEDIATE); + mSv.updateTaskViewToTransform(tv, mTmpTransform, AnimationProps.IMMEDIATE); } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java index 853f8688767f..703005f00a49 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java @@ -29,7 +29,6 @@ import android.graphics.Point; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; -import android.provider.Settings; import android.util.AttributeSet; import android.util.FloatProperty; import android.util.IntProperty; @@ -243,9 +242,9 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks } void updateViewPropertiesToTaskTransform(TaskViewTransform toTransform, - TaskViewAnimation toAnimation, ValueAnimator.AnimatorUpdateListener updateCallback) { + AnimationProps toAnimation, ValueAnimator.AnimatorUpdateListener updateCallback) { RecentsConfiguration config = Recents.getConfiguration(); - Utilities.cancelAnimationWithoutCallbacks(mTransformAnimation); + cancelTransformAnimation(); // Compose the animations for the transform mTmpAnimators.clear(); @@ -255,8 +254,8 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks setTaskProgress(toTransform.p); } // Manually call back to the animator listener and update callback - if (toAnimation.listener != null) { - toAnimation.listener.onAnimationEnd(null); + if (toAnimation.getListener() != null) { + toAnimation.getListener().onAnimationEnd(null); } if (updateCallback != null) { updateCallback.onAnimationUpdate(null); @@ -280,7 +279,7 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks /** Resets this view's properties */ void resetViewProperties() { - Utilities.cancelAnimationWithoutCallbacks(mTransformAnimation); + cancelTransformAnimation(); setDim(0); setVisibility(View.VISIBLE); getViewBounds().reset(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAnimation.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAnimation.java deleted file mode 100644 index 5455042241bc..000000000000 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAnimation.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) 2016 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.recents.views; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.view.animation.Interpolator; - -import com.android.systemui.Interpolators; - -import java.util.List; - -/** - * The animation properties to animate a {@link TaskView} to a given {@link TaskViewTransform}. - */ -public class TaskViewAnimation { - - public static final TaskViewAnimation IMMEDIATE = new TaskViewAnimation(0, - Interpolators.LINEAR); - - public final int startDelay; - public final int duration; - public final Interpolator interpolator; - public final Animator.AnimatorListener listener; - - public TaskViewAnimation(int duration, Interpolator interpolator) { - this(0 /* startDelay */, duration, interpolator, null); - } - - public TaskViewAnimation(int duration, Interpolator interpolator, - Animator.AnimatorListener listener) { - this(0 /* startDelay */, duration, interpolator, listener); - } - - public TaskViewAnimation(int startDelay, int duration, Interpolator interpolator) { - this(startDelay, duration, interpolator, null); - } - - public TaskViewAnimation(int startDelay, int duration, Interpolator interpolator, - Animator.AnimatorListener listener) { - this.startDelay = startDelay; - this.duration = duration; - this.interpolator = interpolator; - this.listener = listener; - } - - /** - * Creates a new {@link AnimatorSet} that will animate the given animators with the current - * animation properties. - */ - public AnimatorSet createAnimator(List<Animator> animators) { - AnimatorSet anim = new AnimatorSet(); - anim.setStartDelay(startDelay); - anim.setDuration(duration); - anim.setInterpolator(interpolator); - if (listener != null) { - anim.addListener(listener); - } - anim.playTogether(animators); - return anim; - } - - /** - * Returns whether this animation has any duration. - */ - public boolean isImmediate() { - return duration <= 0; - } -} diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java index 7cde46397a81..c91a833e943a 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java @@ -274,8 +274,8 @@ public class TaskViewHeader extends FrameLayout } @Override - protected void dispatchDraw(Canvas canvas) { - super.dispatchDraw(canvas); + public void onDrawForeground(Canvas canvas) { + super.onDrawForeground(canvas); // Draw the dim layer with the rounded corners canvas.drawRoundRect(0, 0, mTaskViewRect.width(), getHeight() + mCornerRadius, diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java index 85b7c82112a4..32878b0afcb7 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java @@ -154,13 +154,13 @@ public class TaskViewTransform { * Applies this transform to a view. */ public void applyToTaskView(TaskView v, ArrayList<Animator> animators, - TaskViewAnimation taskAnimation, boolean allowShadows) { + AnimationProps animation, boolean allowShadows) { // Return early if not visible if (!visible) { return; } - if (taskAnimation.isImmediate()) { + if (animation.isImmediate()) { if (allowShadows && hasTranslationZChangedFrom(v.getTranslationZ())) { v.setTranslationZ(translationZ); } @@ -177,23 +177,27 @@ public class TaskViewTransform { } } else { if (allowShadows && hasTranslationZChangedFrom(v.getTranslationZ())) { - animators.add(ObjectAnimator.ofFloat(v, View.TRANSLATION_Z, v.getTranslationZ(), - translationZ)); + ObjectAnimator anim = ObjectAnimator.ofFloat(v, View.TRANSLATION_Z, + v.getTranslationZ(), translationZ); + animators.add(animation.apply(AnimationProps.TRANSLATION_Z, anim)); } if (hasScaleChangedFrom(v.getScaleX())) { - animators.add(ObjectAnimator.ofPropertyValuesHolder(v, + ObjectAnimator anim = ObjectAnimator.ofPropertyValuesHolder(v, PropertyValuesHolder.ofFloat(View.SCALE_X, v.getScaleX(), scale), - PropertyValuesHolder.ofFloat(View.SCALE_Y, v.getScaleX(), scale))); + PropertyValuesHolder.ofFloat(View.SCALE_Y, v.getScaleX(), scale)); + animators.add(animation.apply(AnimationProps.SCALE, anim)); } if (hasAlphaChangedFrom(v.getAlpha())) { - animators.add(ObjectAnimator.ofFloat(v, View.ALPHA, v.getAlpha(), alpha)); + ObjectAnimator anim = ObjectAnimator.ofFloat(v, View.ALPHA, v.getAlpha(), alpha); + animators.add(animation.apply(AnimationProps.ALPHA, anim)); } if (hasRectChangedFrom(v)) { - animators.add(ObjectAnimator.ofPropertyValuesHolder(v, + ObjectAnimator anim = ObjectAnimator.ofPropertyValuesHolder(v, PropertyValuesHolder.ofInt(LEFT, v.getLeft(), (int) rect.left), PropertyValuesHolder.ofInt(TOP, v.getTop(), (int) rect.top), PropertyValuesHolder.ofInt(RIGHT, v.getRight(), (int) rect.right), - PropertyValuesHolder.ofInt(BOTTOM, v.getBottom(), (int) rect.bottom))); + PropertyValuesHolder.ofInt(BOTTOM, v.getBottom(), (int) rect.bottom)); + animators.add(animation.apply(AnimationProps.BOUNDS, anim)); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DismissView.java b/packages/SystemUI/src/com/android/systemui/statusbar/DismissView.java index d9276bf8592b..306771491714 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/DismissView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/DismissView.java @@ -17,14 +17,12 @@ package com.android.systemui.statusbar; import android.content.Context; -import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; import com.android.systemui.R; public class DismissView extends StackScrollerDecorView { - private boolean mDismissAllInProgress; private DismissViewButton mDismissButton; public DismissView(Context context, AttributeSet attrs) { @@ -53,27 +51,7 @@ public class DismissView extends StackScrollerDecorView { || touchY > mContent.getY() + mContent.getHeight(); } - public void showClearButton() { - mDismissButton.showButton(); - } - - public void setDismissAllInProgress(boolean dismissAllInProgress) { - if (dismissAllInProgress) { - setClipBounds(null); - } - mDismissAllInProgress = dismissAllInProgress; - } - - @Override - public void setClipBounds(Rect clipBounds) { - if (mDismissAllInProgress) { - // we don't want any clipping to happen! - return; - } - super.setClipBounds(clipBounds); - } - public boolean isButtonVisible() { - return mDismissButton.isButtonStatic(); + return mDismissButton.getAlpha() != 0.0f; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java index 46060f1f243b..b608d67e8eef 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/DismissViewButton.java @@ -17,22 +17,13 @@ package com.android.systemui.statusbar; import android.content.Context; -import android.graphics.Canvas; import android.graphics.Rect; -import android.graphics.drawable.AnimatedVectorDrawable; -import android.graphics.drawable.Drawable; import android.util.AttributeSet; -import android.view.View; import android.view.ViewGroup; -import android.widget.Button; -import com.android.systemui.R; import com.android.systemui.statusbar.stack.NotificationStackScrollLayout; -public class DismissViewButton extends Button { - private AnimatedVectorDrawable mAnimatedDismissDrawable; - private final Drawable mStaticDismissDrawable; - private Drawable mActiveDrawable; +public class DismissViewButton extends AlphaOptimizedButton { public DismissViewButton(Context context) { this(context, null); @@ -49,55 +40,6 @@ public class DismissViewButton extends Button { public DismissViewButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - mAnimatedDismissDrawable = (AnimatedVectorDrawable) getContext().getDrawable( - R.drawable.dismiss_all_shape_animation).mutate(); - mAnimatedDismissDrawable.setCallback(this); - mAnimatedDismissDrawable.setBounds(0, - 0, - mAnimatedDismissDrawable.getIntrinsicWidth(), - mAnimatedDismissDrawable.getIntrinsicHeight()); - mStaticDismissDrawable = getContext().getDrawable(R.drawable.dismiss_all_shape); - mStaticDismissDrawable.setBounds(0, - 0, - mStaticDismissDrawable.getIntrinsicWidth(), - mStaticDismissDrawable.getIntrinsicHeight()); - mStaticDismissDrawable.setCallback(this); - mActiveDrawable = mStaticDismissDrawable; - } - - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - canvas.save(); - int drawableHeight = mActiveDrawable.getBounds().height(); - boolean isRtl = (getLayoutDirection() == View.LAYOUT_DIRECTION_RTL); - int dx = isRtl ? getWidth() / 2 + drawableHeight / 2 : getWidth() / 2 - drawableHeight / 2; - canvas.translate(dx, getHeight() / 2.0f + drawableHeight / - 2.0f); - canvas.scale(isRtl ? -1.0f : 1.0f, -1.0f); - mActiveDrawable.draw(canvas); - canvas.restore(); - } - - @Override - public boolean performClick() { - if (!mAnimatedDismissDrawable.isRunning()) { - mActiveDrawable = mAnimatedDismissDrawable; - mAnimatedDismissDrawable.start(); - } - return super.performClick(); - } - - @Override - protected boolean verifyDrawable(Drawable who) { - return super.verifyDrawable(who) - || who == mAnimatedDismissDrawable - || who == mStaticDismissDrawable; - } - - @Override - public boolean hasOverlappingRendering() { - return false; } /** @@ -118,16 +60,4 @@ public class DismissViewButton extends Button { outRect.top += translationY; outRect.bottom += translationY; } - - public void showButton() { - mActiveDrawable = mStaticDismissDrawable; - invalidate(); - } - - /** - * @return Whether the button is currently static and not being animated. - */ - public boolean isButtonStatic() { - return mActiveDrawable == mStaticDismissDrawable; - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java index 00b9888d69b0..76e522e336ca 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java @@ -197,9 +197,13 @@ public class NotificationContentView extends FrameLayout { if (expandedSize != collapsedSize) { int paddingEnd = contractedHeader.getMeasuredWidth() - expandedSize; contractedHeader.setPadding( - isLayoutRtl() ? paddingEnd : contractedHeader.getPaddingLeft(), + contractedHeader.isLayoutRtl() + ? paddingEnd + : contractedHeader.getPaddingLeft(), contractedHeader.getPaddingTop(), - isLayoutRtl() ? contractedHeader.getPaddingLeft() : paddingEnd, + contractedHeader.isLayoutRtl() + ? contractedHeader.getPaddingLeft() + : paddingEnd, contractedHeader.getPaddingBottom()); contractedHeader.setShowWorkBadgeAtEnd(true); return true; @@ -208,9 +212,13 @@ public class NotificationContentView extends FrameLayout { int paddingEnd = mNotificationContentMarginEnd; if (contractedHeader.getPaddingEnd() != paddingEnd) { contractedHeader.setPadding( - isLayoutRtl() ? paddingEnd : contractedHeader.getPaddingLeft(), + contractedHeader.isLayoutRtl() + ? paddingEnd + : contractedHeader.getPaddingLeft(), contractedHeader.getPaddingTop(), - isLayoutRtl() ? contractedHeader.getPaddingLeft() : paddingEnd, + contractedHeader.isLayoutRtl() + ? contractedHeader.getPaddingLeft() + : paddingEnd, contractedHeader.getPaddingBottom()); contractedHeader.setShowWorkBadgeAtEnd(false); return true; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationHeaderUtil.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationHeaderUtil.java index 98a37f9bbb6d..c70aad2d4198 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationHeaderUtil.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationHeaderUtil.java @@ -74,8 +74,7 @@ public class NotificationHeaderUtil { } private void applyToChild(View view, boolean shouldApply, int originalColor) { - if (view.getVisibility() == View.VISIBLE - && originalColor != NotificationHeaderView.NO_COLOR) { + if (originalColor != NotificationHeaderView.NO_COLOR) { ImageView imageView = (ImageView) view; imageView.getDrawable().mutate(); if (shouldApply) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java index ec7393568395..81144d553685 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java @@ -107,12 +107,13 @@ public class HybridNotificationView extends AlphaOptimizedLinearLayout public void bind(CharSequence title, CharSequence text) { mTitleView.setText(title); - if (TextUtils.isEmpty(title)) { - mTitleView.setVisibility(GONE); - } - mTextView.setText(text); + mTitleView.setVisibility(TextUtils.isEmpty(title) ? GONE : VISIBLE); if (TextUtils.isEmpty(text)) { mTextView.setVisibility(GONE); + mTextView.setText(null); + } else { + mTextView.setVisibility(VISIBLE); + mTextView.setText(text.toString()); } requestLayout(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationViewManager.java index 285d53f2dc5a..28bb66f39572 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationViewManager.java @@ -18,8 +18,13 @@ package com.android.systemui.statusbar.notification; import android.app.Notification; import android.content.Context; +import android.text.BidiFormatter; +import android.text.Spannable; +import android.text.SpannableStringBuilder; import android.text.TextUtils; +import android.text.style.TextAppearanceSpan; import android.view.LayoutInflater; +import android.view.View; import android.view.ViewGroup; import com.android.systemui.R; @@ -34,12 +39,12 @@ public class HybridNotificationViewManager { private final Context mContext; private ViewGroup mParent; - private String mConcadenationString; + private String mDivider; public HybridNotificationViewManager(Context ctx, ViewGroup parent) { mContext = ctx; mParent = parent; - mConcadenationString = mContext.getString(R.string.group_summary_concadenation); + mDivider = " • "; } private HybridNotificationView inflateHybridView() { @@ -83,7 +88,7 @@ public class HybridNotificationViewManager { if (reusableView == null) { reusableView = inflateHybridView(); } - CharSequence summary = null; + SpannableStringBuilder summary = new SpannableStringBuilder(); int childCount = group.size(); for (int i = startIndex; i < childCount; i++) { ExpandableNotificationRow child = group.get(i); @@ -92,15 +97,18 @@ public class HybridNotificationViewManager { if (titleText == null) { continue; } - if (TextUtils.isEmpty(summary)) { - summary = titleText; - } else if (reusableView.isLayoutRtl()) { - summary = titleText + mConcadenationString + summary; - } else { - summary = summary + mConcadenationString + titleText; + if (!TextUtils.isEmpty(summary)) { + summary.append(mDivider, + new TextAppearanceSpan(mContext, R.style. + TextAppearance_Material_Notification_HybridNotificationDivider), + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } + summary.append(BidiFormatter.getInstance().unicodeWrap(titleText)); } - reusableView.bind(summary); + // We want to force the same orientation as the layout RTL mode + BidiFormatter formater = BidiFormatter.getInstance( + reusableView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL); + reusableView.bind(formater.unicodeWrap(summary)); return reusableView; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationBigTextTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationBigTextTemplateViewWrapper.java new file mode 100644 index 000000000000..487a7a03974e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationBigTextTemplateViewWrapper.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2016 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.statusbar.notification; + +import android.content.Context; +import android.service.notification.StatusBarNotification; +import android.view.View; + +import com.android.internal.widget.ImageFloatingTextView; +import com.android.systemui.statusbar.TransformableView; + +/** + * Wraps a notification containing a big text template + */ +public class NotificationBigTextTemplateViewWrapper extends NotificationTemplateViewWrapper { + + private ImageFloatingTextView mBigtext; + + protected NotificationBigTextTemplateViewWrapper(Context ctx, View view) { + super(ctx, view); + } + + private void resolveViews(StatusBarNotification notification) { + mBigtext = (ImageFloatingTextView) mView.findViewById(com.android.internal.R.id.big_text); + } + + @Override + public void notifyContentUpdated(StatusBarNotification notification) { + // Reinspect the notification. Before the super call, because the super call also updates + // the transformation types and we need to have our values set by then. + resolveViews(notification); + super.notifyContentUpdated(notification); + } + + @Override + protected void updateTransformedTypes() { + // This also clears the existing types + super.updateTransformedTypes(); + if (mBigtext != null) { + mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_TEXT, + mBigtext); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java index b060245a4fbb..0c21f0b2c962 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java @@ -55,11 +55,12 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp } TransformState otherState = notification.getCurrentState( TRANSFORMING_VIEW_TITLE); - CrossFadeHelper.fadeOut(mText, endRunnable); + final View text = ownState.getTransformedView(); + CrossFadeHelper.fadeOut(text, endRunnable); if (otherState != null) { int[] otherStablePosition = otherState.getLaidOutLocationOnScreen(); int[] ownPosition = ownState.getLaidOutLocationOnScreen(); - mText.animate() + text.animate() .translationY((otherStablePosition[1] + otherState.getTransformedView().getHeight() - ownPosition[1]) * 0.33f) @@ -72,11 +73,11 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp if (endRunnable != null) { endRunnable.run(); } - TransformState.setClippingDeactivated(mText, + TransformState.setClippingDeactivated(text, false); } }); - TransformState.setClippingDeactivated(mText, true); + TransformState.setClippingDeactivated(text, true); otherState.recycle(); } return true; @@ -90,17 +91,18 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp } TransformState otherState = notification.getCurrentState( TRANSFORMING_VIEW_TITLE); - boolean isVisible = mText.getVisibility() == View.VISIBLE; - CrossFadeHelper.fadeIn(mText); + final View text = ownState.getTransformedView(); + boolean isVisible = text.getVisibility() == View.VISIBLE; + CrossFadeHelper.fadeIn(text); if (otherState != null) { int[] otherStablePosition = otherState.getLaidOutLocationOnScreen(); int[] ownStablePosition = ownState.getLaidOutLocationOnScreen(); if (!isVisible) { - mText.setTranslationY((otherStablePosition[1] + text.setTranslationY((otherStablePosition[1] + otherState.getTransformedView().getHeight() - ownStablePosition[1]) * 0.33f); } - mText.animate() + text.animate() .translationY(0) .setDuration( StackStateAnimator.ANIMATION_DURATION_STANDARD) @@ -108,11 +110,11 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp .withEndAction(new Runnable() { @Override public void run() { - TransformState.setClippingDeactivated(mText, + TransformState.setClippingDeactivated(text, false); } }); - TransformState.setClippingDeactivated(mText, true); + TransformState.setClippingDeactivated(text, true); otherState.recycle(); } return true; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java index f50b9768d270..a2b4c5d24442 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java @@ -37,6 +37,8 @@ public abstract class NotificationViewWrapper implements TransformableView { if (v.getId() == com.android.internal.R.id.status_bar_latest_event_content) { if ("bigPicture".equals(v.getTag())) { return new NotificationBigPictureTemplateViewWrapper(ctx, v); + } else if ("bigText".equals(v.getTag())) { + return new NotificationBigTextTemplateViewWrapper(ctx, v); } return new NotificationTemplateViewWrapper(ctx, v); } else if (v instanceof NotificationHeaderView) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BaseStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BaseStatusBarHeader.java index 9a94d34f7ede..eade2a89447d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BaseStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BaseStatusBarHeader.java @@ -35,6 +35,7 @@ public abstract class BaseStatusBarHeader extends RelativeLayout implements public abstract int getCollapsedHeight(); public abstract int getExpandedHeight(); + public abstract void setExpanded(boolean b); public abstract void setExpansion(float headerExpansionFraction); public abstract void setListening(boolean listening); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java index 3130eb9c4c2d..d3681b72372b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java @@ -154,10 +154,14 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged } mBarState = newState; if (mBarState == StatusBarState.KEYGUARD) { - for (NotificationGroup group : mGroupMap.values()) { - if (group.expanded) { - setGroupExpanded(group, false); - } + collapseAllGroups(); + } + } + + public void collapseAllGroups() { + for (NotificationGroup group : mGroupMap.values()) { + if (group.expanded) { + setGroupExpanded(group, false); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java index cbb71c5d97e6..fd28b095c09d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.phone; import android.content.Context; +import android.content.res.Configuration; import android.graphics.Canvas; import android.util.AttributeSet; import android.view.View; @@ -55,6 +56,20 @@ public class NotificationsQuickSettingsContainer extends FrameLayout } @Override + protected void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + reloadWidth(mScrollView); + reloadWidth(mStackScroller); + } + + private void reloadWidth(View view) { + LayoutParams params = (LayoutParams) view.getLayoutParams(); + params.width = getContext().getResources().getDimensionPixelSize( + R.dimen.notification_panel_width); + view.setLayoutParams(params); + } + + @Override public WindowInsets onApplyWindowInsets(WindowInsets insets) { setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); return insets; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java index 9aeb1f8951be..fe463855020a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java @@ -31,7 +31,6 @@ import android.widget.ImageView; import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; - import com.android.keyguard.KeyguardStatusView; import com.android.systemui.R; import com.android.systemui.qs.QSPanel; @@ -74,6 +73,9 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements private float mDateTimeTranslation; private MultiUserSwitch mMultiUserSwitch; private ImageView mMultiUserAvatar; + private View mQsDetailHeaderBack; + + private final int[] mTmpInt2 = new int[2]; public QuickStatusBarHeader(Context context, AttributeSet attrs) { super(context, attrs); @@ -87,6 +89,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements mDateTimeTranslation = mContext.getResources().getDimension( R.dimen.qs_date_anim_translation); mDateTimeGroup = (ViewGroup) findViewById(R.id.date_time_group); + mDateTimeGroup.findViewById(R.id.empty_time_view).setVisibility(View.GONE); mExpandedGroup = (ViewGroup) findViewById(R.id.expanded_group); mHeaderQsPanel = (QuickQSPanel) findViewById(R.id.quick_qs_panel); @@ -100,6 +103,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements mQsDetailHeader = findViewById(R.id.qs_detail_header); mQsDetailHeader.setAlpha(0); + mQsDetailHeaderBack = mQsDetailHeader.findViewById(com.android.internal.R.id.up); mQsDetailHeaderTitle = (TextView) mQsDetailHeader.findViewById(android.R.id.title); mQsDetailHeaderSwitch = (Switch) mQsDetailHeader.findViewById(android.R.id.toggle); mQsDetailHeaderProgress = (ImageView) findViewById(R.id.qs_detail_header_progress); @@ -367,6 +371,15 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements } }); } + mQsDetailHeaderBack.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + v.getLocationInWindow(mTmpInt2); + mTmpInt2[0] += v.getWidth() / 2; + mTmpInt2[1] += v.getHeight() / 2; + mQsPanel.showDetailAdapter(false, null, mTmpInt2); + } + }); } else { mQsDetailHeader.setClickable(false); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java index 409dac102da1..5cfcd8981890 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.stack; import android.content.Context; +import android.content.res.Configuration; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -58,6 +59,7 @@ public class NotificationChildrenContainer extends ViewGroup { private HybridNotificationView mGroupOverflowContainer; private ViewState mGroupOverFlowState; private int mRealHeight; + private int mLayoutDirection = LAYOUT_DIRECTION_UNDEFINED; public NotificationChildrenContainer(Context context) { this(context, null); @@ -209,6 +211,16 @@ public class NotificationChildrenContainer extends ViewGroup { } } + @Override + protected void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + int layoutDirection = getLayoutDirection(); + if (layoutDirection != mLayoutDirection) { + updateGroupOverflow(); + mLayoutDirection = layoutDirection; + } + } + private View inflateDivider() { return LayoutInflater.from(mContext).inflate( R.layout.notification_children_divider, this, false); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index d6276b86e308..cc0e67df39cb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -1648,6 +1648,9 @@ public class NotificationStackScrollLayout extends ViewGroup bottom = (int) (lastView.getTranslationY() + lastView.getActualHeight()); bottom = Math.min(bottom, getHeight()); } + } else if (mPhoneStatusBar.getBarState() == StatusBarState.KEYGUARD) { + top = mTopPadding; + bottom = top; } mBackgroundBounds.top = Math.max(0, top); mBackgroundBounds.bottom = Math.min(getHeight(), bottom); @@ -2093,12 +2096,6 @@ public class NotificationStackScrollLayout extends ViewGroup generateAddAnimation(child, false /* fromMoreCard */); updateAnimationState(child); updateChronometerForChild(child); - if (canChildBeDismissed(child)) { - // Make sure the dismissButton is visible and not in the animated state. - // We need to do this to avoid a race where a clearable notification is added after the - // dismiss animation is finished - mDismissView.showClearButton(); - } } private void updateHideSensitiveForChild(View child) { @@ -2608,6 +2605,9 @@ public class NotificationStackScrollLayout extends ViewGroup mIsExpanded = isExpanded; mStackScrollAlgorithm.setIsExpanded(isExpanded); if (changed) { + if (!mIsExpanded) { + mGroupManager.collapseAllGroups(); + } updateNotificationAnimationStates(); updateChronometers(); } @@ -2977,7 +2977,6 @@ public class NotificationStackScrollLayout extends ViewGroup mDismissView.performVisibilityAnimation(false, dimissHideFinishRunnable); } else { dimissHideFinishRunnable.run(); - mDismissView.showClearButton(); } } } @@ -2985,7 +2984,6 @@ public class NotificationStackScrollLayout extends ViewGroup public void setDismissAllInProgress(boolean dismissAllInProgress) { mDismissAllInProgress = dismissAllInProgress; - mDismissView.setDismissAllInProgress(dismissAllInProgress); mAmbientState.setDismissAllInProgress(dismissAllInProgress); if (dismissAllInProgress) { disableClipOptimization(); diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java b/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java index 7b06393d4e4e..d8cf2e2bcbdc 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/ColorMatrixTile.java @@ -56,7 +56,7 @@ public class ColorMatrixTile extends QSTile<QSTile.State> implements DisplayCont } @Override - protected State newTileState() { + public State newTileState() { return new State(); } diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java index 6febe5fe8a4b..3e47d8571fad 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java @@ -32,11 +32,14 @@ import android.os.Handler; import android.os.RemoteException; import android.util.Log; +import com.android.systemui.Prefs; + import java.util.ArrayList; import java.util.List; import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID; import static android.app.ActivityManager.StackId.PINNED_STACK_ID; +import static com.android.systemui.Prefs.Key.TV_PICTURE_IN_PICTURE_ONBOARDING_SHOWN; /** * Manages the picture-in-picture (PIP) UI and states. @@ -44,6 +47,7 @@ import static android.app.ActivityManager.StackId.PINNED_STACK_ID; public class PipManager { private static final String TAG = "PipManager"; private static final boolean DEBUG = false; + private static final boolean DEBUG_FORCE_ONBOARDING = false; private static PipManager sPipManager; @@ -65,6 +69,7 @@ public class PipManager { private Rect mMenuModePipBound; private boolean mInitialized; private int mPipTaskId = TASK_ID_NO_PIP; + private boolean mOnboardingShown; private final Runnable mOnActivityPinnedRunnable = new Runnable() { @Override @@ -83,6 +88,7 @@ public class PipManager { if (DEBUG) Log.d(TAG, "PINNED_STACK:" + stackInfo); mPipTaskId = stackInfo.taskIds[stackInfo.taskIds.length - 1]; showPipOverlay(false); + launchPipOnboardingActivityIfNeeded(); } }; private final Runnable mOnTaskStackChanged = new Runnable() { @@ -145,6 +151,8 @@ public class PipManager { IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(Intent.ACTION_MEDIA_RESOURCE_GRANTED); mContext.registerReceiver(mBroadcastReceiver, intentFilter); + mOnboardingShown = Prefs.getBoolean( + mContext, TV_PICTURE_IN_PICTURE_ONBOARDING_SHOWN, false); } /** @@ -169,7 +177,7 @@ public class PipManager { } /** - * Closes PIP (PIPped activity and PIP system UI). + * Closes PIP (PIPed activity and PIP system UI). */ public void closePip() { mState = STATE_NO_PIP; @@ -194,7 +202,7 @@ public class PipManager { } /** - * Moves the PIPped activity to the fullscreen and closes PIP system UI. + * Moves the PIPed activity to the fullscreen and closes PIP system UI. */ public void movePipToFullscreen() { mState = STATE_NO_PIP; @@ -260,6 +268,17 @@ public class PipManager { mListeners.remove(listener); } + private void launchPipOnboardingActivityIfNeeded() { + if (DEBUG_FORCE_ONBOARDING || !mOnboardingShown) { + mOnboardingShown = true; + Prefs.putBoolean(mContext, TV_PICTURE_IN_PICTURE_ONBOARDING_SHOWN, true); + + Intent intent = new Intent(mContext, PipOnboardingActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mContext.startActivity(intent); + } + } + private boolean hasPipTasks() { try { StackInfo stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID); @@ -334,7 +353,7 @@ public class PipManager { */ public interface Listener { /** - * Invoked when a PIPped activity is closed. + * Invoked when a PIPed activity is closed. */ void onPipActivityClosed(); /** @@ -342,7 +361,7 @@ public class PipManager { */ void onShowPipMenu(); /** - * Invoked when the PIPped activity is returned back to the fullscreen. + * Invoked when the PIPed activity is returned back to the fullscreen. */ void onMoveToFullscreen(); } diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipOnboardingActivity.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipOnboardingActivity.java new file mode 100644 index 000000000000..a0b913ab9b2c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipOnboardingActivity.java @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2016 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.tv.pip; + +import android.app.Activity; +import android.os.Bundle; +import android.util.Log; +import android.view.View; + +import com.android.systemui.R; + +/** + * Activity to show an overlay on top of PIP activity to show how to pop up PIP menu. + */ +public class PipOnboardingActivity extends Activity implements PipManager.Listener { + private final PipManager mPipManager = PipManager.getInstance(); + + @Override + protected void onCreate(Bundle bundle) { + super.onCreate(bundle); + setContentView(R.layout.tv_pip_onboarding); + mPipManager.addListener(this); + findViewById(R.id.close).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mPipManager.removeListener(this); + } + + @Override + public void onPipActivityClosed() { + finish(); + } + + @Override + public void onShowPipMenu() { + finish(); + } + + @Override + public void onMoveToFullscreen() { + finish(); + } +} diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 697777c718a3..0e67a24748b8 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -342,5 +342,11 @@ message MetricsEvent { // QS Tile for Data Saver. QS_DATA_SAVER = 284; + + // OPEN: Settings > Security > User credentials + // CATEGORY: Settings + // OS: 6.1 + // GMS: 7.8.99 + USER_CREDENTIALS = 285; } } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityGestureDetector.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityGestureDetector.java index e31080150280..b79a7ba69b4e 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityGestureDetector.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityGestureDetector.java @@ -25,8 +25,11 @@ import android.gesture.GestureStore; import android.gesture.GestureStroke; import android.gesture.Prediction; import android.util.Slog; +import android.util.TypedValue; import android.view.GestureDetector; import android.view.MotionEvent; +import android.view.VelocityTracker; +import android.view.ViewConfiguration; import com.android.internal.R; @@ -46,7 +49,9 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen public interface Listener { public void onDoubleTapAndHold(MotionEvent event, int policyFlags); public boolean onDoubleTap(MotionEvent event, int policyFlags); - public boolean onGesture(int gestureId); + public boolean onGestureCompleted(int gestureId); + public void onGestureStarted(); + public void onGestureCancelled(MotionEvent event, int policyFlags); } private final Listener mListener; @@ -64,6 +69,10 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen // Indicates that motion events are being collected to match a gesture. private boolean mRecognizingGesture; + // Indicates that we've collected enough data to be sure it could be a + // gesture. + private boolean mGestureStarted; + // Indicates that motion events from the second pointer are being checked // for a double tap. private boolean mSecondFingerDoubleTap; @@ -75,11 +84,22 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen // Policy flags of the previous event. private int mPolicyFlags; - // The X of the previous event. - private float mPreviousX; + // These values track the previous point that was saved to use for gesture + // detection. They are only updated when the user moves more than the + // recognition threshold. + private float mPreviousGestureX; + private float mPreviousGestureY; + + // These values track the previous point that was used to determine if there + // was a transition into or out of gesture detection. They are updated when + // the user moves more than the detection threshold. + private float mBaseX; + private float mBaseY; + private long mBaseTime; - // The Y of the previous event. - private float mPreviousY; + // This is the calculated movement threshold used track if the user is still + // moving their finger. + private final float mGestureDetectionThreshold; // Buffer for storing points for gesture detection. private final ArrayList<GesturePoint> mStrokeBuffer = new ArrayList<GesturePoint>(100); @@ -90,6 +110,10 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen // The minimal score for accepting a predicted gesture. private static final float MIN_PREDICTION_SCORE = 2.0f; + private static final int GESTURE_CONFIRM_MM = 10; + private static final long CANCEL_ON_PAUSE_THRESHOLD_STARTED_MS = 1000; + private static final long CANCEL_ON_PAUSE_THRESHOLD_NOT_STARTED_MS = 500; + AccessibilityGestureDetector(Context context, Listener listener) { mListener = listener; @@ -100,11 +124,15 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen mGestureLibrary.setOrientationStyle(8 /* GestureStore.ORIENTATION_SENSITIVE_8 */); mGestureLibrary.setSequenceType(GestureStore.SEQUENCE_SENSITIVE); mGestureLibrary.load(); + + mGestureDetectionThreshold = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_MM, 1, + context.getResources().getDisplayMetrics()) * GESTURE_CONFIRM_MM; } public boolean onMotionEvent(MotionEvent event, int policyFlags) { final float x = event.getX(); final float y = event.getY(); + final long time = event.getEventTime(); mPolicyFlags = policyFlags; switch (event.getActionMasked()) { @@ -112,20 +140,56 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen mDoubleTapDetected = false; mSecondFingerDoubleTap = false; mRecognizingGesture = true; - mPreviousX = x; - mPreviousY = y; + mGestureStarted = false; + mPreviousGestureX = x; + mPreviousGestureY = y; mStrokeBuffer.clear(); - mStrokeBuffer.add(new GesturePoint(x, y, event.getEventTime())); + mStrokeBuffer.add(new GesturePoint(x, y, time)); + + mBaseX = x; + mBaseY = y; + mBaseTime = time; break; case MotionEvent.ACTION_MOVE: if (mRecognizingGesture) { - final float dX = Math.abs(x - mPreviousX); - final float dY = Math.abs(y - mPreviousY); + final float deltaX = mBaseX - x; + final float deltaY = mBaseY - y; + final double moveDelta = Math.hypot(deltaX, deltaY); + if (moveDelta > mGestureDetectionThreshold) { + // If the pointer has moved more than the threshold, + // update the stored values. + mBaseX = x; + mBaseY = y; + mBaseTime = time; + + // If this hasn't been confirmed as a gesture yet, send + // the event. + if (!mGestureStarted) { + mGestureStarted = true; + mListener.onGestureStarted(); + } + } else { + final long timeDelta = time - mBaseTime; + final long threshold = mGestureStarted ? + CANCEL_ON_PAUSE_THRESHOLD_STARTED_MS : + CANCEL_ON_PAUSE_THRESHOLD_NOT_STARTED_MS; + + // If the pointer hasn't moved for longer than the + // timeout, cancel gesture detection. + if (timeDelta > threshold) { + cancelGesture(); + mListener.onGestureCancelled(event, policyFlags); + return false; + } + } + + final float dX = Math.abs(x - mPreviousGestureX); + final float dY = Math.abs(y - mPreviousGestureY); if (dX >= TOUCH_TOLERANCE || dY >= TOUCH_TOLERANCE) { - mPreviousX = x; - mPreviousY = y; - mStrokeBuffer.add(new GesturePoint(x, y, event.getEventTime())); + mPreviousGestureX = x; + mPreviousGestureY = y; + mStrokeBuffer.add(new GesturePoint(x, y, time)); } } break; @@ -134,12 +198,13 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen if (maybeFinishDoubleTap(event, policyFlags)) { return true; } - if (mRecognizingGesture) { - mStrokeBuffer.add(new GesturePoint(x, y, event.getEventTime())); + if (mGestureStarted) { + mStrokeBuffer.add(new GesturePoint(x, y, time)); - if (recognizeGesture()) { - return true; + if (!recognizeGesture()) { + mListener.onGestureCancelled(event, policyFlags); } + return true; } break; @@ -152,7 +217,7 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen // If this was the second finger, attempt to recognize double // taps on it. mSecondFingerDoubleTap = true; - mSecondPointerDownTime = event.getEventTime(); + mSecondPointerDownTime = time; } else { // If there are more than two fingers down, stop watching // for a double tap. @@ -167,6 +232,10 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen return true; } break; + + case MotionEvent.ACTION_CANCEL: + clear(); + break; } // If we're detecting taps on the second finger, map events from the @@ -193,19 +262,14 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen mFirstTapDetected = false; mDoubleTapDetected = false; mSecondFingerDoubleTap = false; + mGestureStarted = false; cancelGesture(); - mStrokeBuffer.clear(); } public boolean firstTapDetected() { return mFirstTapDetected; } - public void cancelGesture() { - mRecognizingGesture = false; - mStrokeBuffer.clear(); - } - @Override public void onLongPress(MotionEvent e) { maybeSendLongPress(e, mPolicyFlags); @@ -251,6 +315,12 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen return mListener.onDoubleTap(event, policyFlags); } + private void cancelGesture() { + mRecognizingGesture = false; + mGestureStarted = false; + mStrokeBuffer.clear(); + } + private boolean recognizeGesture() { Gesture gesture = new Gesture(); gesture.addStroke(new GestureStroke(mStrokeBuffer)); @@ -265,7 +335,7 @@ class AccessibilityGestureDetector extends GestureDetector.SimpleOnGestureListen } try { final int gestureId = Integer.parseInt(bestPrediction.name); - if (mListener.onGesture(gestureId)) { + if (mListener.onGestureCompleted(gestureId)) { return true; } } catch (NumberFormatException nfe) { diff --git a/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java index ca30349867de..9e6cd002e889 100644 --- a/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java +++ b/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java @@ -25,7 +25,6 @@ import android.view.KeyEvent; import android.view.MotionEvent; import android.view.MotionEvent.PointerCoords; import android.view.MotionEvent.PointerProperties; -import android.view.VelocityTracker; import android.view.ViewConfiguration; import android.view.WindowManagerPolicy; import android.view.accessibility.AccessibilityEvent; @@ -87,9 +86,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe // Invalid pointer ID. private static final int INVALID_POINTER_ID = -1; - // The velocity above which we detect gestures. - private static final int GESTURE_DETECTION_VELOCITY_DIP = 1000; - // The minimal distance before we take the middle of the distance between // the two dragging pointers as opposed to use the location of the primary one. private static final int MIN_POINTER_DISTANCE_TO_USE_MIDDLE_LOCATION_DIP = 200; @@ -134,15 +130,9 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe // the two dragging pointers as opposed to use the location of the primary one. private final int mScaledMinPointerDistanceToUseMiddleLocation; - // The scaled velocity above which we detect gestures. - private final int mScaledGestureDetectionVelocity; - // The handler to which to delegate events. private EventStreamTransformation mNext; - // Helper to track gesture velocity. - private final VelocityTracker mVelocityTracker = VelocityTracker.obtain(); - // Helper class to track received pointers. private final ReceivedPointerTracker mReceivedPointerTracker; @@ -200,7 +190,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe final float density = context.getResources().getDisplayMetrics().density; mScaledMinPointerDistanceToUseMiddleLocation = (int) (MIN_POINTER_DISTANCE_TO_USE_MIDDLE_LOCATION_DIP * density); - mScaledGestureDetectionVelocity = (int) (GESTURE_DETECTION_VELOCITY_DIP * density); } @Override @@ -289,11 +278,19 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe mReceivedPointerTracker.onMotionEvent(rawEvent); - if (mGestureDetector.onMotionEvent(event, policyFlags)) { + // The motion detector is interested in the movements in physical space, + // so it uses the rawEvent to ignore magnification and other + // transformations. + if (mGestureDetector.onMotionEvent(rawEvent, policyFlags)) { // Event was handled by the gesture detector. return; } + if (event.getActionMasked() == MotionEvent.ACTION_CANCEL) { + clear(event, policyFlags); + return; + } + switch(mCurrentState) { case STATE_TOUCH_EXPLORING: { handleMotionEventStateTouchExploring(event, rawEvent, policyFlags); @@ -305,7 +302,7 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe handleMotionEventStateDelegating(event, policyFlags); } break; case STATE_GESTURE_DETECTING: { - handleMotionEventGestureDetecting(rawEvent, policyFlags); + // Already handled. } break; default: throw new IllegalStateException("Illegal state: " + mCurrentState); @@ -440,26 +437,50 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe } @Override - public boolean onGesture(int gestureId) { + public boolean onGestureCompleted(int gestureId) { if (mCurrentState != STATE_GESTURE_DETECTING) { return false; } - mAms.onTouchInteractionEnd(); - - // Announce the end of the gesture recognition. - sendAccessibilityEvent(AccessibilityEvent.TYPE_GESTURE_DETECTION_END); - // Announce the end of a the touch interaction. - sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); + endGestureDetection(); mAms.onGesture(gestureId); - mExitGestureDetectionModeDelayed.cancel(); - mCurrentState = STATE_TOUCH_EXPLORING; - return true; } + @Override + public void onGestureStarted() { + // We have to perform gesture detection, so + // clear the current state and try to detect. + mCurrentState = STATE_GESTURE_DETECTING; + mSendHoverEnterAndMoveDelayed.cancel(); + mSendHoverExitDelayed.cancel(); + mExitGestureDetectionModeDelayed.post(); + // Send accessibility event to announce the start + // of gesture recognition. + sendAccessibilityEvent(AccessibilityEvent.TYPE_GESTURE_DETECTION_START); + } + + @Override + public void onGestureCancelled(MotionEvent event, int policyFlags) { + if (mCurrentState == STATE_GESTURE_DETECTING) { + endGestureDetection(); + } else if (mCurrentState == STATE_TOUCH_EXPLORING) { + final int pointerId = mReceivedPointerTracker.getPrimaryPointerId(); + final int pointerIdBits = (1 << pointerId); + + // Cache the event until we discern exploration from gesturing. + mSendHoverEnterAndMoveDelayed.addEvent(event); + + // We have just decided that the user is touch, + // exploring so start sending events. + mSendHoverEnterAndMoveDelayed.forceSendAndRemove(); + mSendHoverExitDelayed.cancel(); + sendMotionEvent(event, MotionEvent.ACTION_HOVER_MOVE, pointerIdBits, policyFlags); + } + } + /** * Handles a motion event in touch exploring state. * @@ -471,8 +492,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe int policyFlags) { ReceivedPointerTracker receivedTracker = mReceivedPointerTracker; - mVelocityTracker.addMovement(rawEvent); - switch (event.getActionMasked()) { case MotionEvent.ACTION_DOWN: { mAms.onTouchInteractionStart(); @@ -525,46 +544,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe if (mSendHoverEnterAndMoveDelayed.isPending()) { // Cache the event until we discern exploration from gesturing. mSendHoverEnterAndMoveDelayed.addEvent(event); - - // It is *important* to use the distance traveled by the pointers - // on the screen which may or may not be magnified. - final float deltaX = receivedTracker.getReceivedPointerDownX(pointerId) - - rawEvent.getX(pointerIndex); - final float deltaY = receivedTracker.getReceivedPointerDownY(pointerId) - - rawEvent.getY(pointerIndex); - final double moveDelta = Math.hypot(deltaX, deltaY); - // The user has moved enough for us to decide. - if (moveDelta > mDoubleTapSlop) { - // Check whether the user is performing a gesture. We - // detect gestures if the pointer is moving above a - // given velocity. - mVelocityTracker.computeCurrentVelocity(1000); - final float maxAbsVelocity = Math.max( - Math.abs(mVelocityTracker.getXVelocity(pointerId)), - Math.abs(mVelocityTracker.getYVelocity(pointerId))); - if (maxAbsVelocity > mScaledGestureDetectionVelocity) { - // We have to perform gesture detection, so - // clear the current state and try to detect. - mCurrentState = STATE_GESTURE_DETECTING; - mVelocityTracker.clear(); - mSendHoverEnterAndMoveDelayed.cancel(); - mSendHoverExitDelayed.cancel(); - mExitGestureDetectionModeDelayed.post(); - // Send accessibility event to announce the start - // of gesture recognition. - sendAccessibilityEvent( - AccessibilityEvent.TYPE_GESTURE_DETECTION_START); - } else { - // We have just decided that the user is touch, - // exploring so start sending events. - mGestureDetector.cancelGesture(); - mSendHoverEnterAndMoveDelayed.forceSendAndRemove(); - mSendHoverExitDelayed.cancel(); - sendMotionEvent(event, MotionEvent.ACTION_HOVER_MOVE, - pointerIdBits, policyFlags); - } - break; - } } else { if (mTouchExplorationInProgress) { sendTouchExplorationGestureStartAndHoverEnterIfNeeded(policyFlags); @@ -602,11 +581,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe } } - // We know that a new state transition is to happen and the - // new state will not be gesture recognition, so cancel - // the gesture. - mGestureDetector.cancelGesture(); - if (isDraggingGesture(event)) { // Two pointers moving in the same direction within // a given distance perform a drag. @@ -620,7 +594,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe mCurrentState = STATE_DELEGATING; sendDownForAllNotInjectedPointers(event, policyFlags); } - mVelocityTracker.clear(); } break; default: { // More than one pointer so the user is not touch exploring @@ -639,7 +612,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe // More than two pointers are delegated to the view hierarchy. mCurrentState = STATE_DELEGATING; sendDownForAllNotInjectedPointers(event, policyFlags); - mVelocityTracker.clear(); } } } break; @@ -648,8 +620,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe final int pointerId = event.getPointerId(event.getActionIndex()); final int pointerIdBits = (1 << pointerId); - mVelocityTracker.clear(); - if (mSendHoverEnterAndMoveDelayed.isPending()) { // If we have not delivered the enter schedule an exit. mSendHoverExitDelayed.post(event, pointerIdBits, policyFlags); @@ -663,9 +633,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe } } break; - case MotionEvent.ACTION_CANCEL: { - clear(event, policyFlags); - } break; } } @@ -756,9 +723,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe } mCurrentState = STATE_TOUCH_EXPLORING; } break; - case MotionEvent.ACTION_CANCEL: { - clear(event, policyFlags); - } break; } } @@ -795,9 +759,6 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe mCurrentState = STATE_TOUCH_EXPLORING; } break; - case MotionEvent.ACTION_CANCEL: { - clear(event, policyFlags); - } break; default: { // Deliver the event. sendMotionEvent(event, event.getAction(), ALL_POINTER_ID_BITS, policyFlags); @@ -805,22 +766,16 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe } } - private void handleMotionEventGestureDetecting(MotionEvent event, int policyFlags) { - switch (event.getActionMasked()) { - case MotionEvent.ACTION_UP: { - mAms.onTouchInteractionEnd(); - // Announce the end of the gesture recognition. - sendAccessibilityEvent(AccessibilityEvent.TYPE_GESTURE_DETECTION_END); - // Announce the end of a the touch interaction. - sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); + private void endGestureDetection() { + mAms.onTouchInteractionEnd(); - mExitGestureDetectionModeDelayed.cancel(); - mCurrentState = STATE_TOUCH_EXPLORING; - } break; - case MotionEvent.ACTION_CANCEL: { - clear(event, policyFlags); - } break; - } + // Announce the end of the gesture recognition. + sendAccessibilityEvent(AccessibilityEvent.TYPE_GESTURE_DETECTION_END); + // Announce the end of a the touch interaction. + sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); + + mExitGestureDetectionModeDelayed.cancel(); + mCurrentState = STATE_TOUCH_EXPLORING; } /** diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index c535ebdc80a0..5e948b117b4e 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -2166,7 +2166,8 @@ public class BackupManagerService { try { ApplicationInfo app = pkg.applicationInfo; if (((app.flags&ApplicationInfo.FLAG_ALLOW_BACKUP) == 0) - || app.backupAgentName == null) { + || app.backupAgentName == null + || (app.flags&ApplicationInfo.FLAG_FULL_BACKUP_ONLY) != 0) { packages.remove(a); } else { diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index 5f57a7632db9..46671729a2ef 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -111,8 +111,9 @@ class AlarmManagerService extends SystemService { static final boolean WAKEUP_STATS = false; - private static final Intent NEXT_ALARM_CLOCK_CHANGED_INTENT = new Intent( - AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED); + private static final Intent NEXT_ALARM_CLOCK_CHANGED_INTENT = + new Intent(AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED) + .addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); final LocalLog mLog = new LocalLog(TAG); diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index c55c5b61c999..14ddc363f392 100644 --- a/services/core/java/com/android/server/LocationManagerService.java +++ b/services/core/java/com/android/server/LocationManagerService.java @@ -24,12 +24,12 @@ import com.android.internal.os.BackgroundThread; import com.android.server.location.ActivityRecognitionProxy; import com.android.server.location.FlpHardwareProvider; import com.android.server.location.FusedProxy; -import com.android.server.location.GnssLocationProvider; import com.android.server.location.GeocoderProxy; import com.android.server.location.GeofenceManager; import com.android.server.location.GeofenceProxy; -import com.android.server.location.GpsMeasurementsProvider; -import com.android.server.location.GpsNavigationMessageProvider; +import com.android.server.location.GnssLocationProvider; +import com.android.server.location.GnssMeasurementsProvider; +import com.android.server.location.GnssNavigationMessageProvider; import com.android.server.location.LocationBlacklist; import com.android.server.location.LocationFudger; import com.android.server.location.LocationProviderInterface; @@ -61,11 +61,11 @@ import android.location.Address; import android.location.Criteria; import android.location.GeocoderParams; import android.location.Geofence; +import android.location.IGnssMeasurementsListener; import android.location.IGnssStatusListener; import android.location.IGnssStatusProvider; import android.location.IGpsGeofenceHardware; -import android.location.IGpsMeasurementsListener; -import android.location.IGpsNavigationMessageListener; +import android.location.IGnssNavigationMessageListener; import android.location.ILocationListener; import android.location.ILocationManager; import android.location.INetInitiatedListener; @@ -162,8 +162,8 @@ public class LocationManagerService extends ILocationManager.Stub { private LocationWorkerHandler mLocationHandler; private PassiveProvider mPassiveProvider; // track passive provider for special cases private LocationBlacklist mBlacklist; - private GpsMeasurementsProvider mGpsMeasurementsProvider; - private GpsNavigationMessageProvider mGpsNavigationMessageProvider; + private GnssMeasurementsProvider mGnssMeasurementsProvider; + private GnssNavigationMessageProvider mGnssNavigationMessageProvider; private IGpsGeofenceHardware mGpsGeofenceProxy; // --- fields below are protected by mLock --- @@ -467,8 +467,8 @@ public class LocationManagerService extends ILocationManager.Stub { mNetInitiatedListener = gnssProvider.getNetInitiatedListener(); addProviderLocked(gnssProvider); mRealProviders.put(LocationManager.GPS_PROVIDER, gnssProvider); - mGpsMeasurementsProvider = gnssProvider.getGpsMeasurementsProvider(); - mGpsNavigationMessageProvider = gnssProvider.getGpsNavigationMessageProvider(); + mGnssMeasurementsProvider = gnssProvider.getGnssMeasurementsProvider(); + mGnssNavigationMessageProvider = gnssProvider.getGnssNavigationMessageProvider(); mGpsGeofenceProxy = gnssProvider.getGpsGeofenceProxy(); } @@ -994,7 +994,7 @@ public class LocationManagerService extends ILocationManager.Stub { */ @Override public int getGpsYearOfHardware() { - if (mGpsNavigationMessageProvider != null) { + if (mGnssNavigationMessageProvider != null) { return mGpsSystemInfoProvider.getGpsYearOfHardware(); } else { return 0; @@ -1923,8 +1923,8 @@ public class LocationManagerService extends ILocationManager.Stub { } @Override - public boolean addGpsMeasurementsListener( - IGpsMeasurementsListener listener, + public boolean addGnssMeasurementsListener( + IGnssMeasurementsListener listener, String packageName) { int allowedResolutionLevel = getCallerAllowedResolutionLevel(); checkResolutionLevelIsSufficientForProviderUse( @@ -1941,22 +1941,22 @@ public class LocationManagerService extends ILocationManager.Stub { Binder.restoreCallingIdentity(identity); } - if (!hasLocationAccess || mGpsMeasurementsProvider == null) { + if (!hasLocationAccess || mGnssMeasurementsProvider == null) { return false; } - return mGpsMeasurementsProvider.addListener(listener); + return mGnssMeasurementsProvider.addListener(listener); } @Override - public void removeGpsMeasurementsListener(IGpsMeasurementsListener listener) { - if (mGpsMeasurementsProvider != null) { - mGpsMeasurementsProvider.removeListener(listener); + public void removeGnssMeasurementsListener(IGnssMeasurementsListener listener) { + if (mGnssMeasurementsProvider != null) { + mGnssMeasurementsProvider.removeListener(listener); } } @Override - public boolean addGpsNavigationMessageListener( - IGpsNavigationMessageListener listener, + public boolean addGnssNavigationMessageListener( + IGnssNavigationMessageListener listener, String packageName) { int allowedResolutionLevel = getCallerAllowedResolutionLevel(); checkResolutionLevelIsSufficientForProviderUse( @@ -1973,16 +1973,16 @@ public class LocationManagerService extends ILocationManager.Stub { Binder.restoreCallingIdentity(identity); } - if (!hasLocationAccess || mGpsNavigationMessageProvider == null) { + if (!hasLocationAccess || mGnssNavigationMessageProvider == null) { return false; } - return mGpsNavigationMessageProvider.addListener(listener); + return mGnssNavigationMessageProvider.addListener(listener); } @Override - public void removeGpsNavigationMessageListener(IGpsNavigationMessageListener listener) { - if (mGpsNavigationMessageProvider != null) { - mGpsNavigationMessageProvider.removeListener(listener); + public void removeGnssNavigationMessageListener(IGnssNavigationMessageListener listener) { + if (mGnssNavigationMessageProvider != null) { + mGnssNavigationMessageProvider.removeListener(listener); } } diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index d0cd5365db15..81607a98c3d0 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -200,7 +200,7 @@ public class LockSettingsService extends ILockSettings.Stub { PendingIntent.FLAG_UPDATE_CURRENT); Notification notification = new Notification.Builder(mContext) - .setSmallIcon(com.android.internal.R.drawable.ic_secure) + .setSmallIcon(com.android.internal.R.drawable.ic_user_secure) .setWhen(0) .setOngoing(true) .setTicker(title) diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index 4a186a620cc1..3ce44526d17b 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -2817,8 +2817,9 @@ class MountService extends IMountService.Stub public ParcelFileDescriptor mountAppFuse(final String name) throws RemoteException { try { final int uid = Binder.getCallingUid(); + final int pid = Binder.getCallingPid(); final NativeDaemonEvent event = - mConnector.execute("appfuse", "mount", uid, name); + mConnector.execute("appfuse", "mount", uid, pid, name); if (event.getFileDescriptors() == null) { throw new RemoteException("AppFuse FD from vold is null."); } @@ -2830,7 +2831,7 @@ class MountService extends IMountService.Stub public void onClose(IOException e) { try { final NativeDaemonEvent event = mConnector.execute( - "appfuse", "unmount", uid, name); + "appfuse", "unmount", uid, pid, name); } catch (NativeDaemonConnectorException unmountException) { Log.e(TAG, "Failed to unmount appfuse."); } diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 143015f0f6ab..2683be66b347 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -4266,6 +4266,21 @@ public class AccountManagerService } } + private boolean isPermitted(String opPackageName, int callingUid, String... permissions) { + for (String perm : permissions) { + if (mContext.checkCallingOrSelfPermission(perm) == PackageManager.PERMISSION_GRANTED) { + if (Log.isLoggable(TAG, Log.VERBOSE)) { + Log.v(TAG, " caller uid " + callingUid + " has " + perm); + } + final int opCode = AppOpsManager.permissionToOpCode(perm); + if (opCode == AppOpsManager.OP_NONE || mAppOpsManager.noteOp( + opCode, callingUid, opPackageName) == AppOpsManager.MODE_ALLOWED) { + return true; + } + } + } + return false; + } private int handleIncomingUser(int userId) { try { @@ -4340,53 +4355,12 @@ public class AccountManagerService private List<String> getTypesVisibleToCaller(int callingUid, int userId, String opPackageName) { - List<String> permissionsToCheck = new ArrayList<String>(2); - permissionsToCheck.add(Manifest.permission.GET_ACCOUNTS_PRIVILEGED); - long id = Binder.clearCallingIdentity(); - try { - ApplicationInfo appInfo = mPackageManager.getApplicationInfo( - opPackageName, 0 /* flags */); - /* - * At or before SDK 23, clients discover all the accounts in their - * user profile (via AccountManager.getAccounts(...)) by declaring - * the GET_ACCOUNTS permission. - * - * After SDK 23 the GET_ACCOUNTS permission is deprecated. Instead - * apps will be able to retrieve those accounts managed by - * authenticators sharing a package signature without any special - * permissions. The only clients able to discover all the accounts - * on the device will be those with the GET_ACCOUNTS_PRVILEGED - * system permission. - */ - if (23 >= appInfo.targetSdkVersion) { - permissionsToCheck.add(Manifest.permission.GET_ACCOUNTS); - } - } catch (NameNotFoundException e) { - // No application associated with the specified package. - Log.w(TAG, "No application associated with package: " + opPackageName); - } finally { - Binder.restoreCallingIdentity(id); - } - boolean isPermitted = isPermitted(opPackageName, callingUid, permissionsToCheck); + boolean isPermitted = + isPermitted(opPackageName, callingUid, Manifest.permission.GET_ACCOUNTS, + Manifest.permission.GET_ACCOUNTS_PRIVILEGED); return getTypesForCaller(callingUid, userId, isPermitted); } - private boolean isPermitted(String opPackageName, int callingUid, List<String> permissions) { - for (String perm : permissions) { - if (mContext.checkCallingOrSelfPermission(perm) == PackageManager.PERMISSION_GRANTED) { - if (Log.isLoggable(TAG, Log.VERBOSE)) { - Log.v(TAG, " caller uid " + callingUid + " has " + perm); - } - final int opCode = AppOpsManager.permissionToOpCode(perm); - if (opCode == AppOpsManager.OP_NONE || mAppOpsManager.noteOp( - opCode, callingUid, opPackageName) == AppOpsManager.MODE_ALLOWED) { - return true; - } - } - } - return false; - } - private List<String> getTypesManagedByCaller(int callingUid, int userId) { return getTypesForCaller(callingUid, userId, false); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ba5bb396c5ca..072249f5928b 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5303,28 +5303,41 @@ public final class ActivityManagerService extends ActivityManagerNative @Override public void killAllBackgroundProcesses() { + killAllBackgroundProcesses(-1); + } + + /** + * Kills all background processes with targetSdkVersion below the specified + * target SDK version. + * + * @param targetSdkVersion the target SDK version below which to kill + * processes, or {@code -1} to kill all processes + */ + private void killAllBackgroundProcesses(int targetSdkVersion) { if (checkCallingPermission(android.Manifest.permission.KILL_BACKGROUND_PROCESSES) != PackageManager.PERMISSION_GRANTED) { - String msg = "Permission Denial: killAllBackgroundProcesses() from pid=" - + Binder.getCallingPid() - + ", uid=" + Binder.getCallingUid() + final String msg = "Permission Denial: killAllBackgroundProcesses() from pid=" + + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid() + " requires " + android.Manifest.permission.KILL_BACKGROUND_PROCESSES; Slog.w(TAG, msg); throw new SecurityException(msg); } - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { - synchronized(this) { - ArrayList<ProcessRecord> procs = new ArrayList<ProcessRecord>(); + synchronized (this) { + final ArrayList<ProcessRecord> procs = new ArrayList<>(); final int NP = mProcessNames.getMap().size(); - for (int ip=0; ip<NP; ip++) { - SparseArray<ProcessRecord> apps = mProcessNames.getMap().valueAt(ip); + for (int ip = 0; ip < NP; ip++) { + final SparseArray<ProcessRecord> apps = mProcessNames.getMap().valueAt(ip); final int NA = apps.size(); - for (int ia=0; ia<NA; ia++) { - ProcessRecord app = apps.valueAt(ia); + for (int ia = 0; ia < NA; ia++) { + final ProcessRecord app = apps.valueAt(ia); if (app.persistent) { - // we don't kill persistent processes + // We don't kill persistent processes. + continue; + } + if (targetSdkVersion > 0 && app.info.targetSdkVersion < targetSdkVersion) { continue; } if (app.removed) { @@ -5336,11 +5349,13 @@ public final class ActivityManagerService extends ActivityManagerNative } } - int N = procs.size(); - for (int i=0; i<N; i++) { + final int N = procs.size(); + for (int i = 0; i < N; i++) { removeProcessLocked(procs.get(i), false, true, "kill all background"); } + mAllowLowerMemLevel = true; + updateOomAdjLocked(); doLowMemReportIfNeededLocked(null); } @@ -17805,6 +17820,11 @@ public final class ActivityManagerService extends ActivityManagerNative mHandler.sendMessage(msg); } + final boolean isDensityChange = (changes & ActivityInfo.CONFIG_DENSITY) != 0; + if (isDensityChange) { + killAllBackgroundProcesses(Build.VERSION_CODES.N); + } + for (int i=mLruProcesses.size()-1; i>=0; i--) { ProcessRecord app = mLruProcesses.get(i); try { @@ -18080,7 +18100,7 @@ public final class ActivityManagerService extends ActivityManagerNative if (app == TOP_APP) { // The last app on the list is the foreground app. adj = ProcessList.FOREGROUND_APP_ADJ; - schedGroup = Process.THREAD_GROUP_DEFAULT; + schedGroup = Process.THREAD_GROUP_TOP_APP; app.adjType = "top-activity"; foregroundActivities = true; procState = PROCESS_STATE_CUR_TOP; diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 3ad6b8329e87..90a7da977355 100755 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -18,6 +18,7 @@ package com.android.server.am; import static android.app.ActivityManager.StackId; import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID; +import static android.app.ActivityManager.StackId.PINNED_STACK_ID; import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS; import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE; import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_AND_PIPABLE; @@ -409,15 +410,40 @@ final class ActivityRecord { } void scheduleConfigurationChanged(Configuration config, boolean reportToActivity) { - if (app != null && app.thread != null) { - try { - if (DEBUG_CONFIGURATION) Slog.v(TAG, "Sending new config to " + this + " " + - "reportToActivity=" + reportToActivity + " and config: " + config); - app.thread.scheduleActivityConfigurationChanged( - appToken, new Configuration(config), reportToActivity); - } catch (RemoteException e) { - // If process died, whatever. - } + if (app == null || app.thread == null) { + return; + } + try { + if (DEBUG_CONFIGURATION) Slog.v(TAG, "Sending new config to " + this + " " + + "reportToActivity=" + reportToActivity + " and config: " + config); + app.thread.scheduleActivityConfigurationChanged( + appToken, new Configuration(config), reportToActivity); + } catch (RemoteException e) { + // If process died, whatever. + } + } + + void scheduleMultiWindowChanged() { + if (task == null || task.stack == null || app == null || app.thread == null) { + return; + } + try { + // An activity is considered to be in multi-window mode if its task isn't fullscreen. + app.thread.scheduleMultiWindowChanged(appToken, !task.mFullscreen); + } catch (Exception e) { + // If process died, I don't care. + } + } + + void schedulePictureInPictureChanged() { + if (task == null || task.stack == null || app == null || app.thread == null) { + return; + } + try { + app.thread.schedulePictureInPictureChanged( + appToken, task.stack.mStackId == PINNED_STACK_ID); + } catch (Exception e) { + // If process died, no one cares. } } @@ -584,13 +610,16 @@ final class ActivityRecord { haveState = true; if (aInfo != null) { + // If the class name in the intent doesn't match that of the target, this is + // probably an alias. We have to create a new ComponentName object to keep track + // of the real activity name, so that FLAG_ACTIVITY_CLEAR_TOP is handled properly. if (aInfo.targetActivity == null - || aInfo.launchMode == ActivityInfo.LAUNCH_MULTIPLE - || aInfo.launchMode == ActivityInfo.LAUNCH_SINGLE_TOP) { + || (aInfo.targetActivity.equals(_intent.getComponent().getClassName()) + && (aInfo.launchMode == ActivityInfo.LAUNCH_MULTIPLE + || aInfo.launchMode == ActivityInfo.LAUNCH_SINGLE_TOP))) { realActivity = _intent.getComponent(); } else { - realActivity = new ComponentName(aInfo.packageName, - aInfo.targetActivity); + realActivity = new ComponentName(aInfo.packageName, aInfo.targetActivity); } taskAffinity = aInfo.taskAffinity; stateNotNeeded = (aInfo.flags& diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 0e970b3fb827..5a0c1c1bcd72 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -395,6 +395,13 @@ final class ActivityStack { mTaskPositioner.setDisplay(activityDisplay.mDisplay); mTaskPositioner.configure(mBounds); } + + if (mStackId == DOCKED_STACK_ID) { + // If we created a docked stack we want to resize it so it resizes all other stacks + // in the system. + mStackSupervisor.resizeDockedStackLocked( + mBounds, null, null, null, null, PRESERVE_WINDOWS); + } } void detachDisplay() { @@ -4827,7 +4834,7 @@ final class ActivityStack { private void postAddTask(TaskRecord task, ActivityStack prevStack) { if (prevStack != null) { - task.reportPictureInPictureChangeIfNeeded(prevStack); + mStackSupervisor.scheduleReportPictureInPictureChangedIfNeeded(task, prevStack); } else if (task.voiceSession != null) { try { task.voiceSession.taskStarted(task.intent, task.taskId); @@ -4886,7 +4893,7 @@ final class ActivityStack { r.setTask(task, null); task.addActivityToTop(r); setAppTask(r, task); - task.reportPictureInPictureChangeIfNeeded(prevStack); + mStackSupervisor.scheduleReportPictureInPictureChangedIfNeeded(task, prevStack); moveToFrontAndResumeStateIfNeeded(r, wasFocused, wasResumed, "moveActivityToStack"); if (wasResumed) { prevStack.mResumedActivity = null; diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index c41caa805b8c..95bc95a8767a 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -203,6 +203,8 @@ public final class ActivityStackSupervisor implements DisplayListener { static final int CONTAINER_CALLBACK_TASK_LIST_EMPTY = FIRST_SUPERVISOR_STACK_MSG + 11; static final int LAUNCH_TASK_BEHIND_COMPLETE = FIRST_SUPERVISOR_STACK_MSG + 12; static final int SHOW_LOCK_TASK_ESCAPE_MESSAGE_MSG = FIRST_SUPERVISOR_STACK_MSG + 13; + static final int REPORT_MULTI_WINDOW_MODE_CHANGED_MSG = FIRST_SUPERVISOR_STACK_MSG + 14; + static final int REPORT_PIP_MODE_CHANGED_MSG = FIRST_SUPERVISOR_STACK_MSG + 15; private static final String VIRTUAL_DISPLAY_BASE_NAME = "ActivityViewVirtualDisplay"; @@ -322,6 +324,14 @@ public final class ActivityStackSupervisor implements DisplayListener { /** List of activities that are in the process of going to sleep. */ final ArrayList<ActivityRecord> mGoingToSleepActivities = new ArrayList<>(); + /** List of activities whose multi-window mode changed that we need to report to the + * application */ + final ArrayList<ActivityRecord> mMultiWindowModeChangedActivities = new ArrayList<>(); + + /** List of activities whose picture-in-picture mode changed that we need to report to the + * application */ + final ArrayList<ActivityRecord> mPipModeChangedActivities = new ArrayList<>(); + /** Used on user changes */ final ArrayList<UserState> mStartingUsers = new ArrayList<>(); @@ -1979,7 +1989,7 @@ public final class ActivityStackSupervisor implements DisplayListener { // We get the bounds to use from window manager which has been adjusted for any // screen controls and is also the same for all stacks. mWindowManager.getStackDockedModeBounds( - HOME_STACK_ID, tempRect, true /* ignoreVisibilityOnKeyguardShowing */); + HOME_STACK_ID, tempRect, true /* ignoreVisibility */); for (int i = FIRST_STATIC_STACK_ID; i <= LAST_STATIC_STACK_ID; i++) { if (StackId.isResizeableByDockedStack(i)) { ActivityStack otherStack = getStack(i); @@ -2246,29 +2256,34 @@ public final class ActivityStackSupervisor implements DisplayListener { // during the relaunch. If we end up not doing any relaunch, we clear the flags later. mWindowManager.setReplacingWindow(topActivity.appToken, animate); } - final int preferredLaunchStackId = stackId; - final ActivityStack stack = moveTaskToStackUncheckedLocked( - task, stackId, toTop, forceFocus, "moveTaskToStack:" + reason); - stackId = stack.mStackId; - - if (!animate) { - stack.mNoAnimActivities.add(topActivity); - } + mWindowManager.deferSurfaceLayout(); + final int preferredLaunchStackId = stackId; boolean kept = true; + try { + final ActivityStack stack = moveTaskToStackUncheckedLocked( + task, stackId, toTop, forceFocus, "moveTaskToStack:" + reason); + stackId = stack.mStackId; - // We might trigger a configuration change. Save the current task bounds for freezing. - mWindowManager.prepareFreezingTaskBounds(stack.mStackId); + if (!animate) { + stack.mNoAnimActivities.add(topActivity); + } + + // We might trigger a configuration change. Save the current task bounds for freezing. + mWindowManager.prepareFreezingTaskBounds(stack.mStackId); - // Make sure the task has the appropriate bounds/size for the stack it is in. - if (stackId == FULLSCREEN_WORKSPACE_STACK_ID && task.mBounds != null) { - kept = resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !mightReplaceWindow); - } else if (stackId == FREEFORM_WORKSPACE_STACK_ID - && task.mBounds == null && task.mLastNonFullscreenBounds != null) { - kept = resizeTaskLocked(task, task.mLastNonFullscreenBounds, - RESIZE_MODE_SYSTEM, !mightReplaceWindow); - } else if (stackId == DOCKED_STACK_ID || stackId == PINNED_STACK_ID) { - kept = resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !mightReplaceWindow); + // Make sure the task has the appropriate bounds/size for the stack it is in. + if (stackId == FULLSCREEN_WORKSPACE_STACK_ID && task.mBounds != null) { + kept = resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !mightReplaceWindow); + } else if (stackId == FREEFORM_WORKSPACE_STACK_ID + && task.mBounds == null && task.mLastNonFullscreenBounds != null) { + kept = resizeTaskLocked(task, task.mLastNonFullscreenBounds, + RESIZE_MODE_SYSTEM, !mightReplaceWindow); + } else if (stackId == DOCKED_STACK_ID || stackId == PINNED_STACK_ID) { + kept = resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !mightReplaceWindow); + } + } finally { + mWindowManager.continueSurfaceLayout(); } if (mightReplaceWindow) { @@ -3390,6 +3405,38 @@ public final class ActivityStackSupervisor implements DisplayListener { mActivityMetricsLogger.logWindowState(); } + void scheduleReportMultiWindowChanged(TaskRecord task) { + for (int i = task.mActivities.size() - 1; i >= 0; i--) { + final ActivityRecord r = task.mActivities.get(i); + if (r.app != null && r.app.thread != null) { + mMultiWindowModeChangedActivities.add(r); + } + } + + if (!mHandler.hasMessages(REPORT_MULTI_WINDOW_MODE_CHANGED_MSG)) { + mHandler.sendEmptyMessage(REPORT_MULTI_WINDOW_MODE_CHANGED_MSG); + } + } + + void scheduleReportPictureInPictureChangedIfNeeded(TaskRecord task, ActivityStack prevStack) { + final ActivityStack stack = task.stack; + if (prevStack == null || prevStack == stack + || (prevStack.mStackId != PINNED_STACK_ID && stack.mStackId != PINNED_STACK_ID)) { + return; + } + + for (int i = task.mActivities.size() - 1; i >= 0; i--) { + final ActivityRecord r = task.mActivities.get(i); + if (r.app != null && r.app.thread != null) { + mPipModeChangedActivities.add(r); + } + } + + if (!mHandler.hasMessages(REPORT_PIP_MODE_CHANGED_MSG)) { + mHandler.sendEmptyMessage(REPORT_PIP_MODE_CHANGED_MSG); + } + } + private final class ActivityStackSupervisorHandler extends Handler { public ActivityStackSupervisorHandler(Looper looper) { @@ -3405,6 +3452,22 @@ public final class ActivityStackSupervisor implements DisplayListener { @Override public void handleMessage(Message msg) { switch (msg.what) { + case REPORT_MULTI_WINDOW_MODE_CHANGED_MSG: { + synchronized (mService) { + for (int i = mMultiWindowModeChangedActivities.size() - 1; i >= 0; i--) { + final ActivityRecord r = mMultiWindowModeChangedActivities.remove(i); + r.scheduleMultiWindowChanged(); + } + } + } break; + case REPORT_PIP_MODE_CHANGED_MSG: { + synchronized (mService) { + for (int i = mPipModeChangedActivities.size() - 1; i >= 0; i--) { + final ActivityRecord r = mPipModeChangedActivities.remove(i); + r.schedulePictureInPictureChanged(); + } + } + } break; case IDLE_TIMEOUT_MSG: { if (DEBUG_IDLE) Slog.d(TAG_IDLE, "handleMessage: IDLE_TIMEOUT_MSG: r=" + msg.obj); diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index 98eebeaca953..b360b897d1ee 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1416,9 +1416,7 @@ class ActivityStarter { if (mLaunchBounds != null) { final int stackId = mTargetStack.mStackId; if (StackId.resizeStackWithLaunchBounds(stackId)) { - mSupervisor.resizeStackLocked(stackId, mLaunchBounds, - null /* tempTaskBounds */, null /* tempTaskInsetBounds */, - !PRESERVE_WINDOWS, true /* allowResizeInDockedMode */); + mService.resizeStack(stackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE); } else { mStartActivity.task.updateOverrideConfiguration(mLaunchBounds); } @@ -1506,9 +1504,7 @@ class ActivityStarter { stackId = stack.mStackId; } if (StackId.resizeStackWithLaunchBounds(stackId)) { - mSupervisor.resizeStackLocked(stackId, mLaunchBounds, - null /* tempTaskBounds */, null /* tempTaskInsetBounds */, - !PRESERVE_WINDOWS, true /* allowResizeInDockedMode */); + mService.resizeStack(stackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE); } } mTargetStack = mInTask.stack; diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index f39ab2fa98ee..a7d948c9a695 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -1320,7 +1320,7 @@ final class TaskRecord { } if (mFullscreen != oldFullscreen) { - reportMultiWindowChange(); + mService.mStackSupervisor.scheduleReportMultiWindowChanged(this); } return !mOverrideConfig.equals(oldConfig) ? mOverrideConfig : null; @@ -1375,40 +1375,6 @@ final class TaskRecord { return bounds; } - private void reportMultiWindowChange() { - for (int i = mActivities.size() - 1; i >= 0; i--) { - final ActivityRecord r = mActivities.get(i); - if (r.app != null && r.app.thread != null) { - try { - // An activity is consider to be in multi-window mode if its task isn't - // fullscreen. - r.app.thread.scheduleMultiWindowChanged(r.appToken, !mFullscreen); - } catch (Exception e) { - Slog.e(TAG, "TaskRecord.reportMultiWindowChange: ", e); - } - } - } - } - - void reportPictureInPictureChangeIfNeeded(ActivityStack prevStack) { - if (prevStack == null || prevStack == stack - || (prevStack.mStackId != PINNED_STACK_ID && stack.mStackId != PINNED_STACK_ID)) { - return; - } - - for (int i = mActivities.size() - 1; i >= 0; i--) { - final ActivityRecord r = mActivities.get(i); - if (r.app != null && r.app.thread != null) { - try { - r.app.thread.schedulePictureInPictureChanged( - r.appToken, stack.mStackId == PINNED_STACK_ID); - } catch (Exception e) { - Slog.e(TAG, "TaskRecord.reportPictureInPictureChangeIfNeeded: ", e); - } - } - } - } - /** Updates the task's bounds and override configuration to match what is expected for the * input stack. */ void updateOverrideConfigurationForStack(ActivityStack inStack) { diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 64c0891fde4f..548f563bd6af 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -3889,8 +3889,29 @@ public class AudioService extends IAudioService.Stub { int index; if (mIsMuted) { index = 0; - } else if (((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported) - || ((device & mFullVolumeDevices) != 0)) { + } else if ((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported) { + /* Special handling for Bluetooth Absolute Volume scenario + * If we send full audio gain, some accessories are too loud even at its lowest + * volume. We are not able to enumerate all such accessories, so here is the + * workaround from phone side. + * For the lowest volume steps 1 and 2, restrict audio gain to 50% and 75%. + * For volume step 0, set audio gain to 0 as some accessories won't mute on their end. + */ + int i = (getIndex(device) + 5)/10; + if (i == 0) { + // 0% for volume 0 + index = 0; + } else if (i == 1) { + // 50% for volume 1 + index = (int)(mIndexMax * 0.5) /10; + } else if (i == 2) { + // 75% for volume 2 + index = (int)(mIndexMax * 0.75) /10; + } else { + // otherwise, full gain + index = (mIndexMax + 5)/10; + } + } else if ((device & mFullVolumeDevices) != 0) { index = (mIndexMax + 5)/10; } else { index = (getIndex(device) + 5)/10; diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java index 91d4c9e36c1a..daf839a59e1b 100644 --- a/services/core/java/com/android/server/content/SyncManager.java +++ b/services/core/java/com/android/server/content/SyncManager.java @@ -600,9 +600,18 @@ public class SyncManager { null, null); } - Intent startServiceIntent = new Intent(mContext, SyncJobService.class); + // Set up the communication channel between the scheduled job and the sync manager. + // This is posted to the *main* looper intentionally, to defer calling startService() + // until after the lengthy primary boot sequence completes on that thread, to avoid + // spurious ANR triggering. + final Intent startServiceIntent = new Intent(mContext, SyncJobService.class); startServiceIntent.putExtra(SyncJobService.EXTRA_MESSENGER, new Messenger(mSyncHandler)); - mContext.startService(startServiceIntent); + new Handler(mContext.getMainLooper()).post(new Runnable() { + @Override + public void run() { + mContext.startService(startServiceIntent); + } + }); } private boolean isDeviceProvisioned() { diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java index 9798e56237e5..ffc52b31a7d5 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -38,8 +38,8 @@ import android.location.FusedBatchOptions; import android.location.GnssStatus; import android.location.IGnssStatusListener; import android.location.IGnssStatusProvider; -import android.location.GpsMeasurementsEvent; -import android.location.GpsNavigationMessageEvent; +import android.location.GnssMeasurementsEvent; +import android.location.GnssNavigationMessageEvent; import android.location.IGpsGeofenceHardware; import android.location.ILocationManager; import android.location.INetInitiatedListener; @@ -368,8 +368,8 @@ public class GnssLocationProvider implements LocationProviderInterface { private Location mLocation = new Location(LocationManager.GPS_PROVIDER); private Bundle mLocationExtras = new Bundle(); private final GnssStatusListenerHelper mListenerHelper; - private final GpsMeasurementsProvider mGpsMeasurementsProvider; - private final GpsNavigationMessageProvider mGpsNavigationMessageProvider; + private final GnssMeasurementsProvider mGnssMeasurementsProvider; + private final GnssNavigationMessageProvider mGnssNavigationMessageProvider; // Handler for processing events private Handler mHandler; @@ -428,12 +428,12 @@ public class GnssLocationProvider implements LocationProviderInterface { return mGpsGeofenceBinder; } - public GpsMeasurementsProvider getGpsMeasurementsProvider() { - return mGpsMeasurementsProvider; + public GnssMeasurementsProvider getGnssMeasurementsProvider() { + return mGnssMeasurementsProvider; } - public GpsNavigationMessageProvider getGpsNavigationMessageProvider() { - return mGpsNavigationMessageProvider; + public GnssNavigationMessageProvider getGnssNavigationMessageProvider() { + return mGnssNavigationMessageProvider; } /** @@ -713,7 +713,7 @@ public class GnssLocationProvider implements LocationProviderInterface { } }; - mGpsMeasurementsProvider = new GpsMeasurementsProvider(mHandler) { + mGnssMeasurementsProvider = new GnssMeasurementsProvider(mHandler) { @Override public boolean isAvailableInPlatform() { return native_is_measurement_supported(); @@ -735,7 +735,7 @@ public class GnssLocationProvider implements LocationProviderInterface { } }; - mGpsNavigationMessageProvider = new GpsNavigationMessageProvider(mHandler) { + mGnssNavigationMessageProvider = new GnssNavigationMessageProvider(mHandler) { @Override protected boolean isAvailableInPlatform() { return native_is_navigation_message_supported(); @@ -1087,8 +1087,8 @@ public class GnssLocationProvider implements LocationProviderInterface { native_set_agps_server(AGPS_TYPE_C2K, mC2KServerHost, mC2KServerPort); } - mGpsMeasurementsProvider.onGpsEnabledChanged(); - mGpsNavigationMessageProvider.onGpsEnabledChanged(); + mGnssMeasurementsProvider.onGpsEnabledChanged(); + mGnssNavigationMessageProvider.onGpsEnabledChanged(); } else { synchronized (mLock) { mEnabled = false; @@ -1123,8 +1123,8 @@ public class GnssLocationProvider implements LocationProviderInterface { // do this before releasing wakelock native_cleanup(); - mGpsMeasurementsProvider.onGpsEnabledChanged(); - mGpsNavigationMessageProvider.onGpsEnabledChanged(); + mGnssMeasurementsProvider.onGpsEnabledChanged(); + mGnssNavigationMessageProvider.onGpsEnabledChanged(); } @Override @@ -1655,15 +1655,15 @@ public class GnssLocationProvider implements LocationProviderInterface { /** * called from native code - Gps measurements callback */ - private void reportMeasurementData(GpsMeasurementsEvent event) { - mGpsMeasurementsProvider.onMeasurementsAvailable(event); + private void reportMeasurementData(GnssMeasurementsEvent event) { + mGnssMeasurementsProvider.onMeasurementsAvailable(event); } /** * called from native code - GPS navigation message callback */ - private void reportNavigationMessage(GpsNavigationMessageEvent event) { - mGpsNavigationMessageProvider.onNavigationMessageAvailable(event); + private void reportNavigationMessage(GnssNavigationMessageEvent event) { + mGnssNavigationMessageProvider.onNavigationMessageAvailable(event); } /** @@ -1677,9 +1677,9 @@ public class GnssLocationProvider implements LocationProviderInterface { requestUtcTime(); } - mGpsMeasurementsProvider.onCapabilitiesUpdated( + mGnssMeasurementsProvider.onCapabilitiesUpdated( (capabilities & GPS_CAPABILITY_MEASUREMENTS) == GPS_CAPABILITY_MEASUREMENTS); - mGpsNavigationMessageProvider.onCapabilitiesUpdated( + mGnssNavigationMessageProvider.onCapabilitiesUpdated( (capabilities & GPS_CAPABILITY_NAV_MESSAGES) == GPS_CAPABILITY_NAV_MESSAGES); } diff --git a/services/core/java/com/android/server/location/GpsMeasurementsProvider.java b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java index b327ca260668..d9e8e91989bb 100644 --- a/services/core/java/com/android/server/location/GpsMeasurementsProvider.java +++ b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java @@ -16,8 +16,8 @@ package com.android.server.location; -import android.location.GpsMeasurementsEvent; -import android.location.IGpsMeasurementsListener; +import android.location.GnssMeasurementsEvent; +import android.location.IGnssMeasurementsListener; import android.os.Handler; import android.os.RemoteException; import android.util.Log; @@ -29,27 +29,27 @@ import android.util.Log; * * @hide */ -public abstract class GpsMeasurementsProvider - extends RemoteListenerHelper<IGpsMeasurementsListener> { - private static final String TAG = "GpsMeasurementsProvider"; +public abstract class GnssMeasurementsProvider + extends RemoteListenerHelper<IGnssMeasurementsListener> { + private static final String TAG = "GnssMeasurementsProvider"; - protected GpsMeasurementsProvider(Handler handler) { + protected GnssMeasurementsProvider(Handler handler) { super(handler, TAG); } - public void onMeasurementsAvailable(final GpsMeasurementsEvent event) { - ListenerOperation<IGpsMeasurementsListener> operation = - new ListenerOperation<IGpsMeasurementsListener>() { + public void onMeasurementsAvailable(final GnssMeasurementsEvent event) { + ListenerOperation<IGnssMeasurementsListener> operation = + new ListenerOperation<IGnssMeasurementsListener>() { @Override - public void execute(IGpsMeasurementsListener listener) throws RemoteException { - listener.onGpsMeasurementsReceived(event); + public void execute(IGnssMeasurementsListener listener) throws RemoteException { + listener.onGnssMeasurementsReceived(event); } }; foreach(operation); } - public void onCapabilitiesUpdated(boolean isGpsMeasurementsSupported) { - setSupported(isGpsMeasurementsSupported); + public void onCapabilitiesUpdated(boolean isGnssMeasurementsSupported) { + setSupported(isGnssMeasurementsSupported); updateResult(); } @@ -60,19 +60,19 @@ public abstract class GpsMeasurementsProvider } @Override - protected ListenerOperation<IGpsMeasurementsListener> getHandlerOperation(int result) { + protected ListenerOperation<IGnssMeasurementsListener> getHandlerOperation(int result) { int status; switch (result) { case RESULT_SUCCESS: - status = GpsMeasurementsEvent.STATUS_READY; + status = GnssMeasurementsEvent.STATUS_READY; break; case RESULT_NOT_AVAILABLE: case RESULT_NOT_SUPPORTED: case RESULT_INTERNAL_ERROR: - status = GpsMeasurementsEvent.STATUS_NOT_SUPPORTED; + status = GnssMeasurementsEvent.STATUS_NOT_SUPPORTED; break; case RESULT_GPS_LOCATION_DISABLED: - status = GpsMeasurementsEvent.STATUS_GPS_LOCATION_DISABLED; + status = GnssMeasurementsEvent.STATUS_GPS_LOCATION_DISABLED; break; case RESULT_UNKNOWN: return null; @@ -84,7 +84,7 @@ public abstract class GpsMeasurementsProvider } private static class StatusChangedOperation - implements ListenerOperation<IGpsMeasurementsListener> { + implements ListenerOperation<IGnssMeasurementsListener> { private final int mStatus; public StatusChangedOperation(int status) { @@ -92,7 +92,7 @@ public abstract class GpsMeasurementsProvider } @Override - public void execute(IGpsMeasurementsListener listener) throws RemoteException { + public void execute(IGnssMeasurementsListener listener) throws RemoteException { listener.onStatusChanged(mStatus); } } diff --git a/services/core/java/com/android/server/location/GpsNavigationMessageProvider.java b/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java index e6bbe56187d5..57bce4b0fbd7 100644 --- a/services/core/java/com/android/server/location/GpsNavigationMessageProvider.java +++ b/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java @@ -16,8 +16,8 @@ package com.android.server.location; -import android.location.GpsNavigationMessageEvent; -import android.location.IGpsNavigationMessageListener; +import android.location.GnssNavigationMessageEvent; +import android.location.IGnssNavigationMessageListener; import android.os.Handler; import android.os.RemoteException; import android.util.Log; @@ -29,28 +29,28 @@ import android.util.Log; * * @hide */ -public abstract class GpsNavigationMessageProvider - extends RemoteListenerHelper<IGpsNavigationMessageListener> { - private static final String TAG = "GpsNavigationMessageProvider"; +public abstract class GnssNavigationMessageProvider + extends RemoteListenerHelper<IGnssNavigationMessageListener> { + private static final String TAG = "GnssNavigationMessageProvider"; - protected GpsNavigationMessageProvider(Handler handler) { + protected GnssNavigationMessageProvider(Handler handler) { super(handler, TAG); } - public void onNavigationMessageAvailable(final GpsNavigationMessageEvent event) { - ListenerOperation<IGpsNavigationMessageListener> operation = - new ListenerOperation<IGpsNavigationMessageListener>() { + public void onNavigationMessageAvailable(final GnssNavigationMessageEvent event) { + ListenerOperation<IGnssNavigationMessageListener> operation = + new ListenerOperation<IGnssNavigationMessageListener>() { @Override - public void execute(IGpsNavigationMessageListener listener) + public void execute(IGnssNavigationMessageListener listener) throws RemoteException { - listener.onGpsNavigationMessageReceived(event); + listener.onGnssNavigationMessageReceived(event); } }; foreach(operation); } - public void onCapabilitiesUpdated(boolean isGpsNavigationMessageSupported) { - setSupported(isGpsNavigationMessageSupported); + public void onCapabilitiesUpdated(boolean isGnssNavigationMessageSupported) { + setSupported(isGnssNavigationMessageSupported); updateResult(); } @@ -61,19 +61,19 @@ public abstract class GpsNavigationMessageProvider } @Override - protected ListenerOperation<IGpsNavigationMessageListener> getHandlerOperation(int result) { + protected ListenerOperation<IGnssNavigationMessageListener> getHandlerOperation(int result) { int status; switch (result) { case RESULT_SUCCESS: - status = GpsNavigationMessageEvent.STATUS_READY; + status = GnssNavigationMessageEvent.STATUS_READY; break; case RESULT_NOT_AVAILABLE: case RESULT_NOT_SUPPORTED: case RESULT_INTERNAL_ERROR: - status = GpsNavigationMessageEvent.STATUS_NOT_SUPPORTED; + status = GnssNavigationMessageEvent.STATUS_NOT_SUPPORTED; break; case RESULT_GPS_LOCATION_DISABLED: - status = GpsNavigationMessageEvent.STATUS_GPS_LOCATION_DISABLED; + status = GnssNavigationMessageEvent.STATUS_GPS_LOCATION_DISABLED; break; case RESULT_UNKNOWN: return null; @@ -85,7 +85,7 @@ public abstract class GpsNavigationMessageProvider } private static class StatusChangedOperation - implements ListenerOperation<IGpsNavigationMessageListener> { + implements ListenerOperation<IGnssNavigationMessageListener> { private final int mStatus; public StatusChangedOperation(int status) { @@ -93,7 +93,7 @@ public abstract class GpsNavigationMessageProvider } @Override - public void execute(IGpsNavigationMessageListener listener) throws RemoteException { + public void execute(IGnssNavigationMessageListener listener) throws RemoteException { listener.onStatusChanged(mStatus); } } diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 5c7707968a46..7f8099e77f7a 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -192,7 +192,7 @@ import java.util.List; * enforcement. */ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { - private static final String TAG = "NetworkPolicy"; + static final String TAG = "NetworkPolicy"; private static final boolean LOGD = false; private static final boolean LOGV = false; @@ -255,6 +255,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { private static final int MSG_RESTRICT_BACKGROUND_CHANGED = 6; private static final int MSG_ADVISE_PERSIST_THRESHOLD = 7; private static final int MSG_SCREEN_ON_CHANGED = 8; + private static final int MSG_RESTRICT_BACKGROUND_WHITELIST_CHANGED = 9; private final Context mContext; private final IActivityManager mActivityManager; @@ -1688,6 +1689,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } writePolicy = true; } + updateRulesForGlobalChangeLocked(true); // Remove associated UID policies int[] uids = new int[0]; @@ -1861,9 +1863,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { Slog.i(TAG, "adding uid " + uid + " to restrict background whitelist"); synchronized (mRulesLock) { mRestrictBackgroundWhitelistUids.append(uid, true); + updateRulesForGlobalChangeLocked(true); writePolicyLocked(); - // TODO: call other update methods like updateNetworkRulesLocked? } + mHandler.obtainMessage(MSG_RESTRICT_BACKGROUND_WHITELIST_CHANGED, uid, 0).sendToTarget(); } @Override @@ -1873,11 +1876,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { synchronized (mRulesLock) { removeRestrictBackgroundWhitelistedUidLocked(uid, true); } + mHandler.obtainMessage(MSG_RESTRICT_BACKGROUND_WHITELIST_CHANGED, uid, 0).sendToTarget(); } - private void removeRestrictBackgroundWhitelistedUidLocked(int uid, boolean writePolicy) { + private void removeRestrictBackgroundWhitelistedUidLocked(int uid, boolean updateNow) { mRestrictBackgroundWhitelistUids.delete(uid); - if (writePolicy) { + if (updateNow) { + updateRulesForGlobalChangeLocked(true); writePolicyLocked(); } } @@ -2571,6 +2576,25 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } } mListeners.finishBroadcast(); + final Intent intent = + new Intent(ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED); + intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); + mContext.sendBroadcastAsUser(intent, UserHandle.ALL); + return true; + } + case MSG_RESTRICT_BACKGROUND_WHITELIST_CHANGED: { + final int uid = msg.arg1; + final PackageManager pm = mContext.getPackageManager(); + final String[] packages = pm.getPackagesForUid(uid); + final int userId = UserHandle.getUserId(uid); + for (String packageName : packages) { + final Intent intent = + new Intent(ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED); + intent.setPackage(packageName); + intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); + mContext.sendBroadcastAsUser(intent, UserHandle.of(userId)); + } + return true; } case MSG_ADVISE_PERSIST_THRESHOLD: { diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java b/services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java index 7b1accafc673..281c3d0a5acb 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java @@ -16,18 +16,24 @@ package com.android.server.net; +import static com.android.server.net.NetworkPolicyManagerService.TAG; + import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.List; -import android.content.Intent; import android.net.INetworkPolicyManager; +import android.net.NetworkPolicy; +import android.os.Binder; import android.os.RemoteException; import android.os.ShellCommand; +import android.util.Log; -public class NetworkPolicyManagerShellCommand extends ShellCommand { +class NetworkPolicyManagerShellCommand extends ShellCommand { final INetworkPolicyManager mInterface; - NetworkPolicyManagerShellCommand(NetworkPolicyManagerService service) { + NetworkPolicyManagerShellCommand(INetworkPolicyManager service) { mInterface = service; } @@ -65,16 +71,24 @@ public class NetworkPolicyManagerShellCommand extends ShellCommand { pw.println(" help"); pw.println(" Print this help text."); pw.println(""); + pw.println(" add restrict-background-whitelist UID"); + pw.println(" Adds a UID to the whitelist for restrict background usage."); + pw.println(" get metered-network ID"); + pw.println(" Checks whether the given non-mobile network is metered or not."); pw.println(" get restrict-background"); pw.println(" Gets the global restrict background usage status."); - pw.println(" set restrict-background BOOLEAN"); - pw.println(" Sets the global restrict background usage status."); + pw.println(" list metered-networks [BOOLEAN]"); + pw.println(" Lists all non-mobile networks and whether they are metered or not."); + pw.println(" If a boolean argument is passed, filters just the metered (or unmetered)"); + pw.println(" networks."); pw.println(" list restrict-background-whitelist"); - pw.println(" Prints UID that are whitelisted for restrict background usage."); - pw.println(" add restrict-background-whitelist UID"); - pw.println(" Adds a UID to the whitelist for restrict background usage."); + pw.println(" Lists UIDs that are whitelisted for restrict background usage."); pw.println(" remove restrict-background-whitelist UID"); pw.println(" Removes a UID from the whitelist for restrict background usage."); + pw.println(" set metered-network ID BOOLEAN"); + pw.println(" Toggles whether the given non-mobile network is metered."); + pw.println(" set restrict-background BOOLEAN"); + pw.println(" Sets the global restrict background usage status."); } private int runGet() throws RemoteException { @@ -85,8 +99,10 @@ public class NetworkPolicyManagerShellCommand extends ShellCommand { return -1; } switch(type) { + case "metered-network": + return getNonMobileMeteredNetwork(); case "restrict-background": - return getRestrictBackgroundWhitelist(); + return getRestrictBackground(); } pw.println("Error: unknown get type '" + type + "'"); return -1; @@ -100,8 +116,10 @@ public class NetworkPolicyManagerShellCommand extends ShellCommand { return -1; } switch(type) { + case "metered-network": + return setNonMobileMeteredNetwork(); case "restrict-background": - return setRestrictBackgroundWhitelist(); + return setRestrictBackground(); } pw.println("Error: unknown set type '" + type + "'"); return -1; @@ -115,6 +133,8 @@ public class NetworkPolicyManagerShellCommand extends ShellCommand { return -1; } switch(type) { + case "metered-networks": + return listNonMobileMeteredNetworks(); case "restrict-background-whitelist": return runListRestrictBackgroundWhitelist(); } @@ -169,19 +189,24 @@ public class NetworkPolicyManagerShellCommand extends ShellCommand { return 0; } - private int getRestrictBackgroundWhitelist() throws RemoteException { + private int getRestrictBackground() throws RemoteException { final PrintWriter pw = getOutPrintWriter(); pw.print("Restrict background status: "); pw.println(mInterface.getRestrictBackground() ? "enabled" : "disabled"); return 0; } - private int setRestrictBackgroundWhitelist() throws RemoteException { + private int setRestrictBackground() throws RemoteException { final int enabled = getNextBooleanArg(); if (enabled < 0) { return enabled; } - mInterface.setRestrictBackground(enabled > 0); + final long token = Binder.clearCallingIdentity(); + try { + mInterface.setRestrictBackground(enabled > 0); + } finally { + Binder.restoreCallingIdentity(token); + } return 0; } @@ -190,7 +215,12 @@ public class NetworkPolicyManagerShellCommand extends ShellCommand { if (uid < 0) { return uid; } - mInterface.addRestrictBackgroundWhitelistedUid(uid); + final long token = Binder.clearCallingIdentity(); + try { + mInterface.addRestrictBackgroundWhitelistedUid(uid); + } finally { + Binder.restoreCallingIdentity(token); + } return 0; } @@ -199,10 +229,95 @@ public class NetworkPolicyManagerShellCommand extends ShellCommand { if (uid < 0) { return uid; } - mInterface.removeRestrictBackgroundWhitelistedUid(uid); + final long token = Binder.clearCallingIdentity(); + try { + mInterface.removeRestrictBackgroundWhitelistedUid(uid); + } finally { + Binder.restoreCallingIdentity(token); + } + return 0; + } + + private int listNonMobileMeteredNetworks() throws RemoteException { + final PrintWriter pw = getOutPrintWriter(); + final String arg = getNextArg(); + final Boolean filter = arg == null ? null : Boolean.valueOf(arg); + for (NetworkPolicy policy : getNonMobilePolicies()) { + if (filter != null && filter.booleanValue() != policy.metered) { + continue; + } + pw.print(getNetworkId(policy)); + pw.print(';'); + pw.println(policy.metered); + } + return 0; + } + + private int getNonMobileMeteredNetwork() throws RemoteException { + final PrintWriter pw = getOutPrintWriter(); + final String id = getNextArg(); + if (id == null) { + pw.println("Error: didn't specify ID"); + return -1; + } + final List<NetworkPolicy> policies = getNonMobilePolicies(); + for (NetworkPolicy policy: policies) { + if (id.equals(getNetworkId(policy))) { + pw.println(policy.metered); + return 0; + } + } return 0; } + private int setNonMobileMeteredNetwork() throws RemoteException { + final PrintWriter pw = getOutPrintWriter(); + final String id = getNextArg(); + if (id == null) { + pw.println("Error: didn't specify ID"); + return -1; + } + final String arg = getNextArg(); + if (arg == null) { + pw.println("Error: didn't specify BOOLEAN"); + return -1; + } + final boolean metered = Boolean.valueOf(arg); + final NetworkPolicy[] policies = mInterface.getNetworkPolicies(null); + boolean changed = false; + for (NetworkPolicy policy : policies) { + if (policy.template.isMatchRuleMobile() || policy.metered == metered) { + continue; + } + final String networkId = getNetworkId(policy); + if (id.equals(networkId)) { + Log.i(TAG, "Changing " + networkId + " metered status to " + metered); + policy.metered = metered; + changed = true; + } + } + if (changed) { + mInterface.setNetworkPolicies(policies); + } + return 0; + } + + private List<NetworkPolicy> getNonMobilePolicies() throws RemoteException { + final NetworkPolicy[] policies = mInterface.getNetworkPolicies(null); + final List<NetworkPolicy> nonMobilePolicies = new ArrayList<NetworkPolicy>(policies.length); + for (NetworkPolicy policy: policies) { + if (!policy.template.isMatchRuleMobile()) { + nonMobilePolicies.add(policy); + } + } + return nonMobilePolicies; + } + + private String getNetworkId(NetworkPolicy policy) { + // ids are typically enclosed on double quotes (") + return policy.template.getNetworkId().replaceAll("^\"|\"$", ""); + } + private int getNextBooleanArg() { final PrintWriter pw = getOutPrintWriter(); final String arg = getNextArg(); diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index ebdb1b242e66..078094cfef7a 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -1265,6 +1265,12 @@ public class NotificationManagerService extends SystemService { } @Override + public boolean hasBannedTopics(String pkg, int uid) { + checkCallerIsSystem(); + return mRankingHelper.hasBannedTopics(pkg, uid); + } + + @Override public ParceledListSlice<Notification.Topic> getTopics(String pkg, int uid) { checkCallerIsSystem(); return new ParceledListSlice<Notification.Topic>(mRankingHelper.getTopics(pkg, uid)); diff --git a/services/core/java/com/android/server/notification/RankingConfig.java b/services/core/java/com/android/server/notification/RankingConfig.java index 7f85e1f8123d..1a7e3550d8e3 100644 --- a/services/core/java/com/android/server/notification/RankingConfig.java +++ b/services/core/java/com/android/server/notification/RankingConfig.java @@ -37,4 +37,6 @@ public interface RankingConfig { int getImportance(String packageName, int uid, Notification.Topic topic); boolean doesAppUseTopics(String packageName, int uid); + + boolean hasBannedTopics(String packageName, int uid); } diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java index 827482ff2a4b..aa36e298bb45 100644 --- a/services/core/java/com/android/server/notification/RankingHelper.java +++ b/services/core/java/com/android/server/notification/RankingHelper.java @@ -389,6 +389,17 @@ public class RankingHelper implements RankingConfig { return topics; } + @Override + public boolean hasBannedTopics(String packageName, int uid) { + final Record r = getOrCreateRecord(packageName, uid); + for (Topic t : r.topics.values()) { + if (t.importance == Ranking.IMPORTANCE_NONE) { + return true; + } + } + return false; + } + /** * Gets priority. If a topic is given, returns the priority of that topic. Otherwise, the * priority of the app. diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 1d91fb7d858a..b7abce2159d3 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -19,6 +19,8 @@ package com.android.server.notification; import static android.media.AudioAttributes.USAGE_ALARM; import static android.media.AudioAttributes.USAGE_NOTIFICATION; import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE; +import static android.media.AudioAttributes.USAGE_UNKNOWN; +import static android.media.AudioAttributes.USAGE_VIRTUAL_SOURCE; import android.app.AppOpsManager; import android.app.AutomaticZenRule; @@ -34,6 +36,7 @@ import android.content.pm.ServiceInfo; import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.database.ContentObserver; +import android.media.AudioAttributes; import android.media.AudioManager; import android.media.AudioManagerInternal; import android.media.AudioSystem; @@ -705,15 +708,20 @@ public class ZenModeHelper { // notification restrictions final boolean muteNotifications = mEffectsSuppressed; - applyRestrictions(muteNotifications, USAGE_NOTIFICATION); - // call restrictions final boolean muteCalls = zen && !mConfig.allowCalls && !mConfig.allowRepeatCallers; - applyRestrictions(muteCalls, USAGE_NOTIFICATION_RINGTONE); - - // alarm restrictions - final boolean muteAlarms = mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS; - applyRestrictions(muteAlarms, USAGE_ALARM); + // total silence restrictions + final boolean muteEverything = mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS; + + for (int i = USAGE_UNKNOWN; i <= USAGE_VIRTUAL_SOURCE; i++) { + if (i == USAGE_NOTIFICATION) { + applyRestrictions(muteNotifications || muteEverything, i); + } else if (i == USAGE_NOTIFICATION_RINGTONE) { + applyRestrictions(muteCalls || muteEverything, i); + } else { + applyRestrictions(muteEverything, i); + } + } } private void applyRestrictions(boolean mute, int usage) { diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index 5d97afaf9793..dac89ec759f7 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -49,6 +49,8 @@ public final class Installer extends SystemService { public static final int DEXOPT_BOOTCOMPLETE = 1 << 4; /** Do not compile, only extract bytecode into an OAT file */ public static final int DEXOPT_EXTRACTONLY = 1 << 5; + /** This is an OTA update dexopt */ + public static final int DEXOPT_OTA = 1 << 6; /** @hide */ @IntDef(flag = true, value = { diff --git a/services/core/java/com/android/server/pm/OtaDexoptService.java b/services/core/java/com/android/server/pm/OtaDexoptService.java new file mode 100644 index 000000000000..da62a2d6fc84 --- /dev/null +++ b/services/core/java/com/android/server/pm/OtaDexoptService.java @@ -0,0 +1,274 @@ +/* + * Copyright (C) 2016 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.server.pm; + +import android.app.AppGlobals; +import android.content.Context; +import android.content.Intent; +import android.content.pm.IOtaDexopt; +import android.content.pm.PackageParser; +import android.content.pm.PackageParser.Package; +import android.content.pm.ResolveInfo; +import android.os.Environment; +import android.os.RemoteException; +import android.os.ResultReceiver; +import android.os.ServiceManager; +import android.os.UserHandle; +import android.os.storage.StorageManager; +import android.util.ArraySet; +import android.util.Log; + +import dalvik.system.DexFile; + +import java.io.File; +import java.io.FileDescriptor; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + +import static com.android.server.pm.Installer.DEXOPT_OTA; + +/** + * A service for A/B OTA dexopting. + * + * {@hide} + */ +public class OtaDexoptService extends IOtaDexopt.Stub { + private final static String TAG = "OTADexopt"; + private final static boolean DEBUG_DEXOPT = true; + // Apps used in the last 7 days. + private final static long DEXOPT_LRU_THRESHOLD_IN_MINUTES = 7 * 24 * 60; + + private final Context mContext; + private final PackageDexOptimizer mPackageDexOptimizer; + private final PackageManagerService mPackageManagerService; + + // TODO: Evaluate the need for WeakReferences here. + private List<PackageParser.Package> mDexoptPackages; + + public OtaDexoptService(Context context, PackageManagerService packageManagerService) { + this.mContext = context; + this.mPackageManagerService = packageManagerService; + + // Use the package manager install and install lock here for the OTA dex optimizer. + mPackageDexOptimizer = new OTADexoptPackageDexOptimizer(packageManagerService.mInstaller, + packageManagerService.mInstallLock, context); + } + + public static OtaDexoptService main(Context context, + PackageManagerService packageManagerService) { + OtaDexoptService ota = new OtaDexoptService(context, packageManagerService); + ServiceManager.addService("otadexopt", ota); + + return ota; + } + + @Override + public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err, + String[] args, ResultReceiver resultReceiver) throws RemoteException { + (new OtaDexoptShellCommand(this)).exec( + this, in, out, err, args, resultReceiver); + } + + @Override + public synchronized void prepare() throws RemoteException { + if (mDexoptPackages != null) { + throw new IllegalStateException("already called prepare()"); + } + + mDexoptPackages = new LinkedList<>(); + + ArrayList<PackageParser.Package> pkgs; + synchronized (mPackageManagerService.mPackages) { + pkgs = new ArrayList<PackageParser.Package>(mPackageManagerService.mPackages.values()); + } + + // Sort apps by importance for dexopt ordering. Important apps are given more priority + // in case the device runs out of space. + + // Give priority to core apps. + for (PackageParser.Package pkg : pkgs) { + if (pkg.coreApp) { + if (DEBUG_DEXOPT) { + Log.i(TAG, "Adding core app " + mDexoptPackages.size() + ": " + pkg.packageName); + } + mDexoptPackages.add(pkg); + } + } + pkgs.removeAll(mDexoptPackages); + + // Give priority to system apps that listen for pre boot complete. + Intent intent = new Intent(Intent.ACTION_PRE_BOOT_COMPLETED); + ArraySet<String> pkgNames = getPackageNamesForIntent(intent, UserHandle.USER_SYSTEM); + for (PackageParser.Package pkg : pkgs) { + if (pkgNames.contains(pkg.packageName)) { + if (DEBUG_DEXOPT) { + Log.i(TAG, "Adding pre boot system app " + mDexoptPackages.size() + ": " + + pkg.packageName); + } + mDexoptPackages.add(pkg); + } + } + pkgs.removeAll(mDexoptPackages); + + // Filter out packages that aren't recently used, add all remaining apps. + // TODO: add a property to control this? + if (mPackageManagerService.isHistoricalPackageUsageAvailable()) { + filterRecentlyUsedApps(pkgs, DEXOPT_LRU_THRESHOLD_IN_MINUTES * 60 * 1000); + } + mDexoptPackages.addAll(pkgs); + + // Now go ahead and also add the libraries required for these packages. + // TODO: Think about interleaving things. + Set<PackageParser.Package> dependencies = new HashSet<>(); + for (PackageParser.Package p : mDexoptPackages) { + dependencies.addAll(mPackageManagerService.findSharedNonSystemLibraries(p)); + } + if (!dependencies.isEmpty()) { + dependencies.removeAll(mDexoptPackages); + } + mDexoptPackages.addAll(dependencies); + + if (DEBUG_DEXOPT) { + StringBuilder sb = new StringBuilder(); + for (PackageParser.Package pkg : mDexoptPackages) { + if (sb.length() > 0) { + sb.append(", "); + } + sb.append(pkg.packageName); + } + Log.i(TAG, "Packages to be optimized: " + sb.toString()); + } + } + + @Override + public synchronized void cleanup() throws RemoteException { + if (DEBUG_DEXOPT) { + Log.i(TAG, "Cleaning up OTA Dexopt state."); + } + mDexoptPackages = null; + } + + @Override + public synchronized boolean isDone() throws RemoteException { + if (mDexoptPackages == null) { + throw new IllegalStateException("done() called before prepare()"); + } + + return mDexoptPackages.isEmpty(); + } + + @Override + public synchronized void dexoptNextPackage() throws RemoteException { + if (mDexoptPackages == null) { + throw new IllegalStateException("dexoptNextPackage() called before prepare()"); + } + if (mDexoptPackages.isEmpty()) { + // Tolerate repeated calls. + return; + } + + PackageParser.Package nextPackage = mDexoptPackages.remove(0); + + if (DEBUG_DEXOPT) { + Log.i(TAG, "Processing " + nextPackage.packageName + " for OTA dexopt."); + } + + // Check for low space. + // TODO: If apps are not installed in the internal /data partition, we should compare + // against that storage's free capacity. + File dataDir = Environment.getDataDirectory(); + long lowThreshold = StorageManager.from(mContext).getStorageLowBytes(dataDir); + if (lowThreshold == 0) { + throw new IllegalStateException("Invalid low memory threshold"); + } + long usableSpace = dataDir.getUsableSpace(); + if (usableSpace < lowThreshold) { + Log.w(TAG, "Not running dexopt on " + nextPackage.packageName + " due to low memory: " + + usableSpace); + return; + } + + mPackageDexOptimizer.performDexOpt(nextPackage, null /* ISAs */, false /* useProfiles */, + false /* extractOnly */); + } + + private ArraySet<String> getPackageNamesForIntent(Intent intent, int userId) { + List<ResolveInfo> ris = null; + try { + ris = AppGlobals.getPackageManager().queryIntentReceivers( + intent, null, 0, userId); + } catch (RemoteException e) { + } + ArraySet<String> pkgNames = new ArraySet<String>(ris == null ? 0 : ris.size()); + if (ris != null) { + for (ResolveInfo ri : ris) { + pkgNames.add(ri.activityInfo.packageName); + } + } + return pkgNames; + } + + private void filterRecentlyUsedApps(Collection<PackageParser.Package> pkgs, + long dexOptLRUThresholdInMills) { + // Filter out packages that aren't recently used. + int total = pkgs.size(); + int skipped = 0; + long now = System.currentTimeMillis(); + for (Iterator<PackageParser.Package> i = pkgs.iterator(); i.hasNext();) { + PackageParser.Package pkg = i.next(); + long then = pkg.mLastPackageUsageTimeInMills; + if (then + dexOptLRUThresholdInMills < now) { + if (DEBUG_DEXOPT) { + Log.i(TAG, "Skipping dexopt of " + pkg.packageName + " last resumed: " + + ((then == 0) ? "never" : new Date(then))); + } + i.remove(); + skipped++; + } + } + if (DEBUG_DEXOPT) { + Log.i(TAG, "Skipped optimizing " + skipped + " of " + total); + } + } + + private static class OTADexoptPackageDexOptimizer extends + PackageDexOptimizer.ForcedUpdatePackageDexOptimizer { + + public OTADexoptPackageDexOptimizer(Installer installer, Object installLock, + Context context) { + super(installer, installLock, context, "*otadexopt*"); + } + + @Override + protected int adjustDexoptFlags(int dexoptFlags) { + // Add the OTA flag. + return dexoptFlags | DEXOPT_OTA; + } + + @Override + protected void recordSuccessfulDexopt(Package pkg, String instructionSet) { + // Never record the dexopt, as it's in the B partition. + } + + } +} diff --git a/services/core/java/com/android/server/pm/OtaDexoptShellCommand.java b/services/core/java/com/android/server/pm/OtaDexoptShellCommand.java new file mode 100644 index 000000000000..ea9cf1766232 --- /dev/null +++ b/services/core/java/com/android/server/pm/OtaDexoptShellCommand.java @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2015 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.server.pm; + +import android.content.pm.IOtaDexopt; +import android.os.RemoteException; +import android.os.ShellCommand; + +import java.io.PrintWriter; + +class OtaDexoptShellCommand extends ShellCommand { + final IOtaDexopt mInterface; + + OtaDexoptShellCommand(OtaDexoptService service) { + mInterface = service; + } + + @Override + public int onCommand(String cmd) { + if (cmd == null) { + return handleDefaultCommands(null); + } + + final PrintWriter pw = getOutPrintWriter(); + try { + switch(cmd) { + case "prepare": + return runOtaPrepare(); + case "cleanup": + return runOtaCleanup(); + case "done": + return runOtaDone(); + case "step": + return runOtaStep(); + default: + return handleDefaultCommands(cmd); + } + } catch (RemoteException e) { + pw.println("Remote exception: " + e); + } + return -1; + } + + private int runOtaPrepare() throws RemoteException { + mInterface.prepare(); + getOutPrintWriter().println("Success"); + return 0; + } + + private int runOtaCleanup() throws RemoteException { + mInterface.cleanup(); + return 0; + } + + private int runOtaDone() throws RemoteException { + final PrintWriter pw = getOutPrintWriter(); + if (mInterface.isDone()) { + pw.println("OTA complete."); + } else { + pw.println("OTA incomplete."); + } + return 0; + } + + private int runOtaStep() throws RemoteException { + mInterface.dexoptNextPackage(); + return 0; + } + + @Override + public void onHelp() { + final PrintWriter pw = getOutPrintWriter(); + pw.println("OTA Dexopt (ota) commands:"); + pw.println(" help"); + pw.println(" Print this help text."); + pw.println(""); + pw.println(" prepare"); + pw.println(" Prepare an OTA dexopt pass, collecting all packages."); + pw.println(" done"); + pw.println(" Replies whether the OTA is complete or not."); + pw.println(" step"); + pw.println(" OTA dexopt the next package."); + pw.println(" cleanup"); + pw.println(" Clean up internal states. Ends an OTA session."); + } +} diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java index fe0f1416371d..64af21313a1d 100644 --- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java +++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageParser; +import android.content.pm.PackageParser.Package; import android.os.PowerManager; import android.os.UserHandle; import android.os.WorkSource; @@ -48,7 +49,7 @@ import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; /** * Helper class for running dexopt command on packages. */ -final class PackageDexOptimizer { +class PackageDexOptimizer { private static final String TAG = "PackageManager.DexOptimizer"; static final String OAT_DIR_NAME = "oat"; // TODO b/19550105 Remove error codes and use exceptions @@ -57,16 +58,28 @@ final class PackageDexOptimizer { static final int DEX_OPT_DEFERRED = 2; static final int DEX_OPT_FAILED = -1; - private final PackageManagerService mPackageManagerService; + private static final boolean DEBUG_DEXOPT = PackageManagerService.DEBUG_DEXOPT; + + private final Installer mInstaller; + private final Object mInstallLock; private final PowerManager.WakeLock mDexoptWakeLock; private volatile boolean mSystemReady; - PackageDexOptimizer(PackageManagerService packageManagerService) { - this.mPackageManagerService = packageManagerService; - PowerManager powerManager = (PowerManager)packageManagerService.mContext.getSystemService( - Context.POWER_SERVICE); - mDexoptWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "*dexopt*"); + PackageDexOptimizer(Installer installer, Object installLock, Context context, + String wakeLockTag) { + this.mInstaller = installer; + this.mInstallLock = installLock; + + PowerManager powerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE); + mDexoptWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, wakeLockTag); + } + + protected PackageDexOptimizer(PackageDexOptimizer from) { + this.mInstaller = from.mInstaller; + this.mInstallLock = from.mInstallLock; + this.mDexoptWakeLock = from.mDexoptWakeLock; + this.mSystemReady = from.mSystemReady; } static boolean canOptimizePackage(PackageParser.Package pkg) { @@ -77,27 +90,19 @@ final class PackageDexOptimizer { * Performs dexopt on all code paths and libraries of the specified package for specified * instruction sets. * - * <p>Calls to {@link com.android.server.pm.Installer#dexopt} are synchronized on - * {@link PackageManagerService#mInstallLock}. + * <p>Calls to {@link com.android.server.pm.Installer#dexopt} on {@link #mInstaller} are + * synchronized on {@link #mInstallLock}. */ - int performDexOpt(PackageParser.Package pkg, String[] instructionSets, - boolean inclDependencies, boolean useProfiles, boolean extractOnly, boolean force) { - ArraySet<String> done; - if (inclDependencies && (pkg.usesLibraries != null || pkg.usesOptionalLibraries != null)) { - done = new ArraySet<String>(); - done.add(pkg.packageName); - } else { - done = null; - } - synchronized (mPackageManagerService.mInstallLock) { + int performDexOpt(PackageParser.Package pkg, String[] instructionSets, boolean useProfiles, + boolean extractOnly) { + synchronized (mInstallLock) { final boolean useLock = mSystemReady; if (useLock) { mDexoptWakeLock.setWorkSource(new WorkSource(pkg.applicationInfo.uid)); mDexoptWakeLock.acquire(); } try { - return performDexOptLI(pkg, instructionSets, done, useProfiles, - extractOnly, force); + return performDexOptLI(pkg, instructionSets, useProfiles, extractOnly); } finally { if (useLock) { mDexoptWakeLock.release(); @@ -106,21 +111,42 @@ final class PackageDexOptimizer { } } + /** + * Determine whether the package should be skipped for the given instruction set. A return + * value of true means the package will be skipped. A return value of false means that the + * package will be further investigated, and potentially compiled. + */ + protected boolean shouldSkipBasedOnISA(PackageParser.Package pkg, String instructionSet) { + return pkg.mDexOptPerformed.contains(instructionSet); + } + + /** + * Adjust the given dexopt-needed value. Can be overridden to influence the decision to + * optimize or not (and in what way). + */ + protected int adjustDexoptNeeded(int dexoptNeeded) { + return dexoptNeeded; + } + + /** + * Adjust the given dexopt flags that will be passed to the installer. + */ + protected int adjustDexoptFlags(int dexoptFlags) { + return dexoptFlags; + } + + /** + * Update the package status after a successful compilation. + */ + protected void recordSuccessfulDexopt(PackageParser.Package pkg, String instructionSet) { + pkg.mDexOptPerformed.add(instructionSet); + } + private int performDexOptLI(PackageParser.Package pkg, String[] targetInstructionSets, - ArraySet<String> done, boolean useProfiles, boolean extractOnly, boolean force) { + boolean useProfiles, boolean extractOnly) { final String[] instructionSets = targetInstructionSets != null ? targetInstructionSets : getAppDexInstructionSets(pkg.applicationInfo); - if (done != null) { - done.add(pkg.packageName); - if (pkg.usesLibraries != null) { - performDexOptLibsLI(pkg.usesLibraries, instructionSets, done); - } - if (pkg.usesOptionalLibraries != null) { - performDexOptLibsLI(pkg.usesOptionalLibraries, instructionSets, done); - } - } - if (!canOptimizePackage(pkg)) { return DEX_OPT_SKIPPED; } @@ -128,34 +154,26 @@ final class PackageDexOptimizer { final boolean vmSafeMode = (pkg.applicationInfo.flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0; final boolean debuggable = (pkg.applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; - if (useProfiles) { - // If we do a profile guided compilation then we might recompile - // the same package if more profile information is available. - force = true; - } - final List<String> paths = pkg.getAllCodePathsExcludingResourceOnly(); boolean performedDexOpt = false; final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets); for (String dexCodeInstructionSet : dexCodeInstructionSets) { - if (!force && pkg.mDexOptPerformed.contains(dexCodeInstructionSet)) { + if (!useProfiles && shouldSkipBasedOnISA(pkg, dexCodeInstructionSet)) { + // Skip only if we do not use profiles since they might trigger a recompilation. continue; } for (String path : paths) { int dexoptNeeded; - if (force) { - dexoptNeeded = DexFile.DEX2OAT_NEEDED; - } else { - try { - dexoptNeeded = DexFile.getDexOptNeeded(path, pkg.packageName, - dexCodeInstructionSet, /* defer */false); - } catch (IOException ioe) { - Slog.w(TAG, "IOException reading apk: " + path, ioe); - return DEX_OPT_FAILED; - } + try { + dexoptNeeded = DexFile.getDexOptNeeded(path, pkg.packageName, + dexCodeInstructionSet, /* defer */false); + } catch (IOException ioe) { + Slog.w(TAG, "IOException reading apk: " + path, ioe); + return DEX_OPT_FAILED; } + dexoptNeeded = adjustDexoptNeeded(dexoptNeeded); if (dexoptNeeded == DexFile.NO_DEXOPT_NEEDED) { // No dexopt needed and we don't use profiles. Nothing to do. @@ -174,21 +192,22 @@ final class PackageDexOptimizer { throw new IllegalStateException("Invalid dexopt needed: " + dexoptNeeded); } + Log.i(TAG, "Running dexopt (" + dexoptType + ") on: " + path + " pkg=" + pkg.applicationInfo.packageName + " isa=" + dexCodeInstructionSet + " vmSafeMode=" + vmSafeMode + " debuggable=" + debuggable + " extractOnly=" + extractOnly + " oatDir = " + oatDir); final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid); - final int dexFlags = + final int dexFlags = adjustDexoptFlags( (!pkg.isForwardLocked() ? DEXOPT_PUBLIC : 0) | (vmSafeMode ? DEXOPT_SAFEMODE : 0) | (debuggable ? DEXOPT_DEBUGGABLE : 0) | (extractOnly ? DEXOPT_EXTRACTONLY : 0) - | DEXOPT_BOOTCOMPLETE; + | DEXOPT_BOOTCOMPLETE); + try { - mPackageManagerService.mInstaller.dexopt(path, sharedGid, - pkg.packageName, dexCodeInstructionSet, dexoptNeeded, oatDir, - dexFlags, pkg.volumeUuid, useProfiles); + mInstaller.dexopt(path, sharedGid, pkg.packageName, dexCodeInstructionSet, + dexoptNeeded, oatDir, dexFlags, pkg.volumeUuid, useProfiles); performedDexOpt = true; } catch (InstallerException e) { Slog.w(TAG, "Failed to dexopt", e); @@ -201,7 +220,7 @@ final class PackageDexOptimizer { // it isn't required. We therefore mark that this package doesn't need dexopt unless // it's forced. performedDexOpt will tell us whether we performed dex-opt or skipped // it. - pkg.mDexOptPerformed.add(dexCodeInstructionSet); + recordSuccessfulDexopt(pkg, dexCodeInstructionSet); } } @@ -232,8 +251,7 @@ final class PackageDexOptimizer { if (codePath.isDirectory()) { File oatDir = getOatDir(codePath); try { - mPackageManagerService.mInstaller.createOatDir(oatDir.getAbsolutePath(), - dexInstructionSet); + mInstaller.createOatDir(oatDir.getAbsolutePath(), dexInstructionSet); } catch (InstallerException e) { Slog.w(TAG, "Failed to create oat dir", e); return null; @@ -247,21 +265,36 @@ final class PackageDexOptimizer { return new File(codePath, OAT_DIR_NAME); } - private void performDexOptLibsLI(ArrayList<String> libs, String[] instructionSets, - ArraySet<String> done) { - for (String libName : libs) { - PackageParser.Package libPkg = mPackageManagerService.findSharedNonSystemLibrary( - libName); - if (libPkg != null && !done.contains(libName)) { - // TODO: Analyze and investigate if we (should) profile libraries. - // Currently this will do a full compilation of the library. - performDexOptLI(libPkg, instructionSets, done, /*useProfiles*/ false, - /* extractOnly */ false, /* force */ false); - } - } - } - void systemReady() { mSystemReady = true; } + + /** + * A specialized PackageDexOptimizer that overrides already-installed checks, forcing a + * dexopt path. + */ + public static class ForcedUpdatePackageDexOptimizer extends PackageDexOptimizer { + + public ForcedUpdatePackageDexOptimizer(Installer installer, Object installLock, + Context context, String wakeLockTag) { + super(installer, installLock, context, wakeLockTag); + } + + public ForcedUpdatePackageDexOptimizer(PackageDexOptimizer from) { + super(from); + } + + @Override + protected boolean shouldSkipBasedOnISA(Package pkg, String instructionSet) { + // Forced compilation, never skip. + return false; + } + + @Override + protected int adjustDexoptNeeded(int dexoptNeeded) { + // Ensure compilation, no matter the current state. + // TODO: The return value is wrong when patchoat is needed. + return DexFile.DEX2OAT_NEEDED; + } + } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index b6905b4325bd..553a9a26de16 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -139,6 +139,7 @@ import android.content.pm.PackageManager.LegacyPackageDeleteObserver; import android.content.pm.PackageManagerInternal; import android.content.pm.PackageParser; import android.content.pm.PackageParser.ActivityIntentInfo; +import android.content.pm.PackageParser.Package; import android.content.pm.PackageParser.PackageLite; import android.content.pm.PackageParser.PackageParserException; import android.content.pm.PackageStats; @@ -263,6 +264,7 @@ import java.io.FileReader; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; +import java.io.PrintStream; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -277,6 +279,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.Date; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -313,7 +316,12 @@ public class PackageManagerService extends IPackageManager.Stub { private static final boolean DEBUG_INTENT_MATCHING = false; private static final boolean DEBUG_PACKAGE_SCANNING = false; private static final boolean DEBUG_VERIFY = false; - private static final boolean DEBUG_DEXOPT = false; + + // Debug output for dexopting. This is shared between PackageManagerService, OtaDexoptService + // and PackageDexOptimizer. All these classes have their own flag to allow switching a single + // user, but by default initialize to this. + static final boolean DEBUG_DEXOPT = false; + private static final boolean DEBUG_ABI_SELECTION = false; private static final boolean DEBUG_EPHEMERAL = false; private static final boolean DEBUG_TRIAGED_MISSING = false; @@ -1990,7 +1998,8 @@ public class PackageManagerService extends IPackageManager.Stub { } mInstaller = installer; - mPackageDexOptimizer = new PackageDexOptimizer(this); + mPackageDexOptimizer = new PackageDexOptimizer(installer, mInstallLock, context, + "*dexopt*"); mMoveCallbacks = new MoveCallbacks(FgThread.get().getLooper()); mOnPermissionChangeListeners = new OnPermissionChangeListeners( @@ -3377,19 +3386,6 @@ public class PackageManagerService extends IPackageManager.Stub { return null; } - /** - * @hide - */ - PackageParser.Package findSharedNonSystemLibrary(String libName) { - synchronized (mPackages) { - PackageManagerService.SharedLibraryEntry lib = mSharedLibraries.get(libName); - if (lib != null && lib.apk != null) { - return mPackages.get(lib.apk); - } - } - return null; - } - @Override public FeatureInfo[] getSystemAvailableFeatures() { Collection<FeatureInfo> featSet; @@ -6718,8 +6714,8 @@ public class PackageManagerService extends IPackageManager.Stub { try { synchronized (mInstallLock) { final String[] instructionSets = new String[] { targetInstructionSet }; - int result = mPackageDexOptimizer.performDexOpt(p, instructionSets, - true /* inclDependencies */, useProfiles, extractOnly, force); + int result = performDexOptInternalWithDependenciesLI(p, instructionSets, + useProfiles, extractOnly, force); return result == PackageDexOptimizer.DEX_OPT_PERFORMED; } } finally { @@ -6739,6 +6735,80 @@ public class PackageManagerService extends IPackageManager.Stub { return pkgs; } + private int performDexOptInternalWithDependenciesLI(PackageParser.Package p, + String instructionSets[], boolean useProfiles, boolean extractOnly, boolean force) { + // Select the dex optimizer based on the force parameter. + // Note: The force option is rarely used (cmdline input for testing, mostly), so it's OK to + // allocate an object here. + PackageDexOptimizer pdo = force + ? new PackageDexOptimizer.ForcedUpdatePackageDexOptimizer(mPackageDexOptimizer) + : mPackageDexOptimizer; + + // Optimize all dependencies first. Note: we ignore the return value and march on + // on errors. + Collection<PackageParser.Package> deps = findSharedNonSystemLibraries(p); + if (!deps.isEmpty()) { + for (PackageParser.Package depPackage : deps) { + // TODO: Analyze and investigate if we (should) profile libraries. + // Currently this will do a full compilation of the library. + pdo.performDexOpt(depPackage, instructionSets, false /* useProfiles */, + false /* extractOnly */); + } + } + + return pdo.performDexOpt(p, instructionSets, useProfiles, extractOnly); + } + + Collection<PackageParser.Package> findSharedNonSystemLibraries(PackageParser.Package p) { + if (p.usesLibraries != null || p.usesOptionalLibraries != null) { + ArrayList<PackageParser.Package> retValue = new ArrayList<>(); + Set<String> collectedNames = new HashSet<>(); + findSharedNonSystemLibrariesRecursive(p, retValue, collectedNames); + + retValue.remove(p); + + return retValue; + } else { + return Collections.emptyList(); + } + } + + private void findSharedNonSystemLibrariesRecursive(PackageParser.Package p, + Collection<PackageParser.Package> collected, Set<String> collectedNames) { + if (!collectedNames.contains(p.packageName)) { + collectedNames.add(p.packageName); + collected.add(p); + + if (p.usesLibraries != null) { + findSharedNonSystemLibrariesRecursive(p.usesLibraries, collected, collectedNames); + } + if (p.usesOptionalLibraries != null) { + findSharedNonSystemLibrariesRecursive(p.usesOptionalLibraries, collected, + collectedNames); + } + } + } + + private void findSharedNonSystemLibrariesRecursive(Collection<String> libs, + Collection<PackageParser.Package> collected, Set<String> collectedNames) { + for (String libName : libs) { + PackageParser.Package libPkg = findSharedNonSystemLibrary(libName); + if (libPkg != null) { + findSharedNonSystemLibrariesRecursive(libPkg, collected, collectedNames); + } + } + } + + private PackageParser.Package findSharedNonSystemLibrary(String libName) { + synchronized (mPackages) { + PackageManagerService.SharedLibraryEntry lib = mSharedLibraries.get(libName); + if (lib != null && lib.apk != null) { + return mPackages.get(lib.apk); + } + } + return null; + } + public void shutdown() { mPackageUsage.write(true); } @@ -6763,9 +6833,8 @@ public class PackageManagerService extends IPackageManager.Stub { // Whoever is calling forceDexOpt wants a fully compiled package. // Don't use profiles since that may cause compilation to be skipped. - final int res = mPackageDexOptimizer.performDexOpt(pkg, instructionSets, - true /* inclDependencies */, false /* useProfiles */, - false /* extractOnly */, true /* force */); + final int res = performDexOptInternalWithDependenciesLI(pkg, instructionSets, + false /* useProfiles */, false /* extractOnly */, true /* force */); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); if (res != PackageDexOptimizer.DEX_OPT_PERFORMED) { @@ -7980,6 +8049,11 @@ public class PackageManagerService extends IPackageManager.Stub { pkg.applicationInfo.primaryCpuAbi = abi; } } + if (cpuAbiOverride != null && + cpuAbiOverride.equals(pkg.applicationInfo.secondaryCpuAbi)) { + pkg.applicationInfo.secondaryCpuAbi = pkg.applicationInfo.primaryCpuAbi; + pkg.applicationInfo.primaryCpuAbi = cpuAbiOverride; + } } else { String[] abiList = (cpuAbiOverride != null) ? new String[] { cpuAbiOverride } : Build.SUPPORTED_ABIS; @@ -12842,8 +12916,11 @@ public class PackageManagerService extends IPackageManager.Stub { Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); } - // Mark that we have an install time CPU ABI override. - pkg.cpuAbiOverride = args.abiOverride; + // If package doesn't declare API override, mark that we have an install + // time CPU ABI override. + if (TextUtils.isEmpty(pkg.cpuAbiOverride)) { + pkg.cpuAbiOverride = args.abiOverride; + } String pkgName = res.name = pkg.packageName; if ((pkg.applicationInfo.flags&ApplicationInfo.FLAG_TEST_ONLY) != 0) { @@ -13016,7 +13093,9 @@ public class PackageManagerService extends IPackageManager.Stub { scanFlags |= SCAN_NO_DEX; try { - derivePackageAbi(pkg, new File(pkg.codePath), args.abiOverride, + String abiOverride = (TextUtils.isEmpty(pkg.cpuAbiOverride) ? + args.abiOverride : pkg.cpuAbiOverride); + derivePackageAbi(pkg, new File(pkg.codePath), abiOverride, true /* extract libs */); } catch (PackageManagerException pme) { Slog.e(TAG, "Error deriving application ABI", pme); @@ -13032,8 +13111,7 @@ public class PackageManagerService extends IPackageManager.Stub { // Do not run PackageDexOptimizer through the local performDexOpt // method because `pkg` is not in `mPackages` yet. int result = mPackageDexOptimizer.performDexOpt(pkg, null /* instructionSets */, - false /* inclDependencies */, false /* useProfiles */, - true /* extractOnly */, false /* force */); + false /* useProfiles */, true /* extractOnly */); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); if (result == PackageDexOptimizer.DEX_OPT_FAILED) { String msg = "Extracking package failed for " + pkgName; @@ -18033,4 +18111,8 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); "Cannot call " + tag + " from UID " + callingUid); } } + + boolean isHistoricalPackageUsageAvailable() { + return mPackageUsage.isHistoricalPackageUsageAvailable(); + } } diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 0f614cad1127..5f4656742e05 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -930,6 +930,9 @@ public class UserManagerService extends IUserManager.Stub { /** @return a specific user restriction that's in effect currently. */ @Override public boolean hasUserRestriction(String restrictionKey, int userId) { + if (!UserRestrictionsUtils.isValidRestriction(restrictionKey)) { + return false; + } Bundle restrictions = getEffectiveUserRestrictions(userId); return restrictions != null && restrictions.getBoolean(restrictionKey); } @@ -946,6 +949,9 @@ public class UserManagerService extends IUserManager.Stub { @Override public boolean hasBaseUserRestriction(String restrictionKey, int userId) { checkManageUsersPermission("hasBaseUserRestriction"); + if (!UserRestrictionsUtils.isValidRestriction(restrictionKey)) { + return false; + } synchronized (mRestrictionsLock) { Bundle bundle = mBaseUserRestrictions.get(userId); return (bundle != null && bundle.getBoolean(restrictionKey, false)); @@ -955,6 +961,9 @@ public class UserManagerService extends IUserManager.Stub { @Override public void setUserRestriction(String key, boolean value, int userId) { checkManageUsersPermission("setUserRestriction"); + if (!UserRestrictionsUtils.isValidRestriction(key)) { + return; + } synchronized (mRestrictionsLock) { // Note we can't modify Bundles stored in mBaseUserRestrictions directly, so create // a copy. diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java index f11872ef000b..f57f75f04ba6 100644 --- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java +++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java @@ -36,6 +36,7 @@ import android.os.UserManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.util.Log; +import android.util.Slog; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlSerializer; @@ -56,7 +57,15 @@ public class UserRestrictionsUtils { private UserRestrictionsUtils() { } - public static final Set<String> USER_RESTRICTIONS = Sets.newArraySet( + private static Set<String> newSetWithUniqueCheck(String[] strings) { + final Set<String> ret = Sets.newArraySet(strings); + + // Make sure there's no overlap. + Preconditions.checkState(ret.size() == strings.length); + return ret; + } + + public static final Set<String> USER_RESTRICTIONS = newSetWithUniqueCheck(new String[] { UserManager.DISALLOW_CONFIG_WIFI, UserManager.DISALLOW_MODIFY_ACCOUNTS, UserManager.DISALLOW_INSTALL_APPS, @@ -95,7 +104,7 @@ public class UserRestrictionsUtils { UserManager.DISALLOW_DATA_ROAMING, UserManager.DISALLOW_SET_USER_ICON, UserManager.DISALLOW_SET_WALLPAPER - ); + }); /** * Set of user restriction which we don't want to persist. @@ -141,6 +150,17 @@ public class UserRestrictionsUtils { UserManager.DISALLOW_UNMUTE_MICROPHONE ); + /** + * Throws {@link IllegalArgumentException} if the given restriction name is invalid. + */ + public static boolean isValidRestriction(@NonNull String restriction) { + if (!USER_RESTRICTIONS.contains(restriction)) { + Slog.wtf(TAG, "Unknown restriction: " + restriction); + return false; + } + return true; + } + public static void writeRestrictions(@NonNull XmlSerializer serializer, @Nullable Bundle restrictions, @NonNull String tag) throws IOException { if (restrictions == null) { diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java index 2deb0d51d1a4..2f076d1d69e3 100644 --- a/services/core/java/com/android/server/vr/VrManagerService.java +++ b/services/core/java/com/android/server/vr/VrManagerService.java @@ -36,6 +36,9 @@ public class VrManagerService extends SystemService { public static final String TAG = "VrManagerService"; + private static native void initializeNative(); + private static native void setVrModeNative(boolean enabled); + private final Object mLock = new Object(); private boolean mVrModeEnabled = false; private ArraySet<VrStateListener> mListeners = new ArraySet<>(); @@ -68,6 +71,10 @@ public class VrManagerService extends SystemService { @Override public void onStart() { + synchronized(mLock) { + initializeNative(); + } + publishLocalService(VrManagerInternal.class, new LocalService()); } @@ -89,6 +96,7 @@ public class VrManagerService extends SystemService { mVrModeEnabled = enabled; // Log mode change event. Slog.i(TAG, "VR mode " + ((mVrModeEnabled) ? "enabled" : "disabled")); + setVrModeNative(mVrModeEnabled); onVrModeChangedLocked(); } } diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index 6452feeb6975..7ec945d74e52 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -302,7 +302,12 @@ class AppWindowToken extends WindowToken { void setWindowsExiting(boolean exiting) { for (int i = allAppWindows.size() - 1; i >= 0; i--) { WindowState win = allAppWindows.get(i); - win.mExiting = exiting; + // If the app already requested to remove its window, we don't modify + // its exiting state. Otherwise the stale window won't get removed on + // exit and could cause focus to be given to the wrong window. + if (!(win.mRemoveOnExit && win.mExiting)) { + win.mExiting = exiting; + } } } diff --git a/services/core/java/com/android/server/wm/BoundsAnimationController.java b/services/core/java/com/android/server/wm/BoundsAnimationController.java index 5f974785b667..1bfdcceca3ec 100644 --- a/services/core/java/com/android/server/wm/BoundsAnimationController.java +++ b/services/core/java/com/android/server/wm/BoundsAnimationController.java @@ -22,6 +22,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.graphics.Rect; import android.util.ArrayMap; @@ -50,13 +51,15 @@ public class BoundsAnimationController { private final Rect mFrom; private final Rect mTo; private final Rect mTmpRect; + private final boolean mMoveToFullScreen; - BoundsAnimator(AnimateBoundsUser target, Rect from, Rect to) { + BoundsAnimator(AnimateBoundsUser target, Rect from, Rect to, boolean moveToFullScreen) { super(); mTarget = target; mFrom = from; mTo = to; mTmpRect = new Rect(); + mMoveToFullScreen = moveToFullScreen; addUpdateListener(this); addListener(this); } @@ -88,6 +91,9 @@ public class BoundsAnimationController { @Override public void onAnimationEnd(Animator animation) { finishAnimation(); + if (mMoveToFullScreen) { + mTarget.moveToFullscreen(); + } } @Override @@ -125,14 +131,25 @@ public class BoundsAnimationController { * necessary cleanup. */ void finishBoundsAnimation(); + + void moveToFullscreen(); + + void getFullScreenBounds(Rect bounds); } - void animateBounds(AnimateBoundsUser target, Rect from, Rect to) { + void animateBounds(final AnimateBoundsUser target, Rect from, Rect to) { + boolean moveToFullscreen = false; + if (to == null) { + to = new Rect(); + target.getFullScreenBounds(to); + moveToFullscreen = true; + } + final BoundsAnimator existing = mRunningAnimations.get(target); if (existing != null) { existing.cancel(); } - BoundsAnimator animator = new BoundsAnimator(target, from, to); + BoundsAnimator animator = new BoundsAnimator(target, from, to, moveToFullscreen); mRunningAnimations.put(target, animator); animator.setFloatValues(0f, 1f); animator.setDuration(DEFAULT_APP_TRANSITION_DURATION); diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index e6fa837c75fe..ecc13648aeb7 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -586,7 +586,7 @@ public class TaskStack implements DimLayer.DimLayerUser, } } - void getStackDockedModeBoundsLocked(Rect outBounds, boolean ignoreVisibilityOnKeyguardShowing) { + void getStackDockedModeBoundsLocked(Rect outBounds, boolean ignoreVisibility) { if (!StackId.isResizeableByDockedStack(mStackId) || mDisplayContent == null) { outBounds.set(mBounds); return; @@ -598,7 +598,7 @@ public class TaskStack implements DimLayer.DimLayerUser, throw new IllegalStateException( "Calling getStackDockedModeBoundsLocked() when there is no docked stack."); } - if (!dockedStack.isVisibleLocked(ignoreVisibilityOnKeyguardShowing)) { + if (!ignoreVisibility && !dockedStack.isVisibleLocked()) { // The docked stack is being dismissed, but we caught before it finished being // dismissed. In that case we want to treat it as if it is not occupying any space and // let others occupy the whole display. @@ -883,17 +883,10 @@ public class TaskStack implements DimLayer.DimLayerUser, } boolean isVisibleLocked() { - return isVisibleLocked(false); - } - - boolean isVisibleLocked(boolean ignoreVisibilityOnKeyguardShowing) { final boolean keyguardOn = mService.mPolicy.isKeyguardShowingOrOccluded(); if (keyguardOn && !StackId.isAllowedOverLockscreen(mStackId)) { // The keyguard is showing and the stack shouldn't show on top of the keyguard. - // We return false for visibility except in cases where the caller wants us to return - // true for visibility when the keyguard is showing. One example, is if the docked - // is being resized due to orientation while the keyguard is on. - return ignoreVisibilityOnKeyguardShowing; + return false; } for (int i = mTasks.size() - 1; i >= 0; i--) { @@ -934,4 +927,18 @@ public class TaskStack implements DimLayer.DimLayerUser, } } } + + @Override + public void moveToFullscreen() { + try { + mService.mActivityManager.moveTasksToFullscreenStack(mStackId, true); + } catch (RemoteException e) { + e.printStackTrace(); + } + } + + @Override + public void getFullScreenBounds(Rect bounds) { + getDisplayContent().getContentRect(bounds); + } } diff --git a/services/core/java/com/android/server/wm/WindowLayersController.java b/services/core/java/com/android/server/wm/WindowLayersController.java index 2cf26180441f..d843a8ce398f 100644 --- a/services/core/java/com/android/server/wm/WindowLayersController.java +++ b/services/core/java/com/android/server/wm/WindowLayersController.java @@ -16,12 +16,14 @@ package com.android.server.wm; -import android.app.ActivityManager.StackId; import android.util.Slog; import android.view.Display; import java.io.PrintWriter; +import java.util.ArrayDeque; +import static android.app.ActivityManager.StackId.DOCKED_STACK_ID; +import static android.app.ActivityManager.StackId.PINNED_STACK_ID; import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; @@ -55,10 +57,10 @@ public class WindowLayersController { } private int mHighestApplicationLayer = 0; - private WindowState mPinnedWindow = null; - private WindowState mDockedWindow = null; + private ArrayDeque<WindowState> mPinnedWindows = new ArrayDeque<>(); + private ArrayDeque<WindowState> mDockedWindows = new ArrayDeque<>(); private WindowState mDockDivider = null; - private WindowState mReplacingWindow = null; + private ArrayDeque<WindowState> mReplacingWindows = new ArrayDeque<>(); final void assignLayersLocked(WindowList windows) { if (DEBUG_LAYERS) Slog.v(TAG_WM, "Assigning layers based on windows=" + windows, @@ -169,43 +171,54 @@ public class WindowLayersController { private void clear() { mHighestApplicationLayer = 0; - mPinnedWindow = null; - mDockedWindow = null; + mPinnedWindows.clear(); + mDockedWindows.clear(); + mReplacingWindows.clear(); mDockDivider = null; } private void collectSpecialWindows(WindowState w) { if (w.mAttrs.type == TYPE_DOCK_DIVIDER) { mDockDivider = w; - } else { - final TaskStack stack = w.getStack(); - if (stack == null) { - return; - } - if (stack.mStackId == StackId.PINNED_STACK_ID) { - mPinnedWindow = w; - } else if (stack.mStackId == StackId.DOCKED_STACK_ID) { - mDockedWindow = w; - } + return; + } + if (w.mWillReplaceWindow) { + mReplacingWindows.add(w); + } + final TaskStack stack = w.getStack(); + if (stack == null) { + return; + } + if (stack.mStackId == PINNED_STACK_ID) { + mPinnedWindows.add(w); + } else if (stack.mStackId == DOCKED_STACK_ID) { + mDockedWindows.add(w); } } private void adjustSpecialWindows() { int layer = mHighestApplicationLayer + 1; - // For pinned and docked stack window, we want to make them above other windows - // also when these windows are animating. - layer = assignAndIncreaseLayerIfNeeded(mDockedWindow, layer); + // For pinned and docked stack window, we want to make them above other windows also when + // these windows are animating. + while (!mDockedWindows.isEmpty()) { + layer = assignAndIncreaseLayerIfNeeded(mDockedWindows.remove(), layer); + } // Leave some space here so the dim layer while dismissing docked/fullscreen stack has space // below the divider but above the app windows. It needs to be below the divider in because // the divider sometimes overlaps the app windows. layer++; layer = assignAndIncreaseLayerIfNeeded(mDockDivider, layer); - // We know that we will be animating a relaunching window in the near future, - // which will receive a z-order increase. We want the replaced window to - // immediately receive the same treatment, e.g. to be above the dock divider. - layer = assignAndIncreaseLayerIfNeeded(mReplacingWindow, layer); - layer = assignAndIncreaseLayerIfNeeded(mPinnedWindow, layer); + // We know that we will be animating a relaunching window in the near future, which will + // receive a z-order increase. We want the replaced window to immediately receive the same + // treatment, e.g. to be above the dock divider. + while (!mReplacingWindows.isEmpty()) { + layer = assignAndIncreaseLayerIfNeeded(mReplacingWindows.remove(), layer); + } + + while (!mPinnedWindows.isEmpty()) { + layer = assignAndIncreaseLayerIfNeeded(mPinnedWindows.remove(), layer); + } } private int assignAndIncreaseLayerIfNeeded(WindowState win, int layer) { diff --git a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java index 66aa8632b9a2..0979cd32a1e2 100644 --- a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java +++ b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java @@ -35,10 +35,10 @@ public class WindowManagerDebugConfig { static final boolean DEBUG_RESIZE = false; static final boolean DEBUG = false; - static final boolean DEBUG_ADD_REMOVE = true; + static final boolean DEBUG_ADD_REMOVE = false; static final boolean DEBUG_FOCUS = false; static final boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || false; - static final boolean DEBUG_ANIM = true; + static final boolean DEBUG_ANIM = false; static final boolean DEBUG_KEYGUARD = false; static final boolean DEBUG_LAYOUT = false; static final boolean DEBUG_LAYERS = false; @@ -50,7 +50,7 @@ public class WindowManagerDebugConfig { static final boolean DEBUG_ORIENTATION = false; static final boolean DEBUG_APP_ORIENTATION = false; static final boolean DEBUG_CONFIGURATION = false; - static final boolean DEBUG_APP_TRANSITIONS = true; + static final boolean DEBUG_APP_TRANSITIONS = false; static final boolean DEBUG_STARTING_WINDOW = false; static final boolean DEBUG_WALLPAPER = false; static final boolean DEBUG_WALLPAPER_LIGHT = false || DEBUG_WALLPAPER; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 47bdb5cbad90..a26430e773cc 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2856,6 +2856,9 @@ public class WindowManagerService extends IWindowManager.Stub WindowStateAnimator winAnimator, int attrChanges, int oldVisibility) { result |= !win.isVisibleLw() ? WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME : 0; if (win.mExiting) { + Slog.d(TAG, "relayoutVisibleWindow: " + win + " mExiting=true, mRemoveOnExit=" + + win.mRemoveOnExit + ", mDestroying=" + win.mDestroying); + winAnimator.cancelExitAnimationForNextAnimationLocked(); win.mExiting = false; } @@ -4695,11 +4698,6 @@ public class WindowManagerService extends IWindowManager.Stub } stack.attachDisplayContent(displayContent); displayContent.attachStack(stack, onTop); - moveStackWindowsLocked(displayContent); - final WindowList windows = displayContent.getWindowList(); - for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) { - windows.get(winNdx).reportResized(); - } if (stack.getRawFullscreen()) { return null; } @@ -4814,12 +4812,11 @@ public class WindowManagerService extends IWindowManager.Stub } } - public void getStackDockedModeBounds( - int stackId, Rect bounds, boolean ignoreVisibilityOnKeyguardShowing) { + public void getStackDockedModeBounds(int stackId, Rect bounds, boolean ignoreVisibility) { synchronized (mWindowMap) { final TaskStack stack = mStackIdToStack.get(stackId); if (stack != null) { - stack.getStackDockedModeBoundsLocked(bounds, ignoreVisibilityOnKeyguardShowing); + stack.getStackDockedModeBoundsLocked(bounds, ignoreVisibility); return; } bounds.setEmpty(); @@ -7260,8 +7257,18 @@ public class WindowManagerService extends IWindowManager.Stub mTaskPositioner = new TaskPositioner(this); mTaskPositioner.register(display); mInputMonitor.updateInputWindowsLw(true /*force*/); + + // We need to grab the touch focus so that the touch events during the + // resizing/scrolling are not sent to the app. 'win' is the main window + // of the app, it may not have focus since there might be other windows + // on top (eg. a dialog window). + WindowState transferFocusFromWin = win; + if (mCurrentFocus != null && mCurrentFocus != win + && mCurrentFocus.mAppToken == win.mAppToken) { + transferFocusFromWin = mCurrentFocus; + } if (!mInputManager.transferTouchFocus( - win.mInputChannel, mTaskPositioner.mServerChannel)) { + transferFocusFromWin.mInputChannel, mTaskPositioner.mServerChannel)) { Slog.e(TAG_WM, "startPositioningLocked: Unable to transfer touch focus"); mTaskPositioner.unregister(); mTaskPositioner = null; @@ -8102,7 +8109,9 @@ public class WindowManagerService extends IWindowManager.Stub final WindowState imeWin = mInputMethodWindow; final TaskStack focusedStack = mCurrentFocus != null ? mCurrentFocus.getStack() : null; - if (imeWin != null && focusedStack != null && imeWin.isVisibleNow() + if (imeWin != null && imeWin.isVisibleNow() + && isStackVisibleLocked(DOCKED_STACK_ID) + && focusedStack != null && focusedStack.getDockSide() == DOCKED_BOTTOM){ final ArrayList<TaskStack> stacks = displayContent.getStacks(); for (int i = stacks.size() - 1; i >= 0; --i) { diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 1dbca968322c..c7c9cbf3ce0e 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -572,7 +572,8 @@ class WindowStateAnimator { WindowSurfaceController createSurfaceLocked() { final WindowState w = mWin; if (w.hasSavedSurface()) { - Slog.i(TAG, "***** createSurface: " + this + ": called when we had a saved surface"); + if (DEBUG_ANIM) Slog.i(TAG, + "createSurface: " + this + ": called when we had a saved surface"); w.restoreSavedSurface(); return mSurfaceController; } diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java index e14cfdf9aac0..3219bfe26aac 100644 --- a/services/core/java/com/android/server/wm/WindowSurfaceController.java +++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java @@ -130,7 +130,7 @@ class WindowSurfaceController { void destroyInTransaction() { // if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) { - Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(3)); + Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(4)); // } try { mSurfaceControl.destroy(); diff --git a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java index d1d472179542..4e1b644df368 100644 --- a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java +++ b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java @@ -647,14 +647,6 @@ class WindowSurfacePlacer { for (int i = windows.size() - 1; i >= 0; i--) { WindowState w = windows.get(i); - Task task = w.getTask(); - if (task == null && w.getDisplayContent().getHomeStack() == null - && w.getAttrs().type != TYPE_PRIVATE_PRESENTATION) { - // TODO: Understand what the use case is here and see if the conditions can be - // simplified. - continue; - } - final boolean obscuredChanged = w.mObscured != mObscured; // Update effect. diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk index d1b864878109..bb571c3d0631 100644 --- a/services/core/jni/Android.mk +++ b/services/core/jni/Android.mk @@ -28,6 +28,7 @@ LOCAL_SRC_FILES += \ $(LOCAL_REL_DIR)/com_android_server_SerialService.cpp \ $(LOCAL_REL_DIR)/com_android_server_SystemServer.cpp \ $(LOCAL_REL_DIR)/com_android_server_tv_TvInputHal.cpp \ + $(LOCAL_REL_DIR)/com_android_server_vr_VrManagerService.cpp \ $(LOCAL_REL_DIR)/com_android_server_UsbDeviceManager.cpp \ $(LOCAL_REL_DIR)/com_android_server_UsbMidiDevice.cpp \ $(LOCAL_REL_DIR)/com_android_server_UsbHostManager.cpp \ diff --git a/services/core/jni/com_android_server_AlarmManagerService.cpp b/services/core/jni/com_android_server_AlarmManagerService.cpp index 5cbb277a2f12..246ab0d259f4 100644 --- a/services/core/jni/com_android_server_AlarmManagerService.cpp +++ b/services/core/jni/com_android_server_AlarmManagerService.cpp @@ -40,6 +40,8 @@ #include <linux/android_alarm.h> #include <linux/rtc.h> +#include <memory> + namespace android { static const size_t N_ANDROID_TIMERFDS = ANDROID_ALARM_TYPE_COUNT + 1; @@ -323,14 +325,14 @@ static bool rtc_is_hctosys(unsigned int rtc_id) static int wall_clock_rtc() { - DIR *dir = opendir(rtc_sysfs); - if (!dir) { + std::unique_ptr<DIR, int(*)(DIR*)> dir(opendir(rtc_sysfs), closedir); + if (!dir.get()) { ALOGE("failed to open %s: %s", rtc_sysfs, strerror(errno)); return -1; } struct dirent *dirent; - while (errno = 0, dirent = readdir(dir)) { + while (errno = 0, dirent = readdir(dir.get())) { unsigned int rtc_id; int matched = sscanf(dirent->d_name, "rtc%u", &rtc_id); diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index 0c85a1578065..e75775fa9237 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -537,11 +537,11 @@ static void android_location_GnssLocationProvider_class_init_native(JNIEnv* env, method_reportMeasurementData = env->GetMethodID( clazz, "reportMeasurementData", - "(Landroid/location/GpsMeasurementsEvent;)V"); + "(Landroid/location/GnssMeasurementsEvent;)V"); method_reportNavigationMessages = env->GetMethodID( clazz, "reportNavigationMessage", - "(Landroid/location/GpsNavigationMessageEvent;)V"); + "(Landroid/location/GnssNavigationMessageEvent;)V"); err = hw_get_module(GPS_HARDWARE_MODULE_ID, (hw_module_t const**)&module); if (err == 0) { @@ -974,7 +974,7 @@ static jobject translate_gps_clock(JNIEnv* env, void* data, size_t size) { GpsClock* clock = reinterpret_cast<GpsClock*>(data); - jclass gpsClockClass = env->FindClass("android/location/GpsClock"); + jclass gpsClockClass = env->FindClass("android/location/GnssClock"); jmethodID gpsClockCtor = env->GetMethodID(gpsClockClass, "<init>", "()V"); jobject gpsClockObject = env->NewObject(gpsClockClass, gpsClockCtor); @@ -1049,264 +1049,264 @@ static jobject translate_gps_measurement(JNIEnv* env, void* data, size_t size) { const char* floatSignature = "(F)V"; const char* doubleSignature = "(D)V"; - jclass gpsMeasurementClass = env->FindClass("android/location/GpsMeasurement"); - jmethodID gpsMeasurementCtor = env->GetMethodID(gpsMeasurementClass, "<init>", "()V"); + jclass gnssMeasurementClass = env->FindClass("android/location/GnssMeasurement"); + jmethodID gnssMeasurementCtor = env->GetMethodID(gnssMeasurementClass, "<init>", "()V"); GpsMeasurement* measurement = reinterpret_cast<GpsMeasurement*>(data); - jobject gpsMeasurementObject = env->NewObject(gpsMeasurementClass, gpsMeasurementCtor); + jobject gnssMeasurementObject = env->NewObject(gnssMeasurementClass, gnssMeasurementCtor); GpsMeasurementFlags flags = measurement->flags; - jmethodID prnSetterMethod = env->GetMethodID(gpsMeasurementClass, "setPrn", byteSignature); - env->CallVoidMethod(gpsMeasurementObject, prnSetterMethod, measurement->prn); + jmethodID prnSetterMethod = env->GetMethodID(gnssMeasurementClass, "setPrn", byteSignature); + env->CallVoidMethod(gnssMeasurementObject, prnSetterMethod, measurement->prn); jmethodID timeOffsetSetterMethod = - env->GetMethodID(gpsMeasurementClass, "setTimeOffsetInNs", doubleSignature); + env->GetMethodID(gnssMeasurementClass, "setTimeOffsetInNs", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, timeOffsetSetterMethod, measurement->time_offset_ns); - jmethodID stateSetterMethod = env->GetMethodID(gpsMeasurementClass, "setState", shortSignature); - env->CallVoidMethod(gpsMeasurementObject, stateSetterMethod, measurement->state); + jmethodID stateSetterMethod = env->GetMethodID(gnssMeasurementClass, "setState", shortSignature); + env->CallVoidMethod(gnssMeasurementObject, stateSetterMethod, measurement->state); jmethodID receivedGpsTowSetterMethod = - env->GetMethodID(gpsMeasurementClass, "setReceivedGpsTowInNs", longSignature); + env->GetMethodID(gnssMeasurementClass, "setReceivedGpsTowInNs", longSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, receivedGpsTowSetterMethod, measurement->received_gps_tow_ns); jmethodID receivedGpsTowUncertaintySetterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setReceivedGpsTowUncertaintyInNs", longSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, receivedGpsTowUncertaintySetterMethod, measurement->received_gps_tow_uncertainty_ns); jmethodID cn0SetterMethod = - env->GetMethodID(gpsMeasurementClass, "setCn0InDbHz", doubleSignature); - env->CallVoidMethod(gpsMeasurementObject, cn0SetterMethod, measurement->c_n0_dbhz); + env->GetMethodID(gnssMeasurementClass, "setCn0InDbHz", doubleSignature); + env->CallVoidMethod(gnssMeasurementObject, cn0SetterMethod, measurement->c_n0_dbhz); jmethodID pseudorangeRateSetterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setPseudorangeRateInMetersPerSec", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, pseudorangeRateSetterMethod, measurement->pseudorange_rate_mps); jmethodID pseudorangeRateUncertaintySetterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setPseudorangeRateUncertaintyInMetersPerSec", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, pseudorangeRateUncertaintySetterMethod, measurement->pseudorange_rate_uncertainty_mps); jmethodID accumulatedDeltaRangeStateSetterMethod = - env->GetMethodID(gpsMeasurementClass, "setAccumulatedDeltaRangeState", shortSignature); + env->GetMethodID(gnssMeasurementClass, "setAccumulatedDeltaRangeState", shortSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, accumulatedDeltaRangeStateSetterMethod, measurement->accumulated_delta_range_state); jmethodID accumulatedDeltaRangeSetterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setAccumulatedDeltaRangeInMeters", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, accumulatedDeltaRangeSetterMethod, measurement->accumulated_delta_range_m); jmethodID accumulatedDeltaRangeUncertaintySetterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setAccumulatedDeltaRangeUncertaintyInMeters", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, accumulatedDeltaRangeUncertaintySetterMethod, measurement->accumulated_delta_range_uncertainty_m); if (flags & GPS_MEASUREMENT_HAS_PSEUDORANGE) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setPseudorangeInMeters", doubleSignature); - env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->pseudorange_m); + env->GetMethodID(gnssMeasurementClass, "setPseudorangeInMeters", doubleSignature); + env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->pseudorange_m); } if (flags & GPS_MEASUREMENT_HAS_PSEUDORANGE_UNCERTAINTY) { jmethodID setterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setPseudorangeUncertaintyInMeters", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->pseudorange_uncertainty_m); } if (flags & GPS_MEASUREMENT_HAS_CODE_PHASE) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setCodePhaseInChips", doubleSignature); - env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->code_phase_chips); + env->GetMethodID(gnssMeasurementClass, "setCodePhaseInChips", doubleSignature); + env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->code_phase_chips); } if (flags & GPS_MEASUREMENT_HAS_CODE_PHASE_UNCERTAINTY) { jmethodID setterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setCodePhaseUncertaintyInChips", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->code_phase_uncertainty_chips); } if (flags & GPS_MEASUREMENT_HAS_CARRIER_FREQUENCY) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setCarrierFrequencyInHz", floatSignature); + env->GetMethodID(gnssMeasurementClass, "setCarrierFrequencyInHz", floatSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->carrier_frequency_hz); } if (flags & GPS_MEASUREMENT_HAS_CARRIER_CYCLES) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setCarrierCycles", longSignature); - env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->carrier_cycles); + env->GetMethodID(gnssMeasurementClass, "setCarrierCycles", longSignature); + env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->carrier_cycles); } if (flags & GPS_MEASUREMENT_HAS_CARRIER_PHASE) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setCarrierPhase", doubleSignature); - env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->carrier_phase); + env->GetMethodID(gnssMeasurementClass, "setCarrierPhase", doubleSignature); + env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->carrier_phase); } if (flags & GPS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY) { jmethodID setterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setCarrierPhaseUncertainty", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->carrier_phase_uncertainty); } jmethodID lossOfLockSetterMethod = - env->GetMethodID(gpsMeasurementClass, "setLossOfLock", byteSignature); - env->CallVoidMethod(gpsMeasurementObject, lossOfLockSetterMethod, measurement->loss_of_lock); + env->GetMethodID(gnssMeasurementClass, "setLossOfLock", byteSignature); + env->CallVoidMethod(gnssMeasurementObject, lossOfLockSetterMethod, measurement->loss_of_lock); if (flags & GPS_MEASUREMENT_HAS_BIT_NUMBER) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setBitNumber", intSignature); - env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->bit_number); + env->GetMethodID(gnssMeasurementClass, "setBitNumber", intSignature); + env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->bit_number); } if (flags & GPS_MEASUREMENT_HAS_TIME_FROM_LAST_BIT) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setTimeFromLastBitInMs", shortSignature); + env->GetMethodID(gnssMeasurementClass, "setTimeFromLastBitInMs", shortSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->time_from_last_bit_ms); } if (flags & GPS_MEASUREMENT_HAS_DOPPLER_SHIFT) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setDopplerShiftInHz", doubleSignature); - env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->doppler_shift_hz); + env->GetMethodID(gnssMeasurementClass, "setDopplerShiftInHz", doubleSignature); + env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->doppler_shift_hz); } if (flags & GPS_MEASUREMENT_HAS_DOPPLER_SHIFT_UNCERTAINTY) { jmethodID setterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setDopplerShiftUncertaintyInHz", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->doppler_shift_uncertainty_hz); } jmethodID multipathIndicatorSetterMethod = - env->GetMethodID(gpsMeasurementClass, "setMultipathIndicator", byteSignature); + env->GetMethodID(gnssMeasurementClass, "setMultipathIndicator", byteSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, multipathIndicatorSetterMethod, measurement->multipath_indicator); if (flags & GPS_MEASUREMENT_HAS_SNR) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setSnrInDb", doubleSignature); - env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->snr_db); + env->GetMethodID(gnssMeasurementClass, "setSnrInDb", doubleSignature); + env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->snr_db); } if (flags & GPS_MEASUREMENT_HAS_ELEVATION) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setElevationInDeg", doubleSignature); - env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->elevation_deg); + env->GetMethodID(gnssMeasurementClass, "setElevationInDeg", doubleSignature); + env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->elevation_deg); } if (flags & GPS_MEASUREMENT_HAS_ELEVATION_UNCERTAINTY) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setElevationUncertaintyInDeg", doubleSignature); + env->GetMethodID(gnssMeasurementClass, "setElevationUncertaintyInDeg", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->elevation_uncertainty_deg); } if (flags & GPS_MEASUREMENT_HAS_AZIMUTH) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, "setAzimuthInDeg", doubleSignature); - env->CallVoidMethod(gpsMeasurementObject, setterMethod, measurement->azimuth_deg); + env->GetMethodID(gnssMeasurementClass, "setAzimuthInDeg", doubleSignature); + env->CallVoidMethod(gnssMeasurementObject, setterMethod, measurement->azimuth_deg); } if (flags & GPS_MEASUREMENT_HAS_AZIMUTH_UNCERTAINTY) { jmethodID setterMethod = env->GetMethodID( - gpsMeasurementClass, + gnssMeasurementClass, "setAzimuthUncertaintyInDeg", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->azimuth_uncertainty_deg); } - jmethodID usedInFixSetterMethod = env->GetMethodID(gpsMeasurementClass, "setUsedInFix", "(Z)V"); + jmethodID usedInFixSetterMethod = env->GetMethodID(gnssMeasurementClass, "setUsedInFix", "(Z)V"); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, usedInFixSetterMethod, (flags & GPS_MEASUREMENT_HAS_USED_IN_FIX) && measurement->used_in_fix); if (size == sizeof(GpsMeasurement)) { jmethodID setterMethod = - env->GetMethodID(gpsMeasurementClass, + env->GetMethodID(gnssMeasurementClass, "setPseudorangeRateCarrierInMetersPerSec", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->pseudorange_rate_carrier_mps); setterMethod = - env->GetMethodID(gpsMeasurementClass, + env->GetMethodID(gnssMeasurementClass, "setPseudorangeRateCarrierUncertaintyInMetersPerSec", doubleSignature); env->CallVoidMethod( - gpsMeasurementObject, + gnssMeasurementObject, setterMethod, measurement->pseudorange_rate_carrier_uncertainty_mps); } - env->DeleteLocalRef(gpsMeasurementClass); - return gpsMeasurementObject; + env->DeleteLocalRef(gnssMeasurementClass); + return gnssMeasurementObject; } /** @@ -1321,23 +1321,23 @@ static jobjectArray translate_gps_measurements(JNIEnv* env, void* data) { return NULL; } - jclass gpsMeasurementClass = env->FindClass("android/location/GpsMeasurement"); - jobjectArray gpsMeasurementArray = env->NewObjectArray( + jclass gnssMeasurementClass = env->FindClass("android/location/GnssMeasurement"); + jobjectArray gnssMeasurementArray = env->NewObjectArray( measurementCount, - gpsMeasurementClass, + gnssMeasurementClass, NULL /* initialElement */); for (uint16_t i = 0; i < measurementCount; ++i) { - jobject gpsMeasurement = translate_gps_measurement( + jobject gnssMeasurement = translate_gps_measurement( env, &(gps_data->measurements[i]), sizeof(gps_data->measurements[0])); - env->SetObjectArrayElement(gpsMeasurementArray, i, gpsMeasurement); - env->DeleteLocalRef(gpsMeasurement); + env->SetObjectArrayElement(gnssMeasurementArray, i, gnssMeasurement); + env->DeleteLocalRef(gnssMeasurement); } - env->DeleteLocalRef(gpsMeasurementClass); - return gpsMeasurementArray; + env->DeleteLocalRef(gnssMeasurementClass); + return gnssMeasurementArray; } static void measurement_callback(GpsData* data) { @@ -1360,25 +1360,25 @@ static void measurement_callback(GpsData* data) { gpsClock = translate_gps_clock(env, &data->clock, sizeof(GpsClock_v1)); measurementArray = translate_gps_measurements<GpsData_v1>(env, data); } - jclass gpsMeasurementsEventClass = env->FindClass("android/location/GpsMeasurementsEvent"); - jmethodID gpsMeasurementsEventCtor = env->GetMethodID( - gpsMeasurementsEventClass, + jclass gnssMeasurementsEventClass = env->FindClass("android/location/GnssMeasurementsEvent"); + jmethodID gnssMeasurementsEventCtor = env->GetMethodID( + gnssMeasurementsEventClass, "<init>", - "(Landroid/location/GpsClock;[Landroid/location/GpsMeasurement;)V"); + "(Landroid/location/GnssClock;[Landroid/location/GnssMeasurement;)V"); - jobject gpsMeasurementsEvent = env->NewObject( - gpsMeasurementsEventClass, - gpsMeasurementsEventCtor, + jobject gnssMeasurementsEvent = env->NewObject( + gnssMeasurementsEventClass, + gnssMeasurementsEventCtor, gpsClock, measurementArray); - env->CallVoidMethod(mCallbacksObj, method_reportMeasurementData, gpsMeasurementsEvent); + env->CallVoidMethod(mCallbacksObj, method_reportMeasurementData, gnssMeasurementsEvent); checkAndClearExceptionFromCallback(env, __FUNCTION__); env->DeleteLocalRef(gpsClock); env->DeleteLocalRef(measurementArray); - env->DeleteLocalRef(gpsMeasurementsEventClass); - env->DeleteLocalRef(gpsMeasurementsEvent); + env->DeleteLocalRef(gnssMeasurementsEventClass); + env->DeleteLocalRef(gnssMeasurementsEvent); } GpsMeasurementCallbacks sGpsMeasurementCallbacks = { @@ -1432,7 +1432,7 @@ static jobject translate_gps_navigation_message(JNIEnv* env, GpsNavigationMessag return NULL; } - jclass navigationMessageClass = env->FindClass("android/location/GpsNavigationMessage"); + jclass navigationMessageClass = env->FindClass("android/location/GnssNavigationMessage"); jmethodID navigationMessageCtor = env->GetMethodID(navigationMessageClass, "<init>", "()V"); jobject navigationMessageObject = env->NewObject(navigationMessageClass, navigationMessageCtor); @@ -1470,11 +1470,11 @@ static void navigation_message_callback(GpsNavigationMessage* message) { jobject navigationMessage = translate_gps_navigation_message(env, message); jclass navigationMessageEventClass = - env->FindClass("android/location/GpsNavigationMessageEvent"); + env->FindClass("android/location/GnssNavigationMessageEvent"); jmethodID navigationMessageEventCtor = env->GetMethodID( navigationMessageEventClass, "<init>", - "(Landroid/location/GpsNavigationMessage;)V"); + "(Landroid/location/GnssNavigationMessage;)V"); jobject navigationMessageEvent = env->NewObject( navigationMessageEventClass, navigationMessageEventCtor, diff --git a/services/core/jni/com_android_server_vr_VrManagerService.cpp b/services/core/jni/com_android_server_vr_VrManagerService.cpp new file mode 100644 index 000000000000..1aba43b2cd8b --- /dev/null +++ b/services/core/jni/com_android_server_vr_VrManagerService.cpp @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2016 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. + */ + +#define LOG_TAG "VrManagerService" + +#include <android_runtime/AndroidRuntime.h> +#include <jni.h> +#include <JNIHelp.h> + +#include <utils/Errors.h> +#include <utils/Log.h> +#include <hardware/hardware.h> +#include <hardware/vr.h> + +namespace android { + +static vr_module_t *gVrHardwareModule = NULL; + + +static void init_native(JNIEnv* /* env */, jclass /* clazz */) { + if (gVrHardwareModule != NULL) { + // This call path should never be hit. + ALOGE("%s: May not initialize VR hardware module more than once!", __FUNCTION__); + return; + } + + int err = hw_get_module(VR_HARDWARE_MODULE_ID, (hw_module_t const**)&gVrHardwareModule); + if (err) { + ALOGW("%s: Could not open VR hardware module, error %s (%d).", __FUNCTION__, + strerror(-err), err); + return; + } + + // Call init method if implemented. + if (gVrHardwareModule->init) { + gVrHardwareModule->init(gVrHardwareModule); + } +} + +static void setVrMode_native(JNIEnv* /* env */, jclass /* clazz */, jboolean enabled) { + if (gVrHardwareModule == NULL) { + // There is no VR hardware module implemented, do nothing. + return; + } + + // Call set_vr_mode method, this must be implemented if the HAL exists. + gVrHardwareModule->set_vr_mode(gVrHardwareModule, static_cast<bool>(enabled)); +} + +static const JNINativeMethod method_table[] = { + { "initializeNative", "()V", (void*)init_native }, + { "setVrModeNative", "(Z)V", (void*)setVrMode_native }, +}; + +int register_android_server_vr_VrManagerService(JNIEnv *env) +{ + return jniRegisterNativeMethods(env, "com/android/server/vr/VrManagerService", + method_table, NELEM(method_table)); +} + +}; // namespace android diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp index a7010bcba5dd..ef5c56c1bcfa 100644 --- a/services/core/jni/onload.cpp +++ b/services/core/jni/onload.cpp @@ -35,6 +35,7 @@ int register_android_server_SystemServer(JNIEnv* env); int register_android_server_UsbDeviceManager(JNIEnv* env); int register_android_server_UsbMidiDevice(JNIEnv* env); int register_android_server_UsbHostManager(JNIEnv* env); +int register_android_server_vr_VrManagerService(JNIEnv* env); int register_android_server_VibratorService(JNIEnv* env); int register_android_server_location_GnssLocationProvider(JNIEnv* env); int register_android_server_location_FlpHardwareProvider(JNIEnv* env); @@ -69,6 +70,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) register_android_server_UsbDeviceManager(env); register_android_server_UsbMidiDevice(env); register_android_server_UsbHostManager(env); + register_android_server_vr_VrManagerService(env); register_android_server_VibratorService(env); register_android_server_SystemServer(env); register_android_server_location_GnssLocationProvider(env); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 4022ac62bf96..908d2f0e8867 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -1463,6 +1463,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { void securityLogSetLoggingEnabledProperty(boolean enabled) { SecurityLog.setLoggingEnabledProperty(enabled); } + + boolean securityLogGetLoggingEnabledProperty() { + return SecurityLog.getLoggingEnabledProperty(); + } + + boolean securityLogIsLoggingEnabled() { + return SecurityLog.isLoggingEnabled(); + } } /** @@ -1607,7 +1615,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (mOwners.hasDeviceOwner()) { mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, "true"); disableDeviceLoggingIfNotCompliant(); - if (SecurityLog.getLoggingEnabledProperty()) { + if (mInjector.securityLogGetLoggingEnabledProperty()) { mSecurityLogMonitor.start(); } } else { @@ -2005,9 +2013,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { void removeActiveAdminLocked(final ComponentName adminReceiver, final int userHandle) { final ActiveAdmin admin = getActiveAdminUncheckedLocked(adminReceiver, userHandle); if (admin != null) { - synchronized (this) { - getUserData(userHandle).mRemovingAdmins.add(adminReceiver); - } + getUserData(userHandle).mRemovingAdmins.add(adminReceiver); + sendAdminCommandLocked(admin, DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLED, new BroadcastReceiver() { @@ -2046,7 +2053,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { resolveIntent.setComponent(adminName); List<ResolveInfo> infos = mContext.getPackageManager().queryBroadcastReceiversAsUser( resolveIntent, - PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, + PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS | + PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, userHandle); if (infos == null || infos.size() <= 0) { throw new IllegalArgumentException("Unknown admin: " + adminName); @@ -2813,14 +2821,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (admin == null) { return; } + // Active device/profile owners must remain active admins. + if (isDeviceOwner(adminReceiver, userHandle) + || isProfileOwner(adminReceiver, userHandle)) { + Slog.e(LOG_TAG, "Device/profile owner cannot be removed: component=" + + adminReceiver); + return; + } if (admin.getUid() != mInjector.binderGetCallingUid()) { - // Active device/profile owners must remain active admins. - if (isDeviceOwner(adminReceiver, userHandle) - || isProfileOwner(adminReceiver, userHandle)) { - Slog.e(LOG_TAG, "Device/profile owner cannot be removed: component=" + - adminReceiver); - return; - } mContext.enforceCallingOrSelfPermission( android.Manifest.permission.MANAGE_DEVICE_ADMINS, null); } @@ -3649,7 +3657,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (!(isProfileOwner(adminComponent, userHandle) || isDeviceOwner(adminComponent, userHandle))) { final boolean preN = getTargetSdk(admin.info.getPackageName(), userHandle) - < android.os.Build.VERSION_CODES.N; + <= android.os.Build.VERSION_CODES.M; // As of N, password resetting to empty/null is not allowed anymore. // TODO Should we allow DO/PO to set an empty password? if (TextUtils.isEmpty(password)) { @@ -4472,7 +4480,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mInjector.binderRestoreCallingIdentity(ident); } - if (SecurityLog.isLoggingEnabled()) { + if (mInjector.securityLogIsLoggingEnabled()) { SecurityLog.writeEvent(SecurityLog.TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT, /*result*/ 0); } } @@ -4502,7 +4510,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } - if (SecurityLog.isLoggingEnabled()) { + if (mInjector.securityLogIsLoggingEnabled()) { SecurityLog.writeEvent(SecurityLog.TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT, /*result*/ 1); } } @@ -4511,7 +4519,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { public void reportKeyguardDismissed() { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.BIND_DEVICE_ADMIN, null); - if (SecurityLog.isLoggingEnabled()) { + if (mInjector.securityLogIsLoggingEnabled()) { SecurityLog.writeEvent(SecurityLog.TAG_KEYGUARD_DISMISSED); } } @@ -4520,7 +4528,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { public void reportKeyguardSecured() { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.BIND_DEVICE_ADMIN, null); - if (SecurityLog.isLoggingEnabled()) { + if (mInjector.securityLogIsLoggingEnabled()) { SecurityLog.writeEvent(SecurityLog.TAG_KEYGUARD_SECURED); } } @@ -5473,9 +5481,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { throw new SecurityException(e); } synchronized (this) { + final ComponentName deviceOwnerComponent = mOwners.getDeviceOwnerComponent(); + final int deviceOwnerUserId = mOwners.getDeviceOwnerUserId(); if (!mOwners.hasDeviceOwner() - || !mOwners.getDeviceOwnerComponent().getPackageName().equals(packageName) - || (mOwners.getDeviceOwnerUserId() != UserHandle.getUserId(callingUid))) { + || !deviceOwnerComponent.getPackageName().equals(packageName) + || (deviceOwnerUserId != UserHandle.getUserId(callingUid))) { throw new SecurityException( "clearDeviceOwner can only be called by the device owner"); } @@ -5487,8 +5497,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { admin.forceEphemeralUsers = false; mUserManagerInternal.setForceEphemeralUsers(admin.forceEphemeralUsers); } - - clearUserPoliciesLocked(new UserHandle(UserHandle.USER_SYSTEM)); + clearUserPoliciesLocked(deviceOwnerUserId); mOwners.clearDeviceOwner(); mOwners.writeDeviceOwner(); @@ -5498,6 +5507,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { long ident = mInjector.binderClearCallingIdentity(); try { mInjector.getIBackupManager().setBackupServiceActive(UserHandle.USER_SYSTEM, true); + + removeActiveAdminLocked(deviceOwnerComponent, deviceOwnerUserId); } catch (RemoteException e) { throw new IllegalStateException("Failed reactivating backup service.", e); } finally { @@ -5538,9 +5549,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { synchronized (this) { admin.disableCamera = false; admin.userRestrictions = null; - clearUserPoliciesLocked(callingUser); + clearUserPoliciesLocked(userId); mOwners.removeProfileOwner(userId); mOwners.writeProfileOwner(userId); + + final long ident = mInjector.binderClearCallingIdentity(); + try { + removeActiveAdminLocked(who, userId); + } finally { + mInjector.binderRestoreCallingIdentity(ident); + } } } @@ -5568,8 +5586,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return mLockPatternUtils.getDeviceOwnerInfo(); } - private void clearUserPoliciesLocked(UserHandle userHandle) { - int userId = userHandle.getIdentifier(); + private void clearUserPoliciesLocked(int userId) { // Reset some of the user-specific policies DevicePolicyData policy = getUserData(userId); policy.mPermissionPolicy = DevicePolicyManager.PERMISSION_POLICY_PROMPT; @@ -5583,8 +5600,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { try { mIPackageManager.updatePermissionFlagsForAllApps( PackageManager.FLAG_PERMISSION_POLICY_FIXED, - 0 /* flagValues */, userHandle.getIdentifier()); - pushUserRestrictions(userHandle.getIdentifier()); + 0 /* flagValues */, userId); + pushUserRestrictions(userId); } catch (RemoteException re) { } finally { mInjector.binderRestoreCallingIdentity(ident); @@ -6851,6 +6868,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { @Override public void setUserRestriction(ComponentName who, String key, boolean enabledFromThisOwner) { Preconditions.checkNotNull(who, "ComponentName is null"); + if (!UserRestrictionsUtils.isValidRestriction(key)) { + return; + } + final int userHandle = mInjector.userHandleGetCallingUserId(); synchronized (this) { ActiveAdmin activeAdmin = @@ -7244,7 +7265,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (managedUserId < 0) { return; } - if (getCrossProfileCallerIdDisabledForUser(managedUserId)) { + if (isCrossProfileQuickContactDisabled(managedUserId)) { if (VERBOSE_LOG) { Log.v(LOG_TAG, "Cross-profile contacts access disabled for user " + managedUserId); @@ -7260,6 +7281,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } /** + * @return true if cross-profile QuickContact is disabled + */ + private boolean isCrossProfileQuickContactDisabled(int userId) { + return getCrossProfileCallerIdDisabledForUser(userId) + && getCrossProfileContactsSearchDisabledForUser(userId); + } + + /** * @return the user ID of the managed user that is linked to the current user, if any. * Otherwise -1. */ @@ -8344,7 +8373,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { Preconditions.checkNotNull(admin); synchronized (this) { getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER); - return SecurityLog.getLoggingEnabledProperty(); + return mInjector.securityLogGetLoggingEnabledProperty(); } } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 254a37a7adfa..b64db578decb 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -80,6 +80,7 @@ import com.android.server.os.SchedulingPolicyService; import com.android.server.pm.BackgroundDexOptService; import com.android.server.pm.Installer; import com.android.server.pm.LauncherAppsService; +import com.android.server.pm.OtaDexoptService; import com.android.server.pm.PackageManagerService; import com.android.server.pm.UserManagerService; import com.android.server.power.PowerManagerService; @@ -1097,6 +1098,18 @@ public final class SystemServer { } Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); + // Manages A/B OTA dexopting. + boolean disableOtaDexopt = SystemProperties.getBoolean("config.disable_otadexopt", + false); + if (!disableOtaDexopt) { + traceBeginAndSlog("StartOtaDexOptService"); + try { + OtaDexoptService.main(mSystemContext, mPackageManagerService); + } catch (Throwable e) { + reportWtf("starting BackgroundDexOptService", e); + } + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); + } } mSystemServiceManager.startService(LauncherAppsService.class); diff --git a/services/net/java/android/net/apf/ApfGenerator.java b/services/net/java/android/net/apf/ApfGenerator.java new file mode 100644 index 000000000000..96c2ba535dd1 --- /dev/null +++ b/services/net/java/android/net/apf/ApfGenerator.java @@ -0,0 +1,883 @@ +/* + * Copyright (C) 2016 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 android.net.apf; + +import java.util.ArrayList; +import java.util.HashMap; + +/** + * APF assembler/generator. A tool for generating an APF program. + * + * Call add*() functions to add instructions to the program, then call + * {@link generate} to get the APF bytecode for the program. + * + * @hide + */ +public class ApfGenerator { + /** + * This exception is thrown when an attempt is made to generate an illegal instruction. + */ + public static class IllegalInstructionException extends Exception { + IllegalInstructionException(String msg) { + super(msg); + } + } + private enum Opcodes { + LABEL(-1), + LDB(1), // Load 1 byte from immediate offset, e.g. "ldb R0, [5]" + LDH(2), // Load 2 bytes from immediate offset, e.g. "ldh R0, [5]" + LDW(3), // Load 4 bytes from immediate offset, e.g. "ldw R0, [5]" + LDBX(4), // Load 1 byte from immediate offset plus register, e.g. "ldbx R0, [5]R0" + LDHX(5), // Load 2 byte from immediate offset plus register, e.g. "ldhx R0, [5]R0" + LDWX(6), // Load 4 byte from immediate offset plus register, e.g. "ldwx R0, [5]R0" + ADD(7), // Add, e.g. "add R0,5" + MUL(8), // Multiply, e.g. "mul R0,5" + DIV(9), // Divide, e.g. "div R0,5" + AND(10), // And, e.g. "and R0,5" + OR(11), // Or, e.g. "or R0,5" + SH(12), // Left shift, e.g, "sh R0, 5" or "sh R0, -5" (shifts right) + LI(13), // Load immediate, e.g. "li R0,5" (immediate encoded as signed value) + JMP(14), // Jump, e.g. "jmp label" + JEQ(15), // Compare equal and branch, e.g. "jeq R0,5,label" + JNE(16), // Compare not equal and branch, e.g. "jne R0,5,label" + JGT(17), // Compare greater than and branch, e.g. "jgt R0,5,label" + JLT(18), // Compare less than and branch, e.g. "jlt R0,5,label" + JSET(19), // Compare any bits set and branch, e.g. "jset R0,5,label" + JNEBS(20), // Compare not equal byte sequence, e.g. "jnebs R0,5,label,0x1122334455" + EXT(21); // Followed by immediate indicating ExtendedOpcodes. + + final int value; + + private Opcodes(int value) { + this.value = value; + } + } + // Extended opcodes. Primary opcode is Opcodes.EXT. ExtendedOpcodes are encoded in the immediate + // field. + private enum ExtendedOpcodes { + LDM(0), // Load from memory, e.g. "ldm R0,5" + STM(16), // Store to memory, e.g. "stm R0,5" + NOT(32), // Not, e.g. "not R0" + NEG(33), // Negate, e.g. "neg R0" + SWAP(34), // Swap, e.g. "swap R0,R1" + MOVE(35); // Move, e.g. "move R0,R1" + + final int value; + + private ExtendedOpcodes(int value) { + this.value = value; + } + } + public enum Register { + R0(0), + R1(1); + + final int value; + + private Register(int value) { + this.value = value; + } + } + private class Instruction { + private final byte mOpcode; // A "Opcode" value. + private final byte mRegister; // A "Register" value. + private boolean mHasImm; + private byte mImmSize; + private boolean mImmSigned; + private int mImm; + // When mOpcode is a jump: + private byte mTargetLabelSize; + private String mTargetLabel; + // When mOpcode == Opcodes.LABEL: + private String mLabel; + // When mOpcode == Opcodes.JNEBS: + private byte[] mCompareBytes; + // Offset in bytes from the begining of this program. Set by {@link ApfGenerator#generate}. + int offset; + + Instruction(Opcodes opcode, Register register) { + mOpcode = (byte)opcode.value; + mRegister = (byte)register.value; + } + + Instruction(Opcodes opcode) { + this(opcode, Register.R0); + } + + void setImm(int imm, boolean signed) { + mHasImm = true; + mImm = imm; + mImmSigned = signed; + mImmSize = calculateImmSize(imm, signed); + } + + void setUnsignedImm(int imm) { + setImm(imm, false); + } + + void setSignedImm(int imm) { + setImm(imm, true); + } + + void setLabel(String label) throws IllegalInstructionException { + if (mLabels.containsKey(label)) { + throw new IllegalInstructionException("duplicate label " + label); + } + if (mOpcode != Opcodes.LABEL.value) { + throw new IllegalStateException("adding label to non-label instruction"); + } + mLabel = label; + mLabels.put(label, this); + } + + void setTargetLabel(String label) { + mTargetLabel = label; + mTargetLabelSize = 4; // May shrink later on in generate(). + } + + void setCompareBytes(byte[] bytes) { + if (mOpcode != Opcodes.JNEBS.value) { + throw new IllegalStateException("adding compare bytes to non-JNEBS instruction"); + } + mCompareBytes = bytes; + } + + /** + * @return size of instruction in bytes. + */ + int size() { + if (mOpcode == Opcodes.LABEL.value) { + return 0; + } + int size = 1; + if (mHasImm) { + size += generatedImmSize(); + } + if (mTargetLabel != null) { + size += generatedImmSize(); + } + if (mCompareBytes != null) { + size += mCompareBytes.length; + } + return size; + } + + /** + * Resize immediate value field so that it's only as big as required to + * contain the offset of the jump destination. + * @return {@code true} if shrunk. + */ + boolean shrink() throws IllegalInstructionException { + if (mTargetLabel == null) { + return false; + } + int oldSize = size(); + int oldTargetLabelSize = mTargetLabelSize; + mTargetLabelSize = calculateImmSize(calculateTargetLabelOffset(), false); + if (mTargetLabelSize > oldTargetLabelSize) { + throw new IllegalStateException("instruction grew"); + } + return size() < oldSize; + } + + /** + * Assemble value for instruction size field. + */ + private byte generateImmSizeField() { + byte immSize = generatedImmSize(); + // Encode size field to fit in 2 bits: 0->0, 1->1, 2->2, 3->4. + return immSize == 4 ? 3 : immSize; + } + + /** + * Assemble first byte of generated instruction. + */ + private byte generateInstructionByte() { + byte sizeField = generateImmSizeField(); + return (byte)((mOpcode << 3) | (sizeField << 1) | mRegister); + } + + /** + * Write {@code value} at offset {@code writingOffset} into {@code bytecode}. + * {@link generatedImmSize} bytes are written. {@code value} is truncated to + * {@code generatedImmSize} bytes. {@code value} is treated simply as a + * 32-bit value, so unsigned values should be zero extended and the truncation + * should simply throw away their zero-ed upper bits, and signed values should + * be sign extended and the truncation should simply throw away their signed + * upper bits. + */ + private int writeValue(int value, byte[] bytecode, int writingOffset) { + for (int i = generatedImmSize() - 1; i >= 0; i--) { + bytecode[writingOffset++] = (byte)((value >> (i * 8)) & 255); + } + return writingOffset; + } + + /** + * Generate bytecode for this instruction at offset {@link offset}. + */ + void generate(byte[] bytecode) throws IllegalInstructionException { + if (mOpcode == Opcodes.LABEL.value) { + return; + } + int writingOffset = offset; + bytecode[writingOffset++] = generateInstructionByte(); + if (mTargetLabel != null) { + writingOffset = writeValue(calculateTargetLabelOffset(), bytecode, writingOffset); + } + if (mHasImm) { + writingOffset = writeValue(mImm, bytecode, writingOffset); + } + if (mCompareBytes != null) { + System.arraycopy(mCompareBytes, 0, bytecode, writingOffset, mCompareBytes.length); + writingOffset += mCompareBytes.length; + } + if ((writingOffset - offset) != size()) { + throw new IllegalStateException("wrote " + (writingOffset - offset) + + " but should have written " + size()); + } + } + + /** + * Calculate the size of either the immediate field or the target label field, if either is + * present. Most instructions have either an immediate or a target label field, but for the + * instructions that have both, the size of the target label field must be the same as the + * size of the immediate field, because there is only one length field in the instruction + * byte, hence why this function simply takes the maximum of the two sizes, so neither is + * truncated. + */ + private byte generatedImmSize() { + return mImmSize > mTargetLabelSize ? mImmSize : mTargetLabelSize; + } + + private int calculateTargetLabelOffset() throws IllegalInstructionException { + Instruction targetLabelInstruction; + if (mTargetLabel == DROP_LABEL) { + targetLabelInstruction = mDropLabel; + } else if (mTargetLabel == PASS_LABEL) { + targetLabelInstruction = mPassLabel; + } else { + targetLabelInstruction = mLabels.get(mTargetLabel); + } + if (targetLabelInstruction == null) { + throw new IllegalInstructionException("label not found: " + mTargetLabel); + } + // Calculate distance from end of this instruction to instruction.offset. + final int targetLabelOffset = targetLabelInstruction.offset - (offset + size()); + if (targetLabelOffset < 0) { + throw new IllegalInstructionException("backward branches disallowed; label: " + + mTargetLabel); + } + return targetLabelOffset; + } + + private byte calculateImmSize(int imm, boolean signed) { + if (imm == 0) { + return 0; + } + if (signed && (imm >= -128 && imm <= 127) || + !signed && (imm >= 0 && imm <= 255)) { + return 1; + } + if (signed && (imm >= -32768 && imm <= 32767) || + !signed && (imm >= 0 && imm <= 65535)) { + return 2; + } + return 4; + } + } + + /** + * Jump to this label to terminate the program and indicate the packet + * should be dropped. + */ + public static final String DROP_LABEL = "__DROP__"; + + /** + * Jump to this label to terminate the program and indicate the packet + * should be passed to the AP. + */ + public static final String PASS_LABEL = "__PASS__"; + + /** + * Number of memory slots available for access via APF stores to memory and loads from memory. + * The memory slots are numbered 0 to {@code MEMORY_SLOTS} - 1. This must be kept in sync with + * the APF interpreter. + */ + public static final int MEMORY_SLOTS = 16; + + /** + * Memory slot number that is prefilled with the IPv4 header length. + * Note that this memory slot may be overwritten by a program that + * executes stores to this memory slot. This must be kept in sync with + * the APF interpreter. + */ + public static final int IPV4_HEADER_SIZE_MEMORY_SLOT = 13; + + /** + * Memory slot number that is prefilled with the size of the packet being filtered in bytes. + * Note that this memory slot may be overwritten by a program that + * executes stores to this memory slot. This must be kept in sync with the APF interpreter. + */ + public static final int PACKET_SIZE_MEMORY_SLOT = 14; + + /** + * Memory slot number that is prefilled with the age of the filter in seconds. The age of the + * filter is the time since the filter was installed until now. + * Note that this memory slot may be overwritten by a program that + * executes stores to this memory slot. This must be kept in sync with the APF interpreter. + */ + public static final int FILTER_AGE_MEMORY_SLOT = 15; + + /** + * First memory slot containing prefilled values. Can be used in range comparisons to determine + * if memory slot index is within prefilled slots. + */ + public static final int FIRST_PREFILLED_MEMORY_SLOT = IPV4_HEADER_SIZE_MEMORY_SLOT; + + /** + * Last memory slot containing prefilled values. Can be used in range comparisons to determine + * if memory slot index is within prefilled slots. + */ + public static final int LAST_PREFILLED_MEMORY_SLOT = FILTER_AGE_MEMORY_SLOT; + + private final ArrayList<Instruction> mInstructions = new ArrayList<Instruction>(); + private final HashMap<String, Instruction> mLabels = new HashMap<String, Instruction>(); + private final Instruction mDropLabel = new Instruction(Opcodes.LABEL); + private final Instruction mPassLabel = new Instruction(Opcodes.LABEL); + private boolean mGenerated; + + /** + * Set version of APF instruction set to generate instructions for. Returns {@code true} + * if generating for this version is supported, {@code false} otherwise. + */ + public boolean setApfVersion(int version) { + // This version number syncs up with APF_VERSION in hardware/google/apf/apf_interpreter.h + return version == 2; + } + + private void addInstruction(Instruction instruction) { + if (mGenerated) { + throw new IllegalStateException("Program already generated"); + } + mInstructions.add(instruction); + } + + /** + * Define a label at the current end of the program. Jumps can jump to this label. Labels are + * their own separate instructions, though with size 0. This facilitates having labels with + * no corresponding code to execute, for example a label at the end of a program. For example + * an {@link ApfGenerator} might be passed to a function that adds a filter like so: + * <pre> + * load from packet + * compare loaded data, jump if not equal to "next_filter" + * load from packet + * compare loaded data, jump if not equal to "next_filter" + * jump to drop label + * define "next_filter" here + * </pre> + * In this case "next_filter" may not have any generated code associated with it. + */ + public ApfGenerator defineLabel(String name) throws IllegalInstructionException { + Instruction instruction = new Instruction(Opcodes.LABEL); + instruction.setLabel(name); + addInstruction(instruction); + return this; + } + + /** + * Add an unconditional jump instruction to the end of the program. + */ + public ApfGenerator addJump(String target) { + Instruction instruction = new Instruction(Opcodes.JMP); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to load the byte at offset {@code offset} + * bytes from the begining of the packet into {@code register}. + */ + public ApfGenerator addLoad8(Register register, int offset) { + Instruction instruction = new Instruction(Opcodes.LDB, register); + instruction.setUnsignedImm(offset); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to load 16-bits at offset {@code offset} + * bytes from the begining of the packet into {@code register}. + */ + public ApfGenerator addLoad16(Register register, int offset) { + Instruction instruction = new Instruction(Opcodes.LDH, register); + instruction.setUnsignedImm(offset); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to load 32-bits at offset {@code offset} + * bytes from the begining of the packet into {@code register}. + */ + public ApfGenerator addLoad32(Register register, int offset) { + Instruction instruction = new Instruction(Opcodes.LDW, register); + instruction.setUnsignedImm(offset); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to load a byte from the packet into + * {@code register}. The offset of the loaded byte from the begining of the packet is + * the sum of {@code offset} and the value in register R1. + */ + public ApfGenerator addLoad8Indexed(Register register, int offset) { + Instruction instruction = new Instruction(Opcodes.LDBX, register); + instruction.setUnsignedImm(offset); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to load 16-bits from the packet into + * {@code register}. The offset of the loaded 16-bits from the begining of the packet is + * the sum of {@code offset} and the value in register R1. + */ + public ApfGenerator addLoad16Indexed(Register register, int offset) { + Instruction instruction = new Instruction(Opcodes.LDHX, register); + instruction.setUnsignedImm(offset); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to load 32-bits from the packet into + * {@code register}. The offset of the loaded 32-bits from the begining of the packet is + * the sum of {@code offset} and the value in register R1. + */ + public ApfGenerator addLoad32Indexed(Register register, int offset) { + Instruction instruction = new Instruction(Opcodes.LDWX, register); + instruction.setUnsignedImm(offset); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to add {@code value} to register R0. + */ + public ApfGenerator addAdd(int value) { + Instruction instruction = new Instruction(Opcodes.ADD); + instruction.setSignedImm(value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to multiply register R0 by {@code value}. + */ + public ApfGenerator addMul(int value) { + Instruction instruction = new Instruction(Opcodes.MUL); + instruction.setSignedImm(value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to divide register R0 by {@code value}. + */ + public ApfGenerator addDiv(int value) { + Instruction instruction = new Instruction(Opcodes.DIV); + instruction.setSignedImm(value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to logically and register R0 with {@code value}. + */ + public ApfGenerator addAnd(int value) { + Instruction instruction = new Instruction(Opcodes.AND); + instruction.setUnsignedImm(value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to logically or register R0 with {@code value}. + */ + public ApfGenerator addOr(int value) { + Instruction instruction = new Instruction(Opcodes.OR); + instruction.setUnsignedImm(value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to shift left register R0 by {@code value} bits. + */ + public ApfGenerator addLeftShift(int value) { + Instruction instruction = new Instruction(Opcodes.SH); + instruction.setSignedImm(value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to shift right register R0 by {@code value} + * bits. + */ + public ApfGenerator addRightShift(int value) { + Instruction instruction = new Instruction(Opcodes.SH); + instruction.setSignedImm(-value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to add register R1 to register R0. + */ + public ApfGenerator addAddR1() { + Instruction instruction = new Instruction(Opcodes.ADD, Register.R1); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to multiply register R0 by register R1. + */ + public ApfGenerator addMulR1() { + Instruction instruction = new Instruction(Opcodes.MUL, Register.R1); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to divide register R0 by register R1. + */ + public ApfGenerator addDivR1() { + Instruction instruction = new Instruction(Opcodes.DIV, Register.R1); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to logically and register R0 with register R1 + * and store the result back into register R0. + */ + public ApfGenerator addAndR1() { + Instruction instruction = new Instruction(Opcodes.AND, Register.R1); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to logically or register R0 with register R1 + * and store the result back into register R0. + */ + public ApfGenerator addOrR1() { + Instruction instruction = new Instruction(Opcodes.OR, Register.R1); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to shift register R0 left by the value in + * register R1. + */ + public ApfGenerator addLeftShiftR1() { + Instruction instruction = new Instruction(Opcodes.SH, Register.R1); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to move {@code value} into {@code register}. + */ + public ApfGenerator addLoadImmediate(Register register, int value) { + Instruction instruction = new Instruction(Opcodes.LI, register); + instruction.setSignedImm(value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value equals {@code value}. + */ + public ApfGenerator addJumpIfR0Equals(int value, String target) { + Instruction instruction = new Instruction(Opcodes.JEQ); + instruction.setUnsignedImm(value); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value does not equal {@code value}. + */ + public ApfGenerator addJumpIfR0NotEquals(int value, String target) { + Instruction instruction = new Instruction(Opcodes.JNE); + instruction.setUnsignedImm(value); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value is greater than {@code value}. + */ + public ApfGenerator addJumpIfR0GreaterThan(int value, String target) { + Instruction instruction = new Instruction(Opcodes.JGT); + instruction.setUnsignedImm(value); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value is less than {@code value}. + */ + public ApfGenerator addJumpIfR0LessThan(int value, String target) { + Instruction instruction = new Instruction(Opcodes.JLT); + instruction.setUnsignedImm(value); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value has any bits set that are also set in {@code value}. + */ + public ApfGenerator addJumpIfR0AnyBitsSet(int value, String target) { + Instruction instruction = new Instruction(Opcodes.JSET); + instruction.setUnsignedImm(value); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value equals register R1's value. + */ + public ApfGenerator addJumpIfR0EqualsR1(String target) { + Instruction instruction = new Instruction(Opcodes.JEQ, Register.R1); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value does not equal register R1's value. + */ + public ApfGenerator addJumpIfR0NotEqualsR1(String target) { + Instruction instruction = new Instruction(Opcodes.JNE, Register.R1); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value is greater than register R1's value. + */ + public ApfGenerator addJumpIfR0GreaterThanR1(String target) { + Instruction instruction = new Instruction(Opcodes.JGT, Register.R1); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value is less than register R1's value. + */ + public ApfGenerator addJumpIfR0LessThanR1(String target) { + Instruction instruction = new Instruction(Opcodes.JLT, Register.R1); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if register R0's + * value has any bits set that are also set in R1's value. + */ + public ApfGenerator addJumpIfR0AnyBitsSetR1(String target) { + Instruction instruction = new Instruction(Opcodes.JSET, Register.R1); + instruction.setTargetLabel(target); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to jump to {@code target} if the bytes of the + * packet at, an offset specified by {@code register}, match {@code bytes}. + */ + public ApfGenerator addJumpIfBytesNotEqual(Register register, byte[] bytes, String target) { + Instruction instruction = new Instruction(Opcodes.JNEBS, register); + instruction.setUnsignedImm(bytes.length); + instruction.setTargetLabel(target); + instruction.setCompareBytes(bytes); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to load memory slot {@code slot} into + * {@code register}. + */ + public ApfGenerator addLoadFromMemory(Register register, int slot) + throws IllegalInstructionException { + if (slot < 0 || slot > (MEMORY_SLOTS - 1)) { + throw new IllegalInstructionException("illegal memory slot number: " + slot); + } + Instruction instruction = new Instruction(Opcodes.EXT, register); + instruction.setUnsignedImm(ExtendedOpcodes.LDM.value + slot); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to store {@code register} into memory slot + * {@code slot}. + */ + public ApfGenerator addStoreToMemory(Register register, int slot) + throws IllegalInstructionException { + if (slot < 0 || slot > (MEMORY_SLOTS - 1)) { + throw new IllegalInstructionException("illegal memory slot number: " + slot); + } + Instruction instruction = new Instruction(Opcodes.EXT, register); + instruction.setUnsignedImm(ExtendedOpcodes.STM.value + slot); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to logically not {@code register}. + */ + public ApfGenerator addNot(Register register) { + Instruction instruction = new Instruction(Opcodes.EXT, register); + instruction.setUnsignedImm(ExtendedOpcodes.NOT.value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to negate {@code register}. + */ + public ApfGenerator addNeg(Register register) { + Instruction instruction = new Instruction(Opcodes.EXT, register); + instruction.setUnsignedImm(ExtendedOpcodes.NEG.value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to swap the values in register R0 and register R1. + */ + public ApfGenerator addSwap() { + Instruction instruction = new Instruction(Opcodes.EXT); + instruction.setUnsignedImm(ExtendedOpcodes.SWAP.value); + addInstruction(instruction); + return this; + } + + /** + * Add an instruction to the end of the program to move the value into + * {@code register} from the other register. + */ + public ApfGenerator addMove(Register register) { + Instruction instruction = new Instruction(Opcodes.EXT, register); + instruction.setUnsignedImm(ExtendedOpcodes.MOVE.value); + addInstruction(instruction); + return this; + } + + /** + * Updates instruction offset fields using latest instruction sizes. + * @return current program length in bytes. + */ + private int updateInstructionOffsets() { + int offset = 0; + for (Instruction instruction : mInstructions) { + instruction.offset = offset; + offset += instruction.size(); + } + return offset; + } + + /** + * Returns an overestimate of the size of the generated program. {@link #generate} may return + * a program that is smaller. + */ + public int programLengthOverEstimate() { + return updateInstructionOffsets(); + } + + /** + * Generate the bytecode for the APF program. + * @return the bytecode. + * @throws IllegalStateException if a label is referenced but not defined. + */ + public byte[] generate() throws IllegalInstructionException { + // Enforce that we can only generate once because we cannot unshrink instructions and + // PASS/DROP labels may move further away requiring unshrinking if we add further + // instructions. + if (mGenerated) { + throw new IllegalStateException("Can only generate() once!"); + } + mGenerated = true; + int total_size; + boolean shrunk; + // Shrink the immediate value fields of instructions. + // As we shrink the instructions some branch offset + // fields may shrink also, thereby shrinking the + // instructions further. Loop until we've reached the + // minimum size. Rarely will this loop more than a few times. + // Limit iterations to avoid O(n^2) behavior. + int iterations_remaining = 10; + do { + total_size = updateInstructionOffsets(); + // Update drop and pass label offsets. + mDropLabel.offset = total_size + 1; + mPassLabel.offset = total_size; + // Limit run-time in aberant circumstances. + if (iterations_remaining-- == 0) break; + // Attempt to shrink instructions. + shrunk = false; + for (Instruction instruction : mInstructions) { + if (instruction.shrink()) { + shrunk = true; + } + } + } while (shrunk); + // Generate bytecode for instructions. + byte[] bytecode = new byte[total_size]; + for (Instruction instruction : mInstructions) { + instruction.generate(bytecode); + } + return bytecode; + } +} + diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java index 87ac846a2a43..06b6ee75da7a 100644 --- a/services/net/java/android/net/ip/IpManager.java +++ b/services/net/java/android/net/ip/IpManager.java @@ -17,15 +17,21 @@ package android.net.ip; import android.content.Context; +import android.net.BaseDhcpStateMachine; import android.net.DhcpResults; +import android.net.DhcpStateMachine; +import android.net.InterfaceConfiguration; +import android.net.LinkAddress; import android.net.LinkProperties; import android.net.LinkProperties.ProvisioningChange; import android.net.RouteInfo; import android.net.StaticIpConfiguration; +import android.net.dhcp.DhcpClient; import android.os.INetworkManagementService; import android.os.Message; import android.os.RemoteException; import android.os.ServiceManager; +import android.provider.Settings; import android.util.Log; import com.android.internal.annotations.GuardedBy; @@ -37,6 +43,7 @@ import com.android.server.net.NetlinkTracker; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; +import java.util.Objects; /** @@ -84,10 +91,14 @@ public class IpManager extends StateMachine { * as IpManager invokes them. */ + // Implementations must call IpManager#completedPreDhcpAction(). + public void onPreDhcpAction() {} + public void onPostDhcpAction() {} + // TODO: Kill with fire once DHCP and static configuration are moved // out of WifiStateMachine. - public void onIPv4ProvisioningSuccess(DhcpResults dhcpResults, int reason) {} - public void onIPv4ProvisioningFailure(int reason) {} + public void onIPv4ProvisioningSuccess(DhcpResults dhcpResults) {} + public void onIPv4ProvisioningFailure() {} public void onProvisioningSuccess(LinkProperties newLp) {} public void onProvisioningFailure(LinkProperties newLp) {} @@ -103,7 +114,7 @@ public class IpManager extends StateMachine { private static final int CMD_STOP = 1; private static final int CMD_START = 2; private static final int CMD_CONFIRM = 3; - private static final int CMD_UPDATE_DHCPV4_RESULTS = 4; + private static final int EVENT_PRE_DHCP_ACTION_COMPLETE = 4; // Sent by NetlinkTracker to communicate netlink events. private static final int EVENT_NETLINK_LINKPROPERTIES_CHANGED = 5; @@ -126,6 +137,7 @@ public class IpManager extends StateMachine { * Non-final member variables accessed only from within our StateMachine. */ private IpReachabilityMonitor mIpReachabilityMonitor; + private BaseDhcpStateMachine mDhcpStateMachine; private DhcpResults mDhcpResults; private StaticIpConfiguration mStaticIpConfig; @@ -209,17 +221,16 @@ public class IpManager extends StateMachine { sendMessage(CMD_CONFIRM); } + public void completedPreDhcpAction() { + sendMessage(EVENT_PRE_DHCP_ACTION_COMPLETE); + } + public LinkProperties getLinkProperties() { synchronized (mLock) { return new LinkProperties(mLinkProperties); } } - // TODO: Kill with fire once DHCPv4/static config is moved into IpManager. - public void updateWithDhcpResults(DhcpResults dhcpResults, int reason) { - sendMessage(CMD_UPDATE_DHCPV4_RESULTS, reason, 0, dhcpResults); - } - /** * Internals. @@ -274,6 +285,12 @@ public class IpManager extends StateMachine { return delta; } + private boolean linkPropertiesUnchanged(LinkProperties newLp) { + synchronized (mLock) { + return Objects.equals(newLp, mLinkProperties); + } + } + private LinkProperties assembleLinkProperties() { // [1] Create a new LinkProperties object to populate. LinkProperties newLp = new LinkProperties(); @@ -322,6 +339,29 @@ public class IpManager extends StateMachine { return newLp; } + private void clearIPv4Address() { + try { + final InterfaceConfiguration ifcg = new InterfaceConfiguration(); + ifcg.setLinkAddress(new LinkAddress("0.0.0.0/0")); + mNwService.setInterfaceConfig(mInterfaceName, ifcg); + } catch (RemoteException e) { + Log.e(TAG, "ALERT: Failed to clear IPv4 address on interface " + mInterfaceName, e); + } + } + + private void handleIPv4Success(DhcpResults dhcpResults) { + mDhcpResults = new DhcpResults(dhcpResults); + setLinkProperties(assembleLinkProperties()); + mCallback.onIPv4ProvisioningSuccess(dhcpResults); + } + + private void handleIPv4Failure() { + clearIPv4Address(); + mDhcpResults = null; + setLinkProperties(assembleLinkProperties()); + mCallback.onIPv4ProvisioningFailure(); + } + class StoppedState extends State { @Override public void enter() { @@ -350,6 +390,16 @@ public class IpManager extends StateMachine { setLinkProperties(assembleLinkProperties()); break; + case DhcpStateMachine.CMD_ON_QUIT: + // CMD_ON_QUIT is really more like "EVENT_ON_QUIT". + // Shutting down DHCPv4 progresses simultaneously with + // transitioning to StoppedState, so we can receive this + // message after we've already transitioned here. + // + // TODO: Figure out if this is actually useful and if not + // expunge it. + break; + default: return NOT_HANDLED; } @@ -364,6 +414,7 @@ public class IpManager extends StateMachine { try { mNwService.setInterfaceIpv6PrivacyExtensions(mInterfaceName, true); mNwService.enableIpv6(mInterfaceName); + // TODO: Perhaps clearIPv4Address() as well. } catch (RemoteException re) { Log.e(TAG, "Unable to change interface settings: " + re); } catch (IllegalStateException ie) { @@ -382,7 +433,20 @@ public class IpManager extends StateMachine { } }); - // TODO: Check mStaticIpConfig and handle accordingly. + // If we have a StaticIpConfiguration attempt to apply it and + // handle the result accordingly. + if (mStaticIpConfig != null) { + if (applyStaticIpConfig()) { + handleIPv4Success(new DhcpResults(mStaticIpConfig)); + } else { + handleIPv4Failure(); + } + } else { + // Start DHCPv4. + makeDhcpStateMachine(); + mDhcpStateMachine.registerForPreDhcpNotification(); + mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP); + } } @Override @@ -390,6 +454,12 @@ public class IpManager extends StateMachine { mIpReachabilityMonitor.stop(); mIpReachabilityMonitor = null; + if (mDhcpStateMachine != null) { + mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_STOP_DHCP); + mDhcpStateMachine.doQuit(); + mDhcpStateMachine = null; + } + resetLinkProperties(); } @@ -401,34 +471,34 @@ public class IpManager extends StateMachine { break; case CMD_START: - // TODO: Defer this message to be delivered after a state transition - // to StoppedState. That way, receiving CMD_START in StartedState - // effects a restart. - Log.e(TAG, "ALERT: START received in StartedState."); + Log.e(TAG, "ALERT: START received in StartedState. Please fix caller."); break; case CMD_CONFIRM: + // TODO: Possibly introduce a second type of confirmation + // that both probes (a) on-link neighbors and (b) does + // a DHCPv4 RENEW. We used to do this on Wi-Fi framework + // roams. if (mCallback.usingIpReachabilityMonitor()) { mIpReachabilityMonitor.probeAll(); } break; - case CMD_UPDATE_DHCPV4_RESULTS: - final DhcpResults dhcpResults = (DhcpResults) msg.obj; - final int reason = msg.arg1; - if (dhcpResults != null) { - mDhcpResults = new DhcpResults(dhcpResults); - setLinkProperties(assembleLinkProperties()); - mCallback.onIPv4ProvisioningSuccess(dhcpResults, reason); - } else { - mDhcpResults = null; - setLinkProperties(assembleLinkProperties()); - mCallback.onIPv4ProvisioningFailure(reason); + case EVENT_PRE_DHCP_ACTION_COMPLETE: + // It's possible to reach here if, for example, someone + // calls completedPreDhcpAction() after provisioning with + // a static IP configuration. + if (mDhcpStateMachine != null) { + mDhcpStateMachine.sendMessage( + DhcpStateMachine.CMD_PRE_DHCP_ACTION_COMPLETE); } break; - case EVENT_NETLINK_LINKPROPERTIES_CHANGED: + case EVENT_NETLINK_LINKPROPERTIES_CHANGED: { final LinkProperties newLp = assembleLinkProperties(); + if (linkPropertiesUnchanged(newLp)) { + break; + } final ProvisioningChange delta = setLinkProperties(newLp); // NOTE: The only receiver of these callbacks currently @@ -448,7 +518,39 @@ public class IpManager extends StateMachine { mCallback.onLinkPropertiesChange(newLp); break; } + break; + } + + case DhcpStateMachine.CMD_PRE_DHCP_ACTION: + mCallback.onPreDhcpAction(); + break; + + case DhcpStateMachine.CMD_POST_DHCP_ACTION: { + // Note that onPostDhcpAction() is likely to be + // asynchronous, and thus there is no guarantee that we + // will be able to observe any of its effects here. + mCallback.onPostDhcpAction(); + + final DhcpResults dhcpResults = (DhcpResults) msg.obj; + switch (msg.arg1) { + case DhcpStateMachine.DHCP_SUCCESS: + handleIPv4Success(dhcpResults); + break; + case DhcpStateMachine.DHCP_FAILURE: + handleIPv4Failure(); + break; + default: + Log.e(TAG, "Unknown CMD_POST_DHCP_ACTION status:" + msg.arg1); + } + break; + } + case DhcpStateMachine.CMD_ON_QUIT: + // CMD_ON_QUIT is really more like "EVENT_ON_QUIT". + // Regardless, we ignore it. + // + // TODO: Figure out if this is actually useful and if not + // expunge it. break; default: @@ -457,5 +559,37 @@ public class IpManager extends StateMachine { return HANDLED; } + private boolean applyStaticIpConfig() { + final InterfaceConfiguration ifcg = new InterfaceConfiguration(); + ifcg.setLinkAddress(mStaticIpConfig.ipAddress); + ifcg.setInterfaceUp(); + try { + mNwService.setInterfaceConfig(mInterfaceName, ifcg); + if (DBG) Log.d(TAG, "Static IP configuration succeeded"); + } catch (IllegalStateException | RemoteException e) { + Log.e(TAG, "Static IP configuration failed: ", e); + return false; + } + + return true; + } + + private void makeDhcpStateMachine() { + final boolean usingLegacyDhcp = (Settings.Global.getInt( + mContext.getContentResolver(), + Settings.Global.LEGACY_DHCP_CLIENT, 0) == 1); + + if (usingLegacyDhcp) { + mDhcpStateMachine = DhcpStateMachine.makeDhcpStateMachine( + mContext, + IpManager.this, + mInterfaceName); + } else { + mDhcpStateMachine = DhcpClient.makeDhcpStateMachine( + mContext, + IpManager.this, + mInterfaceName); + } + } } } diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 3ad26d38abaa..25cb64c94215 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -1,3 +1,7 @@ +######################################################################### +# Build FrameworksServicesTests package +######################################################################### + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -22,5 +26,36 @@ LOCAL_PACKAGE_NAME := FrameworksServicesTests LOCAL_CERTIFICATE := platform +LOCAL_JNI_SHARED_LIBRARIES := libapfjni + include $(BUILD_PACKAGE) +######################################################################### +# Build JNI Shared Library +######################################################################### + +LOCAL_PATH:= $(LOCAL_PATH)/jni + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests + +LOCAL_CFLAGS := -Wall -Werror + +LOCAL_C_INCLUDES := \ + libpcap \ + hardware/google/apf + +LOCAL_SRC_FILES := apf_jni.cpp + +LOCAL_SHARED_LIBRARIES := \ + libnativehelper \ + liblog + +LOCAL_STATIC_LIBRARIES := \ + libpcap \ + libapf + +LOCAL_MODULE := libapfjni + +include $(BUILD_SHARED_LIBRARY) diff --git a/services/tests/servicestests/jni/apf_jni.cpp b/services/tests/servicestests/jni/apf_jni.cpp new file mode 100644 index 000000000000..7d142eb76b95 --- /dev/null +++ b/services/tests/servicestests/jni/apf_jni.cpp @@ -0,0 +1,182 @@ +/* + * Copyright 2016, 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. + */ + +#include <JNIHelp.h> +#include <ScopedUtfChars.h> +#include <jni.h> +#include <pcap.h> +#include <stdlib.h> +#include <string> +#include <utils/Log.h> + +#include "apf_interpreter.h" + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +// JNI function acting as simply call-through to native APF interpreter. +static jint com_android_server_ApfTest_apfSimulate( + JNIEnv* env, jclass, jbyteArray program, jbyteArray packet, jint filter_age) { + return accept_packet( + (uint8_t*)env->GetByteArrayElements(program, NULL), + env->GetArrayLength(program), + (uint8_t*)env->GetByteArrayElements(packet, NULL), + env->GetArrayLength(packet), + filter_age); +} + +class ScopedPcap { + public: + ScopedPcap(pcap_t* pcap) : pcap_ptr(pcap) {} + ~ScopedPcap() { + pcap_close(pcap_ptr); + } + + pcap_t* get() const { return pcap_ptr; }; + private: + pcap_t* const pcap_ptr; +}; + +class ScopedFILE { + public: + ScopedFILE(FILE* fp) : file(fp) {} + ~ScopedFILE() { + fclose(file); + } + + FILE* get() const { return file; }; + private: + FILE* const file; +}; + +static void throwException(JNIEnv* env, const std::string& error) { + jclass newExcCls = env->FindClass("java/lang/IllegalStateException"); + if (newExcCls == 0) { + abort(); + return; + } + env->ThrowNew(newExcCls, error.c_str()); +} + +static jstring com_android_server_ApfTest_compileToBpf(JNIEnv* env, jclass, jstring jfilter) { + ScopedUtfChars filter(env, jfilter); + std::string bpf_string; + ScopedPcap pcap(pcap_open_dead(DLT_EN10MB, 65535)); + if (pcap.get() == NULL) { + throwException(env, "pcap_open_dead failed"); + return NULL; + } + + // Compile "filter" to a BPF program + bpf_program bpf; + if (pcap_compile(pcap.get(), &bpf, filter.c_str(), 0, PCAP_NETMASK_UNKNOWN)) { + throwException(env, "pcap_compile failed"); + return NULL; + } + + // Translate BPF program to human-readable format + const struct bpf_insn* insn = bpf.bf_insns; + for (uint32_t i = 0; i < bpf.bf_len; i++) { + bpf_string += bpf_image(insn++, i); + bpf_string += "\n"; + } + + return env->NewStringUTF(bpf_string.c_str()); +} + +static jboolean com_android_server_ApfTest_compareBpfApf(JNIEnv* env, jclass, jstring jfilter, + jstring jpcap_filename, jbyteArray japf_program) { + ScopedUtfChars filter(env, jfilter); + ScopedUtfChars pcap_filename(env, jpcap_filename); + const uint8_t* apf_program = (uint8_t*)env->GetByteArrayElements(japf_program, NULL); + const uint32_t apf_program_len = env->GetArrayLength(japf_program); + + // Open pcap file for BPF filtering + ScopedFILE bpf_fp(fopen(pcap_filename.c_str(), "rb")); + char pcap_error[PCAP_ERRBUF_SIZE]; + ScopedPcap bpf_pcap(pcap_fopen_offline(bpf_fp.get(), pcap_error)); + if (bpf_pcap.get() == NULL) { + throwException(env, "pcap_fopen_offline failed: " + std::string(pcap_error)); + return false; + } + + // Open pcap file for APF filtering + ScopedFILE apf_fp(fopen(pcap_filename.c_str(), "rb")); + ScopedPcap apf_pcap(pcap_fopen_offline(apf_fp.get(), pcap_error)); + if (apf_pcap.get() == NULL) { + throwException(env, "pcap_fopen_offline failed: " + std::string(pcap_error)); + return false; + } + + // Compile "filter" to a BPF program + bpf_program bpf; + if (pcap_compile(bpf_pcap.get(), &bpf, filter.c_str(), 0, PCAP_NETMASK_UNKNOWN)) { + throwException(env, "pcap_compile failed"); + return false; + } + + // Install BPF filter on bpf_pcap + if (pcap_setfilter(bpf_pcap.get(), &bpf)) { + throwException(env, "pcap_setfilter failed"); + return false; + } + + while (1) { + pcap_pkthdr bpf_header, apf_header; + // Run BPF filter to the next matching packet. + const uint8_t* bpf_packet = pcap_next(bpf_pcap.get(), &bpf_header); + + // Run APF filter to the next matching packet. + const uint8_t* apf_packet; + do { + apf_packet = pcap_next(apf_pcap.get(), &apf_header); + } while (apf_packet != NULL && !accept_packet( + apf_program, apf_program_len, apf_packet, apf_header.len, 0)); + + // Make sure both filters matched the same packet. + if (apf_packet == NULL && bpf_packet == NULL) + break; + if (apf_packet == NULL || bpf_packet == NULL) + return false; + if (apf_header.len != bpf_header.len || + apf_header.ts.tv_sec != bpf_header.ts.tv_sec || + apf_header.ts.tv_usec != bpf_header.ts.tv_usec || + memcmp(apf_packet, bpf_packet, apf_header.len)) + return false; + } + return true; +} + +extern "C" jint JNI_OnLoad(JavaVM* vm, void*) { + JNIEnv *env; + if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { + ALOGE("ERROR: GetEnv failed"); + return -1; + } + + static JNINativeMethod gMethods[] = { + { "apfSimulate", "([B[BI)I", + (void*)com_android_server_ApfTest_apfSimulate }, + { "compileToBpf", "(Ljava/lang/String;)Ljava/lang/String;", + (void*)com_android_server_ApfTest_compileToBpf }, + { "compareBpfApf", "(Ljava/lang/String;Ljava/lang/String;[B)Z", + (void*)com_android_server_ApfTest_compareBpfApf }, + }; + + jniRegisterNativeMethods(env, "com/android/server/ApfTest", + gMethods, ARRAY_SIZE(gMethods)); + + return JNI_VERSION_1_6; +} diff --git a/services/tests/servicestests/res/raw/apf.pcap b/services/tests/servicestests/res/raw/apf.pcap Binary files differnew file mode 100644 index 000000000000..963165f19f73 --- /dev/null +++ b/services/tests/servicestests/res/raw/apf.pcap diff --git a/services/tests/servicestests/src/com/android/server/ApfTest.java b/services/tests/servicestests/src/com/android/server/ApfTest.java new file mode 100644 index 000000000000..640a6c927ed3 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/ApfTest.java @@ -0,0 +1,560 @@ +/* + * Copyright (C) 2012 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.server; + +import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.LargeTest; + +import com.android.frameworks.servicestests.R; +import android.net.apf.ApfGenerator; +import android.net.apf.ApfGenerator.IllegalInstructionException; +import android.net.apf.ApfGenerator.Register; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; + +import libcore.io.IoUtils; +import libcore.io.Streams; + +/** + * Tests for APF program generator and interpreter. + * + * Build, install and run with: + * runtest frameworks-services -c com.android.server.ApfTest + */ +public class ApfTest extends AndroidTestCase { + @Override + public void setUp() throws Exception { + super.setUp(); + // Load up native shared library containing APF interpreter exposed via JNI. + System.loadLibrary("apfjni"); + } + + // Expected return codes from APF interpreter. + private final static int PASS = 1; + private final static int DROP = 0; + // Interpreter will just accept packets without link layer headers, so pad fake packet to at + // least the minimum packet size. + private final static int MIN_PKT_SIZE = 15; + + private void assertVerdict(int expected, byte[] program, byte[] packet, int filterAge) { + assertEquals(expected, apfSimulate(program, packet, filterAge)); + } + + private void assertPass(byte[] program, byte[] packet, int filterAge) { + assertVerdict(PASS, program, packet, filterAge); + } + + private void assertDrop(byte[] program, byte[] packet, int filterAge) { + assertVerdict(DROP, program, packet, filterAge); + } + + private void assertVerdict(int expected, ApfGenerator gen, byte[] packet, int filterAge) + throws IllegalInstructionException { + assertEquals(expected, apfSimulate(gen.generate(), packet, filterAge)); + } + + private void assertPass(ApfGenerator gen, byte[] packet, int filterAge) + throws IllegalInstructionException { + assertVerdict(PASS, gen, packet, filterAge); + } + + private void assertDrop(ApfGenerator gen, byte[] packet, int filterAge) + throws IllegalInstructionException { + assertVerdict(DROP, gen, packet, filterAge); + } + + private void assertPass(ApfGenerator gen) + throws IllegalInstructionException { + assertVerdict(PASS, gen, new byte[MIN_PKT_SIZE], 0); + } + + private void assertDrop(ApfGenerator gen) + throws IllegalInstructionException { + assertVerdict(DROP, gen, new byte[MIN_PKT_SIZE], 0); + } + + /** + * Test each instruction by generating a program containing the instruction, + * generating bytecode for that program and running it through the + * interpreter to verify it functions correctly. + */ + @LargeTest + public void testApfInstructions() throws IllegalInstructionException { + // Empty program should pass because having the program counter reach the + // location immediately after the program indicates the packet should be + // passed to the AP. + ApfGenerator gen = new ApfGenerator(); + assertPass(gen); + + // Test jumping to pass label. + gen = new ApfGenerator(); + gen.addJump(gen.PASS_LABEL); + byte[] program = gen.generate(); + assertEquals(1, program.length); + assertEquals((14 << 3) | (0 << 1) | 0, program[0]); + assertPass(program, new byte[MIN_PKT_SIZE], 0); + + // Test jumping to drop label. + gen = new ApfGenerator(); + gen.addJump(gen.DROP_LABEL); + program = gen.generate(); + assertEquals(2, program.length); + assertEquals((14 << 3) | (1 << 1) | 0, program[0]); + assertEquals(1, program[1]); + assertDrop(program, new byte[15], 15); + + // Test jumping if equal to 0. + gen = new ApfGenerator(); + gen.addJumpIfR0Equals(0, gen.DROP_LABEL); + assertDrop(gen); + + // Test jumping if not equal to 0. + gen = new ApfGenerator(); + gen.addJumpIfR0NotEquals(0, gen.DROP_LABEL); + assertPass(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1); + gen.addJumpIfR0NotEquals(0, gen.DROP_LABEL); + assertDrop(gen); + + // Test jumping if registers equal. + gen = new ApfGenerator(); + gen.addJumpIfR0EqualsR1(gen.DROP_LABEL); + assertDrop(gen); + + // Test jumping if registers not equal. + gen = new ApfGenerator(); + gen.addJumpIfR0NotEqualsR1(gen.DROP_LABEL); + assertPass(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1); + gen.addJumpIfR0NotEqualsR1(gen.DROP_LABEL); + assertDrop(gen); + + // Test load immediate. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test add. + gen = new ApfGenerator(); + gen.addAdd(1234567890); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test subtract. + gen = new ApfGenerator(); + gen.addAdd(-1234567890); + gen.addJumpIfR0Equals(-1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test or. + gen = new ApfGenerator(); + gen.addOr(1234567890); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test and. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addAnd(123456789); + gen.addJumpIfR0Equals(1234567890 & 123456789, gen.DROP_LABEL); + assertDrop(gen); + + // Test left shift. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addLeftShift(1); + gen.addJumpIfR0Equals(1234567890 << 1, gen.DROP_LABEL); + assertDrop(gen); + + // Test right shift. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addRightShift(1); + gen.addJumpIfR0Equals(1234567890 >> 1, gen.DROP_LABEL); + assertDrop(gen); + + // Test multiply. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addMul(2); + gen.addJumpIfR0Equals(1234567890 * 2, gen.DROP_LABEL); + assertDrop(gen); + + // Test divide. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addDiv(2); + gen.addJumpIfR0Equals(1234567890 / 2, gen.DROP_LABEL); + assertDrop(gen); + + // Test divide by zero. + gen = new ApfGenerator(); + gen.addDiv(0); + gen.addJump(gen.DROP_LABEL); + assertPass(gen); + + // Test add. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 1234567890); + gen.addAddR1(); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test subtract. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, -1234567890); + gen.addAddR1(); + gen.addJumpIfR0Equals(-1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test or. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 1234567890); + gen.addOrR1(); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test and. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addLoadImmediate(Register.R1, 123456789); + gen.addAndR1(); + gen.addJumpIfR0Equals(1234567890 & 123456789, gen.DROP_LABEL); + assertDrop(gen); + + // Test left shift. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addLoadImmediate(Register.R1, 1); + gen.addLeftShiftR1(); + gen.addJumpIfR0Equals(1234567890 << 1, gen.DROP_LABEL); + assertDrop(gen); + + // Test right shift. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addLoadImmediate(Register.R1, -1); + gen.addLeftShiftR1(); + gen.addJumpIfR0Equals(1234567890 >> 1, gen.DROP_LABEL); + assertDrop(gen); + + // Test multiply. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addLoadImmediate(Register.R1, 2); + gen.addMulR1(); + gen.addJumpIfR0Equals(1234567890 * 2, gen.DROP_LABEL); + assertDrop(gen); + + // Test divide. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addLoadImmediate(Register.R1, 2); + gen.addDivR1(); + gen.addJumpIfR0Equals(1234567890 / 2, gen.DROP_LABEL); + assertDrop(gen); + + // Test divide by zero. + gen = new ApfGenerator(); + gen.addDivR1(); + gen.addJump(gen.DROP_LABEL); + assertPass(gen); + + // Test byte load. + gen = new ApfGenerator(); + gen.addLoad8(Register.R0, 1); + gen.addJumpIfR0Equals(45, gen.DROP_LABEL); + assertDrop(gen, new byte[]{123,45,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0); + + // Test out of bounds load. + gen = new ApfGenerator(); + gen.addLoad8(Register.R0, 16); + gen.addJumpIfR0Equals(0, gen.DROP_LABEL); + assertPass(gen, new byte[]{123,45,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0); + + // Test half-word load. + gen = new ApfGenerator(); + gen.addLoad16(Register.R0, 1); + gen.addJumpIfR0Equals((45 << 8) | 67, gen.DROP_LABEL); + assertDrop(gen, new byte[]{123,45,67,0,0,0,0,0,0,0,0,0,0,0,0}, 0); + + // Test word load. + gen = new ApfGenerator(); + gen.addLoad32(Register.R0, 1); + gen.addJumpIfR0Equals((45 << 24) | (67 << 16) | (89 << 8) | 12, gen.DROP_LABEL); + assertDrop(gen, new byte[]{123,45,67,89,12,0,0,0,0,0,0,0,0,0,0}, 0); + + // Test byte indexed load. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 1); + gen.addLoad8Indexed(Register.R0, 0); + gen.addJumpIfR0Equals(45, gen.DROP_LABEL); + assertDrop(gen, new byte[]{123,45,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0); + + // Test out of bounds indexed load. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 8); + gen.addLoad8Indexed(Register.R0, 8); + gen.addJumpIfR0Equals(0, gen.DROP_LABEL); + assertPass(gen, new byte[]{123,45,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0); + + // Test half-word indexed load. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 1); + gen.addLoad16Indexed(Register.R0, 0); + gen.addJumpIfR0Equals((45 << 8) | 67, gen.DROP_LABEL); + assertDrop(gen, new byte[]{123,45,67,0,0,0,0,0,0,0,0,0,0,0,0}, 0); + + // Test word indexed load. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 1); + gen.addLoad32Indexed(Register.R0, 0); + gen.addJumpIfR0Equals((45 << 24) | (67 << 16) | (89 << 8) | 12, gen.DROP_LABEL); + assertDrop(gen, new byte[]{123,45,67,89,12,0,0,0,0,0,0,0,0,0,0}, 0); + + // Test jumping if greater than. + gen = new ApfGenerator(); + gen.addJumpIfR0GreaterThan(0, gen.DROP_LABEL); + assertPass(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1); + gen.addJumpIfR0GreaterThan(0, gen.DROP_LABEL); + assertDrop(gen); + + // Test jumping if less than. + gen = new ApfGenerator(); + gen.addJumpIfR0LessThan(0, gen.DROP_LABEL); + assertPass(gen); + gen = new ApfGenerator(); + gen.addJumpIfR0LessThan(1, gen.DROP_LABEL); + assertDrop(gen); + + // Test jumping if any bits set. + gen = new ApfGenerator(); + gen.addJumpIfR0AnyBitsSet(3, gen.DROP_LABEL); + assertPass(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1); + gen.addJumpIfR0AnyBitsSet(3, gen.DROP_LABEL); + assertDrop(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 3); + gen.addJumpIfR0AnyBitsSet(3, gen.DROP_LABEL); + assertDrop(gen); + + // Test jumping if register greater than. + gen = new ApfGenerator(); + gen.addJumpIfR0GreaterThanR1(gen.DROP_LABEL); + assertPass(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 2); + gen.addLoadImmediate(Register.R1, 1); + gen.addJumpIfR0GreaterThanR1(gen.DROP_LABEL); + assertDrop(gen); + + // Test jumping if register less than. + gen = new ApfGenerator(); + gen.addJumpIfR0LessThanR1(gen.DROP_LABEL); + assertPass(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 1); + gen.addJumpIfR0LessThanR1(gen.DROP_LABEL); + assertDrop(gen); + + // Test jumping if any bits set in register. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 3); + gen.addJumpIfR0AnyBitsSetR1(gen.DROP_LABEL); + assertPass(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 3); + gen.addLoadImmediate(Register.R0, 1); + gen.addJumpIfR0AnyBitsSetR1(gen.DROP_LABEL); + assertDrop(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 3); + gen.addLoadImmediate(Register.R0, 3); + gen.addJumpIfR0AnyBitsSetR1(gen.DROP_LABEL); + assertDrop(gen); + + // Test load from memory. + gen = new ApfGenerator(); + gen.addLoadFromMemory(Register.R0, 0); + gen.addJumpIfR0Equals(0, gen.DROP_LABEL); + assertDrop(gen); + + // Test store to memory. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 1234567890); + gen.addStoreToMemory(Register.R1, 12); + gen.addLoadFromMemory(Register.R0, 12); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test filter age pre-filled memory. + gen = new ApfGenerator(); + gen.addLoadFromMemory(Register.R0, gen.FILTER_AGE_MEMORY_SLOT); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen, new byte[MIN_PKT_SIZE], 1234567890); + + // Test packet size pre-filled memory. + gen = new ApfGenerator(); + gen.addLoadFromMemory(Register.R0, gen.PACKET_SIZE_MEMORY_SLOT); + gen.addJumpIfR0Equals(MIN_PKT_SIZE, gen.DROP_LABEL); + assertDrop(gen); + + // Test IPv4 header size pre-filled memory. + gen = new ApfGenerator(); + gen.addLoadFromMemory(Register.R0, gen.IPV4_HEADER_SIZE_MEMORY_SLOT); + gen.addJumpIfR0Equals(20, gen.DROP_LABEL); + assertDrop(gen, new byte[]{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x45}, 0); + + // Test not. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addNot(Register.R0); + gen.addJumpIfR0Equals(~1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test negate. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addNeg(Register.R0); + gen.addJumpIfR0Equals(-1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test move. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 1234567890); + gen.addMove(Register.R0); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addMove(Register.R1); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen); + + // Test swap. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R1, 1234567890); + gen.addSwap(); + gen.addJumpIfR0Equals(1234567890, gen.DROP_LABEL); + assertDrop(gen); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1234567890); + gen.addSwap(); + gen.addJumpIfR0Equals(0, gen.DROP_LABEL); + assertDrop(gen); + + // Test jump if bytes not equal. + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1); + gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{123}, gen.DROP_LABEL); + program = gen.generate(); + assertEquals(6, program.length); + assertEquals((13 << 3) | (1 << 1) | 0, program[0]); + assertEquals(1, program[1]); + assertEquals(((20 << 3) | (1 << 1) | 0) - 256, program[2]); + assertEquals(1, program[3]); + assertEquals(1, program[4]); + assertEquals(123, program[5]); + assertDrop(program, new byte[MIN_PKT_SIZE], 0); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1); + gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{123}, gen.DROP_LABEL); + byte[] packet123 = new byte[]{0,123,0,0,0,0,0,0,0,0,0,0,0,0,0}; + assertPass(gen, packet123, 0); + gen = new ApfGenerator(); + gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{123}, gen.DROP_LABEL); + assertDrop(gen, packet123, 0); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1); + gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{1,2,30,4,5}, gen.DROP_LABEL); + byte[] packet12345 = new byte[]{0,1,2,3,4,5,0,0,0,0,0,0,0,0,0}; + assertDrop(gen, packet12345, 0); + gen = new ApfGenerator(); + gen.addLoadImmediate(Register.R0, 1); + gen.addJumpIfBytesNotEqual(Register.R0, new byte[]{1,2,3,4,5}, gen.DROP_LABEL); + assertPass(gen, packet12345, 0); + } + + /** + * Generate some BPF programs, translate them to APF, then run APF and BPF programs + * over packet traces and verify both programs filter out the same packets. + */ + @LargeTest + public void testApfAgainstBpf() throws Exception { + String[] tcpdump_filters = new String[]{ "udp", "tcp", "icmp", "icmp6", "udp port 53", + "arp", "dst 239.255.255.250", "arp or tcp or udp port 53", "net 192.168.1.0/24", + "arp or icmp6 or portrange 53-54", "portrange 53-54 or portrange 100-50000", + "tcp[tcpflags] & (tcp-ack|tcp-fin) != 0 and (ip[2:2] > 57 or icmp)" }; + String pcap_filename = stageFile(R.raw.apf); + for (String tcpdump_filter : tcpdump_filters) { + byte[] apf_program = Bpf2Apf.convert(compileToBpf(tcpdump_filter)); + assertTrue("Failed to match for filter: " + tcpdump_filter, + compareBpfApf(tcpdump_filter, pcap_filename, apf_program)); + } + } + + /** + * Stage a file for testing, i.e. make it native accessible. Given a resource ID, + * copy that resource into the app's data directory and return the path to it. + */ + private String stageFile(int rawId) throws Exception { + File file = new File(getContext().getFilesDir(), "staged_file"); + new File(file.getParent()).mkdirs(); + InputStream in = null; + OutputStream out = null; + try { + in = getContext().getResources().openRawResource(rawId); + out = new FileOutputStream(file); + Streams.copy(in, out); + } finally { + if (in != null) in.close(); + if (out != null) out.close(); + } + return file.getAbsolutePath(); + } + + /** + * Call the APF interpreter the run {@code program} on {@code packet} pretending the + * filter was installed {@code filter_age} seconds ago. + */ + private native static int apfSimulate(byte[] program, byte[] packet, int filter_age); + + /** + * Compile a tcpdump human-readable filter (e.g. "icmp" or "tcp port 54") into a BPF + * prorgam and return a human-readable dump of the BPF program identical to "tcpdump -d". + */ + private native static String compileToBpf(String filter); + + /** + * Open packet capture file {@code pcap_filename} and filter the packets using tcpdump + * human-readable filter (e.g. "icmp" or "tcp port 54") compiled to a BPF program and + * at the same time using APF program {@code apf_program}. Return {@code true} if + * both APF and BPF programs filter out exactly the same packets. + */ + private native static boolean compareBpfApf(String filter, String pcap_filename, + byte[] apf_program); +} diff --git a/services/tests/servicestests/src/com/android/server/Bpf2Apf.java b/services/tests/servicestests/src/com/android/server/Bpf2Apf.java new file mode 100644 index 000000000000..29594a84fc48 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/Bpf2Apf.java @@ -0,0 +1,327 @@ +/* + * Copyright (C) 2015 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.server; + +import android.net.apf.ApfGenerator; +import android.net.apf.ApfGenerator.IllegalInstructionException; +import android.net.apf.ApfGenerator.Register; + +import java.io.BufferedReader; +import java.io.InputStreamReader; + +/** + * BPF to APF translator. + * + * Note: This is for testing purposes only and is not guaranteed to support + * translation of all BPF programs. + * + * Example usage: + * javac net/java/android/net/apf/ApfGenerator.java \ + * tests/servicestests/src/com/android/server/Bpf2Apf.java + * sudo tcpdump -i em1 -d icmp | java -classpath tests/servicestests/src:net/java \ + * com.android.server.Bpf2Apf + */ +public class Bpf2Apf { + private static int parseImm(String line, String arg) { + if (!arg.startsWith("#0x")) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + final long val_long = Long.parseLong(arg.substring(3), 16); + if (val_long < 0 || val_long > Long.parseLong("ffffffff", 16)) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + return new Long((val_long << 32) >> 32).intValue(); + } + + /** + * Convert a single line of "tcpdump -d" (human readable BPF program dump) {@code line} into + * APF instruction(s) and append them to {@code gen}. Here's an example line: + * (001) jeq #0x86dd jt 2 jf 7 + */ + private static void convertLine(String line, ApfGenerator gen) + throws IllegalInstructionException { + if (line.indexOf("(") != 0 || line.indexOf(")") != 4 || line.indexOf(" ") != 5) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + int label = Integer.parseInt(line.substring(1, 4)); + gen.defineLabel(Integer.toString(label)); + String opcode = line.substring(6, 10).trim(); + String arg = line.substring(15, Math.min(32, line.length())).trim(); + switch (opcode) { + case "ld": + case "ldh": + case "ldb": + case "ldx": + case "ldxb": + case "ldxh": + Register dest = opcode.contains("x") ? Register.R1 : Register.R0; + if (arg.equals("4*([14]&0xf)")) { + if (!opcode.equals("ldxb")) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + gen.addLoadFromMemory(dest, gen.IPV4_HEADER_SIZE_MEMORY_SLOT); + break; + } + if (arg.equals("#pktlen")) { + if (!opcode.equals("ld")) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + gen.addLoadFromMemory(dest, gen.PACKET_SIZE_MEMORY_SLOT); + break; + } + if (arg.startsWith("#0x")) { + if (!opcode.equals("ld")) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + gen.addLoadImmediate(dest, parseImm(line, arg)); + break; + } + if (arg.startsWith("M[")) { + if (!opcode.startsWith("ld")) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + int memory_slot = Integer.parseInt(arg.substring(2, arg.length() - 1)); + if (memory_slot < 0 || memory_slot >= gen.MEMORY_SLOTS || + // Disallow use of pre-filled slots as BPF programs might + // wrongfully assume they're initialized to 0. + (memory_slot >= gen.FIRST_PREFILLED_MEMORY_SLOT && + memory_slot <= gen.LAST_PREFILLED_MEMORY_SLOT)) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + gen.addLoadFromMemory(dest, memory_slot); + break; + } + if (arg.startsWith("[x + ")) { + int offset = Integer.parseInt(arg.substring(5, arg.length() - 1)); + switch (opcode) { + case "ld": + case "ldx": + gen.addLoad32Indexed(dest, offset); + break; + case "ldh": + case "ldxh": + gen.addLoad16Indexed(dest, offset); + break; + case "ldb": + case "ldxb": + gen.addLoad8Indexed(dest, offset); + break; + } + } else { + int offset = Integer.parseInt(arg.substring(1, arg.length() - 1)); + switch (opcode) { + case "ld": + case "ldx": + gen.addLoad32(dest, offset); + break; + case "ldh": + case "ldxh": + gen.addLoad16(dest, offset); + break; + case "ldb": + case "ldxb": + gen.addLoad8(dest, offset); + break; + } + } + break; + case "st": + case "stx": + Register src = opcode.contains("x") ? Register.R1 : Register.R0; + if (!arg.startsWith("M[")) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + int memory_slot = Integer.parseInt(arg.substring(2, arg.length() - 1)); + if (memory_slot < 0 || memory_slot >= gen.MEMORY_SLOTS || + // Disallow overwriting pre-filled slots + (memory_slot >= gen.FIRST_PREFILLED_MEMORY_SLOT && + memory_slot <= gen.LAST_PREFILLED_MEMORY_SLOT)) { + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + gen.addStoreToMemory(src, memory_slot); + break; + case "add": + case "and": + case "or": + case "sub": + if (arg.equals("x")) { + switch(opcode) { + case "add": + gen.addAddR1(); + break; + case "and": + gen.addAndR1(); + break; + case "or": + gen.addOrR1(); + break; + case "sub": + gen.addNeg(Register.R1); + gen.addAddR1(); + gen.addNeg(Register.R1); + break; + } + } else { + int imm = parseImm(line, arg); + switch(opcode) { + case "add": + gen.addAdd(imm); + break; + case "and": + gen.addAnd(imm); + break; + case "or": + gen.addOr(imm); + break; + case "sub": + gen.addAdd(-imm); + break; + } + } + break; + case "jeq": + case "jset": + case "jgt": + case "jge": + int val = 0; + boolean reg_compare; + if (arg.startsWith("x")) { + reg_compare = true; + } else { + reg_compare = false; + val = parseImm(line, arg); + } + int jt_offset = line.indexOf("jt"); + int jf_offset = line.indexOf("jf"); + String true_label = line.substring(jt_offset + 2, jf_offset).trim(); + String false_label = line.substring(jf_offset + 2).trim(); + boolean true_label_is_fallthrough = Integer.parseInt(true_label) == label + 1; + boolean false_label_is_fallthrough = Integer.parseInt(false_label) == label + 1; + if (true_label_is_fallthrough && false_label_is_fallthrough) + break; + switch (opcode) { + case "jeq": + if (!true_label_is_fallthrough) { + if (reg_compare) { + gen.addJumpIfR0EqualsR1(true_label); + } else { + gen.addJumpIfR0Equals(val, true_label); + } + } + if (!false_label_is_fallthrough) { + if (!true_label_is_fallthrough) { + gen.addJump(false_label); + } else if (reg_compare) { + gen.addJumpIfR0NotEqualsR1(false_label); + } else { + gen.addJumpIfR0NotEquals(val, false_label); + } + } + break; + case "jset": + if (reg_compare) { + gen.addJumpIfR0AnyBitsSetR1(true_label); + } else { + gen.addJumpIfR0AnyBitsSet(val, true_label); + } + if (!false_label_is_fallthrough) { + gen.addJump(false_label); + } + break; + case "jgt": + if (!true_label_is_fallthrough || + // We have no less-than-or-equal-to register to register + // comparison instruction, so in this case we'll jump + // around an unconditional jump. + (!false_label_is_fallthrough && reg_compare)) { + if (reg_compare) { + gen.addJumpIfR0GreaterThanR1(true_label); + } else { + gen.addJumpIfR0GreaterThan(val, true_label); + } + } + if (!false_label_is_fallthrough) { + if (!true_label_is_fallthrough || reg_compare) { + gen.addJump(false_label); + } else { + gen.addJumpIfR0LessThan(val + 1, false_label); + } + } + break; + case "jge": + if (!false_label_is_fallthrough || + // We have no greater-than-or-equal-to register to register + // comparison instruction, so in this case we'll jump + // around an unconditional jump. + (!true_label_is_fallthrough && reg_compare)) { + if (reg_compare) { + gen.addJumpIfR0LessThanR1(false_label); + } else { + gen.addJumpIfR0LessThan(val, false_label); + } + } + if (!true_label_is_fallthrough) { + if (!false_label_is_fallthrough || reg_compare) { + gen.addJump(true_label); + } else { + gen.addJumpIfR0GreaterThan(val - 1, true_label); + } + } + break; + } + break; + case "ret": + if (arg.equals("#0")) { + gen.addJump(gen.DROP_LABEL); + } else { + gen.addJump(gen.PASS_LABEL); + } + break; + case "tax": + gen.addMove(Register.R1); + break; + case "txa": + gen.addMove(Register.R0); + break; + default: + throw new IllegalArgumentException("Unhandled instruction: " + line); + } + } + + /** + * Convert the output of "tcpdump -d" (human readable BPF program dump) {@code bpf} into an APF + * program and return it. + */ + public static byte[] convert(String bpf) throws IllegalInstructionException { + ApfGenerator gen = new ApfGenerator(); + for (String line : bpf.split("\\n")) convertLine(line, gen); + return gen.generate(); + } + + /** + * Convert the output of "tcpdump -d" (human readable BPF program dump) piped in stdin into an + * APF program and output it via stdout. + */ + public static void main(String[] args) throws Exception { + BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); + String line = null; + StringBuilder responseData = new StringBuilder(); + ApfGenerator gen = new ApfGenerator(); + while ((line = in.readLine()) != null) convertLine(line, gen); + System.out.write(gen.generate()); + } +} diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java index bd37f4a75e6f..db2a9ad3223c 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java @@ -291,5 +291,15 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi void securityLogSetLoggingEnabledProperty(boolean enabled) { context.settings.securityLogSetLoggingEnabledProperty(enabled); } + + @Override + boolean securityLogGetLoggingEnabledProperty() { + return context.settings.securityLogGetLoggingEnabledProperty(); + } + + @Override + boolean securityLogIsLoggingEnabled() { + return context.settings.securityLogIsLoggingEnabled(); + } } } diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 87569b7a6caa..64f60d93628b 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -559,6 +559,10 @@ public class DevicePolicyManagerTest extends DpmTestBase { expected.getMessage().contains("already has a device owner")); } + // DO admin can't be deactivated. + dpm.removeActiveAdmin(admin1); + assertTrue(dpm.isAdminActive(admin1)); + // TODO Test getDeviceOwnerName() too. To do so, we need to change // DPMS.getApplicationLabel() because Context.createPackageContextAsUser() is not mockable. } @@ -763,6 +767,11 @@ public class DevicePolicyManagerTest extends DpmTestBase { assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser()); + dpm.addUserRestriction(admin1, UserManager.DISALLOW_ADD_USER); + + assertTrue(dpm.isAdminActive(admin1)); + assertFalse(dpm.isRemovingAdmin(admin1, UserHandle.USER_SYSTEM)); + // Set up other mocks. when(mContext.userManager.getUserRestrictions()).thenReturn(new Bundle()); @@ -770,11 +779,21 @@ public class DevicePolicyManagerTest extends DpmTestBase { doReturn(DpmMockContext.CALLER_SYSTEM_USER_UID).when(mContext.packageManager).getPackageUidAsUser( eq(admin1.getPackageName()), anyInt()); + reset(mContext.userManagerInternal); dpm.clearDeviceOwnerApp(admin1.getPackageName()); // Now DO shouldn't be set. assertNull(dpm.getDeviceOwnerComponentOnAnyUser()); + verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions( + eq(UserHandle.USER_SYSTEM), + MockUtils.checkUserRestrictions(), + MockUtils.checkUserRestrictions() + ); + + assertTrue(dpm.isAdminActive(admin1)); + assertTrue(dpm.isRemovingAdmin(admin1, UserHandle.USER_SYSTEM)); + // TODO Check other calls. } @@ -823,6 +842,10 @@ public class DevicePolicyManagerTest extends DpmTestBase { public void testSetProfileOwner() throws Exception { setAsProfileOwner(admin1); + // PO admin can't be deactivated. + dpm.removeActiveAdmin(admin1); + assertTrue(dpm.isAdminActive(admin1)); + // Try setting DO on the same user, which should fail. setUpPackageManagerForAdmin(admin2, DpmMockContext.CALLER_UID); dpm.setActiveAdmin(admin2, /* refreshing= */ true, DpmMockContext.CALLER_USER_HANDLE); @@ -835,6 +858,22 @@ public class DevicePolicyManagerTest extends DpmTestBase { } } + public void testClearProfileOwner() throws Exception { + setAsProfileOwner(admin1); + + mContext.binder.callingUid = DpmMockContext.CALLER_UID; + + assertTrue(dpm.isProfileOwnerApp(admin1.getPackageName())); + assertFalse(dpm.isRemovingAdmin(admin1, DpmMockContext.CALLER_USER_HANDLE)); + + // Clear + dpm.clearProfileOwner(admin1); + + // Check + assertFalse(dpm.isProfileOwnerApp(admin1.getPackageName())); + assertTrue(dpm.isRemovingAdmin(admin1, DpmMockContext.CALLER_USER_HANDLE)); + } + public void testSetProfileOwner_failures() throws Exception { // TODO Test more failure cases. Basically test all chacks in enforceCanSetProfileOwner(). } diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java index 651873230082..7a000985a5ca 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java @@ -198,6 +198,14 @@ public class DpmMockContext extends MockContext { void securityLogSetLoggingEnabledProperty(boolean enabled) { } + + public boolean securityLogGetLoggingEnabledProperty() { + return false; + } + + public boolean securityLogIsLoggingEnabled() { + return false; + } } public final Context realTestContext; diff --git a/services/usb/java/com/android/server/usb/MtpNotificationManager.java b/services/usb/java/com/android/server/usb/MtpNotificationManager.java index 203d35ed1fc4..17039bb6870c 100644 --- a/services/usb/java/com/android/server/usb/MtpNotificationManager.java +++ b/services/usb/java/com/android/server/usb/MtpNotificationManager.java @@ -30,7 +30,6 @@ import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbInterface; import android.hardware.usb.UsbManager; import android.os.UserHandle; -import android.util.Log; /** * Manager for MTP storage notification. diff --git a/telecomm/java/android/telecom/Phone.java b/telecomm/java/android/telecom/Phone.java index 56eb7ec5fb78..d45938cb9b85 100644 --- a/telecomm/java/android/telecom/Phone.java +++ b/telecomm/java/android/telecom/Phone.java @@ -348,11 +348,6 @@ public final class Phone { } private void checkCallTree(ParcelableCall parcelableCall) { - if (parcelableCall.getParentCallId() != null && - !mCallByTelecomCallId.containsKey(parcelableCall.getParentCallId())) { - Log.wtf(this, "ParcelableCall %s has nonexistent parent %s", - parcelableCall.getId(), parcelableCall.getParentCallId()); - } if (parcelableCall.getChildCallIds() != null) { for (int i = 0; i < parcelableCall.getChildCallIds().size(); i++) { if (!mCallByTelecomCallId.containsKey(parcelableCall.getChildCallIds().get(i))) { diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 72ff27227efb..c122c5a365fc 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -1414,6 +1414,23 @@ public class TelecomManager { return result; } + /** + * Launches the {@link android.app.Activity} to manage blocked numbers. + * <p> This method displays the UI to manage blocked numbers only if + * {@link android.provider.BlockedNumberContract#canCurrentUserBlockNumbers(Context)} returns + * {@code true} for the current user. + */ + public void launchManageBlockedNumbersActivity() { + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.launchManageBlockedNumbersActivity(mContext.getPackageName()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#manageBlockedNumbers", e); + } + } + } + private ITelecomService getTelecomService() { if (mTelecomServiceOverride != null) { return mTelecomServiceOverride; diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index af36b3e41eb2..95c8db54498c 100644 --- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl +++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl @@ -243,4 +243,9 @@ interface ITelecomService { * @see TelecomServiceImpl#setDefaultDialer */ boolean setDefaultDialer(in String packageName); + + /** + * @see TelecomServiceImpl#launchManageBlockedNumbersActivity + **/ + void launchManageBlockedNumbersActivity(in String callingPackageName); } diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java index 8443490feb00..9eb1304c6ab6 100644 --- a/telephony/java/android/telephony/DisconnectCause.java +++ b/telephony/java/android/telephony/DisconnectCause.java @@ -187,6 +187,13 @@ public class DisconnectCause { */ public static final int CDMA_ALREADY_ACTIVATED = 49; + /** + * The call was terminated because it is not possible to place a video call while TTY is + * enabled. + * {@hide} + */ + public static final int VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED = 50; + //********************************************************************************************* // When adding a disconnect type: // 1) Please assign the new type the next id value below. @@ -202,7 +209,7 @@ public class DisconnectCause { public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED; /** Largest valid value for call disconnect codes. */ - public static final int MAXIMUM_VALID_VALUE = CDMA_ALREADY_ACTIVATED; + public static final int MAXIMUM_VALID_VALUE = VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED; /** Private constructor to avoid class instantiation. */ private DisconnectCause() { @@ -310,6 +317,8 @@ public class DisconnectCause { return "IMS_MERGED_SUCCESSFULLY"; case CDMA_ALREADY_ACTIVATED: return "CDMA_ALREADY_ACTIVATED"; + case VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED: + return "VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED"; default: return "INVALID: " + cause; } diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 7d5645ed7337..429839f6f6f9 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -77,6 +77,21 @@ public interface RILConstants { int SIM_SAP_MSG_SIZE_TOO_SMALL = 34; int SIM_SAP_CONNECT_OK_CALL_ONGOING = 35; int LCE_NOT_SUPPORTED = 36; /* Link Capacity Estimation (LCE) not supported */ + int NO_MEMORY = 37; /* Not sufficient memory to process the request */ + int INTERNAL_ERR = 38; /* Hit unexpected vendor internal error scenario */ + int SYSTEM_ERR = 39; /* Hit platform or system error */ + int MODEM_ERR = 40; /* Hit unexpected modem error */ + int INVALID_STATE = 41; /* Can not process the request as vendor RIL is in + invalid state. */ + int NO_RESOURCES = 42; /* Not sufficient resource to process the request */ + int SIM_ERR = 43; /* Received error from SIM card */ + int INVALID_ARGUMENTS = 44; /* Received invalid arguments in request */ + int INVALID_SIM_STATE = 45; /* Can not process the request in current SIM state */ + int INVALID_MODEM_STATE = 46; /* Can not process the request in current Modem state */ + int INVALID_CALL_ID = 47; /* Received invalid call id in request */ + int NO_SMS_TO_ACK = 48; /* ACK received when there is no SMS to ack */ + int NETWORK_ERR = 49; /* Received error from network */ + int REQUEST_RATE_LIMITED = 50; /* Operation denied due to overly-frequent requests */ /* NETWORK_MODE_* See ril.h RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE */ diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk index a4f4ba928855..f74b93abd796 100644 --- a/tools/aapt2/Android.mk +++ b/tools/aapt2/Android.mk @@ -30,6 +30,7 @@ sources := \ compile/PseudolocaleGenerator.cpp \ compile/Pseudolocalizer.cpp \ compile/XmlIdCollector.cpp \ + filter/ConfigFilter.cpp \ flatten/Archive.cpp \ flatten/TableFlattener.cpp \ flatten/XmlFlattener.cpp \ @@ -71,6 +72,7 @@ testSources := \ compile/PseudolocaleGenerator_test.cpp \ compile/Pseudolocalizer_test.cpp \ compile/XmlIdCollector_test.cpp \ + filter/ConfigFilter_test.cpp \ flatten/FileExportWriter_test.cpp \ flatten/TableFlattener_test.cpp \ flatten/XmlFlattener_test.cpp \ diff --git a/tools/aapt2/Locale.cpp b/tools/aapt2/Locale.cpp index 03691568ed47..6acf3b09d301 100644 --- a/tools/aapt2/Locale.cpp +++ b/tools/aapt2/Locale.cpp @@ -70,7 +70,7 @@ static inline bool isNumber(const std::string& str) { return std::all_of(std::begin(str), std::end(str), ::isdigit); } -bool LocaleValue::initFromFilterString(const std::string& str) { +bool LocaleValue::initFromFilterString(const StringPiece& str) { // A locale (as specified in the filter) is an underscore separated name such // as "en_US", "en_Latn_US", or "en_US_POSIX". std::vector<std::string> parts = util::splitAndLowercase(str, '_'); diff --git a/tools/aapt2/Locale.h b/tools/aapt2/Locale.h index ceec764ba4fd..b1c80ab27641 100644 --- a/tools/aapt2/Locale.h +++ b/tools/aapt2/Locale.h @@ -17,6 +17,8 @@ #ifndef AAPT_LOCALE_VALUE_H #define AAPT_LOCALE_VALUE_H +#include "util/StringPiece.h" + #include <androidfw/ResourceTypes.h> #include <string> #include <vector> @@ -37,7 +39,7 @@ struct LocaleValue { /** * Initialize this LocaleValue from a config string. */ - bool initFromFilterString(const std::string& config); + bool initFromFilterString(const StringPiece& config); /** * Initialize this LocaleValue from parts of a vector. diff --git a/tools/aapt2/filter/ConfigFilter.cpp b/tools/aapt2/filter/ConfigFilter.cpp new file mode 100644 index 000000000000..68a017d247f6 --- /dev/null +++ b/tools/aapt2/filter/ConfigFilter.cpp @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2016 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. + */ + +#include "ConfigDescription.h" +#include "filter/ConfigFilter.h" + +#include <androidfw/ResourceTypes.h> + +namespace aapt { + +void AxisConfigFilter::addConfig(ConfigDescription config) { + uint32_t diffMask = ConfigDescription::defaultConfig().diff(config); + + // Ignore the version + diffMask &= ~android::ResTable_config::CONFIG_VERSION; + + // Ignore any densities. Those are best handled in --preferred-density + if ((diffMask & android::ResTable_config::CONFIG_DENSITY) != 0) { + config.density = 0; + diffMask &= ~android::ResTable_config::CONFIG_DENSITY; + } + + mConfigs.insert(std::make_pair(config, diffMask)); + mConfigMask |= diffMask; +} + +bool AxisConfigFilter::match(const ConfigDescription& config) const { + const uint32_t mask = ConfigDescription::defaultConfig().diff(config); + if ((mConfigMask & mask) == 0) { + // The two configurations don't have any common axis. + return true; + } + + uint32_t matchedAxis = 0; + for (const auto& entry : mConfigs) { + const ConfigDescription& target = entry.first; + const uint32_t diffMask = entry.second; + uint32_t diff = target.diff(config); + if ((diff & diffMask) == 0) { + // Mark the axis that was matched. + matchedAxis |= diffMask; + } else if ((diff & diffMask) == android::ResTable_config::CONFIG_LOCALE) { + // If the locales differ, but the languages are the same and + // the locale we are matching only has a language specified, + // we match. + if (config.language[0] && + memcmp(config.language, target.language, sizeof(config.language)) == 0) { + if (config.country[0] == 0) { + matchedAxis |= android::ResTable_config::CONFIG_LOCALE; + } + } + } else if ((diff & diffMask) == android::ResTable_config::CONFIG_SMALLEST_SCREEN_SIZE) { + // Special case if the smallest screen width doesn't match. We check that the + // config being matched has a smaller screen width than the filter specified. + if (config.smallestScreenWidthDp != 0 && + config.smallestScreenWidthDp < target.smallestScreenWidthDp) { + matchedAxis |= android::ResTable_config::CONFIG_SMALLEST_SCREEN_SIZE; + } + } + } + return matchedAxis == (mConfigMask & mask); +} + +} // namespace aapt diff --git a/tools/aapt2/filter/ConfigFilter.h b/tools/aapt2/filter/ConfigFilter.h new file mode 100644 index 000000000000..36e9c44255e4 --- /dev/null +++ b/tools/aapt2/filter/ConfigFilter.h @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2016 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. + */ + +#ifndef AAPT_FILTER_CONFIGFILTER_H +#define AAPT_FILTER_CONFIGFILTER_H + +#include "ConfigDescription.h" + +#include <set> +#include <utility> + +namespace aapt { + +/** + * Matches ConfigDescriptions based on some pattern. + */ +class IConfigFilter { +public: + virtual ~IConfigFilter() = default; + + /** + * Returns true if the filter matches the configuration, false otherwise. + */ + virtual bool match(const ConfigDescription& config) const = 0; +}; + +/** + * Implements config axis matching. An axis is one component of a configuration, like screen + * density or locale. If an axis is specified in the filter, and the axis is specified in + * the configuration to match, they must be compatible. Otherwise the configuration to match is + * accepted. + * + * Used when handling "-c" options. + */ +class AxisConfigFilter : public IConfigFilter { +public: + void addConfig(ConfigDescription config); + + bool match(const ConfigDescription& config) const override; + +private: + std::set<std::pair<ConfigDescription, uint32_t>> mConfigs; + uint32_t mConfigMask = 0; +}; + +} // namespace aapt + +#endif /* AAPT_FILTER_CONFIGFILTER_H */ diff --git a/tools/aapt2/filter/ConfigFilter_test.cpp b/tools/aapt2/filter/ConfigFilter_test.cpp new file mode 100644 index 000000000000..f6b49557306d --- /dev/null +++ b/tools/aapt2/filter/ConfigFilter_test.cpp @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2016 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. + */ + +#include "filter/ConfigFilter.h" +#include "test/Common.h" + +#include <gtest/gtest.h> + +namespace aapt { + +TEST(ConfigFilterTest, EmptyFilterMatchesAnything) { + AxisConfigFilter filter; + + EXPECT_TRUE(filter.match(test::parseConfigOrDie("320dpi"))); + EXPECT_TRUE(filter.match(test::parseConfigOrDie("fr"))); +} + +TEST(ConfigFilterTest, MatchesConfigWithUnrelatedAxis) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("fr")); + + EXPECT_TRUE(filter.match(test::parseConfigOrDie("320dpi"))); +} + +TEST(ConfigFilterTest, MatchesConfigWithSameValueAxis) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("fr")); + + EXPECT_TRUE(filter.match(test::parseConfigOrDie("fr"))); +} + +TEST(ConfigFilterTest, MatchesConfigWithSameValueAxisAndOtherUnrelatedAxis) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("fr")); + + EXPECT_TRUE(filter.match(test::parseConfigOrDie("fr-320dpi"))); +} + +TEST(ConfigFilterTest, MatchesConfigWithOneMatchingAxis) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("fr-rFR")); + filter.addConfig(test::parseConfigOrDie("sw360dp")); + filter.addConfig(test::parseConfigOrDie("normal")); + filter.addConfig(test::parseConfigOrDie("en-rUS")); + + EXPECT_TRUE(filter.match(test::parseConfigOrDie("en"))); +} + +TEST(ConfigFilterTest, DoesNotMatchConfigWithDifferentValueAxis) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("fr")); + + EXPECT_FALSE(filter.match(test::parseConfigOrDie("de"))); +} + +TEST(ConfigFilterTest, DoesNotMatchWhenOneQualifierIsExplicitlyNotMatched) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("fr-rFR")); + filter.addConfig(test::parseConfigOrDie("en-rUS")); + filter.addConfig(test::parseConfigOrDie("normal")); + filter.addConfig(test::parseConfigOrDie("large")); + filter.addConfig(test::parseConfigOrDie("xxhdpi")); + filter.addConfig(test::parseConfigOrDie("sw320dp")); + + EXPECT_FALSE(filter.match(test::parseConfigOrDie("fr-sw600dp-v13"))); +} + +TEST(ConfigFilterTest, MatchesSmallestWidthWhenSmaller) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("sw600dp")); + + EXPECT_TRUE(filter.match(test::parseConfigOrDie("fr-sw320dp-v13"))); +} + +TEST(ConfigFilterTest, MatchesConfigWithSameLanguageButNoRegionSpecified) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("de-rDE")); + + EXPECT_TRUE(filter.match(test::parseConfigOrDie("de"))); +} + +TEST(ConfigFilterTest, IgnoresVersion) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("normal-v4")); + + // The configs don't match on any axis besides version, which should be ignored. + EXPECT_TRUE(filter.match(test::parseConfigOrDie("sw600dp-v13"))); +} + +TEST(ConfigFilterTest, MatchesConfigWithRegion) { + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("kok")); + filter.addConfig(test::parseConfigOrDie("kok-rIN")); + filter.addConfig(test::parseConfigOrDie("kok-v419")); + + EXPECT_TRUE(filter.match(test::parseConfigOrDie("kok-rIN"))); +} + +} // namespace aapt diff --git a/tools/aapt2/link/Link.cpp b/tools/aapt2/link/Link.cpp index 3ecb2c4113d5..fd76e887ab2a 100644 --- a/tools/aapt2/link/Link.cpp +++ b/tools/aapt2/link/Link.cpp @@ -17,8 +17,10 @@ #include "AppInfo.h" #include "Debug.h" #include "Flags.h" +#include "Locale.h" #include "NameMangler.h" #include "compile/IdAssigner.h" +#include "filter/ConfigFilter.h" #include "flatten/Archive.h" #include "flatten/TableFlattener.h" #include "flatten/XmlFlattener.h" @@ -64,7 +66,7 @@ struct LinkOptions { std::vector<std::string> extensionsToNotCompress; Maybe<std::u16string> privateSymbols; ManifestFixerOptions manifestFixerOptions; - + IConfigFilter* configFilter = nullptr; }; struct LinkContext : public IAaptContext { @@ -97,8 +99,8 @@ struct LinkContext : public IAaptContext { class LinkCommand { public: - LinkCommand(const LinkOptions& options) : - mOptions(options), mContext(), mFinalTable(), mFileCollection(nullptr) { + LinkCommand(LinkContext* context, const LinkOptions& options) : + mOptions(options), mContext(context), mFinalTable(), mFileCollection(nullptr) { std::unique_ptr<io::FileCollection> fileCollection = util::make_unique<io::FileCollection>(); @@ -117,14 +119,14 @@ public: AssetManagerSymbolTableBuilder builder; for (const std::string& path : mOptions.includePaths) { if (mOptions.verbose) { - mContext.getDiagnostics()->note(DiagMessage(path) << "loading include path"); + mContext->getDiagnostics()->note(DiagMessage(path) << "loading include path"); } std::unique_ptr<android::AssetManager> assetManager = util::make_unique<android::AssetManager>(); int32_t cookie = 0; if (!assetManager->addAssetPath(android::String8(path.data(), path.size()), &cookie)) { - mContext.getDiagnostics()->error( + mContext->getDiagnostics()->error( DiagMessage(path) << "failed to load include path"); return {}; } @@ -135,7 +137,7 @@ public: std::unique_ptr<ResourceTable> loadTable(const Source& source, const void* data, size_t len) { std::unique_ptr<ResourceTable> table = util::make_unique<ResourceTable>(); - BinaryResourceParser parser(&mContext, table.get(), source, data, len); + BinaryResourceParser parser(mContext, table.get(), source, data, len); if (!parser.parse()) { return {}; } @@ -207,7 +209,7 @@ public: IArchiveWriter* writer) { std::unique_ptr<io::IData> data = file->openAsData(); if (!data) { - mContext.getDiagnostics()->error(DiagMessage(file->getSource()) + mContext->getDiagnostics()->error(DiagMessage(file->getSource()) << "failed to open file"); return false; } @@ -215,7 +217,7 @@ public: std::string errorStr; ssize_t offset = getWrappedDataOffset(data->data(), data->size(), &errorStr); if (offset < 0) { - mContext.getDiagnostics()->error(DiagMessage(file->getSource()) << errorStr); + mContext->getDiagnostics()->error(DiagMessage(file->getSource()) << errorStr); return false; } @@ -228,7 +230,7 @@ public: } } - mContext.getDiagnostics()->error( + mContext->getDiagnostics()->error( DiagMessage(mOptions.outputPath) << "failed to write file " << outPath); return false; } @@ -252,9 +254,9 @@ public: */ bool verifyNoExternalPackages() { auto isExtPackageFunc = [&](const std::unique_ptr<ResourceTablePackage>& pkg) -> bool { - return mContext.getCompilationPackage() != pkg->name || + return mContext->getCompilationPackage() != pkg->name || !pkg->id || - pkg->id.value() != mContext.getPackageId(); + pkg->id.value() != mContext->getPackageId(); }; bool error = false; @@ -270,13 +272,13 @@ public: // 'android' package. This is due to legacy reasons. if (valueCast<Id>(configValue.value.get()) && package->name == u"android") { - mContext.getDiagnostics()->warn( + mContext->getDiagnostics()->warn( DiagMessage(configValue.value->getSource()) << "generated id '" << resName << "' for external package '" << package->name << "'"); } else { - mContext.getDiagnostics()->error( + mContext->getDiagnostics()->error( DiagMessage(configValue.value->getSource()) << "defined resource '" << resName << "' for external package '" << package->name @@ -297,9 +299,9 @@ public: std::unique_ptr<IArchiveWriter> makeArchiveWriter() { if (mOptions.outputToDirectory) { - return createDirectoryArchiveWriter(mContext.getDiagnostics(), mOptions.outputPath); + return createDirectoryArchiveWriter(mContext->getDiagnostics(), mOptions.outputPath); } else { - return createZipFileArchiveWriter(mContext.getDiagnostics(), mOptions.outputPath); + return createZipFileArchiveWriter(mContext->getDiagnostics(), mOptions.outputPath); } } @@ -308,7 +310,7 @@ public: TableFlattenerOptions options = {}; options.useExtendedChunks = mOptions.staticLib; TableFlattener flattener(&buffer, options); - if (!flattener.consume(&mContext, table)) { + if (!flattener.consume(mContext, table)) { return false; } @@ -320,7 +322,7 @@ public: } } - mContext.getDiagnostics()->error( + mContext->getDiagnostics()->error( DiagMessage() << "failed to write resources.arsc to archive"); return false; } @@ -332,7 +334,7 @@ public: options.keepRawValues = mOptions.staticLib; options.maxSdkLevel = maxSdkLevel; XmlFlattener flattener(&buffer, options); - if (!flattener.consume(&mContext, xmlRes)) { + if (!flattener.consume(mContext, xmlRes)) { return false; } @@ -343,7 +345,7 @@ public: } } } - mContext.getDiagnostics()->error( + mContext->getDiagnostics()->error( DiagMessage() << "failed to write " << path << " to archive"); return false; } @@ -361,13 +363,13 @@ public: std::ofstream fout(outPath, std::ofstream::binary); if (!fout) { - mContext.getDiagnostics()->error(DiagMessage() << strerror(errno)); + mContext->getDiagnostics()->error(DiagMessage() << strerror(errno)); return false; } JavaClassGenerator generator(table, javaOptions); if (!generator.generate(packageNameToGenerate, outPackage, &fout)) { - mContext.getDiagnostics()->error(DiagMessage(outPath) << generator.getError()); + mContext->getDiagnostics()->error(DiagMessage(outPath) << generator.getError()); return false; } return true; @@ -380,24 +382,24 @@ public: std::string outPath = mOptions.generateJavaClassPath.value(); file::appendPath(&outPath, - file::packageToPath(util::utf16ToUtf8(mContext.getCompilationPackage()))); + file::packageToPath(util::utf16ToUtf8(mContext->getCompilationPackage()))); file::mkdirs(outPath); file::appendPath(&outPath, "Manifest.java"); std::ofstream fout(outPath, std::ofstream::binary); if (!fout) { - mContext.getDiagnostics()->error(DiagMessage() << strerror(errno)); + mContext->getDiagnostics()->error(DiagMessage() << strerror(errno)); return false; } ManifestClassGenerator generator; - if (!generator.generate(mContext.getDiagnostics(), mContext.getCompilationPackage(), + if (!generator.generate(mContext->getDiagnostics(), mContext->getCompilationPackage(), manifestXml, &fout)) { return false; } if (!fout) { - mContext.getDiagnostics()->error(DiagMessage() << strerror(errno)); + mContext->getDiagnostics()->error(DiagMessage() << strerror(errno)); return false; } return true; @@ -410,13 +412,13 @@ public: std::ofstream fout(mOptions.generateProguardRulesPath.value(), std::ofstream::binary); if (!fout) { - mContext.getDiagnostics()->error(DiagMessage() << strerror(errno)); + mContext->getDiagnostics()->error(DiagMessage() << strerror(errno)); return false; } proguard::writeKeepSet(&fout, keepSet); if (!fout) { - mContext.getDiagnostics()->error(DiagMessage() << strerror(errno)); + mContext->getDiagnostics()->error(DiagMessage() << strerror(errno)); return false; } return true; @@ -425,7 +427,7 @@ public: bool mergeStaticLibrary(const std::string& input) { // TODO(adamlesinski): Load resources from a static library APK and merge the table into // TableMerger. - mContext.getDiagnostics()->warn(DiagMessage() + mContext->getDiagnostics()->warn(DiagMessage() << "linking static libraries not supported yet: " << input); return true; @@ -433,12 +435,12 @@ public: bool mergeResourceTable(io::IFile* file, bool override) { if (mOptions.verbose) { - mContext.getDiagnostics()->note(DiagMessage() << "linking " << file->getSource()); + mContext->getDiagnostics()->note(DiagMessage() << "linking " << file->getSource()); } std::unique_ptr<io::IData> data = file->openAsData(); if (!data) { - mContext.getDiagnostics()->error(DiagMessage(file->getSource()) + mContext->getDiagnostics()->error(DiagMessage(file->getSource()) << "failed to open file"); return false; } @@ -460,7 +462,7 @@ public: bool mergeCompiledFile(io::IFile* file, std::unique_ptr<ResourceFile> fileDesc, bool overlay) { if (mOptions.verbose) { - mContext.getDiagnostics()->note(DiagMessage() << "adding " << file->getSource()); + mContext->getDiagnostics()->note(DiagMessage() << "adding " << file->getSource()); } bool result = false; @@ -477,12 +479,12 @@ public: // Add the exports of this file to the table. for (SourcedResourceName& exportedSymbol : fileDesc->exportedSymbols) { if (exportedSymbol.name.package.empty()) { - exportedSymbol.name.package = mContext.getCompilationPackage().toString(); + exportedSymbol.name.package = mContext->getCompilationPackage().toString(); } ResourceNameRef resName = exportedSymbol.name; - Maybe<ResourceName> mangledName = mContext.getNameMangler()->mangleName( + Maybe<ResourceName> mangledName = mContext->getNameMangler()->mangleName( exportedSymbol.name); if (mangledName) { resName = mangledName.value(); @@ -491,7 +493,7 @@ public: std::unique_ptr<Id> id = util::make_unique<Id>(); id->setSource(fileDesc->source.withLine(exportedSymbol.line)); bool result = mFinalTable.addResourceAllowMangled(resName, {}, std::move(id), - mContext.getDiagnostics()); + mContext->getDiagnostics()); if (!result) { return false; } @@ -507,7 +509,7 @@ public: std::unique_ptr<io::ZipFileCollection> collection = io::ZipFileCollection::create( input, &errorStr); if (!collection) { - mContext.getDiagnostics()->error(DiagMessage(input) << errorStr); + mContext->getDiagnostics()->error(DiagMessage(input) << errorStr); return false; } @@ -543,12 +545,12 @@ public: // Try opening the file and looking for an Export header. std::unique_ptr<io::IData> data = file->openAsData(); if (!data) { - mContext.getDiagnostics()->error(DiagMessage(src) << "failed to open"); + mContext->getDiagnostics()->error(DiagMessage(src) << "failed to open"); return false; } std::unique_ptr<ResourceFile> resourceFile = loadFileExportHeader( - src, data->data(), data->size(), mContext.getDiagnostics()); + src, data->data(), data->size(), mContext->getDiagnostics()); if (resourceFile) { return mergeCompiledFile(file, std::move(resourceFile), override); } @@ -564,62 +566,63 @@ public: int run(const std::vector<std::string>& inputFiles) { // Load the AndroidManifest.xml std::unique_ptr<xml::XmlResource> manifestXml = loadXml(mOptions.manifestPath, - mContext.getDiagnostics()); + mContext->getDiagnostics()); if (!manifestXml) { return 1; } if (Maybe<AppInfo> maybeAppInfo = extractAppInfoFromManifest(manifestXml.get())) { - mContext.mCompilationPackage = maybeAppInfo.value().package; + mContext->mCompilationPackage = maybeAppInfo.value().package; } else { - mContext.getDiagnostics()->error(DiagMessage(mOptions.manifestPath) + mContext->getDiagnostics()->error(DiagMessage(mOptions.manifestPath) << "no package specified in <manifest> tag"); return 1; } - if (!util::isJavaPackageName(mContext.mCompilationPackage)) { - mContext.getDiagnostics()->error(DiagMessage(mOptions.manifestPath) + if (!util::isJavaPackageName(mContext->mCompilationPackage)) { + mContext->getDiagnostics()->error(DiagMessage(mOptions.manifestPath) << "invalid package name '" - << mContext.mCompilationPackage + << mContext->mCompilationPackage << "'"); return 1; } - mContext.mNameMangler = util::make_unique<NameMangler>( - NameManglerPolicy{ mContext.mCompilationPackage }); + mContext->mNameMangler = util::make_unique<NameMangler>( + NameManglerPolicy{ mContext->mCompilationPackage }); - if (mContext.mCompilationPackage == u"android") { - mContext.mPackageId = 0x01; + if (mContext->mCompilationPackage == u"android") { + mContext->mPackageId = 0x01; } else { - mContext.mPackageId = 0x7f; + mContext->mPackageId = 0x7f; } - mContext.mSymbols = createSymbolTableFromIncludePaths(); - if (!mContext.mSymbols) { + mContext->mSymbols = createSymbolTableFromIncludePaths(); + if (!mContext->mSymbols) { return 1; } TableMergerOptions tableMergerOptions; tableMergerOptions.autoAddOverlay = mOptions.autoAddOverlay; - mTableMerger = util::make_unique<TableMerger>(&mContext, &mFinalTable, tableMergerOptions); + tableMergerOptions.filter = mOptions.configFilter; + mTableMerger = util::make_unique<TableMerger>(mContext, &mFinalTable, tableMergerOptions); if (mOptions.verbose) { - mContext.getDiagnostics()->note( - DiagMessage() << "linking package '" << mContext.mCompilationPackage << "' " - << "with package ID " << std::hex << (int) mContext.mPackageId); + mContext->getDiagnostics()->note( + DiagMessage() << "linking package '" << mContext->mCompilationPackage << "' " + << "with package ID " << std::hex << (int) mContext->mPackageId); } for (const std::string& input : inputFiles) { if (!processFile(input, false)) { - mContext.getDiagnostics()->error(DiagMessage() << "failed parsing input"); + mContext->getDiagnostics()->error(DiagMessage() << "failed parsing input"); return 1; } } for (const std::string& input : mOptions.overlayFiles) { if (!processFile(input, true)) { - mContext.getDiagnostics()->error(DiagMessage() << "failed parsing overlays"); + mContext->getDiagnostics()->error(DiagMessage() << "failed parsing overlays"); return 1; } } @@ -630,8 +633,8 @@ public: if (!mOptions.staticLib) { PrivateAttributeMover mover; - if (!mover.consume(&mContext, &mFinalTable)) { - mContext.getDiagnostics()->error( + if (!mover.consume(mContext, &mFinalTable)) { + mContext->getDiagnostics()->error( DiagMessage() << "failed moving private attributes"); return 1; } @@ -639,23 +642,23 @@ public: { IdAssigner idAssigner; - if (!idAssigner.consume(&mContext, &mFinalTable)) { - mContext.getDiagnostics()->error(DiagMessage() << "failed assigning IDs"); + if (!idAssigner.consume(mContext, &mFinalTable)) { + mContext->getDiagnostics()->error(DiagMessage() << "failed assigning IDs"); return 1; } } - mContext.mNameMangler = util::make_unique<NameMangler>(NameManglerPolicy{ - mContext.mCompilationPackage, mTableMerger->getMergedPackages() }); - mContext.mSymbols = JoinedSymbolTableBuilder() + mContext->mNameMangler = util::make_unique<NameMangler>(NameManglerPolicy{ + mContext->mCompilationPackage, mTableMerger->getMergedPackages() }); + mContext->mSymbols = JoinedSymbolTableBuilder() .addSymbolTable(util::make_unique<SymbolTableWrapper>(&mFinalTable)) - .addSymbolTable(std::move(mContext.mSymbols)) + .addSymbolTable(std::move(mContext->mSymbols)) .build(); { ReferenceLinker linker; - if (!linker.consume(&mContext, &mFinalTable)) { - mContext.getDiagnostics()->error(DiagMessage() << "failed linking references"); + if (!linker.consume(mContext, &mFinalTable)) { + mContext->getDiagnostics()->error(DiagMessage() << "failed linking references"); return 1; } } @@ -664,24 +667,24 @@ public: std::unique_ptr<IArchiveWriter> archiveWriter = makeArchiveWriter(); if (!archiveWriter) { - mContext.getDiagnostics()->error(DiagMessage() << "failed to create archive"); + mContext->getDiagnostics()->error(DiagMessage() << "failed to create archive"); return 1; } bool error = false; { ManifestFixer manifestFixer(mOptions.manifestFixerOptions); - if (!manifestFixer.consume(&mContext, manifestXml.get())) { + if (!manifestFixer.consume(mContext, manifestXml.get())) { error = true; } // AndroidManifest.xml has no resource name, but the CallSite is built from the name // (aka, which package the AndroidManifest.xml is coming from). // So we give it a package name so it can see local resources. - manifestXml->file.name.package = mContext.getCompilationPackage().toString(); + manifestXml->file.name.package = mContext->getCompilationPackage().toString(); XmlReferenceLinker manifestLinker; - if (manifestLinker.consume(&mContext, manifestXml.get())) { + if (manifestLinker.consume(mContext, manifestXml.get())) { if (!proguard::collectProguardRulesForManifest(Source(mOptions.manifestPath), manifestXml.get(), &proguardKeepSet)) { @@ -704,7 +707,7 @@ public: } if (error) { - mContext.getDiagnostics()->error(DiagMessage() << "failed processing manifest"); + mContext->getDiagnostics()->error(DiagMessage() << "failed processing manifest"); return 1; } @@ -718,13 +721,13 @@ public: (util::stringEndsWith<char>(path, ".xml.flat") || util::stringEndsWith<char>(path, ".xml"))) { if (mOptions.verbose) { - mContext.getDiagnostics()->note(DiagMessage() << "linking " << path); + mContext->getDiagnostics()->note(DiagMessage() << "linking " << path); } io::IFile* file = fileToMerge.file; std::unique_ptr<io::IData> data = file->openAsData(); if (!data) { - mContext.getDiagnostics()->error(DiagMessage(file->getSource()) + mContext->getDiagnostics()->error(DiagMessage(file->getSource()) << "failed to open file"); return 1; } @@ -733,9 +736,9 @@ public: if (util::stringEndsWith<char>(path, ".flat")) { xmlRes = loadBinaryXmlSkipFileExport(file->getSource(), data->data(), data->size(), - mContext.getDiagnostics()); + mContext->getDiagnostics()); } else { - xmlRes = xml::inflate(data->data(), data->size(), mContext.getDiagnostics(), + xmlRes = xml::inflate(data->data(), data->size(), mContext->getDiagnostics(), file->getSource()); } @@ -751,7 +754,7 @@ public: }; XmlReferenceLinker xmlLinker; - if (xmlLinker.consume(&mContext, xmlRes.get())) { + if (xmlLinker.consume(mContext, xmlRes.get())) { if (!proguard::collectProguardRules(xmlRes->file.source, xmlRes.get(), &proguardKeepSet)) { error = true; @@ -778,14 +781,14 @@ public: xmlRes->file.config.sdkVersion = sdkLevel; std::string genResourcePath = ResourceUtils::buildResourceFileName( - xmlRes->file, mContext.getNameMangler()); + xmlRes->file, mContext->getNameMangler()); bool added = mFinalTable.addFileReference( xmlRes->file.name, xmlRes->file.config, xmlRes->file.source, util::utf8ToUtf16(genResourcePath), - mContext.getDiagnostics()); + mContext->getDiagnostics()); if (!added) { error = true; continue; @@ -804,7 +807,7 @@ public: } } else { if (mOptions.verbose) { - mContext.getDiagnostics()->note(DiagMessage() << "copying " << path); + mContext->getDiagnostics()->note(DiagMessage() << "copying " << path); } if (!copyFileToArchive(fileToMerge.file, fileToMerge.dstPath, @@ -815,20 +818,20 @@ public: } if (error) { - mContext.getDiagnostics()->error(DiagMessage() << "failed linking file resources"); + mContext->getDiagnostics()->error(DiagMessage() << "failed linking file resources"); return 1; } if (!mOptions.noAutoVersion) { AutoVersioner versioner; - if (!versioner.consume(&mContext, &mFinalTable)) { - mContext.getDiagnostics()->error(DiagMessage() << "failed versioning styles"); + if (!versioner.consume(mContext, &mFinalTable)) { + mContext->getDiagnostics()->error(DiagMessage() << "failed versioning styles"); return 1; } } if (!flattenTable(&mFinalTable, archiveWriter.get())) { - mContext.getDiagnostics()->error(DiagMessage() << "failed to write resources.arsc"); + mContext->getDiagnostics()->error(DiagMessage() << "failed to write resources.arsc"); return 1; } @@ -840,8 +843,8 @@ public: options.useFinal = false; } - const StringPiece16 actualPackage = mContext.getCompilationPackage(); - StringPiece16 outputPackage = mContext.getCompilationPackage(); + const StringPiece16 actualPackage = mContext->getCompilationPackage(); + StringPiece16 outputPackage = mContext->getCompilationPackage(); if (mOptions.customJavaPackage) { // Override the output java package to the custom one. outputPackage = mOptions.customJavaPackage.value(); @@ -852,7 +855,7 @@ public: // to the original package, and private and public symbols to the private package. options.types = JavaClassGeneratorOptions::SymbolTypes::kPublic; - if (!writeJavaFile(&mFinalTable, mContext.getCompilationPackage(), + if (!writeJavaFile(&mFinalTable, mContext->getCompilationPackage(), outputPackage, options)) { return 1; } @@ -886,7 +889,7 @@ public: private: LinkOptions mOptions; - LinkContext mContext; + LinkContext* mContext; ResourceTable mFinalTable; ResourceTable mLocalFileTable; @@ -907,6 +910,7 @@ int link(const std::vector<StringPiece>& args) { Maybe<std::string> versionCode, versionName; Maybe<std::string> customJavaPackage; std::vector<std::string> extraJavaPackages; + Maybe<std::string> configs; bool legacyXFlag = false; bool requireLocalization = false; Flags flags = Flags() @@ -928,6 +932,8 @@ int link(const std::vector<StringPiece>& args) { &legacyXFlag) .optionalSwitch("-z", "Require localization of strings marked 'suggested'", &requireLocalization) + .optionalFlag("-c", "Comma separated list of configurations to include. The default\n" + "is all configurations", &configs) .optionalSwitch("--output-to-dir", "Outputs the APK contents to a directory specified " "by -o", &options.outputToDirectory) @@ -967,6 +973,8 @@ int link(const std::vector<StringPiece>& args) { return 1; } + LinkContext context; + if (privateSymbolsPackage) { options.privateSymbols = util::utf8ToUtf16(privateSymbolsPackage.value()); } @@ -1011,7 +1019,31 @@ int link(const std::vector<StringPiece>& args) { } } - LinkCommand cmd(options); + AxisConfigFilter filter; + if (configs) { + for (const StringPiece& configStr : util::tokenize<char>(configs.value(), ',')) { + ConfigDescription config; + LocaleValue lv; + if (lv.initFromFilterString(configStr)) { + lv.writeTo(&config); + } else if (!ConfigDescription::parse(configStr, &config)) { + context.getDiagnostics()->error( + DiagMessage() << "invalid config '" << configStr << "' for -c option"); + return 1; + } + + if (config.density != 0) { + context.getDiagnostics()->warn( + DiagMessage() << "ignoring density '" << config << "' for -c option"); + } else { + filter.addConfig(config); + } + } + + options.configFilter = &filter; + } + + LinkCommand cmd(&context, options); return cmd.run(flags.getArgs()); } diff --git a/tools/aapt2/link/TableMerger.cpp b/tools/aapt2/link/TableMerger.cpp index 27a23bd65103..e01a00401133 100644 --- a/tools/aapt2/link/TableMerger.cpp +++ b/tools/aapt2/link/TableMerger.cpp @@ -100,7 +100,7 @@ bool TableMerger::mergeAndMangle(const Source& src, const StringPiece16& package return false; } - mFilesToMerge[ResourceKeyRef{ name, config }] = FileToMerge{ + mFilesToMerge[ResourceKeyRef(name, config)] = FileToMerge{ f, oldFile->getSource(), util::utf16ToUtf8(*newFile->path) }; return true; }; @@ -201,6 +201,9 @@ bool TableMerger::doMerge(const Source& src, auto iter = std::lower_bound(dstEntry->values.begin(), dstEntry->values.end(), srcValue.config, cmp::lessThanConfig); + const bool stripConfig = mOptions.filter ? + !mOptions.filter->match(srcValue.config) : false; + if (iter != dstEntry->values.end() && iter->config == srcValue.config) { const int collisionResult = ResourceTable::resolveValueCollision( iter->value.get(), srcValue.value.get()); @@ -224,11 +227,15 @@ bool TableMerger::doMerge(const Source& src, continue; } - } else { + } else if (!stripConfig){ // Insert a place holder value. We will fill it in below. iter = dstEntry->values.insert(iter, ResourceConfigValue{ srcValue.config }); } + if (stripConfig) { + continue; + } + if (FileReference* f = valueCast<FileReference>(srcValue.value.get())) { std::unique_ptr<FileReference> newFileRef; if (manglePackage) { @@ -287,7 +294,7 @@ bool TableMerger::mergeFileImpl(const ResourceFile& fileDesc, io::IFile* file, b auto callback = [&](const ResourceNameRef& name, const ConfigDescription& config, FileReference* newFile, FileReference* oldFile) -> bool { - mFilesToMerge[ResourceKeyRef{ name, config }] = FileToMerge{ + mFilesToMerge[ResourceKeyRef(name, config)] = FileToMerge{ file, oldFile->getSource(), util::utf16ToUtf8(*newFile->path) }; return true; }; diff --git a/tools/aapt2/link/TableMerger.h b/tools/aapt2/link/TableMerger.h index e1be5d52e9cf..4539679fa769 100644 --- a/tools/aapt2/link/TableMerger.h +++ b/tools/aapt2/link/TableMerger.h @@ -20,6 +20,7 @@ #include "Resource.h" #include "ResourceTable.h" #include "ResourceValues.h" +#include "filter/ConfigFilter.h" #include "io/File.h" #include "process/IResourceTableConsumer.h" #include "util/Util.h" @@ -51,6 +52,11 @@ struct TableMergerOptions { * If true, resources in overlays can be added without previously having existed. */ bool autoAddOverlay = false; + + /** + * A filter that removes resources whose configurations don't match. + */ + IConfigFilter* filter = nullptr; }; /** diff --git a/tools/aapt2/link/TableMerger_test.cpp b/tools/aapt2/link/TableMerger_test.cpp index fa4afd3d852a..45c8c98780b8 100644 --- a/tools/aapt2/link/TableMerger_test.cpp +++ b/tools/aapt2/link/TableMerger_test.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "filter/ConfigFilter.h" #include "io/FileSystem.h" #include "link/TableMerger.h" #include "test/Builders.h" @@ -243,4 +244,36 @@ TEST_F(TableMergerTest, FailToMergeNewResourceWithoutAutoAddOverlay) { ASSERT_FALSE(merger.mergeOverlay({}, tableB.get())); } +TEST_F(TableMergerTest, MergeAndStripResourcesNotMatchingFilter) { + ResourceTable finalTable; + TableMergerOptions options; + options.autoAddOverlay = false; + + AxisConfigFilter filter; + filter.addConfig(test::parseConfigOrDie("en")); + options.filter = &filter; + + test::TestFile fileA("res/layout-en/main.xml"), fileB("res/layout-fr-rFR/main.xml"); + const ResourceName name = test::parseNameOrDie(u"@com.app.a:layout/main"); + const ConfigDescription configEn = test::parseConfigOrDie("en"); + const ConfigDescription configFr = test::parseConfigOrDie("fr-rFR"); + + TableMerger merger(mContext.get(), &finalTable, options); + ASSERT_TRUE(merger.mergeFile(ResourceFile{ name, configEn }, &fileA)); + ASSERT_TRUE(merger.mergeFile(ResourceFile{ name, configFr }, &fileB)); + + EXPECT_NE(nullptr, test::getValueForConfig<FileReference>(&finalTable, + u"@com.app.a:layout/main", + configEn)); + EXPECT_EQ(nullptr, test::getValueForConfig<FileReference>(&finalTable, + u"@com.app.a:layout/main", + configFr)); + + EXPECT_NE(merger.getFilesToMerge().end(), + merger.getFilesToMerge().find(ResourceKeyRef(name, configEn))); + + EXPECT_EQ(merger.getFilesToMerge().end(), + merger.getFilesToMerge().find(ResourceKeyRef(name, configFr))); +} + } // namespace aapt diff --git a/tools/aapt2/test/Builders.h b/tools/aapt2/test/Builders.h index 93a11b9334a8..579a46ec230f 100644 --- a/tools/aapt2/test/Builders.h +++ b/tools/aapt2/test/Builders.h @@ -84,6 +84,11 @@ public: util::make_unique<FileReference>(mTable->stringPool.makeRef(path))); } + ResourceTableBuilder& addFileReference(const StringPiece16& name, const StringPiece16& path, + const ConfigDescription& config) { + return addValue(name, {}, config, + util::make_unique<FileReference>(mTable->stringPool.makeRef(path))); + } ResourceTableBuilder& addValue(const StringPiece16& name, std::unique_ptr<Value> value) { diff --git a/wifi/java/android/net/wifi/AnqpInformationElement.java b/wifi/java/android/net/wifi/AnqpInformationElement.java new file mode 100644 index 000000000000..47b712991c49 --- /dev/null +++ b/wifi/java/android/net/wifi/AnqpInformationElement.java @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2016 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 android.net.wifi; + +/** + * This object contains the payload of an ANQP element. + * Vendor id is the vendor ID for the element, or 0 if it is an 802.11(u) element. + * Hotspot 2.0 uses the WFA Vendor ID which is 0x506f9a + * The payload contains the bytes of the payload, starting after the length octet(s). + * @hide + */ +public class AnqpInformationElement { + public static final int HOTSPOT20_VENDOR_ID = 0x506f9a; + + public static final int ANQP_QUERY_LIST = 256; + public static final int ANQP_CAPABILITY_LIST = 257; + public static final int ANQP_VENUE_NAME = 258; + public static final int ANQP_EMERGENCY_NUMBER = 259; + public static final int ANQP_NWK_AUTH_TYPE = 260; + public static final int ANQP_ROAMING_CONSORTIUM = 261; + public static final int ANQP_IP_ADDR_AVAILABILITY = 262; + public static final int ANQP_NAI_REALM = 263; + public static final int ANQP_3GPP_NETWORK = 264; + public static final int ANQP_GEO_LOC = 265; + public static final int ANQP_CIVIC_LOC = 266; + public static final int ANQP_LOC_URI = 267; + public static final int ANQP_DOM_NAME = 268; + public static final int ANQP_EMERGENCY_ALERT = 269; + public static final int ANQP_TDLS_CAP = 270; + public static final int ANQP_EMERGENCY_NAI = 271; + public static final int ANQP_NEIGHBOR_REPORT = 272; + public static final int ANQP_VENDOR_SPEC = 56797; + + public static final int HS_QUERY_LIST = 1; + public static final int HS_CAPABILITY_LIST = 2; + public static final int HS_FRIENDLY_NAME = 3; + public static final int HS_WAN_METRICS = 4; + public static final int HS_CONN_CAPABILITY = 5; + public static final int HS_NAI_HOME_REALM_QUERY = 6; + public static final int HS_OPERATING_CLASS = 7; + public static final int HS_OSU_PROVIDERS = 8; + public static final int HS_ICON_REQUEST = 10; + public static final int HS_ICON_FILE = 11; + + private final int mVendorId; + private final int mElementId; + private final byte[] mPayload; + + public AnqpInformationElement(int vendorId, int elementId, byte[] payload) { + mVendorId = vendorId; + mElementId = elementId; + mPayload = payload; + } + + public int getVendorId() { + return mVendorId; + } + + public int getElementId() { + return mElementId; + } + + public byte[] getPayload() { + return mPayload; + } +} diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index bad4e9cf0397..1c7a308746b0 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -20,7 +20,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.net.wifi.ScanSettings; import android.net.wifi.ScanResult; -import android.net.wifi.ScanInfo; +import android.net.wifi.PasspointManagementObjectDefinition; import android.net.wifi.WifiConnectionStatistics; import android.net.wifi.WifiActivityEnergyInfo; import android.net.Network; @@ -50,6 +50,17 @@ interface IWifiManager int addOrUpdateNetwork(in WifiConfiguration config); + int addPasspointManagementObject(String mo); + + int modifyPasspointManagementObject(String fqdn, + in List<PasspointManagementObjectDefinition> mos); + + void queryPasspointIcon(long bssid, String fileName); + + int matchProviderWithCurrentNetwork(String fqdn); + + void deauthenticateNetwork(long holdoff, boolean ess); + boolean removeNetwork(int netId); boolean enableNetwork(int netId, boolean disableOthers); @@ -64,10 +75,6 @@ interface IWifiManager void disconnect(); - List<ScanInfo> getScanInfos(String callingPackage); - - void setOsuSelection(int osuID); - void reconnect(); void reassociate(); diff --git a/wifi/java/android/net/wifi/ScanInfo.aidl b/wifi/java/android/net/wifi/PasspointManagementObjectDefinition.aidl index 18ae5088146f..eb7cc39d5e33 100644 --- a/wifi/java/android/net/wifi/ScanInfo.aidl +++ b/wifi/java/android/net/wifi/PasspointManagementObjectDefinition.aidl @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015, The Android Open Source Project + * Copyright (c) 2008, 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. @@ -16,4 +16,4 @@ package android.net.wifi; -parcelable ScanInfo; +parcelable PasspointManagementObjectDefinition; diff --git a/wifi/java/android/net/wifi/PasspointManagementObjectDefinition.java b/wifi/java/android/net/wifi/PasspointManagementObjectDefinition.java new file mode 100644 index 000000000000..611ed15c76b5 --- /dev/null +++ b/wifi/java/android/net/wifi/PasspointManagementObjectDefinition.java @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2016 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 android.net.wifi; + +import android.os.Parcel; +import android.os.Parcelable; + +/** + * This object describes a partial tree structure in the Hotspot 2.0 release 2 management object. + * The object is used during subscription remediation to modify parts of an existing PPS MO + * tree (Hotspot 2.0 specification section 9.1). + * @hide + */ +public class PasspointManagementObjectDefinition implements Parcelable { + private final String mBaseUri; + private final String mUrn; + private final String mMoTree; + + public PasspointManagementObjectDefinition(String baseUri, String urn, String moTree) { + mBaseUri = baseUri; + mUrn = urn; + mMoTree = moTree; + } + + public String getmBaseUri() { + return mBaseUri; + } + + public String getmUrn() { + return mUrn; + } + + public String getmMoTree() { + return mMoTree; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mBaseUri); + dest.writeString(mUrn); + dest.writeString(mMoTree); + } + + /** + * Implement the Parcelable interface {@hide} + */ + public static final Creator<PasspointManagementObjectDefinition> CREATOR = + new Creator<PasspointManagementObjectDefinition>() { + public PasspointManagementObjectDefinition createFromParcel(Parcel in) { + return new PasspointManagementObjectDefinition( + in.readString(), /* base URI */ + in.readString(), /* URN */ + in.readString() /* Tree XML */ + ); + } + + public PasspointManagementObjectDefinition[] newArray(int size) { + return new PasspointManagementObjectDefinition[size]; + } + }; +} + diff --git a/wifi/java/android/net/wifi/ScanInfo.java b/wifi/java/android/net/wifi/ScanInfo.java deleted file mode 100644 index 39186fa7a38a..000000000000 --- a/wifi/java/android/net/wifi/ScanInfo.java +++ /dev/null @@ -1,189 +0,0 @@ -package android.net.wifi; - -import android.os.Parcel; -import android.os.Parcelable; - -public class ScanInfo implements Parcelable { - private final ScanResult mScanResult; - - private final long mBSSID; // The BSSID of the best AP with an SSID matching the OSU - private final int mRSSI; // RSSI of the AP with BSSID - private final String mSSID; // The SSID to connect to for an OSU connection. - private final String mName; - private final String mServiceDescription; - private final String mIconType; - private final byte[] mIconData; - private final int mOSUIdentity; - - public ScanInfo(ScanResult scanResult) { - mScanResult = scanResult; - - mBSSID = -1; - mRSSI = -1; - mSSID = null; - mName = null; - mServiceDescription = null; - mIconType = null; - mIconData = null; - mOSUIdentity = -1; - } - - public ScanInfo(long BSSID, int rssi, String SSID, String name, String serviceDescription, - String iconType, byte[] iconData, int OSUIdentity) { - mBSSID = BSSID; - mRSSI = rssi; - mSSID = SSID; - mName = name; - mServiceDescription = serviceDescription; - mIconType = iconType; - mIconData = iconData; - mOSUIdentity = OSUIdentity; - - mScanResult = null; - } - - /** - * Get the scan result of this ScanInfo. - * @return The ScanResult, if this ScanInfo contains a one. If the ScanInfo contains - * OSU information getScanResult will return null. - */ - public ScanResult getScanResult() { - return mScanResult; - } - - /** - * OSU only: The BSSID of the AP who advertises the OSU SSID. This value is not guaranteed to - * be correct; In the somewhat unlikely case that multiple APs advertise OSU SSIDs that matches - * an OSU information element returned through ANQP and one of those is not related to an OSU - * there is a (slight) risk that the BSSID is for a "spoof" OSU. - * The matching algorithm that produces the ScanInfo objects makes a best effort to get the - * matching right though and since it is (a) fair to assume that the OSU SSID resides on the - * same AP as the one advertising the OSU information, and (b) BSSIDs for multi-SSID APs are - * typically adjacent to each other, matching will prefer the BSSID closest to the advertising - * APs BSSID if multiple SSIDs match. - * @return The BSSID. - */ - public long getBssid() { - return mBSSID; - } - - /** - * OSU only. - * @return The signal level of the AP associated with the BSSID from getBSSID. - */ - public int getRssi() { - return mRSSI; - } - - /** - * OSU only. - * @return The SSID of the AP to which to associate to establish an OSU connection. - */ - public String getSsid() { - return mSSID; - } - - /** - * OSU only. - * @return The name of the Service Provider of the OSU. - */ - public String getName() { - return mName; - } - - /** - * OSU only. - * @return The service description of the OSU. - */ - public String getServiceDescription() { - return mServiceDescription; - } - - /** - * OSU only. - * Get the type of icon that icon data represents, e.g. JPG, PNG etc. This field is formatted - * using standard MIME encodings per RFC-4288 and IANA MIME media types. - * @return The icon type in icon data. - */ - public String getIconType() { - return mIconType; - } - - /** - * OSU only. - * @return The binary data of the icon. - */ - public byte[] getIconData() { - return mIconData; - } - - /** - * OSU only. - * @return a unique identity for the OSU. This value is generated by the framework and should - * be used to uniquely identify a specific OSU. Please note that values may be reused after - * a very long time-span (in any normal scenario, likely years) and implementations should make - * sure to not rely on any long term persisted values. - */ - public int getOsuIdentity() { - return mOSUIdentity; - } - - private static final int ScanResultMarker = 0; - private static final int OSUMarker = 1; - - @Override - public int describeContents() { - return 0; - } - - /** Implement the Parcelable interface {@hide} */ - public static final Creator<ScanInfo> CREATOR = - new Creator<ScanInfo>() { - @Override - public ScanInfo createFromParcel(Parcel source) { - int marker = source.readInt(); - if (marker == ScanResultMarker) { - return new ScanInfo(ScanResult.CREATOR.createFromParcel(source)); - } - else if (marker == OSUMarker) { - return new ScanInfo( - source.readLong(), - source.readInt(), - source.readString(), - source.readString(), - source.readString(), - source.readString(), - source.createByteArray(), - source.readInt() - ); - } - else { - throw new RuntimeException("Bad ScanInfo data"); - } - } - - @Override - public ScanInfo[] newArray(int size) { - return new ScanInfo[0]; - } - }; - - @Override - public void writeToParcel(Parcel dest, int flags) { - if (mScanResult != null) { - dest.writeInt(ScanResultMarker); - mScanResult.writeToParcel(dest, flags); - return; - } - - dest.writeInt(OSUMarker); - dest.writeLong(mBSSID); - dest.writeInt(mRSSI); - dest.writeString(mSSID); - dest.writeString(mName); - dest.writeString(mServiceDescription); - dest.writeString(mIconType); - dest.writeByteArray(mIconData); - dest.writeInt(mOSUIdentity); - } -} diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java index 1f0533959e01..4a86c59542ab 100644 --- a/wifi/java/android/net/wifi/ScanResult.java +++ b/wifi/java/android/net/wifi/ScanResult.java @@ -43,6 +43,19 @@ public class ScanResult implements Parcelable { * The address of the access point. */ public String BSSID; + + /** + * The HESSID from the beacon. + * @hide + */ + public long hessid; + + /** + * The ANQP Domain ID from the Hotspot 2.0 Indication element, if present. + * @hide + */ + public int anqpDomainId; + /** * Describes the authentication, key management, and encryption schemes * supported by the access point. @@ -341,14 +354,27 @@ public class ScanResult implements Parcelable { /** information elements found in the beacon * @hide */ - public InformationElement informationElements[]; + public InformationElement[] informationElements; + + /** ANQP response elements. + * @hide + */ + public AnqpInformationElement[] anqpElements; /** {@hide} */ - public ScanResult(WifiSsid wifiSsid, String BSSID, String caps, int level, int frequency, - long tsf) { + public ScanResult(WifiSsid wifiSsid, String BSSID, long hessid, int anqpDomainId, + byte[] osuProviders, String caps, int level, int frequency, long tsf) { this.wifiSsid = wifiSsid; this.SSID = (wifiSsid != null) ? wifiSsid.toString() : WifiSsid.NONE; this.BSSID = BSSID; + this.hessid = hessid; + this.anqpDomainId = anqpDomainId; + if (osuProviders != null) { + this.anqpElements = new AnqpInformationElement[1]; + this.anqpElements[0] = + new AnqpInformationElement(AnqpInformationElement.HOTSPOT20_VENDOR_ID, + AnqpInformationElement.HS_OSU_PROVIDERS, osuProviders); + } this.capabilities = caps; this.level = level; this.frequency = frequency; @@ -380,11 +406,14 @@ public class ScanResult implements Parcelable { } /** {@hide} */ - public ScanResult(String Ssid, String BSSID, String caps, int level, int frequency, + public ScanResult(String Ssid, String BSSID, long hessid, int anqpDomainId, String caps, + int level, int frequency, long tsf, int distCm, int distSdCm, int channelWidth, int centerFreq0, int centerFreq1, boolean is80211McRTTResponder) { this.SSID = Ssid; this.BSSID = BSSID; + this.hessid = hessid; + this.anqpDomainId = anqpDomainId; this.capabilities = caps; this.level = level; this.frequency = frequency; @@ -402,11 +431,12 @@ public class ScanResult implements Parcelable { } /** {@hide} */ - public ScanResult(WifiSsid wifiSsid, String Ssid, String BSSID, String caps, int level, + public ScanResult(WifiSsid wifiSsid, String Ssid, String BSSID, long hessid, int anqpDomainId, + String caps, int level, int frequency, long tsf, int distCm, int distSdCm, int channelWidth, int centerFreq0, int centerFreq1, boolean is80211McRTTResponder) { - this(Ssid, BSSID, caps,level, frequency, tsf, distCm, distSdCm, channelWidth, centerFreq0, - centerFreq1, is80211McRTTResponder); + this(Ssid, BSSID, hessid, anqpDomainId, caps, level, frequency, tsf, distCm, + distSdCm, channelWidth, centerFreq0, centerFreq1, is80211McRTTResponder); this.wifiSsid = wifiSsid; } @@ -416,6 +446,10 @@ public class ScanResult implements Parcelable { wifiSsid = source.wifiSsid; SSID = source.SSID; BSSID = source.BSSID; + hessid = source.hessid; + anqpDomainId = source.anqpDomainId; + informationElements = source.informationElements; + anqpElements = source.anqpElements; capabilities = source.capabilities; level = source.level; frequency = source.frequency; @@ -496,6 +530,8 @@ public class ScanResult implements Parcelable { } dest.writeString(SSID); dest.writeString(BSSID); + dest.writeLong(hessid); + dest.writeInt(anqpDomainId); dest.writeString(capabilities); dest.writeInt(level); dest.writeInt(frequency); @@ -532,6 +568,18 @@ public class ScanResult implements Parcelable { for (int i = 0; i < anqpLines.size(); i++) { dest.writeString(anqpLines.get(i)); } + } + else { + dest.writeInt(0); + } + if (anqpElements != null) { + dest.writeInt(anqpElements.length); + for (AnqpInformationElement element : anqpElements) { + dest.writeInt(element.getVendorId()); + dest.writeInt(element.getElementId()); + dest.writeInt(element.getPayload().length); + dest.writeByteArray(element.getPayload()); + } } else { dest.writeInt(0); } @@ -546,19 +594,22 @@ public class ScanResult implements Parcelable { wifiSsid = WifiSsid.CREATOR.createFromParcel(in); } ScanResult sr = new ScanResult( - wifiSsid, - in.readString(), /* SSID */ - in.readString(), /* BSSID */ - in.readString(), /* capabilities */ - in.readInt(), /* level */ - in.readInt(), /* frequency */ - in.readLong(), /* timestamp */ - in.readInt(), /* distanceCm */ - in.readInt(), /* distanceSdCm */ - in.readInt(), /* channelWidth */ - in.readInt(), /* centerFreq0 */ - in.readInt(), /* centerFreq1 */ - false /* rtt responder, fixed with flags below */ + wifiSsid, + in.readString(), /* SSID */ + in.readString(), /* BSSID */ + in.readLong(), /* HESSID */ + in.readInt(), /* ANQP Domain ID */ + in.readString(), /* capabilities */ + in.readInt(), /* level */ + in.readInt(), /* frequency */ + in.readLong(), /* timestamp */ + in.readInt(), /* distanceCm */ + in.readInt(), /* distanceSdCm */ + in.readInt(), /* channelWidth */ + in.readInt(), /* centerFreq0 */ + in.readInt(), /* centerFreq1 */ + false /* rtt responder, + fixed with flags below */ ); sr.seen = in.readLong(); @@ -590,6 +641,19 @@ public class ScanResult implements Parcelable { sr.anqpLines.add(in.readString()); } } + n = in.readInt(); + if (n != 0) { + sr.anqpElements = new AnqpInformationElement[n]; + for (int i = 0; i < n; i++) { + int vendorId = in.readInt(); + int elementId = in.readInt(); + int len = in.readInt(); + byte[] payload = new byte[len]; + in.readByteArray(payload); + sr.anqpElements[i] = + new AnqpInformationElement(vendorId, elementId, payload); + } + } return sr; } diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 4c224607829f..a9132a59ced5 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -58,6 +58,9 @@ public class WifiConfiguration implements Parcelable { /** {@hide} */ public static final int INVALID_NETWORK_ID = -1; + /** {@hide} */ + private String mPasspointManagementObjectTree; + /** * Recognized key management schemes. */ @@ -80,11 +83,16 @@ public class WifiConfiguration implements Parcelable { */ @SystemApi public static final int WPA2_PSK = 4; + /** + * Hotspot 2.0 r2 OSEN: + * @hide + */ + public static final int OSEN = 5; public static final String varName = "key_mgmt"; public static final String[] strings = { "NONE", "WPA_PSK", "WPA_EAP", "IEEE8021X", - "WPA2_PSK" }; + "WPA2_PSK", "OSEN" }; } /** @@ -97,10 +105,14 @@ public class WifiConfiguration implements Parcelable { public static final int WPA = 0; /** WPA2/IEEE 802.11i */ public static final int RSN = 1; + /** HS2.0 r2 OSEN + * @hide + */ + public static final int OSEN = 2; public static final String varName = "proto"; - public static final String[] strings = { "WPA", "RSN" }; + public static final String[] strings = { "WPA", "RSN", "OSEN" }; } /** @@ -159,10 +171,15 @@ public class WifiConfiguration implements Parcelable { public static final int TKIP = 2; /** AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0] */ public static final int CCMP = 3; + /** Hotspot 2.0 r2 OSEN + * @hide + */ + public static final int GTK_NOT_USED = 4; public static final String varName = "group"; - public static final String[] strings = { "WEP40", "WEP104", "TKIP", "CCMP" }; + public static final String[] strings = + { "WEP40", "WEP104", "TKIP", "CCMP", "GTK_NOT_USED" }; } /** Possible status of a network configuration. */ @@ -1735,6 +1752,16 @@ public class WifiConfiguration implements Parcelable { return shared || (UserHandle.getUserId(creatorUid) == userId); } + /** @hide */ + public void setPasspointManagementObjectTree(String passpointManagementObjectTree) { + mPasspointManagementObjectTree = passpointManagementObjectTree; + } + + /** @hide */ + public String getMoTree() { + return mPasspointManagementObjectTree; + } + /** copy constructor {@hide} */ public WifiConfiguration(WifiConfiguration source) { if (source != null) { @@ -1886,6 +1913,7 @@ public class WifiConfiguration implements Parcelable { dest.writeInt(numNoInternetAccessReports); dest.writeInt(noInternetAccessExpected ? 1 : 0); dest.writeInt(shared ? 1 : 0); + dest.writeString(mPasspointManagementObjectTree); } /** Implement the Parcelable interface {@hide} */ @@ -1954,6 +1982,7 @@ public class WifiConfiguration implements Parcelable { config.numNoInternetAccessReports = in.readInt(); config.noInternetAccessExpected = in.readInt() != 0; config.shared = in.readInt() != 0; + config.mPasspointManagementObjectTree = in.readString(); return config; } diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 605e8c0b0b1e..a0dbd85049b2 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -273,8 +273,11 @@ public class WifiEnterpriseConfig implements Parcelable { public static final int AKA = 5; /** EAP-Authentication and Key Agreement Prime */ public static final int AKA_PRIME = 6; + /** Hotspot 2.0 r2 OSEN */ + public static final int UNAUTH_TLS = 7; /** @hide */ - public static final String[] strings = { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA", "AKA'" }; + public static final String[] strings = + { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA", "AKA'", "WFA-UNAUTH-TLS" }; /** Prevent initialization */ private Eap() {} diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index db40cd8b3649..2ad3c2e16e21 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -26,28 +26,26 @@ import android.net.DhcpInfo; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkRequest; -import android.net.wifi.ScanSettings; import android.os.Binder; import android.os.Build; -import android.os.IBinder; import android.os.Handler; import android.os.HandlerThread; +import android.os.IBinder; import android.os.Looper; import android.os.Message; +import android.os.Messenger; import android.os.RemoteException; import android.os.WorkSource; -import android.os.Messenger; import android.util.Log; import android.util.SparseArray; -import java.net.InetAddress; -import java.util.concurrent.CountDownLatch; - import com.android.internal.annotations.GuardedBy; import com.android.internal.util.AsyncChannel; import com.android.internal.util.Protocol; +import java.net.InetAddress; import java.util.List; +import java.util.concurrent.CountDownLatch; /** * This class provides the primary API for managing all aspects of Wi-Fi @@ -114,6 +112,51 @@ public class WifiManager { public static final int WIFI_CREDENTIAL_FORGOT = 1; /** + * Broadcast intent action indicating that the a Passpoint release 2 icon has been received. + * @hide + */ + public static final String PASSPOINT_ICON_RECEIVED_ACTION = + "android.net.wifi.PASSPOINT_ICON_RECEIVED"; + /** @hide */ + public static final String EXTRA_PASSPOINT_ICON_BSSID = "bssid"; + /** @hide */ + public static final String EXTRA_PASSPOINT_ICON_FILE = "file"; + /** @hide */ + public static final String EXTRA_PASSPOINT_ICON_DATA = "icon"; + + /** + * Broadcast intent action indicating that the a Passpoint release + * 2 WNM frame has been received. + * @hide + */ + public static final String PASSPOINT_WNM_FRAME_RECEIVED_ACTION = + "android.net.wifi.PASSPOINT_WNM_FRAME_RECEIVED"; + /** + * Originating BSS + * @hide */ + public static final String EXTRA_PASSPOINT_WNM_BSSID = "bssid"; + /** + * SOAP-XML or OMA-DM + * @hide */ + public static final String EXTRA_PASSPOINT_WNM_METHOD = "method"; + /** + * Type of Passpoint match + * @hide */ + public static final String EXTRA_PASSPOINT_WNM_PPOINT_MATCH = "match"; + /** + * String + * @hide */ + public static final String EXTRA_PASSPOINT_WNM_URL = "url"; + /** + * Boolean true=ess, false=bss + * @hide */ + public static final String EXTRA_PASSPOINT_WNM_ESS = "ess"; + /** + * Delay in seconds + * @hide */ + public static final String EXTRA_PASSPOINT_WNM_DELAY = "delay"; + + /** * Broadcast intent action indicating that Wi-Fi has been enabled, disabled, * enabling, disabling, or unknown. One extra provides this state as an int. * Another extra provides the previous state, if available. @@ -779,6 +822,76 @@ public class WifiManager { } /** + * Add a Hotspot 2.0 release 2 Management Object + * @param mo The MO in XML form + * @return -1 for failure + * @hide + */ + public int addPasspointManagementObject(String mo) { + try { + return mService.addPasspointManagementObject(mo); + } catch (RemoteException e) { + return -1; + } + } + + /** + * Modify a Hotspot 2.0 release 2 Management Object + * @param fqdn The FQDN of the service provider + * @param mos A List of MO definitions to be updated + * @return the number of nodes updated, or -1 for failure + * @hide + */ + public int modifyPasspointManagementObject(String fqdn, + List<PasspointManagementObjectDefinition> mos) { + try { + return mService.modifyPasspointManagementObject(fqdn, mos); + } catch (RemoteException e) { + return -1; + } + } + + /** + * Query for a Hotspot 2.0 release 2 OSU icon + * @param bssid The BSSID of the AP + * @param fileName Icon file name + * @hide + */ + public void queryPasspointIcon(long bssid, String fileName) { + try { + mService.queryPasspointIcon(bssid, fileName); + } catch (RemoteException e) { + } + } + + /** + * Match the currently associated network against the SP matching the given FQDN + * @param fqdn FQDN of the SP + * @return ordinal [HomeProvider, RoamingProvider, Incomplete, None, Declined] + * @hide + */ + public int matchProviderWithCurrentNetwork(String fqdn) { + try { + return mService.matchProviderWithCurrentNetwork(fqdn); + } catch (RemoteException e) { + return -1; + } + } + + /** + * Deauthenticate and set the re-authentication hold off time for the current network + * @param holdoff hold off time in milliseconds + * @param ess set if the hold off pertains to an ESS rather than a BSS + * @hide + */ + public void deauthenticateNetwork(long holdoff, boolean ess) { + try { + mService.deauthenticateNetwork(holdoff, ess); + } catch (RemoteException e) { + } + } + + /** * Remove the specified network from the list of configured networks. * This may result in the asynchronous delivery of state change * events. @@ -1199,30 +1312,6 @@ public class WifiManager { } /** - * An augmented version of getScanResults that returns ScanResults as well as OSU information - * wrapped in ScanInfo objects. - * @return - */ - public List<ScanInfo> getScanInfos() { - try { - return mService.getScanInfos(mContext.getOpPackageName()); - } catch (RemoteException e) { - return null; - } - } - - /** - * Notify the OSU framework about the currently selected OSU. - * @param osuID The OSU ID from ScanInfo.getOsuIdentity() - */ - public void setOsuSelection(int osuID) { - try { - mService.setOsuSelection(osuID); - } catch (RemoteException e) { - } - } - - /** * Check if scanning is always available. * * If this return {@code true}, apps can issue {@link #startScan} and fetch scan results |
